diff options
| author | Mikael Eriksson | 2017-05-17 12:28:33 +0200 |
|---|---|---|
| committer | Mikael Eriksson | 2017-05-17 12:28:33 +0200 |
| commit | bbab84f5cf3171a89056ec5dabf8c88e268ea1b0 (patch) | |
| tree | cff24fa4f3286c7e7efc2705c28fc4b15b5ab87a | |
| parent | ac5927bd5272da1af75a71fdd5d5bdc83dde4149 (diff) | |
| download | aur-bbab84f5cf3171a89056ec5dabf8c88e268ea1b0.tar.gz | |
Merge with core/linux 4.11.1-1
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | config.i686 | 2 | ||||
| -rw-r--r-- | config.x86_64 | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 # |