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

Message-ID: <4B260F25.6070908@gmail.com>
Date:	Mon, 14 Dec 2009 11:10:45 +0100
From:	Jiri Slaby <jirislaby@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@...iv.linux.org.uk>
Subject: Re: linux-next: manual merge of the limits tree with Linus' tree

On 12/14/2009 04:39 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the limits tree got a conflict in
> arch/ia64/kernel/sys_ia64.c between commit
> bb52d6694002b9d632bb355f64daa045c6293a4e ("Get rid of open-coding in
> ia64_brk()") from Linus' tree and commit
> d9ef7d0ce61f214180f505b78cdf8f9b3d862dfa ("IA64: use helpers for
> rlimits") from the limits tree.
> 
> The former removed the code that the latter was updating.  A merge with
> Linus' tree will fix this up, but it is pretty trivial anyway.

Hi.

Thanks, I fixed all 3 conflicts.

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