linux-kernel - linux-next: manual merge of the pcmcia tree with the arm 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>] [day] [month] [year] [list]

Message-Id: <20120305142248.56e1a4719f16c246c3095cf3@canb.auug.org.au>
Date:	Mon, 5 Mar 2012 14:22:48 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dominik Brodowski <linux@...inikbrodowski.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Yong Zhang <yong.zhang0@...il.com>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the pcmcia tree with the arm tree

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/pcmcia/soc_common.c between commit a7670151a48c ("PCMCIA:
soc_common: remove soc_pcmcia_*_irqs functions") from the arm tree and
commit d571c79e86fa ("pcmcia: irq: Remove IRQF_DISABLED") from the pcmcia
tree.

The former removed the code modified by the latter, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped