linux-kernel - 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-next>] [day] [month] [year] [list]

Date:	Tue, 14 Feb 2012 15:36:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the irqdomain tree with Linus' tree

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.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped