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

Message-ID: <CAM_iQpXmwb3DhwJ3WbojKUWmbmVL3Qxkx8w8oLnOKYC+=hWO4Q@mail.gmail.com>
Date:	Tue, 30 Aug 2011 23:24:32 +0800
From:	Américo Wang <xiyou.wangcong@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the akpm with Linus' tree

On Mon, Aug 29, 2011 at 1:22 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got a conflict in
> arch/cris/include/asm/serial.h between commit 02016bc0381c ("cris: add
> arch/cris/include/asm/serial.h") from Linus' tree and commit f8b20ed71f1b
> ("Fix the following build errors:") from the akpm tree.
>
> There former appears to be a later version of the latter, so I dropped
> the latter.

Yeah, thanks Stephen!
--
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/