* linux-next: manual merge of the tip tree with the usb-gadget-fixes tree
@ 2015-03-11 2:41 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-03-11 2:41 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Felipe Balbi
Cc: linux-next, linux-kernel, Valentin Rothberg, Valentin Rothberg
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-03-11 2:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-11 2:41 linux-next: manual merge of the tip tree with the usb-gadget-fixes 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