linux-kernel - linux-next: manual merge of the staging tree with the 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>] [day] [month] [year] [list]

Message-Id: <20140312013758.9fb3fcc6559a30883e15e787@kernel.org>
Date:	Wed, 12 Mar 2014 01:37:58 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Greg KH <greg@...ah.com>,
	Valentina Manea <valentina.manea.m@...il.com>,
	Alan Stern <stern@...land.harvard.edu>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the staging tree with the  tree

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;

Content of type "application/pgp-signature" skipped