* linux-next: manual merge of the driver-core tree with the tegra tree
@ 2014-11-24 7:28 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-11-24 7:28 UTC (permalink / raw)
To: Greg KH, Stephen Warren, Colin Cross, Olof Johansson, Thierry Reding
Cc: linux-next, linux-kernel, Wolfram Sang
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
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 sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the driver-core tree with the tegra tree
@ 2014-11-24 7:25 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-11-24 7:25 UTC (permalink / raw)
To: Greg KH, Stephen Warren, Colin Cross, Olof Johansson, Thierry Reding
Cc: linux-next, linux-kernel, Wolfram Sang
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/iommu/tegra-smmu.c between commit a2257374a4bd ("memory: Add
NVIDIA Tegra memory controller support") from the tegra tree and commit
98b773cf7b6b ("iommu: drop owner assignment from platform_drivers")
from the driver-core tree.
I fixed it up (the former removed the code modified by the latter) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-24 7:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-24 7:28 linux-next: manual merge of the driver-core tree with the tegra tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-11-24 7:25 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).