linux-kernel - Re: linux-next: manual merge of the irqdomain 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: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CACxGe6uvbyT9Jwg3+nzjF36cSAPqSWOdpKeiPT+JtbeEz5h7tw@mail.gmail.com>
Date:	Mon, 13 Feb 2012 21:44:18 -0700
From:	Grant Likely <grant.likely@...retlab.ca>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the irqdomain tree with Linus' tree

On Mon, Feb 13, 2012 at 9:36 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the irqdomain tree got a conflict in
> drivers/mfd/twl-core.c between commit 6252547b8a7a ("ARM: omap: fix
> broken twl-core dependencies and ifdefs") from Linus' tree and commit
> 7da5a66bbf1f ("irq_domain: Remove 'new' irq_domain in favour of the ppc
> one") from the irqdomain tree.
>
> The latter removes the code modified by the former, so I did that.

Thanks Stephen. I'll respin the tree after the next rc

g.

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



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
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/