linux-kernel - linux-next: manual merge of the usb-gadget tree with the usb.current 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20130322143135.8f9c42c298fd86e4084ca397@canb.auug.org.au>
Date:	Fri, 22 Mar 2013 14:31:35 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Felipe Balbi <balbi@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alan Stern <stern@...land.harvard.edu>,
	Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the usb-gadget tree with the
 usb.current tree

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2280.c between commit 8119b55aed81 ("USB: gadget:
net2280: remove leftover driver->unbind call in error pathway") from the
usb.current tree and commit 68abc94f8de8 ("usb: gadget: net2280: don't 
touch gadget.dev.driver") from the usb-gadget 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/gadget/net2280.c
index 3bd0f99,691cc65..0000000
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@@ -1924,7 -1920,7 +1920,6 @@@ static int net2280_start(struct usb_gad
  err_func:
  	device_remove_file (&dev->pdev->dev, &dev_attr_function);
  err_unbind:
- 	dev->gadget.dev.driver = NULL;
 -	driver->unbind (&dev->gadget);
  	dev->driver = NULL;
  	return retval;
  }

Content of type "application/pgp-signature" skipped