diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-14 10:59:25 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-14 10:59:25 -0400 |
| commit | 0a3cece3407d90d361d43233ee8a4fc2e04e25ed (patch) | |
| tree | becf5b307f55083d9ecc09baffb99a7bbea60924 | |
| parent | e8b63c6de876998f6466bc681b4555f3ea342e1a (diff) | |
| download | kernel-0a3cece3407d90d361d43233ee8a4fc2e04e25ed.tar.gz kernel-0a3cece3407d90d361d43233ee8a4fc2e04e25ed.tar.xz kernel-0a3cece3407d90d361d43233ee8a4fc2e04e25ed.zip | |
Linux v4.2-rc6-130-g7ddab73346a1
| -rw-r--r-- | config-armv7-generic | 1 | ||||
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | config-x86-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | 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 <jwboyer@fedoraproject.org> - 4.2.0-0.rc6.git1.1 +- Linux v4.2-rc6-130-g7ddab73346a1 + * Tue Aug 11 2015 Peter Robinson <pbrobinson@fedoraproject.org> - 4.2.0-0.rc6.git0.2 - Drop UACCESS_WITH_MEMCPY on ARMv7 as it's broken (rhbz 1250613) @@ -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 |