From a5acca3c590b9e467bf0bc85f2559c532eb8483f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 19 Aug 2016 07:54:13 -0500 Subject: [PATCH] Linux v4.8-rc2-232-g3408fef --- gitrev | 2 +- kernel.spec | 8 +++---- openstack_fix.patch | 53 --------------------------------------------- sources | 2 +- 4 files changed, 6 insertions(+), 59 deletions(-) delete mode 100644 openstack_fix.patch diff --git a/gitrev b/gitrev index 682724df9..f34f017d6 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -5ff132c07aa155d759ab3da946c86351313d3020 +3408fef7448ce7d3c926978ee1a511e7707bffba diff --git a/kernel.spec b/kernel.spec index 03304be08..8d3587dc6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 2 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -602,9 +602,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch # https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org/message/A4YCP7OGMX6JLFT5V44H57GOMAQLC3M4/ Patch839: drm-i915-Acquire-audio-powerwell-for-HD-Audio-regist.patch -#rhbz 1361414 -Patch841: openstack_fix.patch - #rhbz 1200901 (There should be something better upstream at some point) Patch842: qxl-reapply-cursor-after-SetCrtc-calls.patch @@ -2145,6 +2142,9 @@ fi # # %changelog +* Fri Aug 19 2016 Justin M. Forbes - 4.8.0-0.rc2.git3.1 +- Linux v4.8-rc2-232-g3408fef + * Fri Aug 19 2016 Peter Robinson - Minor Tegra changes diff --git a/openstack_fix.patch b/openstack_fix.patch deleted file mode 100644 index a967c350e..000000000 --- a/openstack_fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5ef9f289c4e698054e5687edb54f0da3cdc9173a Mon Sep 17 00:00:00 2001 -From: Ian Wienand -Date: Wed, 3 Aug 2016 15:44:57 +1000 -Subject: OVS: Ignore negative headroom value - -net_device->ndo_set_rx_headroom (introduced in -871b642adebe300be2e50aa5f65a418510f636ec) says - - "Setting a negtaive value reset the rx headroom - to the default value". - -It seems that the OVS implementation in -3a927bc7cf9d0fbe8f4a8189dd5f8440228f64e7 overlooked this and sets -dev->needed_headroom unconditionally. - -This doesn't have an immediate effect, but can mess up later -LL_RESERVED_SPACE calculations, such as done in -net/ipv6/mcast.c:mld_newpack. For reference, this issue was found -from a skb_panic raised there after the length calculations had given -the wrong result. - -Note the other current users of this interface -(drivers/net/tun.c:tun_set_headroom and -drivers/net/veth.c:veth_set_rx_headroom) are both checking this -correctly thus need no modification. - -Thanks to Ben for some pointers from the crash dumps! - -Cc: Benjamin Poirier -Cc: Paolo Abeni -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1361414 -Signed-off-by: Ian Wienand -Signed-off-by: David S. Miller ---- - net/openvswitch/vport-internal_dev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c -index 434e04c..95c3614 100644 ---- a/net/openvswitch/vport-internal_dev.c -+++ b/net/openvswitch/vport-internal_dev.c -@@ -140,7 +140,7 @@ internal_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats) - - static void internal_set_rx_headroom(struct net_device *dev, int new_hr) - { -- dev->needed_headroom = new_hr; -+ dev->needed_headroom = new_hr < 0 ? 0 : new_hr; - } - - static const struct net_device_ops internal_dev_netdev_ops = { --- -cgit v0.12 - diff --git a/sources b/sources index e0cdc8fa3..017dcabd9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 5276563eb1f39a048e4a8a887408c031 linux-4.7.tar.xz fe259c02c75eec61d1aa4b1211f3c853 perf-man-4.7.tar.gz 0d6c6c82846042198bc6ac4260a88b03 patch-4.8-rc2.xz -8535396052a9242a0e33e31200d647ef patch-4.8-rc2-git2.xz +4ffac1647db59a64ef3b315ee5e2a09f patch-4.8-rc2-git3.xz