From: Arnd Bergmann Date: Thu, 28 May 2020 20:17:49 +0000 (+0200) Subject: Merge branch 'baikal/drivers' into arm/drivers X-Git-Tag: v5.8-rc1~138^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78f7d98be7a869fd6f99c1c2abe7ce2adc3198e0;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'baikal/drivers' into arm/drivers These are mainly fixups for comments that collided with me already merging v3 of the series, and one patch that I had forgotten to pick up. * baikal/drivers: bus: bt1-axi: Build the driver into the kernel bus: bt1-apb: Build the driver into the kernel bus: bt1-axi: Use sysfs_streq instead of strncmp bus: bt1-axi: Optimize the return points in the driver bus: bt1-apb: Use sysfs_streq instead of strncmp bus: bt1-apb: Use PTR_ERR_OR_ZERO to return from request-regs method bus: bt1-apb: Fix show/store callback identations bus: bt1-apb: Include linux/io.h dt-bindings: memory: Add Baikal-T1 L2-cache Control Block binding Signed-off-by: Arnd Bergmann --- 78f7d98be7a869fd6f99c1c2abe7ce2adc3198e0