lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 24 Nov 2014 18:28:49 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Stephen Warren <swarren@...dia.com>,
Colin Cross <ccross@...roid.com>,
Olof Johansson <olof@...om.net>,
Thierry Reding <treding@...dia.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Wolfram Sang <wsa@...-dreams.de>
Subject: linux-next: manual merge of the driver-core tree with the tegra
tree
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@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists