Merge tag 'omap-for-v5.4/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 Sep 2019 12:24:58 +0000 (14:24 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 3 Sep 2019 12:24:59 +0000 (14:24 +0200)
commita3a2902fb86e40a991bfd4bb84328df50b700541
treedd26fd868cfb89c4a180252cb14d416221346eed
parent7bbf8693103589936570e241db4ebf7beee55568
parent50f57ef83d836d727902a6a7e70cca61b0d02655
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 <arnd@arndb.de>