summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Eriksson2016-02-01 14:34:02 +0100
committerMikael Eriksson2016-02-01 14:37:28 +0100
commit09793e3187edbcfbd2ee6f422e2a140a390c8338 (patch)
tree434117214a0a4d95e524167ac434ca1a1b51ce8b
parent565c618bf709a0613118d3e8576d7859b8d5b10b (diff)
downloadaur-09793e3187edbcfbd2ee6f422e2a140a390c8338.tar.gz
Merged 4.4.1-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--config2
-rw-r--r--config.x86_642
4 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a28ef6c0692c..864a4bcb9e77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Mon Feb 1 13:37:28 UTC 2016
pkgbase = linux-mainline
pkgver = 4.5rc1
pkgrel = 1
@@ -19,8 +21,8 @@ pkgbase = linux-mainline
source = change-default-console-loglevel.patch
sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
sha256sums = e85df921d461dd39c488ddd4f14b29ce1478b3df5551c6edda074690afe7e047
- sha256sums = d402c67f5a7334ac9e242344055ef4ac63fe43a1d8f1cda82eddd59d7242a63e
- sha256sums = ddeadf2910deb0803d4d4920c4dc7f07d3fb63bca564073aeb5f6181358f20d7
+ sha256sums = fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64
+ sha256sums = 756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a
sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
diff --git a/PKGBUILD b/PKGBUILD
index 90668ce5595a..924548d1c984 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,8 +27,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'change-default-console-loglevel.patch')
sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
'e85df921d461dd39c488ddd4f14b29ce1478b3df5551c6edda074690afe7e047'
- 'd402c67f5a7334ac9e242344055ef4ac63fe43a1d8f1cda82eddd59d7242a63e'
- 'ddeadf2910deb0803d4d4920c4dc7f07d3fb63bca564073aeb5f6181358f20d7'
+ 'fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64'
+ '756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
validpgpkeys=(
diff --git a/config b/config
index 8020666dcdc6..53cfc82bd642 100644
--- a/config
+++ b/config
@@ -7546,7 +7546,7 @@ CONFIG_X86_PTDUMP_CORE=y
# CONFIG_EFI_PGT_DUMP is not set
CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
-CONFIG_DEBUG_WX=y
+# CONFIG_DEBUG_WX is not set
CONFIG_DEBUG_SET_MODULE_RONX=y
# CONFIG_DEBUG_NX_TEST is not set
CONFIG_DOUBLEFAULT=y
diff --git a/config.x86_64 b/config.x86_64
index 7f63808a8e97..90ea64409252 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -7286,7 +7286,7 @@ CONFIG_X86_PTDUMP_CORE=y
# CONFIG_EFI_PGT_DUMP is not set
CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
-CONFIG_DEBUG_WX=y
+# CONFIG_DEBUG_WX is not set
CONFIG_DEBUG_SET_MODULE_RONX=y
# CONFIG_DEBUG_NX_TEST is not set
CONFIG_DOUBLEFAULT=y