linux-kernel - linux-next: manual merge of the usb tree with the driver-core tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130218153242.747962940bbed03bfdb2623b@canb.auug.org.au>
Date:	Mon, 18 Feb 2013 15:32:42 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thierry Reding <thierry.reding@...onic-design.de>,
	Manjunath Goudar <manjunath.goudar@...aro.org>
Subject: linux-next: manual merge of the usb tree with the driver-core tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-vt8500.c between commit 148e11349b0c ("usb: Convert
to devm_ioremap_resource()") from the driver-core tree and commit
d57ada0c37ec ("USB: EHCI: make ehci-vt8500 a separate driver") from the
usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/usb/host/ehci-vt8500.c
index 7ecf709,98d65bd..0000000
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@@ -16,7 -16,12 +16,13 @@@
   *
   */
  
 +#include <linux/err.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/usb.h>
+ #include <linux/usb/hcd.h>
+ #include <linux/io.h>
+ #include <linux/dma-mapping.h>
  #include <linux/of.h>
  #include <linux/platform_device.h>
  

Content of type "application/pgp-signature" skipped