From 0a3cece3407d90d361d43233ee8a4fc2e04e25ed Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 14 Aug 2015 10:59:25 -0400 Subject: [PATCH 1/4] Linux v4.2-rc6-130-g7ddab73346a1 --- config-armv7-generic | 1 - config-generic | 1 + config-x86-generic | 1 - kernel.spec | 7 +++++-- sources | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config-armv7-generic b/config-armv7-generic index ef7ee634a..57ec7ce93 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -827,7 +827,6 @@ CONFIG_MFD_CROS_EC_SPI=m CONFIG_KEYBOARD_CROS_EC=m CONFIG_I2C_CROS_EC_TUNNEL=m CONFIG_SND_SOC_TS3A227E=m -CONFIG_CHROME_PLATFORMS=y CONFIG_CROS_EC_CHARDEV=m CONFIG_R8188EU=m diff --git a/config-generic b/config-generic index a4ed2797d..30060bfd4 100644 --- a/config-generic +++ b/config-generic @@ -5573,6 +5573,7 @@ CONFIG_PSTORE_RAM=m # CONFIG_SIGMA is not set +CONFIG_CHROME_PLATFORMS=y CONFIG_BCMA=m CONFIG_BCMA_BLOCKIO=y diff --git a/config-x86-generic b/config-x86-generic index eb786908e..dd1d03d3f 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -219,7 +219,6 @@ CONFIG_ASUS_LAPTOP=m CONFIG_COMPAL_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m -CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_LAPTOP=m CONFIG_CHROMEOS_PSTORE=m CONFIG_EEEPC_LAPTOP=m diff --git a/kernel.spec b/kernel.spec index d2bc1a701..b9ba895d5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,7 +40,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2024,6 +2024,9 @@ fi # # %changelog +* Fri Aug 14 2015 Josh Boyer - 4.2.0-0.rc6.git1.1 +- Linux v4.2-rc6-130-g7ddab73346a1 + * Tue Aug 11 2015 Peter Robinson - 4.2.0-0.rc6.git0.2 - Drop UACCESS_WITH_MEMCPY on ARMv7 as it's broken (rhbz 1250613) diff --git a/sources b/sources index 40d864473..25b3c9aca 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz 84e34c2f58901edcc5c840fe9893c02e perf-man-4.1.tar.gz 91449a3a20ecc0e23e288efdff2095dd patch-4.2-rc6.xz +1092e031daf983feda21ef6997af4635 patch-4.2-rc6-git1.xz From eba9aaa22cc9ce0544859a6cd22b8c02d5867d6a Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 14 Aug 2015 17:01:47 -0400 Subject: [PATCH 2/4] Disable AMDGPU_CIK Per airlied's request. radeon has better support for the hardware and it was added to amdgpu for debugging purposes. --- config-generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-generic b/config-generic index 30060bfd4..dfa69a6cf 100644 --- a/config-generic +++ b/config-generic @@ -3141,7 +3141,7 @@ CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_USERPTR=y # CONFIG_DRM_RADEON_UMS is not set CONFIG_DRM_AMDGPU=m -CONFIG_DRM_AMDGPU_CIK=y +# CONFIG_DRM_AMDGPU_CIK is not set CONFIG_DRM_AMDGPU_USERPTR=y # CONFIG_DRM_I810 is not set # CONFIG_DRM_MGA is not set From 6358da67132f748278076c68cb4ced33ee221d0e Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Sat, 15 Aug 2015 20:54:25 -0400 Subject: [PATCH 3/4] Patch from Hans de Goede to add yoga 3 rfkill quirk (rhbz 1239050) --- ...dd-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch | 40 +++++++++++++++++++ kernel.spec | 6 +++ 2 files changed, 46 insertions(+) create mode 100644 ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch diff --git a/ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch b/ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch new file mode 100644 index 000000000..9e2838f22 --- /dev/null +++ b/ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch @@ -0,0 +1,40 @@ +From 72695420d48c264b3ca0dacccda1a4789a52c2f6 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Fri, 24 Jul 2015 11:45:28 +0200 +Subject: [PATCH] ideapad-laptop: Add Lenovo Yoga 3 14 to no_hw_rfkill dmi list + +Like some of the other Yoga models the Lenovo Yoga 3 14 does not have a +hw rfkill switch, and trying to read the hw rfkill switch through the +ideapad module causes it to always reported blocking breaking wifi. + +This commit adds the Lenovo Yoga 3 14 to the no_hw_rfkill dmi list, fixing +the wifi breakage. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1239050 +Cc: stable@vger.kernel.org +Signed-off-by: Hans de Goede +--- + drivers/platform/x86/ideapad-laptop.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c +index 76b57388d01b..81c3e582309a 100644 +--- a/drivers/platform/x86/ideapad-laptop.c ++++ b/drivers/platform/x86/ideapad-laptop.c +@@ -853,6 +853,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { + }, + }, + { ++ .ident = "Lenovo Yoga 3 14", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 3 14"), ++ }, ++ }, ++ { + .ident = "Lenovo Yoga 3 Pro 1370", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), +-- +2.4.3 + diff --git a/kernel.spec b/kernel.spec index b9ba895d5..4d5ba1d9c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -587,6 +587,9 @@ Patch507: HID-chicony-Add-support-for-Acer-Aspire-Switch-12.patch Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch +#rhbz 1239050 +Patch509: ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch + Patch904: kdbus.patch # END OF PATCH DEFINITIONS @@ -2024,6 +2027,9 @@ fi # # %changelog +* Sat Aug 15 2015 Josh Boyer +- Patch from Hans de Goede to add yoga 3 rfkill quirk (rhbz 1239050) + * Fri Aug 14 2015 Josh Boyer - 4.2.0-0.rc6.git1.1 - Linux v4.2-rc6-130-g7ddab73346a1 From a2c295ca1bf0befdce7f12c75adaece0a270010f Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 17 Aug 2015 07:59:44 -0400 Subject: [PATCH 4/4] Linux v4.2-rc7 --- kernel.spec | 7 +++++-- sources | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel.spec b/kernel.spec index 4d5ba1d9c..ecde67574 100644 --- a/kernel.spec +++ b/kernel.spec @@ -65,9 +65,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 6 +%define rcrev 7 # The git snapshot level -%define gitrev 1 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2027,6 +2027,9 @@ fi # # %changelog +* Mon Aug 17 2015 Josh Boyer - 4.2.0-0.rc7.git0.1 +- Linux v4.2-rc7 + * Sat Aug 15 2015 Josh Boyer - Patch from Hans de Goede to add yoga 3 rfkill quirk (rhbz 1239050) diff --git a/sources b/sources index 25b3c9aca..ae37b7006 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz 84e34c2f58901edcc5c840fe9893c02e perf-man-4.1.tar.gz -91449a3a20ecc0e23e288efdff2095dd patch-4.2-rc6.xz -1092e031daf983feda21ef6997af4635 patch-4.2-rc6-git1.xz +487c2146c2ed114354dded0fba9ed310 patch-4.2-rc7.xz