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.
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAl1kCcERHHRvbnlAYXRv
bWlkZS5jb20ACgkQG9Q+yVyrpXPOfhAA3yv95lG1eyrhJ+E/kOWrinDARIDJvh+2
Ha1A3HkyJ+qzNg1GdeQ5exU3/ZsJRvKdU5MSmldnrvg9jWYFcBMeF8vtR7ZMEdzJ
GDW4o211WEmca/ni9ChNmfVWPF5WSoeMQLa3Ytg40lc1v7CuHYSrmrB2Rqjtpnon
uokTt3hjJHCX/Q5wvf8sWdhAynPbxq7zcCMNbyGxzaoKolWas6bpLmcNwHp4zDi0
JE+bd7sc9ZvBt8mnsJ9XUMVdQQ75jD3LeJyYzixMxNxpfUsnc3WZDZgaxFpW1hCK
eBTRNQLiwZ9MsbgWCUdY7Brd+GIW15HPX+r5s2GhtXXqex+abfSRRqH6P7uneAmn
9CfxzYshITfl7R7nSd1HzGKg4DjNmsktFFFyKWd/H8xvjI5lnt9M1VSyRVJiY+1z
bw4IV+ag+n3NfOzhpi3ddB9uFhSZtpJ1SH7Ynj7NS3YSfWamJs93Z0RXVAZXYNM0
Vwj+g/YfgtY7qnSGcbfoBPLh7gmGRpsVOxOOmuMlkwcVjN1Pvb3wqT+JGUiCxm6d
rdcazAxjc2rvnJuJc1stzrSBMT5AZdxAw+DOTTLRfEcBnf6C5mhGFRyOCxhxL2QB
Q2MWI1aHWqjmu1QTnBLDoUNyaKyxrZm00cq2b4U8lh7xO4v3ACks2jXuD5zQjzjo
nTReIX6lPeQ=
=DRR4
-----END PGP SIGNATURE-----
Merge tag 'omap-for-v5.4/soc-signed' of git://git.kernel.org/pub/scm/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>