linux-kernel - Re: linux-next: manual merge of the arm-soc 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 for Android: free password hash cracker in your pocket

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

Message-Id: <201111241555.03715.arnd@arndb.de>
Date:	Thu, 24 Nov 2011 15:55:03 +0000
From:	Arnd Bergmann <arnd@...db.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@...osoft.com>,
	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	Jamie Iles <jamie.iles@...hembedded.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with Linus' tree

On Thursday 24 November 2011, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/net/ethernet/cadence/Kconfig between commit eccab1ec87d0
> ("net/cadence: enable by default NET_ATMEL") from Linus' tree and commit
> f75ba50bdc2b ("macb: initial support for Cadence GEM") from the arm-soc
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Yes, looks good.

Thanks,

	Arnd
--
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/