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..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 @@ -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/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 d2bc1a701..ecde67574 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 @@ -65,7 +65,7 @@ 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 0 # Set rpm version accordingly @@ -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,15 @@ 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) + +* 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..ae37b7006 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz 84e34c2f58901edcc5c840fe9893c02e perf-man-4.1.tar.gz -91449a3a20ecc0e23e288efdff2095dd patch-4.2-rc6.xz +487c2146c2ed114354dded0fba9ed310 patch-4.2-rc7.xz