diff --git a/gitrev b/gitrev index 1ed46c7fe..cc19e5957 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -f6d07dfcb15aad199d7351d3122eabd506968daf +7f151f1d8abb7d5930b49d4796b463dca1673cb7 diff --git a/kernel.spec b/kernel.spec index 3d6a23622..2d90971f2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -588,9 +588,6 @@ Patch510: 0001-iwlwifi-Add-new-PCI-IDs-for-the-8260-series.patch #CVE-2015-7990 rhbz 1276437 1276438 Patch511: RDS-fix-race-condition-when-sending-a-message-on-unb.patch -#rhbz 1281674 -Patch512: set_features_failure.patch - # END OF PATCH DEFINITIONS %endif @@ -2034,6 +2031,9 @@ fi # # %changelog +* Wed Nov 18 2015 Laura Abbott - 4.4.0-0.rc1.git1.1 +- Linux v4.4-rc1-96-g7f151f1 + * Mon Nov 16 2015 Laura Abbott - 4.4.0-0.rc1.git0.1 - Linux v4.4-rc1 - Disable debugging options. diff --git a/set_features_failure.patch b/set_features_failure.patch deleted file mode 100644 index ea2fc2066..000000000 --- a/set_features_failure.patch +++ /dev/null @@ -1,79 +0,0 @@ -From aab370e4fd0c3506ad759e74bb383aa4fc540cc1 Mon Sep 17 00:00:00 2001 -From: Nikolay Aleksandrov -Date: Fri, 13 Nov 2015 11:51:17 +0100 -Subject: [PATCH] net/core: ensure features get disabled on new lower devs - -On 11/13/2015 11:29 AM, Jiri Pirko wrote: -> Fri, Nov 13, 2015 at 01:26:18AM CET, f.fainelli@gmail.com wrote: ->> On 04/11/15 18:56, David Miller wrote: ->>>> Fixes: fd867d51f889 ("net/core: generic support for disabling netdev features down stack") ->>> ... ->>>> Reported-by: Nikolay Aleksandrov ->>>> Signed-off-by: Jarod Wilson ->>>> --- ->>>> v2: Based on suggestions from Alex, and with not changing err to ret, this ->>>> patch actually becomes quite minimal and doesn't ugly up the code much. ->>> ->>> Applied, thanks. ->> ->> This causes some warnings to be displayed for DSA stacked devices: ->> ->> [ 1.272297] brcm-sf2 f0b00000.ethernet_switch: Starfighter 2 top: ->> 4.00, core: 2.00 base: 0xf0c80000, IRQs: 68, 69 ->> [ 1.283181] libphy: dsa slave smi: probed ->> [ 1.344088] f0b403c0.mdio:05: Broadcom BCM7445 PHY revision: 0xd0, ->> patch: 3 ->> [ 1.658917] brcm-sf2 f0b00000.ethernet_switch gphy (uninitialized): ->> attached PHY at address 5 [Broadcom BCM7445] ->> [ 1.669414] brcm-sf2 f0b00000.ethernet_switch gphy: set_features() ->> failed (-1); wanted 0x0000000000004020, left 0x0000000000004820 ->> [ 1.734202] brcm-sf2 f0b00000.ethernet_switch rgmii_1 ->> (uninitialized): attached PHY at address 0 [Generic PHY] ->> [ 1.744486] brcm-sf2 f0b00000.ethernet_switch rgmii_1: set_features() ->> failed (-1); wanted 0x0000000000004020, left 0x0000000000004820 ->> [ 1.809091] brcm-sf2 f0b00000.ethernet_switch rgmii_2 ->> (uninitialized): attached PHY at address 1 [Generic PHY] ->> [ 1.819364] brcm-sf2 f0b00000.ethernet_switch rgmii_2: set_features() ->> failed (-1); wanted 0x0000000000004020, left 0x0000000000004820 ->> [ 1.884090] brcm-sf2 f0b00000.ethernet_switch moca (uninitialized): ->> attached PHY at address 2 [Generic PHY] ->> [ 1.894109] brcm-sf2 f0b00000.ethernet_switch moca: set_features() ->> failed (-1); wanted 0x0000000000004020, left 0x0000000000004820 ->> ->> DSA slave network devices are not associated with their master network ->> device using the typical lower/upper netdev helpers. ->> ->> I do not have a good fix to come up with yet, but if you see something ->> obvious with net/dsa/slave.c, feel free to send patches for testing, I ->> can boot net-next on this platform. -> -> I'm having similar issues with bridge, with linus's git now: -> -[snip] - -Hmm, I think it's because the bridge and dsa/slave don't have ndo_set_features() -so err is left as -1 and thus an error is reported which isn't actually true. -Before in this case the features would just get set, so could you please try -the following patch ? - -Signed-off-by: Laura Abbott ---- - net/core/dev.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/net/core/dev.c b/net/core/dev.c -index ab9b8d0..4a1d198 100644 ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -6426,6 +6426,8 @@ int __netdev_update_features(struct net_device *dev) - - if (dev->netdev_ops->ndo_set_features) - err = dev->netdev_ops->ndo_set_features(dev, features); -+ else -+ err = 0; - - if (unlikely(err < 0)) { - netdev_err(dev, --- -2.5.0 - diff --git a/sources b/sources index 799ccec08..e7b2af720 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 58b35794eee3b6d52ce7be39357801e7 linux-4.3.tar.xz 7c516c9528b9f9aac0136944b0200b7e perf-man-4.3.tar.gz 67848ae7a0ca2695598d77c9ee576100 patch-4.4-rc1.xz +fbf03c706f5303ad5170145a24fb9db8 patch-4.4-rc1-git1.xz