* linux-next: manual merge of the akpm tree with the usb tree
@ 2015-10-19 6:03 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-10-19 6:03 UTC (permalink / raw)
To: Andrew Morton, Greg KH
Cc: linux-next, linux-kernel, Peter Senna Tschudin, Christoph Hellwig
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/usb/host/fusbh200-hcd.c
between commit:
34e51ba6b65b ("usb-host: Remove fusbh200 driver")
from the usb tree and patch:
"dma: remove external references to dma_supported"
from the akpm tree.
I fixed it up (the former removed the file, so I did that) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-10-19 6:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-19 6:03 linux-next: manual merge of the akpm tree with the usb 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