summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-21 14:48:42 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-21 14:48:42 -0400
commit3c73a9603098f94dec8ee49d25a22f3b0d946d3a (patch)
treef4d894b89ecc560c23b94846b6d946acee2f27bf
parent96ebb7b6ef8896a4541b1b6d5cb103eabb180fba (diff)
downloadkernel-3c73a9603098f94dec8ee49d25a22f3b0d946d3a.tar.gz
kernel-3c73a9603098f94dec8ee49d25a22f3b0d946d3a.tar.xz
kernel-3c73a9603098f94dec8ee49d25a22f3b0d946d3a.zip
Linux v4.0-9362-g1fc149933fd4
-rw-r--r--Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch4
-rw-r--r--config-arm-generic1
-rw-r--r--config-armv71
-rw-r--r--config-generic3
-rw-r--r--kernel.spec5
-rw-r--r--lis3-improve-handling-of-null-rate.patch2
-rw-r--r--scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch2
-rw-r--r--sources2
8 files changed, 14 insertions, 6 deletions
diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index d0a4d10bc..33285a3ae 100644
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 274252f205b7..d7805f0fd528 100644
+index 84960c66c77b..f5920f27596b 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -3850,7 +3850,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3862,7 +3862,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
the allocated input device; If set to 0, video driver
will only send out the event without touching backlight
brightness level.
diff --git a/config-arm-generic b/config-arm-generic
index 624af21e1..1f023e553 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -145,6 +145,7 @@ CONFIG_PCIE_DW=y
CONFIG_EXTCON=m
CONFIG_EXTCON_GPIO=m
CONFIG_EXTCON_ADC_JACK=m
+# CONFIG_EXTCON_USB_GPIO is not set
# CONFIG_EXTCON_SM5502 is not set
# CONFIG_EXTCON_RT8973A is not set
diff --git a/config-armv7 b/config-armv7
index 2063c092c..52e0ef4c7 100644
--- a/config-armv7
+++ b/config-armv7
@@ -276,6 +276,7 @@ CONFIG_PINCTRL_MSM8X74=m
CONFIG_PINCTRL_MSM8916=m
CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
CONFIG_COMMON_CLK_QCOM=m
+# CONFIG_MSM_GCC_8916 is not set
# CONFIG_IPQ_LCC_806X is not set
# CONFIG_MSM_LCC_8960 is not set
CONFIG_MFD_QCOM_RPM=m
diff --git a/config-generic b/config-generic
index 37bd8f707..9e7439894 100644
--- a/config-generic
+++ b/config-generic
@@ -203,6 +203,7 @@ CONFIG_BINFMT_MISC=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_PWM is not set
#
# Generic Driver Options
@@ -5006,6 +5007,8 @@ CONFIG_DW_DMAC_PCI=m
# CONFIG_FSL_EDMA is not set
# CONFIG_NBPFAXI_DMA is not set
CONFIG_ASYNC_TX_DMA=y
+# CONFIG_HSU_DMA is not set
+# CONFIG_HSU_DMA_PCI is not set
CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel.spec b/kernel.spec
index 93c20dc2a..6438ab74a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 10
+%define gitrev 11
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2193,6 +2193,9 @@ fi
#
#
%changelog
+* Tue Apr 21 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git11.1
+- Linux v4.0-9362-g1fc149933fd4
+
* Tue Apr 21 2015 Josh Boyer <jwboyer@fedoraproject.org>
- Enable ECHO driver (rhbz 749884)
diff --git a/lis3-improve-handling-of-null-rate.patch b/lis3-improve-handling-of-null-rate.patch
index 5d25039bb..f956729ba 100644
--- a/lis3-improve-handling-of-null-rate.patch
+++ b/lis3-improve-handling-of-null-rate.patch
@@ -17,7 +17,7 @@ Signed-off-by: ??ric Piel <eric.piel@tremplin-utc.net>
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
-index 3ef4627f9cb1..2b2d2e8e5eeb 100644
+index 4739689d23ad..d713074200f3 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
@@ -216,7 +216,8 @@ static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z)
diff --git a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
index 8c9c41aae..d97397b03 100644
--- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -9,7 +9,7 @@ Upstream-status: Fedora mustard (might be worth dropping...)
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index dcc42446f58a..3a075eef713d 100644
+index 79beebf53302..eca0b7e0944f 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2726,13 +2726,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
diff --git a/sources b/sources
index 230f43bfa..c575e068d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
a86916bd12798220da9eb4a1eec3616d linux-4.0.tar.xz
d125eecce68ab6fb5f1f23523c2c04b8 perf-man-4.0.tar.gz
-3ffa3a8db217329c81aa42881c6518c7 patch-4.0-git10.xz
+55aa070fb0705a51c6c32f617a6f1943 patch-4.0-git11.xz