update: kernel 4.18.1

4 files changed, 50 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0157612844c5..7bbe253e2a4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-usermode
 	pkgdesc = User mode Linux kernel and modules
-	pkgver = 4.17.3
+	pkgver = 4.18.1
 	pkgrel = 1
 	url = http://user-mode-linux.sourceforge.net/
 	arch = x86_64
@@ -9,18 +9,16 @@ pkgbase = linux-usermode
 	makedepends = inetutils
 	makedepends = gcc7
 	depends = coreutils
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.xz
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.sign
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.17.3.xz
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.17.3.sign
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.tar.xz
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.tar.sign
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.18.1.xz
 	source = config
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13
+	sha256sums = 19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1
 	sha256sums = SKIP
-	sha256sums = 01d5cc024dcfed615f84fd83be9c248261d8fc2c062520d38397cead6857b596
-	sha256sums = SKIP
-	sha256sums = a3ae8758ea7e1bec8f0dcaf4802f2985d96b6ab3178bc041faf6e00fd9d95ceb
+	sha256sums = f0580daf3ea0716301c929be78c09db4dc3d8add65a1da392c2fc2c841244e8c
+	sha256sums = 10ef174f9512a35cce7ffa93ead6ae3e01ccd7df0d9bdba909024cdade67c082
 
 pkgname = linux-usermode
 
diff --git a/PKGBUILD b/PKGBUILD
index e042d7c78836..0acd1dbfaef8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@ pkgname=linux-usermode
 true && pkgname=(linux-usermode linux-usermode-modules)
 pkgbase=linux-usermode
 _kernelname=-usermodelinux
-_srcname=linux-4.17
-pkgver=4.17.3
+_srcname=linux-4.18
+pkgver=4.18.1
 pkgrel=1
 pkgdesc="User mode Linux kernel and modules"
 arch=('x86_64')
@@ -16,14 +16,14 @@ depends=('coreutils')
 makedepends=('bc' 'inetutils' 'gcc7')
 source=(
   http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign}
-  http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign}
+#  http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign}
+  http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz
   config)
 
-sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13'
+sha256sums=('19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1'
             'SKIP'
-            '01d5cc024dcfed615f84fd83be9c248261d8fc2c062520d38397cead6857b596'
-            'SKIP'
-            'a3ae8758ea7e1bec8f0dcaf4802f2985d96b6ab3178bc041faf6e00fd9d95ceb')
+            'f0580daf3ea0716301c929be78c09db4dc3d8add65a1da392c2fc2c841244e8c'
+            '10ef174f9512a35cce7ffa93ead6ae3e01ccd7df0d9bdba909024cdade67c082')
 
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -67,7 +67,8 @@ package_linux-usermode-modules() {
 
   cd "${srcdir}/${_srcname}"
 
-  # get kernel version
+  # get kernel version, but discard the first result
+  make ARCH=um kernelrelease > /dev/null
   _kernver="$(make ARCH=um kernelrelease)"
 
   #  make ARCH=um INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
diff --git a/config b/config
index ff2fb365690c..b5f30f6840d2 100644
--- a/config
+++ b/config
@@ -1,6 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# User Mode Linux/x86 4.17.3-1 Kernel Configuration
+# User Mode Linux/x86 4.18.1-1 Kernel Configuration
+#
+
+#
+# Compiler: gcc (GCC) 8.2.0
 #
 CONFIG_UML=y
 CONFIG_MMU=y
@@ -72,6 +76,9 @@ CONFIG_KERNEL_STACK_ORDER=1
 CONFIG_NO_DMA=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_SECCOMP=y
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=80200
+CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 
 #
@@ -79,7 +86,6 @@ CONFIG_IRQ_WORK=y
 #
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=128
-CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -201,8 +207,10 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGINS is not set
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_REFCOUNT_FULL is not set
@@ -289,9 +297,13 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
@@ -418,9 +430,10 @@ CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_CORTINA=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_HUAWEI=y
-CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NET_VENDOR_NI=y
@@ -432,8 +445,8 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_SOCIONEXT=y
-CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_NET_VENDOR_VIA=y
 # CONFIG_MDIO_DEVICE is not set
 # CONFIG_PHYLIB is not set
 CONFIG_PPP=m
@@ -478,6 +491,7 @@ CONFIG_WLAN_VENDOR_QUANTENNA=y
 # Enable WiMAX (Networking options) to see the WiMAX drivers
 #
 # CONFIG_WAN is not set
+# CONFIG_NET_FAILOVER is not set
 
 #
 # Character devices
@@ -667,6 +681,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 # CONFIG_NETFILTER is not set
+# CONFIG_BPFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -729,6 +744,7 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
+# CONFIG_FAILOVER is not set
 
 #
 # UML Network Devices
@@ -787,6 +803,7 @@ CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QFMT_V2 is not set
 CONFIG_QUOTACTL=y
 CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
 # CONFIG_FUSE_FS is not set
 # CONFIG_OVERLAY_FS is not set
 
@@ -823,6 +840,7 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_TMPFS_XATTR is not set
+CONFIG_MEMFD_CREATE=y
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ORANGEFS_FS is not set
@@ -956,6 +974,11 @@ CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CCM is not set
 # CONFIG_CRYPTO_GCM is not set
 # CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
 # CONFIG_CRYPTO_SEQIV is not set
 CONFIG_CRYPTO_ECHAINIV=m
 
@@ -1019,7 +1042,6 @@ CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SALSA20_X86_64 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SERPENT is not set
@@ -1037,6 +1059,7 @@ CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_842 is not set
 # CONFIG_CRYPTO_LZ4 is not set
 # CONFIG_CRYPTO_LZ4HC is not set
+# CONFIG_CRYPTO_ZSTD is not set
 
 #
 # Random Number Generation
@@ -1079,6 +1102,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC8 is not set
 # CONFIG_RANDOM32_SELFTEST is not set
 # CONFIG_XZ_DEC is not set
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_SGL_ALLOC=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
@@ -1138,6 +1162,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_VM is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
@@ -1203,6 +1228,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_SORT is not set
@@ -1217,6 +1243,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
+# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_LKM is not set
diff --git a/modules.install b/modules.install
index 1ee4f20827bd..6dea9b4de725 100644
--- a/modules.install
+++ b/modules.install
@@ -1,4 +1,4 @@
-KERNEL_VERSION=4.17.3-1-usermodelinux
+KERNEL_VERSION=4.18.1-1-usermodelinux
 
 post_install() {
   echo ">>> Updating module dependencies. Please wait ..."