diff options
author | graysky | 2021-02-03 21:00:52 -0500 |
---|---|---|
committer | graysky | 2021-02-03 21:00:52 -0500 |
commit | 80011af8363e7217199dbe3efe9b6d4a28f7d5b3 (patch) | |
tree | 2903709bc7576964fc8fc1b89434ca708644bb0c | |
parent | e503386ba6329ee86aa8f9c4d99423f3e461f3aa (diff) | |
download | aur-80011af8363e7217199dbe3efe9b6d4a28f7d5b3.tar.gz |
Update to 5.10.13-3
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | 0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch (renamed from 0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch) | 0 | ||||
-rw-r--r-- | 0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch | 34 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | config | 17 |
5 files changed, 19 insertions, 56 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-ck - pkgver = 5.10.12 + pkgver = 5.10.13 pkgrel = 3 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -12,25 +12,23 @@ pkgbase = linux-ck makedepends = tar makedepends = xz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.12.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.12.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.13.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.13.tar.sign source = config source = enable_additional_cpu_optimizations-20201113.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20201113.tar.gz source = http://ck.kolivas.org/patches/5.0/5.10/5.10-ck1/patch-5.10-ck1.xz source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch source = 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch - source = 0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch - source = 0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch + source = 0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - b2sums = f5e16e92c9543708997d9dfee28feb2cd6e6909a33dc7f97c40b507a8d03bd72717b1af84bed3fa25b2a167652d8cd93b66d145d484e5ad292af24b3bf64a649 + b2sums = f2d6f5512c10ced0990d0d0cbc1aa29e5b54b90bff01f16d16093e9c192de9eb0f31e60c9dd51c686ce88c2a1d89a49bedb503af61c91a6a186794fbe71eedde b2sums = SKIP - b2sums = a03b6ccb7e25ecbf1206043798de396e7feda398f625ff7163bce5c3d7f822fc7eca6ee59253526848a07806a19c102dd8706f24e9702c691bb26c70b7efb844 + b2sums = 23b4034c8a462fe10ae3d6d9cd57a16b743576e831379e075625262c26e597f6b289aff6962509d73774b3cc03b78884651ff09d63507c099c0f9f0d6d9b4572 b2sums = 7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127 b2sums = 067f3389124fdd937ca69e9e9568b1b3194791960a093e81037051eb6d25e80b40bf7f60c61373ac9e92bff9db760766009b1e6f9ee8429a883bb7fce2d60f8a b2sums = de81e92b92ba697e472d6397faa425ebcc09bede6c97008dcae47efd341d2eaa12ec72209c4cc97155df01358e1fce3a86d3f0b5441ac91615037de72105defc b2sums = 9450bd3d4acfa94723eaf22f2c0a13ae3bdb1ceb15ad19d1a1de2fc8d9a7b9b8f759006fd5b4286da135c68bac75791b4bf767ece8b6c40aff95799296ee0327 - b2sums = ea8e11fa3e9ccffe26366c2c279e11ffd4cb7ed0500028afef083188d46a0df2487800417914e63b8ac101b6a28b6a61aad91bea0b7a0305d64be3445a4f68a0 b2sums = 4a40db184421fdda2b01efe22adee7a4e1ce82cbc877bfaea5aaaae7215d1fe9aeb307a5241af6b7b9e539ae3d1a26f35adaedce82c61d3edb60f6e0d1673743 pkgname = linux-ck diff --git a/0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch b/0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch index ea9af039cfb9..ea9af039cfb9 100644 --- a/0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch +++ b/0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch diff --git a/0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch b/0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch deleted file mode 100644 index bacbfc6de846..000000000000 --- a/0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7e80f549f6457db12423c73bb03807b09588c0d6 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet <edumazet@google.com> -Date: Mon, 21 Dec 2020 20:14:02 +0100 -Subject: [PATCH 3/5] iwlwifi: Fix regression from UDP segmentation support - -Eric's tentative fix from -https://lore.kernel.org/linux-wireless/CANn89iJWG2n1s3j7EdpwkQQv-9dOY02V+FGYHAWguO4JiqWuJA@mail.gmail.com/ ---- - drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c -index fe1c538cd718..c27743a58f81 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c -@@ -833,6 +833,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, - - next = skb_gso_segment(skb, netdev_flags); - skb_shinfo(skb)->gso_size = mss; -+ skb_shinfo(skb)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6; - if (WARN_ON_ONCE(IS_ERR(next))) - return -EINVAL; - else if (next) -@@ -855,6 +856,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes, - - if (tcp_payload_len > mss) { - skb_shinfo(tmp)->gso_size = mss; -+ skb_shinfo(tmp)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6; - } else { - if (qos) { - u8 *qc; --- -2.30.0 - @@ -64,7 +64,7 @@ _localmodcfg= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=5.10.12 +pkgver=5.10.13 pkgrel=3 _ckpatchversion=1 arch=(x86_64) @@ -83,21 +83,19 @@ source=( "http://ck.kolivas.org/patches/5.0/5.10/5.10-ck${_ckpatchversion}/$_ckpatch.xz" 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch - 0003-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch - 0004-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch + 0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -b2sums=('f5e16e92c9543708997d9dfee28feb2cd6e6909a33dc7f97c40b507a8d03bd72717b1af84bed3fa25b2a167652d8cd93b66d145d484e5ad292af24b3bf64a649' +b2sums=('f2d6f5512c10ced0990d0d0cbc1aa29e5b54b90bff01f16d16093e9c192de9eb0f31e60c9dd51c686ce88c2a1d89a49bedb503af61c91a6a186794fbe71eedde' 'SKIP' - 'a03b6ccb7e25ecbf1206043798de396e7feda398f625ff7163bce5c3d7f822fc7eca6ee59253526848a07806a19c102dd8706f24e9702c691bb26c70b7efb844' + '23b4034c8a462fe10ae3d6d9cd57a16b743576e831379e075625262c26e597f6b289aff6962509d73774b3cc03b78884651ff09d63507c099c0f9f0d6d9b4572' '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127' '067f3389124fdd937ca69e9e9568b1b3194791960a093e81037051eb6d25e80b40bf7f60c61373ac9e92bff9db760766009b1e6f9ee8429a883bb7fce2d60f8a' 'de81e92b92ba697e472d6397faa425ebcc09bede6c97008dcae47efd341d2eaa12ec72209c4cc97155df01358e1fce3a86d3f0b5441ac91615037de72105defc' '9450bd3d4acfa94723eaf22f2c0a13ae3bdb1ceb15ad19d1a1de2fc8d9a7b9b8f759006fd5b4286da135c68bac75791b4bf767ece8b6c40aff95799296ee0327' - 'ea8e11fa3e9ccffe26366c2c279e11ffd4cb7ed0500028afef083188d46a0df2487800417914e63b8ac101b6a28b6a61aad91bea0b7a0305d64be3445a4f68a0' '4a40db184421fdda2b01efe22adee7a4e1ce82cbc877bfaea5aaaae7215d1fe9aeb307a5241af6b7b9e539ae3d1a26f35adaedce82c61d3edb60f6e0d1673743') export KBUILD_BUILD_HOST=archlinux @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.12-arch1 Kernel Configuration +# Linux/x86 5.10.13-arch1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -2914,7 +2914,7 @@ CONFIG_B53_SRAB_DRIVER=m CONFIG_B53_SERDES=m CONFIG_NET_DSA_BCM_SF2=m CONFIG_NET_DSA_LOOP=m -CONFIG_NET_DSA_LANTIQ_GSWIP=m +# CONFIG_NET_DSA_LANTIQ_GSWIP is not set CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m @@ -3309,7 +3309,7 @@ CONFIG_AT803X_PHY=m CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m -CONFIG_ROCKCHIP_PHY=m +# CONFIG_ROCKCHIP_PHY is not set CONFIG_SMSC_PHY=m CONFIG_STE10XP=m CONFIG_TERANETICS_PHY=m @@ -4157,7 +4157,7 @@ CONFIG_SERIAL_UARTLITE_NR_UARTS=1 CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_LANTIQ=m +# CONFIG_SERIAL_LANTIQ is not set CONFIG_SERIAL_SCCNXP=m CONFIG_SERIAL_SC16IS7XX_CORE=m CONFIG_SERIAL_SC16IS7XX=m @@ -4397,11 +4397,11 @@ CONFIG_SPI_DLN2=m CONFIG_SPI_NXP_FLEXSPI=m CONFIG_SPI_GPIO=m CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_LANTIQ_SSC=m +# CONFIG_SPI_LANTIQ_SSC is not set CONFIG_SPI_OC_TINY=m CONFIG_SPI_PXA2XX=m CONFIG_SPI_PXA2XX_PCI=m -CONFIG_SPI_ROCKCHIP=m +# CONFIG_SPI_ROCKCHIP is not set CONFIG_SPI_SC18IS602=m CONFIG_SPI_SIFIVE=m CONFIG_SPI_MXIC=m @@ -9387,7 +9387,8 @@ CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y # CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_LOADPIN=y +CONFIG_SECURITY_LOADPIN_ENFORCE=y CONFIG_SECURITY_YAMA=y CONFIG_SECURITY_SAFESETID=y CONFIG_SECURITY_LOCKDOWN_LSM=y @@ -9402,7 +9403,7 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_LSM="lockdown,yama" +CONFIG_LSM="lockdown,yama,bpf" # # Kernel hardening options |