From: Mark Brown <broonie@kernel•org>
To: Greg KH <greg@kroah•com>,
Valentina Manea <valentina.manea.m@gmail•com>,
Alan Stern <stern@rowland•harvard.edu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the staging tree with the tree
Date: Wed, 12 Mar 2014 01:37:58 +0000 [thread overview]
Message-ID: <20140312013758.9fb3fcc6559a30883e15e787@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1417 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in between commit f080a51bef2ca ("USB: complain if userspace resets an active endpoint") from the usb tree and commit 9b6f0c4b98171f2a3 ("usbcore: rename struct dev_state to struct usb_dev_state") from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc drivers/usb/core/devio.c
index 12401ee4ba0e,2a8afe6754b8..000000000000
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@@ -1125,21 -1043,7 +1125,21 @@@ static int proc_bulk(struct usb_dev_sta
return ret;
}
+static void check_reset_of_active_ep(struct usb_device *udev,
+ unsigned int epnum, char *ioctl_name)
+{
+ struct usb_host_endpoint **eps;
+ struct usb_host_endpoint *ep;
+
+ eps = (epnum & USB_DIR_IN) ? udev->ep_in : udev->ep_out;
+ ep = eps[epnum & 0x0f];
+ if (ep && !list_empty(&ep->urb_list))
+ dev_warn(&udev->dev, "Process %d (%s) called USBDEVFS_%s for active endpoint 0x%02x\n",
+ task_pid_nr(current), current->comm,
+ ioctl_name, epnum);
+}
+
- static int proc_resetep(struct dev_state *ps, void __user *arg)
+ static int proc_resetep(struct usb_dev_state *ps, void __user *arg)
{
unsigned int ep;
int ret;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-12 1:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 1:37 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-02 20:17 linux-next: manual merge of the staging tree with the tree Mark Brown
2015-12-02 22:07 ` Greg KH
2015-12-03 0:07 ` Mark Brown
2014-08-01 6:21 Stephen Rothwell
2014-08-01 7:38 ` Greg KH
2014-07-11 5:21 Stephen Rothwell
2014-07-11 5:32 ` Sachin Kamat
2014-07-11 6:10 ` Stephen Rothwell
2014-07-11 6:22 ` Sachin Kamat
2014-07-12 16:53 ` Greg KH
2014-03-13 0:50 Mark Brown
2014-03-13 9:17 ` Laurent Pinchart
2014-03-20 15:44 ` Grant Likely
2014-03-20 17:09 ` Mauro Carvalho Chehab
2014-03-20 18:51 ` Grant Likely
2014-03-12 1:32 Mark Brown
2014-03-12 1:49 ` Greg KH
2014-03-12 1:27 Mark Brown
2014-03-12 1:48 ` Greg KH
2010-11-10 2:24 Stephen Rothwell
2010-11-10 18:40 ` Greg KH
2009-03-19 10:12 Stephen Rothwell
2009-03-19 15:32 ` Greg KH
2009-03-19 15:53 ` Greg KH
2009-03-19 21:42 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140312013758.9fb3fcc6559a30883e15e787@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=stern@rowland$(echo .)harvard.edu \
--cc=valentina.manea.m@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox