linux-kernel - linux-next: manual merge of the staging tree with the staging.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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20110609165804.2e96bb77.sfr@canb.auug.org.au>
Date:	Thu, 9 Jun 2011 16:58:04 +1000
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,
	Arjan Mels <arjan.mels@....net>,
	matt mooney <mfm@...eddisk.com>
Subject: linux-next: manual merge of the staging tree with the
 staging.current tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/usbip/stub_dev.c between commit d3ac07788017 ("staging:
usbip: bugfix prevent driver unbind") from the staging.current tree and
commit d012c2a5aca1 ("staging: usbip: stub_dev.c: move stub_driver
definition and update driver name") from the staging tree.

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

diff --cc drivers/staging/usbip/stub_dev.c
index 8cbea42,e26b2ee..0000000
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/staging/usbip/stub_dev.c
@@@ -546,19 -524,9 +524,28 @@@ static void stub_disconnect(struct usb_
  	}
  }
  
 +/* 
 + * Presence of pre_reset and post_reset prevents the driver from being unbound
 + * when the device is being reset
 + */
 + 
 +int stub_pre_reset(struct usb_interface *interface)
 +{
 +	dev_dbg(&interface->dev, "pre_reset\n");
 +	return 0;
 +}
 +
 +int stub_post_reset(struct usb_interface *interface)
 +{
 +	dev_dbg(&interface->dev, "post_reset\n");
 +	return 0;
 +}
++
+ struct usb_driver stub_driver = {
+ 	.name		= "usbip-host",
+ 	.probe		= stub_probe,
+ 	.disconnect	= stub_disconnect,
+ 	.id_table	= stub_table,
++	.pre_reset	= stub_pre_reset,
++	.post_reset	= stub_post_reset,
+ };
--
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/