| 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
| ||
|
Message-ID: <20160121094022.33e25d08@canb.auug.org.au>
Date: Thu, 21 Jan 2016 09:40:22 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
<linux-arm-kernel@...ts.infradead.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Simon Horman <horms+renesas@...ge.net.au>
Subject: linux-next: manual merge of the arm-soc tree with Linus' tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
MAINTAINERS
between commit:
4a121096db9c ("MAINTAINERS: Update mailing list for Renesas SoC Development")
from Linus' tree and commit:
804b0d7011ee ("MAINTAINERS: Remove link to oss.renesas.com which is closed")
from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc MAINTAINERS
index 5461ecc147dc,0939ce1bdb71..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1531,9 -1526,8 +1541,8 @@@ F: drivers/media/platform/s5p-jpeg
ARM/SHMOBILE ARM ARCHITECTURE
M: Simon Horman <horms@...ge.net.au>
M: Magnus Damm <magnus.damm@...il.com>
-L: linux-sh@...r.kernel.org
-Q: http://patchwork.kernel.org/project/linux-sh/list/
+L: linux-renesas-soc@...r.kernel.org
- W: http://oss.renesas.com
+Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
S: Supported
F: arch/arm/boot/dts/emev2*
Powered by blists - more mailing lists