From: Arnd Bergmann Date: Thu, 26 Apr 2018 14:44:54 +0000 (+0200) Subject: Merge tag 'socfpga_defconfig_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: ceph-for-4.17-rc5~58^2~11 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0a2d0501d37d52711d47ea6cafb010822b442fd;p=ceph-client.git Merge tag 'socfpga_defconfig_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into fixes ARM: socfpga_defconfig: fix QSPI Sector 4k - disable CONFIG_MTD_SPI_NOR_USE_4K_SECTORS * tag 'socfpga_defconfig_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: ARM: socfpga_defconfig: Remove QSPI Sector 4K size force --- a0a2d0501d37d52711d47ea6cafb010822b442fd