linux-next: manual merge of the akpm tree with the usb tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the akpm tree with the usb tree
Date	2015-10-19 08:10 +0200
Message-ID	<qlbNU-49Z-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the akpm tree with the usb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-19 08:10 +0200

csiph-web