* linux-next: manual merge of the irqchip tree with the trivial tree
@ 2014-07-18 5:23 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-07-18 5:23 UTC (permalink / raw)
To: Jason Cooper, Jiri Kosina
Cc: linux-next, linux-kernel, Sergei Shtylyov, Suravee Suthikulpanit
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
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@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-07-18 5:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-18 5:23 linux-next: manual merge of the irqchip tree with the trivial tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox