Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/memory/tegra30-mc.c between commit a2257374a4bd ("memory: Add NVIDIA Tegra memory controller support") from the tegra tree and commit 0f0d7e7b022b ("memory: drop owner assignment from platform_drivers") from the driver-core tree.
I fixed it up (the former removed the file, so I did that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpxi2PuGMkVN.pgp
Description: OpenPGP digital signature