aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoryar2015-04-29 09:40:34 -0700
committeryar2015-07-03 17:00:53 -0700
commitcad94cb8ba69fbf1f7abe9c0092ad7dbff62fbd5 (patch)
tree0f13dfc2adbc302daf81fd20d43de10a1982e9b9
parent2e4a4ef56efe2f1d9e226266eaddcaf90eb7be07 (diff)
parentab9213cd11792247d12083c73fdd68f9aa416ff7 (diff)
downloadaur-cad94cb8ba69fbf1f7abe9c0092ad7dbff62fbd5.tar.gz
Merge branch '4.0'
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD18
-rw-r--r--config23
-rw-r--r--config.x86_6427
4 files changed, 54 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 94366516f361..24659e1a3ea3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-linode
pkgdesc = Kernel for Linode servers
- pkgver = 3.19.5
+ pkgver = 4.0.1
pkgrel = 1
url = https://github.com/yardenac/linux-linode
install = install
@@ -23,20 +23,20 @@ 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/v3.x/linux-3.19.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.19.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.19.5.xz
- source = https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.19.5.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.0.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.0.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.1.sign
source = config
source = config.x86_64
source = menu.lst
source = preset
- sha512sums = d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c
+ sha512sums = ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995
sha512sums = SKIP
- sha512sums = 11ebad2372b34b4f2f1636abe212660ace6af83adebb9935cb9aa6430d14b90b8ec1b1ba1844bc1ddce802d42bbf26d8e3aa14d4a86b25fe61dc5551624f5598
+ sha512sums = 3f4547c759a7ce9f75671676d9d57e516ba8a6617d1c195aa5d728bc10926e200ac4285aa2612a7e3a8f4e4f4e3038e250563f139fb4f76d0f93b73222eb7d30
sha512sums = SKIP
- sha512sums = 6735f2aa01e4f3cd0d270b514f87ded2db2ab8315721bb9fddc6079185d7c0bfb94ae9cb01d7a6d2a8690e7aeaa317e0c214ef7bbf086ec304472786a3393069
- sha512sums = 8d19284d9e82e7df0612cd589347908ac7ade766d81e3083c1fb4f0560400193a1334bc3f8720ce37e7bf81ca0141595b06ea57578097b186f2cd656c657cdf7
+ sha512sums = b736319f6d28e7b0de18ff8ebe3bd103b56669bc9ee11f6f128b5429ced39ee54da9a58596716950013a53d9fd7fb654cb6facf67bb8c38724c823b763193303
+ sha512sums = 79a389365fd8b6571d9d512f029814053d98de7684cf68c23b9d6b4285b4da6e69fba061a22fdc2ce551a2fd00eb29e9717858c4abab49ffc0c307dd61bb555c
sha512sums = 0ddff435474213f6c6e62576b6b3042aeffd1df84c47ca6195714a92c2655c33c56ce211c14934f4268afdf246077e1ea04e0958efc263c71aabfb497481022c
sha512sums = a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f
diff --git a/PKGBUILD b/PKGBUILD
index b56470349d99..f979036d6945 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,26 @@
# tracks: https://projects.archlinux.org/svntogit/packages.git/log/trunk?h=packages/linux
pkgname=linux-linode
-_basekernel=3.19
+_basekernel=4.0
_kernelname=${pkgname#linux}
_srcname=linux-${_basekernel}
-pkgver=${_basekernel}.5
+pkgver=${_basekernel}.1
pkgrel=1
arch=('i686' 'x86_64')
url="https://github.com/yardenac/linux-linode"
license=(GPL2)
makedepends=(xmlto docbook-xsl kmod inetutils bc 'gcc>=4.9.0')
options=('!strip')
-source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
- "https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.sign"
- "https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
- "https://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign"
+source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar."{xz,sign}
+ "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}."{xz,sign}
'config'
'config.x86_64'
'menu.lst'
'preset')
-sha512sums=('d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c' 'SKIP'
- '11ebad2372b34b4f2f1636abe212660ace6af83adebb9935cb9aa6430d14b90b8ec1b1ba1844bc1ddce802d42bbf26d8e3aa14d4a86b25fe61dc5551624f5598' 'SKIP'
- '6735f2aa01e4f3cd0d270b514f87ded2db2ab8315721bb9fddc6079185d7c0bfb94ae9cb01d7a6d2a8690e7aeaa317e0c214ef7bbf086ec304472786a3393069'
- '8d19284d9e82e7df0612cd589347908ac7ade766d81e3083c1fb4f0560400193a1334bc3f8720ce37e7bf81ca0141595b06ea57578097b186f2cd656c657cdf7'
+sha512sums=('ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995' 'SKIP'
+ '3f4547c759a7ce9f75671676d9d57e516ba8a6617d1c195aa5d728bc10926e200ac4285aa2612a7e3a8f4e4f4e3038e250563f139fb4f76d0f93b73222eb7d30' 'SKIP'
+ 'b736319f6d28e7b0de18ff8ebe3bd103b56669bc9ee11f6f128b5429ced39ee54da9a58596716950013a53d9fd7fb654cb6facf67bb8c38724c823b763193303'
+ '79a389365fd8b6571d9d512f029814053d98de7684cf68c23b9d6b4285b4da6e69fba061a22fdc2ce551a2fd00eb29e9717858c4abab49ffc0c307dd61bb555c'
'0ddff435474213f6c6e62576b6b3042aeffd1df84c47ca6195714a92c2655c33c56ce211c14934f4268afdf246077e1ea04e0958efc263c71aabfb497481022c'
'a0a78831075336edef0a8faa34fa550986c3c4d89a89f4f39d798da0211129dc90257d162bec2cdefabef2eb5886a710e70c72074b2f3016788861d05d1e2a1f')
validpgpkeys=(
diff --git a/config b/config
index 8c7efa1543a5..a98e4b55bc2e 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.19.0-1 Kernel Configuration
+# Linux/x86 4.0.0-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -119,6 +119,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
+CONFIG_SRCU=y
# CONFIG_TASKS_RCU is not set
CONFIG_RCU_STALL_COMMON=y
CONFIG_RCU_FANOUT=32
@@ -126,6 +127,7 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_RCU_FAST_NO_HZ is not set
# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_RCU_KTHREAD_PRIO=0
# CONFIG_RCU_NOCB_CPU is not set
CONFIG_BUILD_BIN2C=y
CONFIG_IKCONFIG=y
@@ -169,7 +171,6 @@ CONFIG_RD_GZIP=y
# CONFIG_RD_XZ is not set
# CONFIG_RD_LZO is not set
# CONFIG_RD_LZ4 is not set
-CONFIG_INIT_FALLBACK=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
@@ -311,6 +312,7 @@ CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_ARCH_USE_QUEUE_RWLOCK=y
CONFIG_QUEUE_RWLOCK=y
CONFIG_FREEZER=y
@@ -334,7 +336,6 @@ CONFIG_XEN=y
CONFIG_XEN_MAX_DOMAIN_MEMORY=64
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_KVM_GUEST is not set
-# CONFIG_LGUEST_GUEST is not set
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
CONFIG_NO_BOOTMEM=y
@@ -976,7 +977,6 @@ CONFIG_BLK_DEV_NBD=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
@@ -1172,6 +1172,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set
+CONFIG_DEVMEM=y
CONFIG_DEVKMEM=y
#
@@ -1292,6 +1293,8 @@ CONFIG_BCMA_POSSIBLE=y
#
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
# CONFIG_SOUND is not set
#
@@ -1376,6 +1379,11 @@ CONFIG_CLKBLD_I8253=y
CONFIG_IOMMU_SUPPORT=y
#
+# Generic IOMMU Pagetable Support
+#
+# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
+
+#
# Remoteproc drivers
#
# CONFIG_STE_MODEM_RPROC is not set
@@ -1431,7 +1439,6 @@ CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
CONFIG_EXT3_FS_XATTR=y
@@ -1441,7 +1448,6 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_DEBUG=y
-CONFIG_FS_XIP=y
CONFIG_JBD=y
CONFIG_JBD2=y
# CONFIG_JBD2_DEBUG is not set
@@ -1458,6 +1464,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_DEBUG is not set
# CONFIG_BTRFS_ASSERT is not set
# CONFIG_NILFS2_FS is not set
+# CONFIG_FS_DAX is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
@@ -1677,6 +1684,7 @@ CONFIG_TRACING_SUPPORT=y
# CONFIG_PERCPU_TEST is not set
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
# CONFIG_TEST_STRING_HELPERS is not set
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_TEST_RHASHTABLE is not set
@@ -1721,7 +1729,6 @@ CONFIG_KEYS=y
# CONFIG_PERSISTENT_KEYRINGS is not set
# CONFIG_BIG_KEYS is not set
# CONFIG_ENCRYPTED_KEYS is not set
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
@@ -1879,6 +1886,7 @@ CONFIG_CRYPTO_DRBG=m
CONFIG_CRYPTO_USER_API=y
CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
+CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_HASH_INFO=y
# CONFIG_CRYPTO_HW is not set
CONFIG_ASYMMETRIC_KEY_TYPE=m
@@ -1896,6 +1904,7 @@ CONFIG_HAVE_KVM=y
#
CONFIG_RAID6_PQ=y
CONFIG_BITREVERSE=y
+# CONFIG_HAVE_ARCH_BITREVERSE is not set
CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_NET_UTILS=y
diff --git a/config.x86_64 b/config.x86_64
index 673432a6aefc..542d9b1053e5 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.19.0-1 Kernel Configuration
+# Linux/x86 4.0.0-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -122,6 +122,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
# RCU Subsystem
#
CONFIG_TREE_RCU=y
+CONFIG_SRCU=y
# CONFIG_TASKS_RCU is not set
CONFIG_RCU_STALL_COMMON=y
# CONFIG_RCU_USER_QS is not set
@@ -130,6 +131,7 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_RCU_FAST_NO_HZ is not set
# CONFIG_TREE_RCU_TRACE is not set
+CONFIG_RCU_KTHREAD_PRIO=0
# CONFIG_RCU_NOCB_CPU is not set
CONFIG_BUILD_BIN2C=y
CONFIG_IKCONFIG=y
@@ -176,7 +178,6 @@ CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
CONFIG_RD_LZ4=y
-CONFIG_INIT_FALLBACK=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
@@ -325,6 +326,7 @@ CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_ARCH_USE_QUEUE_RWLOCK=y
CONFIG_QUEUE_RWLOCK=y
CONFIG_FREEZER=y
@@ -468,6 +470,7 @@ CONFIG_HOTPLUG_CPU=y
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_CMDLINE_BOOL is not set
+CONFIG_HAVE_LIVEPATCH=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
#
@@ -976,7 +979,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
@@ -1172,6 +1174,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set
+CONFIG_DEVMEM=y
CONFIG_DEVKMEM=y
#
@@ -1290,6 +1293,8 @@ CONFIG_BCMA_POSSIBLE=y
#
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
# CONFIG_SOUND is not set
#
@@ -1376,6 +1381,11 @@ CONFIG_CLKBLD_I8253=y
CONFIG_IOMMU_SUPPORT=y
#
+# Generic IOMMU Pagetable Support
+#
+# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
+
+#
# Remoteproc drivers
#
# CONFIG_STE_MODEM_RPROC is not set
@@ -1431,7 +1441,6 @@ CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
CONFIG_EXT3_FS_XATTR=y
@@ -1441,7 +1450,6 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_DEBUG=y
-CONFIG_FS_XIP=y
CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_JBD2=y
@@ -1459,6 +1467,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_DEBUG is not set
# CONFIG_BTRFS_ASSERT is not set
# CONFIG_NILFS2_FS is not set
+# CONFIG_FS_DAX is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
@@ -1604,6 +1613,9 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
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_KASAN_SHADOW_OFFSET=0xdffffc0000000000
# CONFIG_DEBUG_SHIRQ is not set
#
@@ -1680,6 +1692,7 @@ CONFIG_TRACING_SUPPORT=y
# CONFIG_PERCPU_TEST is not set
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
# CONFIG_TEST_STRING_HELPERS is not set
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_TEST_RHASHTABLE is not set
@@ -1727,7 +1740,6 @@ CONFIG_KEYS=y
# CONFIG_PERSISTENT_KEYRINGS is not set
# CONFIG_BIG_KEYS is not set
# CONFIG_ENCRYPTED_KEYS is not set
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
@@ -1901,6 +1913,7 @@ CONFIG_CRYPTO_DRBG=m
CONFIG_CRYPTO_USER_API=y
CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
+CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_HASH_INFO=y
# CONFIG_CRYPTO_HW is not set
CONFIG_ASYMMETRIC_KEY_TYPE=m
@@ -1910,6 +1923,7 @@ CONFIG_X509_CERTIFICATE_PARSER=m
CONFIG_PKCS7_MESSAGE_PARSER=m
CONFIG_PKCS7_TEST_KEY=m
CONFIG_HAVE_KVM=y
+CONFIG_KVM_COMPAT=y
# CONFIG_VIRTUALIZATION is not set
# CONFIG_BINARY_PRINTF is not set
@@ -1918,6 +1932,7 @@ CONFIG_HAVE_KVM=y
#
CONFIG_RAID6_PQ=y
CONFIG_BITREVERSE=y
+# CONFIG_HAVE_ARCH_BITREVERSE is not set
CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_NET_UTILS=y