summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-01-20 12:58:36 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2017-01-20 12:58:36 +0100
commit13b65e4d53569b7ded1b52f2e9981fbfb11b469d (patch)
treebb1d62c4678776b868ed66924c57aabc599c1c80 /kernel.spec
parentca75f110bc88c5fae16d2eb326d6b660966ed9a1 (diff)
parent9714fae044109d1464a308a4cad17e2aa6377e72 (diff)
downloadkernel-13b65e4d53569b7ded1b52f2e9981fbfb11b469d.tar.gz
kernel-13b65e4d53569b7ded1b52f2e9981fbfb11b469d.tar.xz
kernel-13b65e4d53569b7ded1b52f2e9981fbfb11b469d.zip
Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedorakernel-4.9.5-100.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec18
1 files changed, 11 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index a43e7d027..e47f6f4a4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -59,7 +59,7 @@ Summary: The Linux kernel
# Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -540,8 +540,6 @@ Patch430: ARM-tegra-usb-no-reset.patch
Patch431: bcm2837-initial-support.patch
-Patch432: bcm283x-vc4-fixes.patch
-
Patch433: bcm283x-fixes.patch
# http://www.spinics.net/lists/linux-mmc/msg41151.html
@@ -643,9 +641,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
#ongoing complaint, full discussion delayed until ksummit/plumbers
Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
-# Work around thinkpad firmware memory layout issues and efi_mem_reserve()
-Patch850: 0001-efi-prune-invalid-memory-map-entries.patch
-
# Request from dwalsh
Patch851: selinux-namespace-fix.patch
@@ -2184,7 +2179,16 @@ fi
#
#
%changelog
-* Thu Jan 12 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.4-100
+* Fri Jan 20 2017 Laura Abbott <labbott@redhat.com> - 4.9.5-100
+- Linux v4.9.5
+
+* Tue Jan 17 2017 Laura Abbott <labbott@fedoraproject.org>
+- Fix kubernetes networking issue (rhbz 1414068)
+
+* Tue Jan 17 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.4-100
+- Add possible ATI fixes
+
+* Thu Jan 12 2017 Laura Abbott <labbott@fedoraproject.org>
- Linux v4.9.4 rebase
- Minor updates for Raspberry Pi 3 support (thanks pbrobinson)