Merge remote-tracking branch 'origin/master'kernel-4.5.0-0.rc0.git3.1.vanilla.knurd.1.fc24

9 files changed, 33 insertions, 47 deletions

diff --git a/alua_fix.patch b/alua_fix.patch
deleted file mode 100644
index eb278fabb..000000000
--- a/alua_fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 221255aee67ec1c752001080aafec0c4e9390d95 Mon Sep 17 00:00:00 2001
-From: Hannes Reinecke <hare@suse.de>
-Date: Tue, 1 Dec 2015 10:16:42 +0100
-Subject: scsi: ignore errors from scsi_dh_add_device()
-
-device handler initialisation might fail due to a number of
-reasons. But as device_handlers are optional this shouldn't
-cause us to disable the device entirely.
-So just ignore errors from scsi_dh_add_device().
-
-Reviewed-by: Johannes Thumshirn <jthumshirn@suse.com>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Signed-off-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
----
- drivers/scsi/scsi_sysfs.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
-index fc3cd26..d015374 100644
---- a/drivers/scsi/scsi_sysfs.c
-+++ b/drivers/scsi/scsi_sysfs.c
-@@ -1120,11 +1120,12 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
- 	}
- 
- 	error = scsi_dh_add_device(sdev);
--	if (error) {
-+	if (error)
-+		/*
-+		 * device_handler is optional, so any error can be ignored
-+		 */
- 		sdev_printk(KERN_INFO, sdev,
- 				"failed to add device handler: %d\n", error);
--		return error;
--	}
- 
- 	device_enable_async_suspend(&sdev->sdev_dev);
- 	error = device_add(&sdev->sdev_dev);
--- 
-cgit v0.11.2
-
diff --git a/config-arm-generic b/config-arm-generic
index 9ab276184..bbd20dd77 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -222,10 +222,12 @@ CONFIG_EXTCON=m
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_USB_GPIO=m
+# CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_SM5502 is not set
 # CONFIG_EXTCON_RT8973A is not set
 
 # MTD
+# CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_CFI=m
diff --git a/config-armv7 b/config-armv7
index 2bf65c2c1..f6caf9c91 100644
--- a/config-armv7
+++ b/config-armv7
@@ -331,6 +331,7 @@ CONFIG_QCOM_WDT=m
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_SPMI=m
 CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_PALMAS_GPADC=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
 CONFIG_LEDS_PM8941_WLED=m
diff --git a/config-armv7-generic b/config-armv7-generic
index a44cc8895..1c64a1a87 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -476,6 +476,7 @@ CONFIG_USB_OTG=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_VBUS_DRAW=100
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_U_SERIAL_CONSOLE=y
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_DSPS=m
@@ -629,6 +630,7 @@ CONFIG_MTD_NAND_PXA3xx=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_TMIO=m
 # CONFIG_MTD_NAND_BRCMNAND is not set
+# CONFIG_MTD_MT81xx_NOR is not set
 CONFIG_MTD_SPI_NOR=m
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 CONFIG_MTD_SPINAND_MT29F=m
diff --git a/config-generic b/config-generic
index 390d82894..74b1c417e 100644
--- a/config-generic
+++ b/config-generic
@@ -249,6 +249,7 @@ CONFIG_REGMAP_I2C=m
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_FSL_SPI is not set
 
@@ -547,6 +548,7 @@ CONFIG_SCSI_AM53C974=m
 # CONFIG_SCSI_EATA_PIO is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 CONFIG_SCSI_GDTH=m
+# CONFIG_SCSI_HISI_SAS is not set
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INIA100=m
@@ -2484,6 +2486,7 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
 CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
@@ -2498,6 +2501,7 @@ CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 # CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
+CONFIG_TOUCHSCREEN_TS4800=m
 CONFIG_TOUCHSCREEN_TSC_SERIO=m
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
@@ -2895,10 +2899,13 @@ CONFIG_IIO_BUFFER_CB=y
 # CONFIG_IIO_KFIFO_BUF is not set
 CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_SW_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
+CONFIG_IIO_CONFIGFS=m
+# CONFIG_IIO_HRTIMER_TRIGGER is not set
 # CONFIG_IIO_SYSFS_TRIGGER is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_AD5446 is not set
@@ -2926,6 +2933,7 @@ CONFIG_STK3310=m
 # CONFIG_TSL4531 is not set
 # CONFIG_NAU7802 is not set
 # CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADS8688 is not set
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_VF610_ADC is not set
@@ -2951,9 +2959,11 @@ CONFIG_ACPI_ALS=m
 # CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_IIO_ST_PRESS is not set
 # CONFIG_KXSD9 is not set
+# CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA8452 is not set
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
+# CONFIG_MXC6255 is not set
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
 # CONFIG_AD7266 is not set
@@ -3000,6 +3010,7 @@ CONFIG_KXCJK1013=m
 # CONFIG_ISL29125 is not set
 # CONFIG_JSA1212 is not set
 CONFIG_RPR0521=m
+CONFIG_MAX30100=m
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
 # CONFIG_TCS3414 is not set
@@ -3008,6 +3019,8 @@ CONFIG_PA12203001=m
 # CONFIG_MCP4922 is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MXC4005 is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_INA2XX_ADC is not set
 # CONFIG_VZ89X is not set
 # CONFIG_HDC100X is not set
 # CONFIG_HTU21 is not set
@@ -3019,6 +3032,7 @@ CONFIG_PA12203001=m
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 # CONFIG_HI8435 is not set
+# CONFIG_IMX7D_ADC is not set
 
 # staging IIO drivers
 # CONFIG_AD7291 is not set
@@ -3069,6 +3083,7 @@ CONFIG_PA12203001=m
 # CONFIG_SRAM is not set
 # CONFIG_TI_DAC7512 is not set
 # CONFIG_BMP085_SPI is not set
+# CONFIG_MMA7455_SPI is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 
 CONFIG_W1=m
@@ -4214,6 +4229,7 @@ CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 # CONFIG_USB_SERIAL_METRO is not set
+CONFIG_USB_SERIAL_MXUPORT11=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 # CONFIG_USB_SERIAL_WISHBONE is not set
@@ -4266,6 +4282,7 @@ CONFIG_USB_ULPI_BUS=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_TUSB1210 is not set
+# CONFIG_PHY_HI6220_USB is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USBPHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
@@ -4278,6 +4295,7 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_FTDI_ELAN=m
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_DWC3 is not set
+# CONFIG_USB_DWC3_OF_SIMPLE is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 CONFIG_USB_IOWARRIOR=m
@@ -4849,6 +4867,7 @@ CONFIG_AUDITSYSCALL=y
 
 CONFIG_SECCOMP=y
 CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
 
 
 #
@@ -5575,6 +5594,8 @@ CONFIG_USBIP_HOST=m
 # CONFIG_FB_SM750 is not set
 # CONFIG_STAGING_RDMA is not set
 # CONFIG_WILC1000_DRIVER is not set
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
 # END OF STAGING
 
 #
diff --git a/config-s390x b/config-s390x
index a41d95ac4..6188d09fb 100644
--- a/config-s390x
+++ b/config-s390x
@@ -65,6 +65,7 @@ CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_CPI=m
 CONFIG_SCLP_ASYNC=m
 CONFIG_SCLP_ASYNC_ID="000000000"
+CONFIG_SCLP_OFB=y
 CONFIG_S390_TAPE=m
 CONFIG_S390_TAPE_3590=m
 
diff --git a/gitrev b/gitrev
index 0a8f2d22f..fc7647f6b 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-67990608c8b95d2b8ccc29932376ae73d5818727
+7fdec82af6a9e190e53d07a1463d2a9ac49a8750
diff --git a/kernel.spec b/kernel.spec
index 7975e82ec..4813e7b05 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,7 +75,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -609,9 +609,6 @@ Patch570: HID-multitouch-enable-palm-rejection-if-device-imple.patch
 #rhbz 1286293
 Patch571: ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch
 
-#rhbz 1288687
-Patch572: alua_fix.patch
-
 #CVE-2015-8709 rhbz 1295287 1295288
 Patch603: ptrace-being-capable-wrt-a-process-requires-mapped-u.patch
 
@@ -2071,6 +2068,9 @@ fi
 #
 # 
 %changelog
+* Thu Jan 14 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git3.1
+- Linux v4.4-5593-g7fdec82
+
 * Wed Jan 13 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git2.1
 - Linux v4.4-3408-g6799060
 
diff --git a/sources b/sources
index c7c4a2b30..f1aa7def6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 9a78fa2eb6c68ca5a40ed5af08142599  linux-4.4.tar.xz
 dcbc8fe378a676d5d0dd208cf524e144  perf-man-4.4.tar.gz
-08dc24ebd126ceb03241c15a29c298a1  patch-4.4-git2.xz
+aec418883cc715fdbfce4b6dcc04c8f0  patch-4.4-git3.xz