upd

5 files changed, 53 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8687feca0a52..6b307b619dc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Jun  2 18:34:25 UTC 2016
+# Thu Jul 28 13:46:39 UTC 2016
 pkgbase = linux-usermode
 	pkgdesc = User mode Linux kernel and modules
-	pkgver = 4.6.1
+	pkgver = 4.7.0
 	pkgrel = 1
 	url = http://user-mode-linux.sourceforge.net/
 	arch = i686
@@ -13,14 +13,12 @@ pkgbase = linux-usermode
 	makedepends = vde2-static
 	makedepends = vde2
 	depends = coreutils
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.6.tar.xz
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.1.xz
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.7.tar.xz
 	source = config-i686
 	source = config-x86_64
-	md5sums = d2927020e24a76da4ab482a8bc3e9ef3
-	md5sums = e3479d9c8a0e8757c16eb03a4258587c
-	md5sums = 3dbaa1af7fddb8dda218b6001a87478a
-	md5sums = 5d2f5ff58dab428ff492b482d4565afc
+	md5sums = 5276563eb1f39a048e4a8a887408c031
+	md5sums = 27523cd2017f599a97fb7aeca7873b5b
+	md5sums = 01ea55240d283decc4a15d5c90ea8dba
 
 pkgname = linux-usermode
 
diff --git a/PKGBUILD b/PKGBUILD
index 76fdda34e0b1..b37050c059e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@ pkgname=linux-usermode
 true && pkgname=(linux-usermode linux-usermode-modules)
 pkgbase=linux-usermode
 _kernelname=-usermodelinux
-_srcname=linux-4.6
-pkgver=4.6.1
+_srcname=linux-4.7
+pkgver=4.7.0
 pkgrel=1
 pkgdesc="User mode Linux kernel and modules"
 arch=('i686' 'x86_64')
@@ -12,17 +12,16 @@ url="http://user-mode-linux.sourceforge.net/"
 depends=('coreutils')
 makedepends=('bc' 'inetutils' 'vde2-static' 'vde2')
 source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
-	"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
+#	"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
 	config-i686
 	config-x86_64)
-md5sums=('d2927020e24a76da4ab482a8bc3e9ef3'
-         'e3479d9c8a0e8757c16eb03a4258587c'
-         '3dbaa1af7fddb8dda218b6001a87478a'
-         '5d2f5ff58dab428ff492b482d4565afc')
+md5sums=('5276563eb1f39a048e4a8a887408c031'
+         '27523cd2017f599a97fb7aeca7873b5b'
+         '01ea55240d283decc4a15d5c90ea8dba')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
-  patch -p1 -i "${srcdir}/patch-${pkgver}"
+#  patch -p1 -i "${srcdir}/patch-${pkgver}"
 }
 
 build() {
diff --git a/config-i686 b/config-i686
index 5af8914c71a3..dd0def818839 100644
--- a/config-i686
+++ b/config-i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# User Mode Linux/x86 4.6.1 Kernel Configuration
+# User Mode Linux/x86 4.7.0 Kernel Configuration
 #
 CONFIG_UML=y
 CONFIG_MMU=y
@@ -75,7 +75,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_NEED_PER_CPU_KM=y
@@ -87,6 +86,7 @@ CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_LD_SCRIPT_DYN=y
 CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_HAVE_AOUT=y
@@ -188,7 +188,8 @@ CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
@@ -228,6 +229,7 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_COMPAT_BRK=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
+# CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 # CONFIG_PROFILING is not set
 # CONFIG_UPROBES is not set
@@ -257,6 +259,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
+# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
@@ -424,6 +427,7 @@ CONFIG_DUMMY=m
 # CONFIG_MACVLAN is not set
 # CONFIG_VXLAN is not set
 # CONFIG_GENEVE is not set
+# CONFIG_GTP is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -440,8 +444,6 @@ CONFIG_TUN=m
 #
 # Distributed Switch Architecture drivers
 #
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_ARC=y
 # CONFIG_NET_VENDOR_AURORA is not set
@@ -508,7 +510,6 @@ CONFIG_WLAN_VENDOR_ZYDAS=y
 #
 CONFIG_TTY=y
 CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=32
 # CONFIG_N_GSM is not set
@@ -545,6 +546,7 @@ CONFIG_UML_RANDOM=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# CONFIG_GPIOLIB is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_POWER_RESET is not set
 # CONFIG_POWER_AVS is not set
@@ -557,6 +559,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_ACCESSIBILITY is not set
+
+#
+# DMABUF options
+#
+# CONFIG_SYNC_FILE is not set
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_VIRT_DRIVERS is not set
@@ -971,6 +978,7 @@ CONFIG_KEYS=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_ENCRYPTED_KEYS=m
+# CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
@@ -1110,7 +1118,6 @@ CONFIG_CRYPTO_HW=y
 #
 # Certificates for signature checking
 #
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_BINARY_PRINTF is not set
 
 #
@@ -1150,6 +1157,7 @@ CONFIG_NLATTR=y
 # CONFIG_DDR is not set
 # CONFIG_IRQ_POLL is not set
 # CONFIG_SG_SPLIT is not set
+# CONFIG_SG_POOL is not set
 # CONFIG_ARCH_HAS_SG_CHAIN is not set
 
 #
@@ -1239,6 +1247,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_PROVE_RCU is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_TORTURE_TEST is not set
+# CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
@@ -1262,7 +1271,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
diff --git a/config-x86_64 b/config-x86_64
index 3c9bd0b82e01..ab230f295dfc 100644
--- a/config-x86_64
+++ b/config-x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# User Mode Linux/x86 4.6.1 Kernel Configuration
+# User Mode Linux/x86 4.7.0 Kernel Configuration
 #
 CONFIG_UML=y
 CONFIG_MMU=y
@@ -52,7 +52,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=0
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_NEED_PER_CPU_KM=y
@@ -64,6 +63,7 @@ CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_LD_SCRIPT_DYN=y
 CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
@@ -164,7 +164,8 @@ CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
@@ -204,6 +205,7 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_COMPAT_BRK=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
+# CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 # CONFIG_PROFILING is not set
 # CONFIG_UPROBES is not set
@@ -213,6 +215,9 @@ CONFIG_SECCOMP_FILTER=y
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_MODULES_USE_ELF_RELA=y
+# CONFIG_HAVE_ARCH_HASH is not set
+# CONFIG_ISA_BUS_API is not set
+# CONFIG_CPU_NO_EFFICIENT_FFS is not set
 
 #
 # GCOV-based kernel profiling
@@ -230,6 +235,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
+# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_BSGLIB is not set
@@ -396,6 +402,7 @@ CONFIG_DUMMY=m
 # CONFIG_MACVLAN is not set
 # CONFIG_VXLAN is not set
 # CONFIG_GENEVE is not set
+# CONFIG_GTP is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -412,8 +419,6 @@ CONFIG_TUN=m
 #
 # Distributed Switch Architecture drivers
 #
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_ARC=y
 # CONFIG_NET_VENDOR_AURORA is not set
@@ -480,7 +485,6 @@ CONFIG_WLAN_VENDOR_ZYDAS=y
 #
 CONFIG_TTY=y
 CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=32
 # CONFIG_N_GSM is not set
@@ -516,6 +520,7 @@ CONFIG_UML_RANDOM=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+# CONFIG_GPIOLIB is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_POWER_RESET is not set
 # CONFIG_POWER_AVS is not set
@@ -528,6 +533,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_ACCESSIBILITY is not set
+
+#
+# DMABUF options
+#
+# CONFIG_SYNC_FILE is not set
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_VIRT_DRIVERS is not set
@@ -943,6 +953,7 @@ CONFIG_KEYS=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 CONFIG_ENCRYPTED_KEYS=m
+# CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
@@ -1082,7 +1093,6 @@ CONFIG_CRYPTO_HW=y
 #
 # Certificates for signature checking
 #
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_BINARY_PRINTF is not set
 
 #
@@ -1122,6 +1132,7 @@ CONFIG_NLATTR=y
 # CONFIG_DDR is not set
 # CONFIG_IRQ_POLL is not set
 # CONFIG_SG_SPLIT is not set
+# CONFIG_SG_POOL is not set
 # CONFIG_ARCH_HAS_SG_CHAIN is not set
 
 #
@@ -1211,6 +1222,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_PROVE_RCU is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_TORTURE_TEST is not set
+# CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
@@ -1234,7 +1246,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
diff --git a/modules.install b/modules.install
index 7772a89ae12e..dfccff301d0a 100644
--- a/modules.install
+++ b/modules.install
@@ -1,4 +1,4 @@
-KERNEL_VERSION=4.6.1-usermodelinux
+KERNEL_VERSION=4.7.0-usermodelinux
 
 post_install() {
   echo ">>> Updating module dependencies. Please wait ..."