Re: linux-next: manual merge of the akpm tree with the arm-soc tree

[Stephen Rothwell]

Hi,

On Tue, 28 Feb 2012 22:54:06 -0800 Haojian Zhuang <hzhuang1@xxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature