diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-27 17:54:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-27 17:54:38 -0400 |
| commit | 350c44dfb99017e9147ee07d37a40626bde62250 (patch) | |
| tree | 2a69f066e782471f0ad9fd198e803430a046e47f | |
| parent | 39984d22138339fb2b14b21de635ef177cce0c7a (diff) | |
| parent | 6cc8e545b79311de2dbf7f05291fc77a54ffea6b (diff) | |
Merge branch '2020-03-27-master-imports'
- Update a few MAINTAINERS entries
- cache alignment fix in ext4 code
- Two small test fixes
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | fs/ext4/ext4fs.c | 2 | ||||
| -rw-r--r-- | test/compression.c | 2 | ||||
| -rw-r--r-- | test/py/tests/test_mmc_rd.py | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 92dda40a85..b50652bd85 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -527,6 +527,13 @@ M: Simon Glass <sjg@chromium.org> S: Maintained F: tools/binman/ +BTRFS +M: Marek Behun <marek.behun@nic.cz> +S: Maintained +F: cmd/btrfs.c +F: fs/btrfs/ +F: include/btrfs.h + BUILDMAN M: Simon Glass <sjg@chromium.org> S: Maintained @@ -937,6 +944,7 @@ T: git https://gitlab.denx.de/u-boot/custodians/u-boot-usb.git F: drivers/usb/ F: common/usb.c F: common/usb_kbd.c +F: include/usb.h USB xHCI M: Bin Meng <bmeng.cn@gmail.com> diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 1c616a26a2..966b427a97 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -288,7 +288,7 @@ int ext_cache_read(struct ext_block_cache *cache, lbaint_t block, int size) if (cache->buf && cache->block == block && cache->size == size) return 1; ext_cache_fini(cache); - cache->buf = malloc(size); + cache->buf = memalign(ARCH_DMA_MINALIGN, size); if (!cache->buf) return 0; if (!ext4fs_devread(block, 0, size, cache->buf)) { diff --git a/test/compression.c b/test/compression.c index cf040d7c86..63f929fa4b 100644 --- a/test/compression.c +++ b/test/compression.c @@ -451,7 +451,7 @@ static int compress_using_none(struct unit_test_state *uts, } /** - * run_bootm_test() - Run tests on the bootm decopmression function + * run_bootm_test() - Run tests on the bootm decompression function * * @comp_type: Compression type to test * @compress: Our function to compress data diff --git a/test/py/tests/test_mmc_rd.py b/test/py/tests/test_mmc_rd.py index a25aa5f6f7..ea652f9136 100644 --- a/test/py/tests/test_mmc_rd.py +++ b/test/py/tests/test_mmc_rd.py @@ -56,7 +56,7 @@ env__mmc_dev_configs = ( 'info_mode': ???, 'info_buswidth': ???. }, -} +) # Configuration data for test_mmc_rd; defines regions of the MMC (entire # devices, or ranges of sectors) which can be read: @@ -210,7 +210,7 @@ def test_mmc_info(u_boot_console, env__mmc_dev_config): assert good_response in response good_response = "Bus Speed: %s" % info_speed assert good_response in response - good_response = "Mode : %s" % info_mode + good_response = "Mode: %s" % info_mode assert good_response in response good_response = "Bus Width: %s" % info_buswidth assert good_response in response |