diff options
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | config-x86-generic | 3 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/config-generic b/config-generic index 0e8f19219..4f476178b 100644 --- a/config-generic +++ b/config-generic @@ -4788,6 +4788,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_DEBUG_DRIVER is not set CONFIG_HEADERS_CHECK=y # CONFIG_LKDTM is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_READABLE_ASM is not set diff --git a/config-x86-generic b/config-x86-generic index 81dfdc3f4..585472215 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -547,6 +547,9 @@ CONFIG_PINCTRL_CHERRYVIEW=y CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_BROXTON=m +# I have no idea why this is x86-specific +CONFIG_E1000E_HWTS=y + #baytrail/cherrytrail stuff CONFIG_KEYBOARD_GPIO=m CONFIG_INPUT_SOC_BUTTON_ARRAY=m @@ -1 +1 @@ -e23604edac2a7be6a8808a5d13fac6b9df4eb9a8 +710d60cbf1b312a8075a2158cbfbbd9c66132dcc diff --git a/kernel.spec b/kernel.spec index 92a5698bf..fcf1cb13e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2140,6 +2140,9 @@ fi # # %changelog +* Wed Mar 16 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git2.1 +- Linux v4.5-760-g710d60cbf1b3 + * Tue Mar 15 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git1.1 - Linux v4.5-481-ge23604edac2a - Enable RANDOMIZE_BASE @@ -1,3 +1,3 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz -5b6449964608a59b6b8a48e6a2d175e6 patch-4.5-git1.xz +4e29382cb38aa885e7f3ec89d318665f patch-4.5-git2.xz |