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 for Android: free password hash cracker in your pocket
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:	Mon, 20 Dec 2010 16:28:11 +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,
	Marek Belisko <marek.belisko@...il.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/composite.c between commit
dbb442b85a1d82f91cfe0524c4f9b3a5196a10ca ("Revert "USB: gadget: Allow
function access to device ID data during bind()"") from the usb.current
tree and commit 78bff3c65df33da47e93736bd8847b694084e5a9 ("USB: gadget:
composite: Typo fix") from the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/usb/gadget/composite.c
index 8572dad,21dc0da..0000000
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@@ -1118,15 -1126,7 +1118,15 @@@ static int composite_bind(struct usb_ga
  	cdev->desc = *composite->dev;
  	cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
  
 +	/* standardized runtime overrides for device ID data */
 +	if (idVendor)
 +		cdev->desc.idVendor = cpu_to_le16(idVendor);
 +	if (idProduct)
 +		cdev->desc.idProduct = cpu_to_le16(idProduct);
 +	if (bcdDevice)
 +		cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);
 +
- 	/* stirng overrides */
+ 	/* string overrides */
  	if (iManufacturer || !cdev->desc.iManufacturer) {
  		if (!iManufacturer && !composite->iManufacturer &&
  		    !*composite_manufacturer)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists