linux-kernel - Re: linux-next: manual merge of the akpm tree with the rr 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: <877gwfv9c1.fsf@rustcorp.com.au>
Date:	Mon, 14 May 2012 10:59:34 +0930
From:	Rusty Russell <rusty@...tcorp.com.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andi Kleen <ak@...ux.intel.com>,
	"Al Viro" <viro@...iv.linux.org.uk>
Subject: Re: linux-next: manual merge of the akpm tree with the rr tree

On Thu, 10 May 2012 18:51:55 +1000, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got conflicts in
> kernel/lglock.c, include/linux/lglock.h, fs/namespace.c and fs/internal.h
> between various commits from the rr tree and commit "brlocks/lglocks:
> cleanups" from the akpm tree.
> 
> The akpm tree patch seems to be a merge of the rr tree commits, so I
> dropped the akpm tree patch.

Al said he'd take them, so I dropped mine now too.

Thanks,
Rusty.

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