linux-kernel - Re: linux-next: manual merge of the tip 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4D8079BE.6050505@linutronix.de>
Date:	Wed, 16 Mar 2011 09:50:06 +0100
From:	Sebastian Andrzej Siewior <bigeasy@...utronix.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the tip tree with Linus' tree

Stephen Rothwell wrote:
> Hi all,
Hi Stephen,

> Today's linux-next merge of the tip tree got a conflict in
> arch/x86/platform/ce4100/ce4100.c between commit 03150171dcf9 ("x86:
> ce4100: Set pci ops via callback instead of module init") from Linus'
> tree and commit 1fa4163bdc19 ("x86: ce4100: Use OF to setup devices")
> from the tip tree.

I just looked and Linus already pulled and fixed it up by himself. Thanks
for letting me know.

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