Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-10 12:02:04 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-10 12:02:04 +0200
commit46aeaaa4e82ae38a3406f70b7b6988e07d120cf3 (patch)
tree5d77e4a77ed97ae44d497c43b86a7501ea70f1f3
parent2e2350c2b359a102692a74d3d98cb2aac5ff11bc (diff)
parent50afa5a9e85649be3f837aa6b9289689b16e84b7 (diff)
Merge branch 'master-vanilla-configs' into linux-next
-rw-r--r--config/arm64/vanilla2
-rw-r--r--config/armv7hl/vanilla2
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/ppc64le/vanilla2
-rw-r--r--config/x86_64/vanilla2
6 files changed, 6 insertions, 6 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index e001645530..62b446f30b 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -9593,7 +9593,7 @@ CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set
# CONFIG_OVERLAY_FS_METACOPY is not set
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index ad4a471f12..c6c4e5998a 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -9782,7 +9782,7 @@ CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set
# CONFIG_OVERLAY_FS_METACOPY is not set
diff --git a/config/i386/vanilla b/config/i386/vanilla
index f729640e6b..c7391c30c8 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -8710,7 +8710,7 @@ CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set
# CONFIG_OVERLAY_FS_METACOPY is not set
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 9c0cb3f8fa..9c83784dad 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -6814,7 +6814,7 @@ CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set
# CONFIG_OVERLAY_FS_METACOPY is not set
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 3b9fd7ba59..4b4216b3f9 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -6668,7 +6668,7 @@ CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set
# CONFIG_OVERLAY_FS_METACOPY is not set
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 8aed316e6c..37e614e118 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -8479,7 +8479,7 @@ CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
# CONFIG_OVERLAY_FS_INDEX is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set
# CONFIG_OVERLAY_FS_METACOPY is not set