diff --git a/Input-add-driver-for-the-Goodix-touchpanel.patch b/Input-add-driver-for-the-Goodix-touchpanel.patch index 807609c50..eb84838c6 100644 --- a/Input-add-driver-for-the-Goodix-touchpanel.patch +++ b/Input-add-driver-for-the-Goodix-touchpanel.patch @@ -21,7 +21,7 @@ Signed-off-by: Dmitry Torokhov create mode 100644 drivers/input/touchscreen/goodix.c diff --git a/MAINTAINERS b/MAINTAINERS -index 0ff630de8a6d..e4b643f22336 100644 +index c721042e7e45..738708f8b75f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4154,6 +4154,12 @@ L: linux-media@vger.kernel.org diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch index 18587426c..c6a5a8217 100644 --- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch +++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch @@ -28,7 +28,7 @@ index 479f33204a37..e362ef82dcc1 100644 virtio_mmio.device= [VMMIO] Memory mapped virtio (platform) device. diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index 807a88a0f394..b8a441713e86 100644 +index 9d75ead2a1f9..d7a0142cae8d 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot"); diff --git a/kernel.spec b/kernel.spec index f9e800222..db142f5c5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 7 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2201,6 +2201,9 @@ fi # ||----w | # || || %changelog +* Fri Dec 05 2014 Josh Boyer - 3.18.0-0.rc7.git3.1 +- Linux v3.18-rc7-59-g56c67ce187a8 + * Thu Dec 04 2014 Josh Boyer - 3.18.0-0.rc7.git2.1 - Linux v3.18-rc7-48-g7cc78f8fa02c diff --git a/sources b/sources index 417125adf..2000bc430 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ fb30d0f29214d75cddd2faa94f73d5cf linux-3.17.tar.xz 159e969cbc27201d8e2fa0f609dc722f perf-man-3.17.tar.gz 3f67a949be63d47b6286ec63e6194e54 patch-3.18-rc7.xz -b9d4664724660efa0bc481e7ddbb8366 patch-3.18-rc7-git2.xz +671e959ab06dab1fb63280c12668a826 patch-3.18-rc7-git3.xz