Control: tags -1 + patch
* Mattia Dongili <malat...@linux.it>, 2014-04-15, 07:19:
Updating the user-mode-linux package is just a matter of setting the
correct version in debian/{rules,control}, updating the kernel
configuration (there are debian/rules targets to help with that -
oldconfig{32,64} - policy is M for everything) and building the
package. If there are no major issues, this is it.
I've attached what I have so far.
I answered "no" for a couple of Y/N questions; hope this is okay. I also
had to disable CONFIG_PHY_EXYNOS_MIPI_VIDEO, because otherwise the build
fails with:
MODPOST 744 modules
ERROR: "devm_ioremap_resource" [drivers/phy/phy-exynos-mipi-video.ko] undefined!
But CONFIG_PHY_EXYNOS_MIPI_VIDEO is not enabled in the stock Debian
kernels either, so it's not a big loss.
The package builds successfully and seems to work on i386. I'll test on
amd64 later.
--
Jakub Wilk
diffstat for user-mode-linux-3.12-1um user-mode-linux-3.13-1um
config.amd64 | 75 +++++++++++++++++++++++++++++++++++++++++++++++++------
config.i386 | 74 ++++++++++++++++++++++++++++++++++++++++++++++++------
debian/changelog | 10 +++++++
debian/control | 2 -
debian/rules | 2 -
5 files changed, 145 insertions(+), 18 deletions(-)
Control files: lines which differ (wdiff format)
------------------------------------------------
Build-Depends: debhelper (>> 5.0.0), quilt, [-linux-source-3.12,-] {+linux-source-3.13,+} docbook-to-man, xz-utils, m4, module-init-tools, libvdeplug2-dev, libpcap-dev, bc, dpkg (>= 1.16.2)
diff -Nru user-mode-linux-3.12-1um/config.amd64 user-mode-linux-3.13-1um/config.amd64
--- user-mode-linux-3.12-1um/config.amd64 2013-12-30 01:24:25.000000000 +0100
+++ user-mode-linux-3.13-1um/config.amd64 2014-04-15 15:04:08.000000000 +0200
@@ -1,8 +1,7 @@
#
# Automatically generated file; DO NOT EDIT.
-# User Mode Linux/x86_64 3.12.6 Kernel Configuration
+# User Mode Linux/x86_64 3.13.7 Kernel Configuration
#
-CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
CONFIG_UML=y
CONFIG_MMU=y
CONFIG_NO_IOMEM=y
@@ -38,6 +37,7 @@
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
CONFIG_X86_64=y
+CONFIG_ARCH_DEFCONFIG="arch/um/configs/x86_64_defconfig"
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_3_LEVEL_PGTABLES=y
@@ -99,7 +99,6 @@
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
#
# IRQ subsystem
@@ -209,6 +208,7 @@
CONFIG_SLUB=y
# CONFIG_PROFILING is not set
CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_MODULES_USE_ELF_RELA=y
#
@@ -218,6 +218,7 @@
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -285,7 +286,6 @@
# UML Character Devices
#
CONFIG_STDERR_CONSOLE=y
-CONFIG_STDIO_CONSOLE=y
CONFIG_SSL=y
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y
@@ -329,6 +329,7 @@
CONFIG_CONNECTOR=m
# CONFIG_MTD is not set
CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
CONFIG_BLK_DEV_UBD=y
# CONFIG_BLK_DEV_UBD_SYNC is not set
CONFIG_BLK_DEV_COW_COMMON=y
@@ -386,6 +387,14 @@
CONFIG_ALTERA_STAPL=m
#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
+
+#
# SCSI device support
#
CONFIG_SCSI_MOD=m
@@ -450,8 +459,8 @@
CONFIG_MD_FAULTY=m
CONFIG_BCACHE=m
# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
@@ -462,8 +471,8 @@
CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_CACHE is not set
CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
@@ -705,6 +714,7 @@
# Analog to digital converters
#
CONFIG_MAX1363=m
+CONFIG_MCP3422=m
CONFIG_NAU7802=m
CONFIG_TI_ADC081C=m
@@ -753,12 +763,17 @@
#
CONFIG_ADJD_S311=m
CONFIG_APDS9300=m
+CONFIG_CM36651=m
+CONFIG_GP2AP020A00F=m
+CONFIG_TCS3472=m
# CONFIG_SENSORS_TSL2563 is not set
+CONFIG_TSL4531=m
CONFIG_VCNL4000=m
#
# Magnetometer sensors
#
+CONFIG_MAG3110=m
# CONFIG_IIO_ST_MAGN_3AXIS is not set
#
@@ -780,6 +795,13 @@
CONFIG_PWM_SYSFS=y
# CONFIG_RESET_CONTROLLER is not set
# CONFIG_FMC is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
+# CONFIG_POWERCAP is not set
CONFIG_NET=y
#
@@ -848,7 +870,6 @@
CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_TCP_MD5SIG=y
CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
# CONFIG_IPV6_OPTIMISTIC_DAD is not set
@@ -862,6 +883,7 @@
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_VTI=m
CONFIG_IPV6_SIT=m
# CONFIG_IPV6_SIT_6RD is not set
CONFIG_IPV6_NDISC_NODETYPE=y
@@ -924,6 +946,17 @@
CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_TFTP=m
CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -1016,7 +1049,9 @@
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m
@@ -1067,6 +1102,11 @@
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -1099,6 +1139,9 @@
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1124,6 +1167,7 @@
# DECnet: Netfilter Configuration
#
CONFIG_DECNET_NF_GRABULATOR=m
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1247,6 +1291,7 @@
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
@@ -1283,6 +1328,7 @@
CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
CONFIG_NETPRIO_CGROUP=m
CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
@@ -1324,6 +1370,7 @@
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
CONFIG_NFC_NCI=m
CONFIG_NFC_HCI=m
CONFIG_NFC_SHDLC=y
@@ -1483,6 +1530,11 @@
# CONFIG_LOGFS is not set
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
@@ -1510,6 +1562,7 @@
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
CONFIG_AUFS_FS=m
CONFIG_AUFS_BRANCH_MAX_127=y
# CONFIG_AUFS_BRANCH_MAX_511 is not set
@@ -1541,6 +1594,7 @@
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_OBJLAYOUT=m
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
CONFIG_NFS_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -1649,6 +1703,8 @@
# Security options
#
CONFIG_KEYS=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
CONFIG_ENCRYPTED_KEYS=m
CONFIG_KEYS_DEBUG_PROC_KEYS=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
@@ -1807,6 +1863,7 @@
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
# CONFIG_CRYPTO_HW is not set
CONFIG_ASYMMETRIC_KEY_TYPE=m
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
@@ -1836,6 +1893,7 @@
CONFIG_LIBCRC32C=y
CONFIG_CRC8=m
CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
@@ -1862,6 +1920,7 @@
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
+CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_DQL=y
CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
@@ -1892,7 +1951,7 @@
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_MAGIC_SYSRQ_DEFAULT_MASK=0x1
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
# CONFIG_DEBUG_KERNEL is not set
#
diff -Nru user-mode-linux-3.12-1um/config.i386 user-mode-linux-3.13-1um/config.i386
--- user-mode-linux-3.12-1um/config.i386 2013-12-30 01:24:25.000000000 +0100
+++ user-mode-linux-3.13-1um/config.i386 2014-04-15 15:03:59.000000000 +0200
@@ -1,8 +1,7 @@
#
# Automatically generated file; DO NOT EDIT.
-# User Mode Linux/i386 3.12.6 Kernel Configuration
+# User Mode Linux/i386 3.13.7 Kernel Configuration
#
-CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
CONFIG_UML=y
CONFIG_MMU=y
CONFIG_NO_IOMEM=y
@@ -62,6 +61,7 @@
# CONFIG_64BIT is not set
CONFIG_X86_32=y
# CONFIG_X86_64 is not set
+CONFIG_ARCH_DEFCONFIG="arch/um/configs/i386_defconfig"
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_3_LEVEL_PGTABLES=y
@@ -124,7 +124,6 @@
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
#
# IRQ subsystem
@@ -247,6 +246,7 @@
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -315,7 +315,6 @@
# UML Character Devices
#
CONFIG_STDERR_CONSOLE=y
-CONFIG_STDIO_CONSOLE=y
CONFIG_SSL=y
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y
@@ -359,6 +358,7 @@
CONFIG_CONNECTOR=m
# CONFIG_MTD is not set
CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
CONFIG_BLK_DEV_UBD=y
# CONFIG_BLK_DEV_UBD_SYNC is not set
CONFIG_BLK_DEV_COW_COMMON=y
@@ -416,6 +416,14 @@
CONFIG_ALTERA_STAPL=m
#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
+
+#
# SCSI device support
#
CONFIG_SCSI_MOD=m
@@ -480,8 +488,8 @@
CONFIG_MD_FAULTY=m
CONFIG_BCACHE=m
# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
@@ -492,8 +500,8 @@
CONFIG_DM_THIN_PROVISIONING=m
# CONFIG_DM_CACHE is not set
CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
@@ -736,6 +744,7 @@
# Analog to digital converters
#
CONFIG_MAX1363=m
+CONFIG_MCP3422=m
CONFIG_NAU7802=m
CONFIG_TI_ADC081C=m
@@ -784,12 +793,17 @@
#
CONFIG_ADJD_S311=m
CONFIG_APDS9300=m
+CONFIG_CM36651=m
+CONFIG_GP2AP020A00F=m
+CONFIG_TCS3472=m
# CONFIG_SENSORS_TSL2563 is not set
+CONFIG_TSL4531=m
CONFIG_VCNL4000=m
#
# Magnetometer sensors
#
+CONFIG_MAG3110=m
# CONFIG_IIO_ST_MAGN_3AXIS is not set
#
@@ -811,6 +825,13 @@
CONFIG_PWM_SYSFS=y
# CONFIG_RESET_CONTROLLER is not set
# CONFIG_FMC is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
+# CONFIG_POWERCAP is not set
CONFIG_NET=y
#
@@ -879,7 +900,6 @@
CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_TCP_MD5SIG=y
CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
# CONFIG_IPV6_OPTIMISTIC_DAD is not set
@@ -893,6 +913,7 @@
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_VTI=m
CONFIG_IPV6_SIT=m
# CONFIG_IPV6_SIT_6RD is not set
CONFIG_IPV6_NDISC_NODETYPE=y
@@ -955,6 +976,17 @@
CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_TFTP=m
CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -1047,7 +1079,9 @@
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m
@@ -1098,6 +1132,11 @@
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -1130,6 +1169,9 @@
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1155,6 +1197,7 @@
# DECnet: Netfilter Configuration
#
CONFIG_DECNET_NF_GRABULATOR=m
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1278,6 +1321,7 @@
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
@@ -1314,6 +1358,7 @@
CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
CONFIG_NETPRIO_CGROUP=m
CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
@@ -1355,6 +1400,7 @@
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
CONFIG_NFC_NCI=m
CONFIG_NFC_HCI=m
CONFIG_NFC_SHDLC=y
@@ -1514,6 +1560,11 @@
# CONFIG_LOGFS is not set
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZO is not set
@@ -1541,6 +1592,7 @@
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
CONFIG_AUFS_FS=m
CONFIG_AUFS_BRANCH_MAX_127=y
# CONFIG_AUFS_BRANCH_MAX_511 is not set
@@ -1572,6 +1624,7 @@
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_OBJLAYOUT=m
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
CONFIG_NFS_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -1680,6 +1733,8 @@
# Security options
#
CONFIG_KEYS=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
CONFIG_ENCRYPTED_KEYS=m
CONFIG_KEYS_DEBUG_PROC_KEYS=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
@@ -1838,6 +1893,7 @@
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
# CONFIG_CRYPTO_HW is not set
CONFIG_ASYMMETRIC_KEY_TYPE=m
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
@@ -1867,6 +1923,7 @@
CONFIG_LIBCRC32C=y
CONFIG_CRC8=m
CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
@@ -1893,6 +1950,7 @@
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
+CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_DQL=y
CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
@@ -1923,7 +1981,7 @@
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_MAGIC_SYSRQ_DEFAULT_MASK=0x1
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
# CONFIG_DEBUG_KERNEL is not set
#
diff -Nru user-mode-linux-3.12-1um/debian/changelog user-mode-linux-3.13-1um/debian/changelog
--- user-mode-linux-3.12-1um/debian/changelog 2014-04-15 15:32:34.000000000 +0200
+++ user-mode-linux-3.13-1um/debian/changelog 2014-04-15 14:29:08.000000000 +0200
@@ -1,3 +1,13 @@
+user-mode-linux (3.13-1um-0.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release (closes: #742016). Thanks to Ansgar Burchardt for the
+ bug report:
+ + Update Linux version number in debian/control and debian/rules.
+ + Refresh configs.
+
+ -- Jakub Wilk <jw...@debian.org> Tue, 15 Apr 2014 14:27:13 +0200
+
user-mode-linux (3.12-1um-1) unstable; urgency=high
* New upstream release (Closes: #733351) - aka. I wish there was a better
diff -Nru user-mode-linux-3.12-1um/debian/control user-mode-linux-3.13-1um/debian/control
--- user-mode-linux-3.12-1um/debian/control 2014-04-15 15:32:34.000000000 +0200
+++ user-mode-linux-3.13-1um/debian/control 2014-04-15 12:10:46.000000000 +0200
@@ -2,7 +2,7 @@
Section: kernel
Priority: extra
Maintainer: User Mode Linux Maintainers <pkg-uml-p...@lists.alioth.debian.org>
-Build-Depends: debhelper (>> 5.0.0), quilt, linux-source-3.12, docbook-to-man, xz-utils, m4, module-init-tools, libvdeplug2-dev, libpcap-dev, bc, dpkg (>= 1.16.2)
+Build-Depends: debhelper (>> 5.0.0), quilt, linux-source-3.13, docbook-to-man, xz-utils, m4, module-init-tools, libvdeplug2-dev, libpcap-dev, bc, dpkg (>= 1.16.2)
Uploaders: Mattia Dongili <malat...@debian.org>, Ritesh Raj Sarraf <r...@debian.org>
Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/pkg-uml/user-mode-linux.git
diff -Nru user-mode-linux-3.12-1um/debian/rules user-mode-linux-3.13-1um/debian/rules
--- user-mode-linux-3.12-1um/debian/rules 2014-04-15 15:32:34.000000000 +0200
+++ user-mode-linux-3.13-1um/debian/rules 2014-04-15 12:12:49.000000000 +0200
@@ -6,7 +6,7 @@
#export DH_VERBOSE=1
config_target:=oldconfig
-kernel_version:=3.12
+kernel_version:=3.13
kernel_src:=linux-source-$(kernel_version)
BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W linux-source-$(kernel_version))
debian:=$(CURDIR)/debian
