linux-kernel - linux-next: manual merge of the irqchip tree with the trivial 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]

Date:	Fri, 18 Jul 2014 15:23:04 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jason Cooper <jason@...edaemon.net>, Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>,
	Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>
Subject: linux-next: manual merge of the irqchip tree with the trivial tree

Hi Jason,

Today's linux-next merge of the irqchip tree got a conflict in
drivers/irqchip/irq-gic.c between commit d31e373d0778 ("irq-gic: remove
file name from heading comment") from the trivial tree and commit
fe7ac63fe539 ("irqchip: gic: Restructuring ARM GIC code") from the
irqchip tree.

I fixed it up (I just removed the file name from the comment) and can
carry the fix as necessary (no action is required).

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

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)