summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagicking2017-09-25 02:56:51 +0200
committerMagicking2017-09-25 03:03:29 +0200
commitbe42b312a9f3cddb22bf6b64f5db161575bf6728 (patch)
treec527be7a8ffe0071d91fb9a1461fc3ae3b773a13
parent9d497280dc9159bbd9f62dd634daecad1fe59302 (diff)
downloadaur-be42b312a9f3cddb22bf6b64f5db161575bf6728.tar.gz
Remove old patches
-rw-r--r--.SRCINFO27
-rw-r--r--bonding-ratelimit-failed-speed-duplex-update-warning.patch47
-rw-r--r--bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch68
-rw-r--r--mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch35
4 files changed, 10 insertions, 167 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a4846f20ac14..b3fe82d227d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
pkgbase = linux-tp-x1-carbon-5th
- pkgver = 4.12.8
- pkgrel = 2
+ pkgver = 4.13.2
+ pkgrel = 1
url = https://www.kernel.org/
arch = i686
arch = x86_64
license = GPL2
makedepends = xmlto
- makedepends = docbook-xsl
makedepends = kmod
makedepends = inetutils
makedepends = bc
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.12.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.12.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.12.8.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.12.8.sign
- source = bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch
- source = bonding-ratelimit-failed-speed-duplex-update-warning.patch
- source = mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.13.2.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.13.2.sign
source = thinkpad_x1_carbon_5th.patch
source = config.i686
source = config.x86_64
@@ -26,16 +22,13 @@ pkgbase = linux-tp-x1-carbon-5th
source = linux.preset
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab
+ sha256sums = 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c
sha256sums = SKIP
- sha256sums = 32b860911a3bafd5cd5bc813a427c90fad6eafdf607fa64e1b763b16ab605636
+ sha256sums = dfb5753b89580494a54d1021d14f1fa91b54d4ab9bf6175fc8cf8cb8c41d8e3f
sha256sums = SKIP
- sha256sums = 48e0505438bb4ccc7a0e050a896122b490e8f1b1446aa3833841a9d4d7853d68
- sha256sums = fc606711a922638d5cc4358f47f69f554d9e6eab1cec91f0b49f00911f399722
- sha256sums = b830ce777543c0edd20a77d70f204c095f2429bb37151cd4a8c9dfae2af8d51a
sha256sums = 11fa14b2921b31419cb8f19d52d966bcdf3ba8c66e055e24dd2dd37d0e3b2f5c
- sha256sums = df55887a43dcbb6bd35fd2fb1ec841427b6ea827334c0880cbc256d4f042a7a1
- sha256sums = bf84528c592d1841bba0662242f0339a24a1de384c31f28248631e8be9446586
+ sha256sums = 73278ee56c5d3855e67ff50caa77a7cb47fb29ebd8f9b7ca9ebee4e2d446529c
+ sha256sums = 1b9cbe1c25653d563515344a7c6cc9f79447ac9274fcf4de0007228e979b55dd
sha256sums = 834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
diff --git a/bonding-ratelimit-failed-speed-duplex-update-warning.patch b/bonding-ratelimit-failed-speed-duplex-update-warning.patch
deleted file mode 100644
index c1a8bc5b47e6..000000000000
--- a/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 <futur.andy@googlemail.com>
-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 <futur.andy@googlemail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- 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/bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch b/bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch
deleted file mode 100644
index 09028515b84f..000000000000
--- a/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 <futur.andy@googlemail.com>
-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 <futur.andy@googlemail.com>
-Acked-by: Mahesh Bandewar <maheshb@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- 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
-
diff --git a/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch b/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch
deleted file mode 100644
index bf089e08adc6..000000000000
--- a/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
-index acae781f7359..3288c2b36731 100644
---- a/arch/arm64/include/asm/elf.h
-+++ b/arch/arm64/include/asm/elf.h
-@@ -114,10 +114,10 @@
-
- /*
- * This is the base location for PIE (ET_DYN with INTERP) loads. On
-- * 64-bit, this is raised to 4GB to leave the entire 32-bit address
-+ * 64-bit, this is above 4GB to leave the entire 32-bit address
- * space open for things that want to use the area for 32-bit pointers.
- */
--#define ELF_ET_DYN_BASE 0x100000000UL
-+#define ELF_ET_DYN_BASE (2 * TASK_SIZE_64 / 3)
-
- #ifndef __ASSEMBLY__
-
-diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
-index 1c18d83d3f09..9aeb91935ce0 100644
---- a/arch/x86/include/asm/elf.h
-+++ b/arch/x86/include/asm/elf.h
-@@ -247,11 +247,11 @@ extern int force_personality32;
-
- /*
- * This is the base location for PIE (ET_DYN with INTERP) loads. On
-- * 64-bit, this is raised to 4GB to leave the entire 32-bit address
-+ * 64-bit, this is above 4GB to leave the entire 32-bit address
- * space open for things that want to use the area for 32-bit pointers.
- */
- #define ELF_ET_DYN_BASE (mmap_is_ia32() ? 0x000400000UL : \
-- 0x100000000UL)
-+ (TASK_SIZE / 3 * 2))
-
- /* This yields a mask that user programs can use to figure out what
- instruction set this CPU supports. This could be done in user space,