From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Felipe Balbi <balbi@ti.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Valentin Rothberg <Valentin.Rothberg@lip6.fr>,
Valentin Rothberg <valentinrothberg@gmail.com>
Subject: linux-next: manual merge of the tip tree with the usb-gadget-fixes tree
Date: Wed, 11 Mar 2015 13:41:50 +1100 [thread overview]
Message-ID: <20150311134150.2cd9464c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/usb/isp1760/isp1760-core.c between commit 80b4a0f8feeb ("usb:
isp1760: set IRQ flags properly") from the usb-gadget-fixes tree and
commit d8bf368d0631 ("genirq: Remove the deprecated 'IRQF_DISABLED'
request_irq() flag entirely") from the tip tree.
I fixed it up (the latter is a subset of the former) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2015-03-11 2:41 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=20150311134150.2cd9464c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Valentin.Rothberg@lip6.fr \
--cc=balbi@ti.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=valentinrothberg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®