sync with 4.14-final

8 files changed, 16 insertions, 126 deletions

diff --git a/d01.patch b/d01.patch
deleted file mode 100644
index afdf3aa96574ce..00000000000000
--- a/d01.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From foo@baz Thu Sep 14 23:35:39 PDT 2017
-Date: Thu, 14 Sep 2017 23:35:39 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: fpga: altera-cvp: remove DRIVER_ATTR() usage
-
-It's better to be explicit and use the DRIVER_ATTR_RW() macro when
-defining a driver's sysfs file.
-
-This is part of a series to drop DRIVER_ATTR() from the tree entirely.
-
-Cc: Alan Tull <atull@kernel.org>
-Cc: Moritz Fischer <mdf@kernel.org>
-Cc: linux-fpga@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/fpga/altera-cvp.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/fpga/altera-cvp.c
-+++ b/drivers/fpga/altera-cvp.c
-@@ -361,12 +361,12 @@ static const struct fpga_manager_ops alt
- 	.write_complete	= altera_cvp_write_complete,
- };
- 
--static ssize_t show_chkcfg(struct device_driver *dev, char *buf)
-+static ssize_t chkcfg_show(struct device_driver *dev, char *buf)
- {
- 	return snprintf(buf, 3, "%d\n", altera_cvp_chkcfg);
- }
- 
--static ssize_t store_chkcfg(struct device_driver *drv, const char *buf,
-+static ssize_t chkcfg_store(struct device_driver *drv, const char *buf,
- 			    size_t count)
- {
- 	int ret;
-@@ -378,7 +378,7 @@ static ssize_t store_chkcfg(struct devic
- 	return count;
- }
- 
--static DRIVER_ATTR(chkcfg, 0600, show_chkcfg, store_chkcfg);
-+static DRIVER_ATTR(chkcfg);
- 
- static int altera_cvp_probe(struct pci_dev *pdev,
- 			    const struct pci_device_id *dev_id);
diff --git a/d99.patch b/d99.patch
deleted file mode 100644
index c993196623b5c2..00000000000000
--- a/d99.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From foo@baz Wed Nov 30 14:34:22 CET 2016
-Date: Wed, 30 Nov 2016 14:34:22 +0100
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: [PATCH] driver core: remove DRIVER_ATTR
-
-DRIVER_ATTR is no longer in use, and driver authors should be using
-DRIVER_ATTR_RW() or DRIVER_ATTR_RO() or DRIVER_ATTR_WO() instead in
-order to always get the permissions correct.  So remove it so that no
-one can use it anymore.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- Documentation/driver-model/driver.txt |    7 ++++---
- Documentation/filesystems/sysfs.txt   |    3 ++-
- include/linux/device.h                |    2 --
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-
---- a/Documentation/driver-model/driver.txt
-+++ b/Documentation/driver-model/driver.txt
-@@ -196,12 +196,13 @@ struct driver_attribute {
- };
- 
- Device drivers can export attributes via their sysfs directories. 
--Drivers can declare attributes using a DRIVER_ATTR macro that works
--identically to the DEVICE_ATTR macro. 
-+Drivers can declare attributes using a DRIVER_ATTR_RW and DRIVER_ATTR_RO
-+macro that works identically to the DEVICE_ATTR_RW and DEVICE_ATTR_RO
-+macros.
- 
- Example:
- 
--DRIVER_ATTR(debug,0644,show_debug,store_debug);
-+DRIVER_ATTR_RW(debug);
- 
- This is equivalent to declaring:
- 
---- a/Documentation/filesystems/sysfs.txt
-+++ b/Documentation/filesystems/sysfs.txt
-@@ -366,7 +366,8 @@ struct driver_attribute {
- 
- Declaring:
- 
--DRIVER_ATTR(_name, _mode, _show, _store)
-+DRIVER_ATTR_RO(_name)
-+DRIVER_ATTR_RW(_name)
- 
- Creation/Removal:
- 
---- a/include/linux/device.h
-+++ b/include/linux/device.h
-@@ -307,8 +307,6 @@ struct driver_attribute {
- 			 size_t count);
- };
- 
--#define DRIVER_ATTR(_name, _mode, _show, _store) \
--	struct driver_attribute driver_attr_##_name = __ATTR(_name, _mode, _show, _store)
- #define DRIVER_ATTR_RW(_name) \
- 	struct driver_attribute driver_attr_##_name = __ATTR_RW(_name)
- #define DRIVER_ATTR_RO(_name) \
diff --git a/lib-vsprintf-additional-kernel-pointer-filtering-options.patch b/lib-vsprintf-additional-kernel-pointer-filtering-options.patch
index 0d032d2e12359f..c2e939fc025b43 100644
--- a/lib-vsprintf-additional-kernel-pointer-filtering-options.patch
+++ b/lib-vsprintf-additional-kernel-pointer-filtering-options.patch
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/Documentation/sysctl/kernel.txt
 +++ b/Documentation/sysctl/kernel.txt
-@@ -393,6 +393,9 @@ values to unprivileged users is a concer
+@@ -394,6 +394,9 @@ values to unprivileged users is a concer
  When kptr_restrict is set to (2), kernel pointers printed using
  %pK will be replaced with 0's regardless of privileges.
  
@@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int ten_thousand = 10000;
  #endif
  #ifdef CONFIG_PERF_EVENTS
-@@ -851,7 +852,7 @@ static struct ctl_table kern_table[] = {
+@@ -852,7 +853,7 @@ static struct ctl_table kern_table[] = {
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec_minmax_sysadmin,
  		.extra1		= &zero,
diff --git a/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch b/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch
index 2d7de517cf72f7..0a77defcde226d 100644
--- a/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch
+++ b/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch
@@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/Documentation/sysctl/kernel.txt
 +++ b/Documentation/sysctl/kernel.txt
-@@ -394,7 +394,13 @@ When kptr_restrict is set to (2), kernel
+@@ -395,7 +395,13 @@ When kptr_restrict is set to (2), kernel
  %pK will be replaced with 0's regardless of privileges.
  
  When kptr_restrict is set to (3), kernel pointers printed using
@@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int ten_thousand = 10000;
  #endif
  #ifdef CONFIG_PERF_EVENTS
-@@ -852,7 +851,7 @@ static struct ctl_table kern_table[] = {
+@@ -853,7 +852,7 @@ static struct ctl_table kern_table[] = {
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec_minmax_sysadmin,
  		.extra1		= &zero,
diff --git a/lib-vsprintf-whitelist-stack-traces.patch b/lib-vsprintf-whitelist-stack-traces.patch
index 554bed6f4adbd0..49f426bcea8a32 100644
--- a/lib-vsprintf-whitelist-stack-traces.patch
+++ b/lib-vsprintf-whitelist-stack-traces.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/include/linux/kallsyms.h
 +++ b/include/linux/kallsyms.h
-@@ -122,7 +122,7 @@ static inline void print_symbol(const ch
+@@ -123,7 +123,7 @@ static inline void print_symbol(const ch
  
  static inline void print_ip_sym(unsigned long ip)
  {
diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch
index 48714c4fe0fdc3..ba6b6a1403f4f9 100644
--- a/qlcnic_sysfs.patch
+++ b/qlcnic_sysfs.patch
@@ -95,19 +95,19 @@
  	return size;
  }
  
--static struct device_attribute dev_attr_bridged_mode = {
+-static const struct device_attribute dev_attr_bridged_mode = {
 -       .attr = {.name = "bridged_mode", .mode = (S_IRUGO | S_IWUSR)},
 -       .show = qlcnic_show_bridged_mode,
 -       .store = qlcnic_store_bridged_mode,
 -};
 -
--static struct device_attribute dev_attr_diag_mode = {
+-static const struct device_attribute dev_attr_diag_mode = {
 -	.attr = {.name = "diag_mode", .mode = (S_IRUGO | S_IWUSR)},
 -	.show = qlcnic_show_diag_mode,
 -	.store = qlcnic_store_diag_mode,
 -};
 -
--static struct device_attribute dev_attr_beacon = {
+-static const struct device_attribute dev_attr_beacon = {
 -	.attr = {.name = "beacon", .mode = (S_IRUGO | S_IWUSR)},
 -	.show = qlcnic_show_beacon,
 -	.store = qlcnic_store_beacon,
diff --git a/series b/series
index 9fcc92c87f661e..6c234a19f3ac16 100644
--- a/series
+++ b/series
@@ -40,7 +40,5 @@ drivers-uio-un-restrict-sysfs-pointers-for-uio.patch
 
 #
 
-d99.patch
-d01.patch
 qlcnic_sysfs.patch
 #
diff --git a/usb_DEVICE_ATTR.patch b/usb_DEVICE_ATTR.patch
index 7d1a3fb433a469..75680c3f88299a 100644
--- a/usb_DEVICE_ATTR.patch
+++ b/usb_DEVICE_ATTR.patch
@@ -126,7 +126,7 @@
  		       const struct usb_device_id *id)
 --- a/drivers/usb/gadget/function/f_mass_storage.c
 +++ b/drivers/usb/gadget/function/f_mass_storage.c
-@@ -2559,9 +2559,8 @@ static ssize_t file_store(struct device
+@@ -2544,9 +2544,8 @@ static ssize_t file_store(struct device
  }
  
  static DEVICE_ATTR_RW(nofua);
@@ -140,7 +140,7 @@
  
 --- a/drivers/usb/gadget/udc/core.c
 +++ b/drivers/usb/gadget/udc/core.c
-@@ -1427,8 +1427,8 @@ EXPORT_SYMBOL_GPL(usb_gadget_unregister_
+@@ -1426,8 +1426,8 @@ EXPORT_SYMBOL_GPL(usb_gadget_unregister_
  
  /* ------------------------------------------------------------------------- */
  
@@ -151,7 +151,7 @@
  {
  	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
  
-@@ -1437,10 +1437,11 @@ static ssize_t usb_udc_srp_store(struct
+@@ -1436,10 +1436,11 @@ static ssize_t usb_udc_srp_store(struct
  
  	return n;
  }
@@ -166,7 +166,7 @@
  {
  	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
  
-@@ -1463,7 +1464,7 @@ static ssize_t usb_udc_softconn_store(st
+@@ -1462,7 +1463,7 @@ static ssize_t usb_udc_softconn_store(st
  
  	return n;
  }
@@ -586,7 +586,7 @@
  MYDEV_ATTR_SIMPLE_UNSIGNED(mode_msb, update_display_mode);
 --- a/drivers/usb/serial/ftdi_sio.c
 +++ b/drivers/usb/serial/ftdi_sio.c
-@@ -1692,7 +1692,7 @@ static DEVICE_ATTR_RW(latency_timer);
+@@ -1694,7 +1694,7 @@ static DEVICE_ATTR_RW(latency_timer);
  
  /* Write an event character directly to the FTDI register.  The ASCII
     value is in the low 8 bits, with the enable bit in the 9th bit. */
@@ -595,7 +595,7 @@
  	struct device_attribute *attr, const char *valbuf, size_t count)
  {
  	struct usb_serial_port *port = to_usb_serial_port(dev);
-@@ -1719,7 +1719,7 @@ static ssize_t store_event_char(struct d
+@@ -1721,7 +1721,7 @@ static ssize_t store_event_char(struct d
  
  	return count;
  }
@@ -606,7 +606,7 @@
  {
 --- a/drivers/usb/storage/sierra_ms.c
 +++ b/drivers/usb/storage/sierra_ms.c
-@@ -89,8 +89,8 @@ static void debug_swoc(const struct devi
+@@ -90,8 +90,8 @@ static void debug_swoc(const struct devi
  }
  
  
@@ -617,7 +617,7 @@
  {
  	struct swoc_info *swocInfo;
  	struct usb_interface *intf = to_usb_interface(dev);
-@@ -121,7 +121,7 @@ static ssize_t show_truinst(struct devic
+@@ -122,7 +122,7 @@ static ssize_t show_truinst(struct devic
  	}
  	return result;
  }