Merge branch '2020-03-27-master-imports'
- Update a few MAINTAINERS entries
- cache alignment fix in ext4 code
- Two small test fixes
diff --git a/MAINTAINERS b/MAINTAINERS
index 92dda40..b50652b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -527,6 +527,13 @@
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 @@
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 1c616a2..966b427 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -288,7 +288,7 @@
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 cf040d7..63f929f 100644
--- a/test/compression.c
+++ b/test/compression.c
@@ -451,7 +451,7 @@
}
/**
- * 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 a25aa5f..ea652f9 100644
--- a/test/py/tests/test_mmc_rd.py
+++ b/test/py/tests/test_mmc_rd.py
@@ -56,7 +56,7 @@
'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 @@
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