From: Arnd Bergmann Date: Tue, 3 Sep 2019 12:24:58 +0000 (+0200) Subject: Merge tag 'omap-for-v5.4/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.4-rc1~187^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3a2902fb86e40a991bfd4bb84328df50b700541;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'omap-for-v5.4/soc-signed' of git://git./linux/kernel/git/tmlind/linux-omap into arm/soc SoC changes for omap variants for v5.4 The first change moves platform-specific asm-offsets.h to arch/arm/mach-omap2 to fix iessu with parallel build with CONFIG_IKHEADERS, and the second change removes a useless kfree. Note that the first change causes a trivial merge conflict with the iommu changes for arch/arm/mach-omap2/Makefile. * tag 'omap-for-v5.4/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Delete an unnecessary kfree() call in omap_hsmmc_pdata_init() ARM: OMAP2+: move platform-specific asm-offset.h to arch/arm/mach-omap2 Link: https://lore.kernel.org/r/pull-1567016893-318461@atomide.com Signed-off-by: Arnd Bergmann --- a3a2902fb86e40a991bfd4bb84328df50b700541