Merge branch '4.15'

3 files changed, 80 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84783df01562..535b40f3e443 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Feb  4 00:03:53 UTC 2018
+# Sun Feb  4 00:05:36 UTC 2018
 pkgbase = linux-linode
 	pkgdesc = Kernel for Linode servers
-	pkgver = 4.14.17
+	pkgver = 4.15.1
 	pkgrel = 1
 	url = https://github.com/yardenac/linux-linode
 	install = install
@@ -24,41 +24,41 @@ pkgbase = linux-linode
 	options = !strip
 	backup = etc/mkinitcpio.d/linux-linode.preset
 	backup = boot/grub/menu.lst
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.17.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.17.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.1.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.1.sign
 	source = config
 	source = 08_linux_linode
 	source = 98-linux-linode.hook
 	source = 99-grub-ll.hook
 	source = menu.lst
 	source = preset
-	md5sums = bacdb9ffdcd922aa069a5e1520160e24
+	md5sums = 0d701ac1e2a67d47ce7127432df2c32b
 	md5sums = SKIP
-	md5sums = 0f72d86a7829537e35ed1a47d0671939
+	md5sums = 839159e4710e11dcc836023b3d7b1bf7
 	md5sums = SKIP
-	md5sums = 1104c462cda1b0de734d5b2a3c503fd1
+	md5sums = d677feac9fd958c345255de9391c3442
 	md5sums = bc30565cf444b710c252675cf65fb46e
 	md5sums = c52c29a8502f6c75e309208f0afab11f
 	md5sums = 625481f015365febcd65aa136ee555f9
 	md5sums = 15fae1e2da901b937d284890fd91cfab
 	md5sums = e1b5255cfbf5f8ca79b4b4568feec801
-	sha256sums = f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
+	sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769
 	sha256sums = SKIP
-	sha256sums = 1e62d56e37bd15daec7c3d20a605624e1e0a21c44856880c6dbe0c9e41cabfa8
+	sha256sums = 202a0a34f221ae335de096c292927d7a7d4bcdbc2dd46d43b8a5f6420f95a0cf
 	sha256sums = SKIP
-	sha256sums = b6286ad5338d6e8fd1050485db8ac49741036a5a8621d2dd2ac4f48991678d0a
+	sha256sums = 05c2b7b4648d9fc6101e7ecfbc66d463dde6fa482f924f455a0aa2c0a62821b8
 	sha256sums = 7d56a81083d1468d90ebec97a44ec44f80f8cb87bd506ed1918d6664d6309ad5
 	sha256sums = 3efa91fcb4698bde0598678bbf9a4a747c011823af82704eed2c146ed7cd9734
 	sha256sums = 368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3
 	sha256sums = a055b6005a324240b35c416d9d08fba21c5f614eefb46f244035d04bf085224f
 	sha256sums = 29fa2c1ea75f55a61276496507b788b1a8bde1d7c16bee4f525651db34076e46
-	sha512sums = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
+	sha512sums = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
 	sha512sums = SKIP
-	sha512sums = fd785f0ab864ef4d2b18041183d867fb3a00e6d8718cb016d61a5c6de9f29f6653678ae6cc72593224da3e1bc44cc061d285a2f426ca1d62b4eb571549c440e3
+	sha512sums = d0ffcf6f8311a9b4cfa42cd07c24429af4e2e735c9a841de2baa206873652a42aa4853f19fecc82a2fcf464a39b7a62249c940287a040c4a310e4d024ae5d55f
 	sha512sums = SKIP
-	sha512sums = cfb57bae802283e7c5fcee08774d33df8e6b60cae0563bd58d0b316c3369faac8f9a666c1e90b9af761dc01fe6381cb1ad37bea8fab7a6f165263a1dd7c0ff0f
+	sha512sums = 61e6e47701c30ac5c683b86bf37405e9356177c2d5ef98fb401fc8cd2c2f89d09fa1bd47e8fc40ff24139f5ff1199311a23419abd4adb2a15f35629cf815e7b8
 	sha512sums = 7a80f858c32a9dd62f43aba0b7119a1196869216117164bcde24ab46022e8a1bbe27821faa26ca690a1633a5a9fe324e98e5cdf14f37591d569cbc71f542482d
 	sha512sums = c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f
 	sha512sums = db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf
diff --git a/PKGBUILD b/PKGBUILD
index e37cecda03d0..88a38df185f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # tracks: https://projects.archlinux.org/svntogit/packages.git/log/trunk?h=packages/linux
 
 pkgname=linux-linode
-_basekernel=4.14
+_basekernel=4.15
 _kernelname=${pkgname#linux}
 _srcname=linux-${_basekernel}
-pkgver=${_basekernel}.17
+pkgver=${_basekernel}.1
 pkgrel=1
 arch=('x86_64')
 url="https://github.com/yardenac/linux-linode"
@@ -20,25 +20,25 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar."{xz,sign}
         '99-grub-ll.hook'
         'menu.lst'
         'preset')
-sha512sums=('77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8' 'SKIP'
-            'fd785f0ab864ef4d2b18041183d867fb3a00e6d8718cb016d61a5c6de9f29f6653678ae6cc72593224da3e1bc44cc061d285a2f426ca1d62b4eb571549c440e3' 'SKIP'
-            'cfb57bae802283e7c5fcee08774d33df8e6b60cae0563bd58d0b316c3369faac8f9a666c1e90b9af761dc01fe6381cb1ad37bea8fab7a6f165263a1dd7c0ff0f'
+sha512sums=('c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea' 'SKIP'
+            'd0ffcf6f8311a9b4cfa42cd07c24429af4e2e735c9a841de2baa206873652a42aa4853f19fecc82a2fcf464a39b7a62249c940287a040c4a310e4d024ae5d55f' 'SKIP'
+            '61e6e47701c30ac5c683b86bf37405e9356177c2d5ef98fb401fc8cd2c2f89d09fa1bd47e8fc40ff24139f5ff1199311a23419abd4adb2a15f35629cf815e7b8'
             '7a80f858c32a9dd62f43aba0b7119a1196869216117164bcde24ab46022e8a1bbe27821faa26ca690a1633a5a9fe324e98e5cdf14f37591d569cbc71f542482d'
             'c57a6c8d9978cb6a1034bed33ba5e06bef9b134f22113761798d4fa46e8091e7b0bd26f3a14d79122ba780b2f7a93ca26850f4da6a654f81b34cc79c242f683f'
             'db9080b2548e4dcd61eaaf20cd7d37cbbc8c204ce85a2e3408d0671f6b26010f77a61affd2c77e809768714eca29d3afb64765a3f2099317a2c928eff3feb4cf'
             '73cb4c064d8942fddaac48158b7e77d19afc1cb61f83936f21832ba7d7266ccfd3021114252edd5cec5542096204f48cf30544fd6bffff79bc94d96fabe74f52'
             '62870a08f000abfe8eb1f50271afdf04686af108554f7629dc5e1d7610ad14bdc9cd14d2609270b83f9edb745a520b81fa7bfb92ebcc28a146df040c895b549b')
-sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7' 'SKIP'
-            '1e62d56e37bd15daec7c3d20a605624e1e0a21c44856880c6dbe0c9e41cabfa8' 'SKIP'
-            'b6286ad5338d6e8fd1050485db8ac49741036a5a8621d2dd2ac4f48991678d0a'
+sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP'
+            '202a0a34f221ae335de096c292927d7a7d4bcdbc2dd46d43b8a5f6420f95a0cf' 'SKIP'
+            '05c2b7b4648d9fc6101e7ecfbc66d463dde6fa482f924f455a0aa2c0a62821b8'
             '7d56a81083d1468d90ebec97a44ec44f80f8cb87bd506ed1918d6664d6309ad5'
             '3efa91fcb4698bde0598678bbf9a4a747c011823af82704eed2c146ed7cd9734'
             '368fb58e7aa465f597e9a72da4b6eea4183c1a85242173412d54ad18d10d8fb3'
             'a055b6005a324240b35c416d9d08fba21c5f614eefb46f244035d04bf085224f'
             '29fa2c1ea75f55a61276496507b788b1a8bde1d7c16bee4f525651db34076e46')
-md5sums=('bacdb9ffdcd922aa069a5e1520160e24' 'SKIP'
-         '0f72d86a7829537e35ed1a47d0671939' 'SKIP'
-         '1104c462cda1b0de734d5b2a3c503fd1'
+md5sums=('0d701ac1e2a67d47ce7127432df2c32b' 'SKIP'
+         '839159e4710e11dcc836023b3d7b1bf7' 'SKIP'
+         'd677feac9fd958c345255de9391c3442'
          'bc30565cf444b710c252675cf65fb46e'
          'c52c29a8502f6c75e309208f0afab11f'
          '625481f015365febcd65aa136ee555f9'
diff --git a/config b/config
index eefb4155712b..3d603bcf4662 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.14-1 Kernel Configuration
+# Linux/x86 4.15.0-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -70,7 +70,6 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_FHANDLE=y
 # CONFIG_USELIB is not set
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
@@ -90,6 +89,8 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
@@ -123,6 +124,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
+CONFIG_CPU_ISOLATION=y
 
 #
 # RCU Subsystem
@@ -168,7 +170,6 @@ CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_BPF is not set
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
-# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -200,11 +201,8 @@ CONFIG_MULTIUSER=y
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_FHANDLE=y
 CONFIG_POSIX_TIMERS=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
 CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
@@ -217,13 +215,17 @@ CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
-CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+# CONFIG_USERFAULTFD is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 # CONFIG_PC104 is not set
@@ -338,7 +340,6 @@ CONFIG_REFCOUNT_FULL=y
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -553,12 +554,14 @@ CONFIG_ARCH_HAS_ZONE_DEVICE=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 # CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
 # CONFIG_X86_PMEM_LEGACY is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_MTRR is not set
 CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_UMIP=y
 # CONFIG_X86_INTEL_MPX is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 # CONFIG_EFI is not set
@@ -611,6 +614,7 @@ CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 # CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_LPIT=y
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
@@ -702,11 +706,10 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 # CONFIG_PCI_STUB is not set
 CONFIG_XEN_PCIDEV_FRONTEND=y
-CONFIG_HT_IRQ=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
@@ -1277,6 +1280,10 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 # CONFIG_VIRTIO_BLK is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
+
+#
+# NVME Support
+#
 # CONFIG_BLK_DEV_NVME is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
@@ -1311,7 +1318,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 #
 
 #
-# Altera FPGA firmware download module
+# Altera FPGA firmware download module (requires I2C)
 #
 # CONFIG_INTEL_MEI is not set
 # CONFIG_INTEL_MEI_ME is not set
@@ -1319,6 +1326,10 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 # CONFIG_VMWARE_VMCI is not set
 
 #
+# Intel MIC & related support
+#
+
+#
 # Intel MIC Bus Driver
 #
 # CONFIG_INTEL_MIC_BUS is not set
@@ -1873,6 +1884,7 @@ CONFIG_DEVPORT=y
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 # CONFIG_PTP_1588_CLOCK_PCH is not set
+# CONFIG_PINCTRL is not set
 # CONFIG_GPIOLIB is not set
 # CONFIG_W1 is not set
 # CONFIG_POWER_AVS is not set
@@ -1915,6 +1927,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 #
 # Broadcom thermal drivers
 #
+# CONFIG_BRCMSTB_THERMAL is not set
 # CONFIG_BCM_NS_THERMAL is not set
 
 #
@@ -1989,6 +2002,11 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 #
 # ACP (Audio CoProcessor) Configuration
 #
+
+#
+# AMD Library routines
+#
+# CONFIG_CHASH is not set
 # CONFIG_DRM_LIB_RANDOM is not set
 
 #
@@ -2202,11 +2220,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_GADGET is not set
-
-#
-# USB Power Delivery and Type-C drivers
-#
-# CONFIG_TYPEC_UCSI is not set
+# CONFIG_TYPEC is not set
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_UWB is not set
 # CONFIG_MMC is not set
@@ -2264,6 +2278,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_TMEM=m
 CONFIG_XEN_PCIDEV_BACKEND=m
+# CONFIG_XEN_PVCALLS_FRONTEND is not set
 # CONFIG_XEN_PVCALLS_BACKEND is not set
 CONFIG_XEN_PRIVCMD=y
 CONFIG_XEN_ACPI_PROCESSOR=m
@@ -2301,7 +2316,6 @@ CONFIG_LNET_MAX_PAYLOAD=1048576
 #
 # USB Power Delivery and Type-C drivers
 #
-# CONFIG_TYPEC_TCPM is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set
 CONFIG_PMC_ATOM=y
 # CONFIG_CHROME_PLATFORMS is not set
@@ -2328,6 +2342,7 @@ CONFIG_COMMON_CLK_XGENE=y
 # CONFIG_CLK_BCM_63XX is not set
 # CONFIG_CLK_BCM_KONA is not set
 # CONFIG_CLK_BCM_CYGNUS is not set
+# CONFIG_CLK_BCM_HR2 is not set
 # CONFIG_CLK_BCM_NSP is not set
 # CONFIG_CLK_BCM_NS2 is not set
 # CONFIG_CLK_BCM_SR is not set
@@ -2339,7 +2354,9 @@ CONFIG_COMMON_CLK_XGENE=y
 # CONFIG_RESET_HISI is not set
 # CONFIG_COMMON_CLK_BOSTON is not set
 # CONFIG_COMMON_CLK_MT2701 is not set
+# CONFIG_COMMON_CLK_MT2712 is not set
 # CONFIG_COMMON_CLK_MT6797 is not set
+# CONFIG_COMMON_CLK_MT7622 is not set
 # CONFIG_COMMON_CLK_MT8135 is not set
 # CONFIG_COMMON_CLK_MT8173 is not set
 # CONFIG_CLK_RENESAS is not set
@@ -2421,6 +2438,7 @@ CONFIG_IOMMU_SUPPORT=y
 # Rpmsg drivers
 #
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+# CONFIG_RPMSG_VIRTIO is not set
 
 #
 # SOC (System On Chip) specific Drivers
@@ -2431,6 +2449,7 @@ CONFIG_IOMMU_SUPPORT=y
 # Amlogic SoC drivers
 #
 # CONFIG_MESON_GX_SOCINFO is not set
+# CONFIG_MESON_MX_SOCINFO is not set
 # CONFIG_AT91_SOC_ID is not set
 
 #
@@ -2441,6 +2460,10 @@ CONFIG_IOMMU_SUPPORT=y
 #
 # i.MX SoC drivers
 #
+
+#
+# MediaTek SoC drivers
+#
 # CONFIG_MTK_INFRACFG is not set
 # CONFIG_MTK_SCPSYS is not set
 
@@ -2462,7 +2485,12 @@ CONFIG_ROCKCHIP_GRF=y
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
+
+#
+# IRQ chip support
+#
 CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_ARM_GIC_V3_ITS is not set
 # CONFIG_TS4800_IRQ is not set
 # CONFIG_IRQ_UNIPHIER_AIDET is not set
 # CONFIG_IPACK_BUS is not set
@@ -2532,6 +2560,7 @@ CONFIG_DAX=y
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_FS_IOMAP=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
@@ -2559,6 +2588,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_F2FS_FS is not set
 # CONFIG_FS_DAX is not set
@@ -2580,6 +2610,7 @@ CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
 CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_INDEX is not set
 
 #
@@ -2634,6 +2665,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 CONFIG_CRAMFS=y
+CONFIG_CRAMFS_BLOCKDEV=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_FILE_CACHE=y
 # CONFIG_SQUASHFS_FILE_DIRECT is not set
@@ -2766,7 +2798,6 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
@@ -2867,6 +2898,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
@@ -3056,6 +3088,7 @@ CONFIG_CRYPTO_SHA512_MB=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_TGR192=y
 CONFIG_CRYPTO_WP512=y
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=y
@@ -3149,7 +3182,6 @@ CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_CRC_CCITT=m