linux-kernel - Re: linux-next: manual merge of the akpm tree with the slab 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: <CAOJsxLEkPbgYCPkknK1ZiPH6RjmAQbLgPnvb=mBVOQrY67m47g@mail.gmail.com>
Date:	Wed, 14 Sep 2011 09:35:09 +0300
From:	Pekka Enberg <penberg@...helsinki.fi>
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,
	Dave Jones <davej@...hat.com>,
	Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
	Christoph Lameter <cl@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the akpm tree with the slab tree

On Wed, Sep 14, 2011 at 9:24 AM, 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
> mm/slab.c between commit fdde6abb3e8d ("slab: use print_hex_dump") from
> the slab tree and commit 0cf5ab251a1a ("When we get corruption reports,
> it's useful to see if the kernel was") from the akpm tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Andrew, if you send me the patch to penberg@...helsinki.fi, I can fix
up the conflict and carry it in my tree.

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