linux-kernel - linux-next: manual merge of the xen-two tree with the tip 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]

Message-Id: <20110210145528.95c90b63.sfr@au1.ibm.com>
Date:	Thu, 10 Feb 2011 14:55:28 +1100
From:	Stephen Rothwell <sfr@....ibm.com>
To:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the xen-two tree with the tip tree

Hi Konrad,

Today's linux-next merge of the xen-two tree got a conflict in
kernel/irq/manage.c between commit
dc5f219e88294b93009eef946251251ffffb6d60 ("genirq: Add
IRQF_FORCE_RESUME") from the tip tree and commit
c6c5596743c2a333a8e31b0247f44cd367484a5e ("genirq: Add
IRQF_FORCE_RESUME") from the xen-two tree.

Despite having the same Author time stamps, these commits are not quite the
same.  I used the version from the tip tree which kept the line:

		desc->status &= ~IRQ_SUSPENDED;

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped