linux-kernel - Re: linux-next: manual merge of the akpm tree with the arm-soc 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: <20120229181103.e05c55bafd959f739d6a336b@canb.auug.org.au>
Date:	Wed, 29 Feb 2012 18:11:03 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Haojian Zhuang <hzhuang1@...vell.com>
Cc:	Yong Zhang <yong.zhang0@...il.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>
Subject: Re: linux-next: manual merge of the akpm tree with the arm-soc tree

Hi,

On Tue, 28 Feb 2012 22:54:06 -0800 Haojian Zhuang <hzhuang1@...vell.com> wrote:
>
> Since there's the conflict on code. Does it mean that I need to re-submit
> those patches in arm-soc that should be based on commit "drivers/rtc:
> remove IRQF_DISABLED" from the akpm tree?

No, that conflict can be resolved by Linus during the next merge window
(unless someone else wants to do something about it).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped