From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Cooper <jason@lakedaemon•net>, Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sergei Shtylyov <sergei.shtylyov@cogentembedded•com>,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd•com>
Subject: linux-next: manual merge of the irqchip tree with the trivial tree
Date: Fri, 18 Jul 2014 15:23:04 +1000 [thread overview]
Message-ID: <20140718152304.3daf648a@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2014-07-18 5:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140718152304.3daf648a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Suravee.Suthikulpanit@amd$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sergei.shtylyov@cogentembedded$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox