summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD10
-rw-r--r--config18
3 files changed, 20 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a675208b434d..2452446096c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Mon Jun 24 09:34:44 UTC 2019
+# Wed Aug 26 19:59:29 UTC 2020
pkgbase = linux-mptcp
- pkgver = 0.95
+ pkgver = 0.95.1
pkgrel = 1
epoch = 1
url = http://www.multipath-tcp.org/
@@ -13,21 +13,21 @@ pkgbase = linux-mptcp
makedepends = bc
makedepends = libelf
options = !strip
- source = https://github.com/multipath-tcp/mptcp/archive/8bf32af5f92a94f064b324ec1abc3ae030baec56/linux-mptcp-0.95-8bf32af5f92a94f064b324ec1abc3ae030baec56.tar.gz
+ source = https://github.com/multipath-tcp/mptcp/archive/22010a0444bb897ea8928db68ef81a05f888e949/linux-mptcp-0.95.1-22010a0444bb897ea8928db68ef81a05f888e949.tar.gz
source = config
source = 60-linux.hook
source = 90-linux.hook
source = linux-mptcp.preset
source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
- sha256sums = 22d4894c6ae6b06d1ad6b0dc8c9bad069ce5c0e3b845e0596aefbc941d112363
- sha256sums = 42c0b8df494efba408be2af61c1503fc16d5d6dcfb539944d3fa7098e60cace5
+ sha256sums = b647682e0808c7e9baffe7e2b0abbbcf47119a2f2c35edd0f98efed908f1191d
+ sha256sums = 7a50de4882ef2229a9da00cb4b162fa18fa0f7e96e731320512645a31bbaf99c
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
sha256sums = 36b1118c8dedadc4851150ddd4eb07b1c58ac5bbf3022cc2501a27c2b476da98
pkgname = linux-mptcp
- pkgdesc = The Linux kernel and modules with Multipath TCP support (based on linux 4.19.55)
+ pkgdesc = The Linux kernel and modules with Multipath TCP support (based on linux 4.19.126)
install = linux-mptcp.install
depends = coreutils
depends = linux-firmware
diff --git a/PKGBUILD b/PKGBUILD
index fa0cf6fb480c..ca3447f3f2e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@
# Contributor: Élie Bouttier <elie@bouttier.eu>
pkgbase=linux-mptcp
-pkgver=0.95
+pkgver=0.95.1
pkgrel=1
epoch=1
-_commit=8bf32af5f92a94f064b324ec1abc3ae030baec56
+_commit=22010a0444bb897ea8928db68ef81a05f888e949
_srcname=mptcp-${_commit}
arch=('x86_64')
url="http://www.multipath-tcp.org/"
@@ -22,8 +22,8 @@ source=("https://github.com/multipath-tcp/mptcp/archive/${_commit}/${pkgbase}-${
'90-linux.hook' # pacman hook for initramfs regeneration
'linux-mptcp.preset' # standard config files for mkinitcpio ramdisk
'0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch')
-sha256sums=('22d4894c6ae6b06d1ad6b0dc8c9bad069ce5c0e3b845e0596aefbc941d112363'
- '42c0b8df494efba408be2af61c1503fc16d5d6dcfb539944d3fa7098e60cace5'
+sha256sums=('b647682e0808c7e9baffe7e2b0abbbcf47119a2f2c35edd0f98efed908f1191d'
+ '7a50de4882ef2229a9da00cb4b162fa18fa0f7e96e731320512645a31bbaf99c'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
@@ -75,7 +75,7 @@ build() {
}
_package() {
- pkgdesc="The Linux kernel and modules with Multipath TCP support (based on linux 4.19.55)"
+ pkgdesc="The Linux kernel and modules with Multipath TCP support (based on linux 4.19.126)"
[ "${pkgbase}" = "linux" ] && groups=('base')
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
optdepends=('crda: to set the correct wireless channels of your country'
diff --git a/config b/config
index 7be232c006e7..20b48c6cdd3c 100644
--- a/config
+++ b/config
@@ -1,13 +1,13 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.55-1 Kernel Configuration
+# Linux/x86 4.19.126-1 Kernel Configuration
#
#
-# Compiler: gcc (GCC) 9.1.0
+# Compiler: gcc (GCC) 10.2.0
#
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90100
+CONFIG_GCC_VERSION=100200
CONFIG_CLANG_VERSION=0
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_IRQ_WORK=y
@@ -411,6 +411,9 @@ CONFIG_X86_SMAP=y
CONFIG_X86_INTEL_UMIP=y
CONFIG_X86_INTEL_MPX=y
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+# CONFIG_X86_INTEL_TSX_MODE_OFF is not set
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+CONFIG_X86_INTEL_TSX_MODE_AUTO=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_EFI_MIXED=y
@@ -2100,7 +2103,6 @@ CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP_W1=m
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
-CONFIG_REGMAP_SOUNDWIRE=m
CONFIG_DMA_SHARED_BUFFER=y
# CONFIG_DMA_FENCE_TRACE is not set
@@ -3208,7 +3210,7 @@ CONFIG_LED_TRIGGER_PHY=y
CONFIG_SFP=m
CONFIG_AMD_PHY=m
CONFIG_AQUANTIA_PHY=m
-CONFIG_ASIX_PHY=m
+CONFIG_AX88796B_PHY=m
CONFIG_AT803X_PHY=m
CONFIG_BCM7XXX_PHY=m
CONFIG_BCM87XX_PHY=m
@@ -6130,10 +6132,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
#
# Frame buffer Devices
#
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
CONFIG_FB_CMDLINE=y
CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
CONFIG_FB_BOOT_VESA_SUPPORT=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
@@ -7060,7 +7062,6 @@ CONFIG_USB_EMI62=m
CONFIG_USB_EMI26=m
CONFIG_USB_ADUTUX=m
CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
CONFIG_USB_LEGOTOWER=m
CONFIG_USB_LCD=m
CONFIG_USB_CYPRESS_CY7C63=m
@@ -8137,7 +8138,6 @@ CONFIG_SOUNDWIRE=y
#
# SoundWire Devices
#
-CONFIG_SOUNDWIRE_BUS=m
CONFIG_SOUNDWIRE_CADENCE=m
CONFIG_SOUNDWIRE_INTEL=m