From 6a59ded7ad8dafddbe15bd897a7cbc35355c7817 Mon Sep 17 00:00:00 2001 From: Bruno Cichon Date: Fri, 8 Sep 2017 21:57:47 +0000 Subject: Update libre/linux-libre to 4.12.10-gnu --- libre/linux-libre/PKGBUILD | 12 +--- ...elimit-failed-speed-duplex-update-warning.patch | 47 --------------- ...uire-speed-duplex-only-for-802.3ad-alb-an.patch | 68 ---------------------- 3 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 libre/linux-libre/bonding-ratelimit-failed-speed-duplex-update-warning.patch delete mode 100644 libre/linux-libre/bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ba1ec57f7..f37055bd7 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _pkgbasever=4.12-gnu -_pkgver=4.12.9-gnu +_pkgver=4.12.10-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -43,8 +43,6 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l 'linux.preset' '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' - 'bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch' - 'bonding-ratelimit-failed-speed-duplex-update-warning.patch' # armv7h patches # "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig} '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' @@ -59,7 +57,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l '0010-ARM-dove-enable-ethernet-on-D3Plug.patch') sha512sums=('d5586dba2e4deeb42ffe98c9305111da56e0741bb4508642d103367a0ef712c837e160366c3656d18f0d636fcd5b60c27593cb9216e10025d6abc74e6cdb05e4' 'SKIP' - '1c8ede75976fc9cfe3ea189c24f1ffd7e4648705297ac34781333b3e3a274c3fac979636abfc147e7cdef764ae2bb9275c4313480bc6ad3d73c57138d14c611f' + 'a7338878d643d931ceb60aa72be12ce2499b564d6774fe29af5003558a00b2ae4188bf0bdc7a3cbec2b2c2d5edac0f5d39bcacb7f8dae2b6edde11358446083c' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -74,8 +72,6 @@ sha512sums=('d5586dba2e4deeb42ffe98c9305111da56e0741bb4508642d103367a0ef712c837e '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - '10622e73ab1c69ba6f36bd73097e21890f9fec9411f1c15df7c379a8800f7f3f2d701a116dc38f2cea1bb58c6305ee57890fe6ff115929d35a578660487fdc6f' - '9899c8fea07611324fbf96b6af86362986b4e780f7816d1d82a136cae2341283a4b19013ea0e7b562798604d04559e5abd59b6d695b957d1100e4de179059baa' 'b3c214cc9adf22858f21ea8b0b919bd167257c2f624e98718d486b7fb82f1cfd17f578f799c13c26948bc2cb23e9eb6de0ef9299cbe49afb63929778eda24026' 'db14593a4a0c0371e2cc2bcdcb0a4ac2abec96945dbb455393c5ef5140eca8ffb857dfee818087e4dfe261e9725a9e40a5d7e4c9774bca96560e3628743d7955' '5ed2d772ff47517b21ba5f848ee2792a85e5e2a3d80a2aa4f0eef2acc445c20c630e6033bb180754d5cfcf11b19dbfa939b14e00bbe2acaacde02f90e3ddbb48' @@ -145,10 +141,6 @@ prepare() { # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html patch -p1 -i "${srcdir}/0002-fix-Atmel-maXTouch-touchscreen-support.patch" - # https://bugzilla.kernel.org/show_bug.cgi?id=196547 - patch -Np1 -i ../bonding-ratelimit-failed-speed-duplex-update-warning.patch - patch -Np1 -i ../bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch - cat "${srcdir}/config.${CARCH}" > ./.config # append pkgrel to extraversion diff --git a/libre/linux-libre/bonding-ratelimit-failed-speed-duplex-update-warning.patch b/libre/linux-libre/bonding-ratelimit-failed-speed-duplex-update-warning.patch deleted file mode 100644 index c1a8bc5b4..000000000 --- a/libre/linux-libre/bonding-ratelimit-failed-speed-duplex-update-warning.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 11e9d7829dd08dbafb24517fe922f11c3a8a9dc2 Mon Sep 17 00:00:00 2001 -From: Andreas Born -Date: Sat, 12 Aug 2017 00:36:55 +0200 -Subject: [PATCH] bonding: ratelimit failed speed/duplex update warning - -bond_miimon_commit() handles the UP transition for each slave of a bond -in the case of MII. It is triggered 10 times per second for the default -MII Polling interval of 100ms. For device drivers that do not implement -__ethtool_get_link_ksettings() the call to bond_update_speed_duplex() -fails persistently while the MII status could remain UP. That is, in -this and other cases where the speed/duplex update keeps failing over a -longer period of time while the MII state is UP, a warning is printed -every MII polling interval. - -To address these excessive warnings net_ratelimit() should be used. -Printing a warning once would not be sufficient since the call to -bond_update_speed_duplex() could recover to succeed and fail again -later. In that case there would be no new indication what went wrong. - -Fixes: b5bf0f5b16b9c (bonding: correctly update link status during mii-commit phase) -Signed-off-by: Andreas Born -Signed-off-by: David S. Miller ---- - drivers/net/bonding/bond_main.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c -index 85bb272d2a34..fc63992ab0e0 100644 ---- a/drivers/net/bonding/bond_main.c -+++ b/drivers/net/bonding/bond_main.c -@@ -2144,9 +2144,10 @@ static void bond_miimon_commit(struct bonding *bond) - if (bond_update_speed_duplex(slave) && - bond_needs_speed_duplex(bond)) { - slave->link = BOND_LINK_DOWN; -- netdev_warn(bond->dev, -- "failed to get link speed/duplex for %s\n", -- slave->dev->name); -+ if (net_ratelimit()) -+ netdev_warn(bond->dev, -+ "failed to get link speed/duplex for %s\n", -+ slave->dev->name); - continue; - } - bond_set_slave_link_state(slave, BOND_LINK_UP, --- -2.14.1 - diff --git a/libre/linux-libre/bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch b/libre/linux-libre/bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch deleted file mode 100644 index 09028515b..000000000 --- a/libre/linux-libre/bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ad729bc9acfb7c47112964b4877ef5404578ed13 Mon Sep 17 00:00:00 2001 -From: Andreas Born -Date: Thu, 10 Aug 2017 06:41:44 +0200 -Subject: [PATCH] bonding: require speed/duplex only for 802.3ad, alb and tlb - -The patch c4adfc822bf5 ("bonding: make speed, duplex setting consistent -with link state") puts the link state to down if -bond_update_speed_duplex() cannot retrieve speed and duplex settings. -Assumably the patch was written with 802.3ad mode in mind which relies -on link speed/duplex settings. For other modes like active-backup these -settings are not required. Thus, only for these other modes, this patch -reintroduces support for slaves that do not support reporting speed or -duplex such as wireless devices. This fixes the regression reported in -bug 196547 (https://bugzilla.kernel.org/show_bug.cgi?id=196547). - -Fixes: c4adfc822bf5 ("bonding: make speed, duplex setting consistent -with link state") -Signed-off-by: Andreas Born -Acked-by: Mahesh Bandewar -Signed-off-by: David S. Miller ---- - drivers/net/bonding/bond_main.c | 6 ++++-- - include/net/bonding.h | 5 +++++ - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c -index 9bee6c1c70cc..85bb272d2a34 100644 ---- a/drivers/net/bonding/bond_main.c -+++ b/drivers/net/bonding/bond_main.c -@@ -1569,7 +1569,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) - new_slave->delay = 0; - new_slave->link_failure_count = 0; - -- if (bond_update_speed_duplex(new_slave)) -+ if (bond_update_speed_duplex(new_slave) && -+ bond_needs_speed_duplex(bond)) - new_slave->link = BOND_LINK_DOWN; - - new_slave->last_rx = jiffies - -@@ -2140,7 +2141,8 @@ static void bond_miimon_commit(struct bonding *bond) - continue; - - case BOND_LINK_UP: -- if (bond_update_speed_duplex(slave)) { -+ if (bond_update_speed_duplex(slave) && -+ bond_needs_speed_duplex(bond)) { - slave->link = BOND_LINK_DOWN; - netdev_warn(bond->dev, - "failed to get link speed/duplex for %s\n", -diff --git a/include/net/bonding.h b/include/net/bonding.h -index b00508d22e0a..b2e68657a216 100644 ---- a/include/net/bonding.h -+++ b/include/net/bonding.h -@@ -277,6 +277,11 @@ static inline bool bond_is_lb(const struct bonding *bond) - BOND_MODE(bond) == BOND_MODE_ALB; - } - -+static inline bool bond_needs_speed_duplex(const struct bonding *bond) -+{ -+ return BOND_MODE(bond) == BOND_MODE_8023AD || bond_is_lb(bond); -+} -+ - static inline bool bond_is_nondyn_tlb(const struct bonding *bond) - { - return (BOND_MODE(bond) == BOND_MODE_TLB) && --- -2.14.1 - -- cgit v1.2.3