linux-kernel - linux-next: manual merge of the arm tree with Linus' tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090731103354.5e7fdd42.sfr@canb.auug.org.au>
Date:	Fri, 31 Jul 2009 10:33:54 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King <rmk@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hartley Sweeten <hartleys@...ionengravers.com>,
	Ryan Mallon <ryan@...ewatersys.com>,
	Joe Perches <joe@...ches.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the arm tree with Linus' tree

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in MAINTAINERS
between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
coalesce name and email address lines") from Linus' tree and commit
d19d36672ee379f26b79df985a9a2e5afb3f1df1 ("[ARM] 5599/1: MAINTAINERS:
update for EP93XX ARM") from the arm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc MAINTAINERS
index 79471ba,1be6a0c..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -535,12 -604,18 +535,15 @@@ W:	http://maxim.org.za/at91_26.htm
  S:	Maintained
  
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
- M:	Lennert Buytenhek <kernel@...tstofly.org>
 -P:	Hartley Sweeten
 -M:	hsweeten@...ionengravers.com
 -P:	Ryan Mallon
 -M:	ryan@...ewatersys.com
++M:	Hartley Sweeten <hsweeten@...ionengravers.com>
++M:	Ryan Mallon <ryan@...ewatersys.com>
  L:	linux-arm-kernel@...ts.arm.linux.org.uk (subscribers-only)
  S:	Maintained
+ F:	arch/arm/mach-ep93xx/
+ F:	arch/arm/mach-ep93xx/include/mach/
  
  ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
 -P:	Lennert Buytenhek
 -M:	kernel@...tstofly.org
 +M:	Lennert Buytenhek <kernel@...tstofly.org>
  L:	linux-arm-kernel@...ts.arm.linux.org.uk (subscribers-only)
  S:	Maintained
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/