From: Arnd Bergmann <arnd@arndb.de>
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: v5.15~8945^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0a2d0501d37d52711d47ea6cafb010822b442fd;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'socfpga_defconfig_fix_v4.17' of git://git./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