linux-kernel - linux-next: manual merge of the pxa 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: <20090803110314.1c2c3cca.sfr@canb.auug.org.au>
Date:	Mon, 3 Aug 2009 11:03:14 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Eric Miao <eric.y.miao@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Marek Vasut <marek.vasut@...il.com>,
	Joe Perches <joe@...ches.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the pxa tree with Linus' tree

Hi Eric,

Today's linux-next merge of the pxa tree got a conflict in MAINTAINERS
between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
coalesce name and email address lines") from Linus' tree and commit
4ad9febe53347962225169c5bde2ec030e46ab1d ("Palm Tungsten|C initial
support") from the pxa tree.

Just context changes.  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 1677158,642cd9a..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -705,12 -803,15 +705,12 @@@ W:	http://wiki.openmoko.org/wiki/Neo_Fr
  S:	Supported
  
  ARM/TOSA MACHINE SUPPORT
 -P:	Dmitry Eremin-Solenikov
 -M:	dbaryshkov@...il.com
 -P:	Dirk Opfer
 -M:	dirk@...er-online.de
 +M:	Dmitry Eremin-Solenikov <dbaryshkov@...il.com>
 +M:	Dirk Opfer <dirk@...er-online.de>
  S:	Maintained
  
- ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
+ ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
 -P:	Marek Vasut
 -M:	marek.vasut@...il.com
 +M:	Marek Vasut <marek.vasut@...il.com>
  W:	http://hackndev.com
  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/