summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Eriksson2017-05-17 12:28:33 +0200
committerMikael Eriksson2017-05-17 12:28:33 +0200
commitbbab84f5cf3171a89056ec5dabf8c88e268ea1b0 (patch)
treecff24fa4f3286c7e7efc2705c28fc4b15b5ab87a
parentac5927bd5272da1af75a71fdd5d5bdc83dde4149 (diff)
downloadaur-bbab84f5cf3171a89056ec5dabf8c88e268ea1b0.tar.gz
Merge with core/linux 4.11.1-1
-rw-r--r--.SRCINFO2
-rw-r--r--config.i6862
-rw-r--r--config.x86_642
3 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c35a82906276..d541e2a6580a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue May 2 14:18:32 UTC 2017
+# Wed May 17 10:28:33 UTC 2017
pkgbase = linux-mainline
pkgver = 4.11rc8
pkgrel = 1
diff --git a/config.i686 b/config.i686
index ee6139992478..86ecb2416798 100644
--- a/config.i686
+++ b/config.i686
@@ -342,7 +342,7 @@ CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_WBT=y
CONFIG_BLK_WBT_SQ=y
CONFIG_BLK_WBT_MQ=y
-# CONFIG_BLK_DEBUG_FS is not set
+CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_SED_OPAL=y
#
diff --git a/config.x86_64 b/config.x86_64
index a05d1577c125..96605b066b35 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -360,7 +360,7 @@ CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_WBT=y
CONFIG_BLK_WBT_SQ=y
CONFIG_BLK_WBT_MQ=y
-# CONFIG_BLK_DEBUG_FS is not set
+CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_SED_OPAL=y
#