Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-30 12:03:39 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-30 12:03:39 +0200
commit1c2e26f72c65000abc9cb7e225f8453299163ac7 (patch)
tree81ee17eb670736c06c14dfea3c3869494c8245f9
parent9d24e28ec5a719d5efe4d0147dc2a84ece1c59d4 (diff)
Automatically updated to 5.3-rc2-next-20190730
-rw-r--r--config/arm64/vanilla4
-rw-r--r--config/armv7hl/vanilla4
-rw-r--r--config/i386/vanilla4
-rw-r--r--config/ppc64/vanilla4
-rw-r--r--config/ppc64le/vanilla4
-rw-r--r--config/x86_64/vanilla4
-rw-r--r--rpm/config.sh2
7 files changed, 19 insertions, 7 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index acb1c4ff7d..ba94567507 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -476,7 +476,6 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_PM_SLEEP_STATS=y
CONFIG_DPM_WATCHDOG=y
CONFIG_DPM_WATCHDOG_TIMEOUT=60
CONFIG_PM_CLK=y
@@ -9667,6 +9666,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
CONFIG_FILE_LOCKING=y
CONFIG_MANDATORY_FILE_LOCKING=y
CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_DEBUG=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index dcc58b7450..d6e7a67269 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -843,7 +843,6 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_PM_SLEEP_STATS=y
CONFIG_DPM_WATCHDOG=y
CONFIG_DPM_WATCHDOG_TIMEOUT=60
CONFIG_APM_EMULATION=m
@@ -9930,6 +9929,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
CONFIG_FILE_LOCKING=y
CONFIG_MANDATORY_FILE_LOCKING=y
CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_DEBUG=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 8702dcdd69..09952a46c6 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -508,7 +508,6 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_PM_SLEEP_STATS=y
CONFIG_DPM_WATCHDOG=y
CONFIG_DPM_WATCHDOG_TIMEOUT=60
CONFIG_PM_TRACE=y
@@ -8804,6 +8803,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
CONFIG_FILE_LOCKING=y
# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_DEBUG=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 20c4cfdce4..973a816e46 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -546,7 +546,6 @@ CONFIG_PM_WAKELOCKS_LIMIT=100
CONFIG_PM_WAKELOCKS_GC=y
CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_STATS=y
CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
@@ -6885,6 +6884,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
CONFIG_FILE_LOCKING=y
# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_DEBUG=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 570e03cacf..5b452b2aff 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -482,7 +482,6 @@ CONFIG_PM_WAKELOCKS_LIMIT=100
CONFIG_PM_WAKELOCKS_GC=y
CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_STATS=y
CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
@@ -6739,6 +6738,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
CONFIG_FILE_LOCKING=y
# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_DEBUG=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 69896747ed..3f44a40617 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -509,7 +509,6 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_SLEEP_DEBUG=y
-CONFIG_PM_SLEEP_STATS=y
CONFIG_DPM_WATCHDOG=y
CONFIG_DPM_WATCHDOG_TIMEOUT=60
CONFIG_PM_TRACE=y
@@ -8578,6 +8577,9 @@ CONFIG_EXPORTFS_BLOCK_OPS=y
CONFIG_FILE_LOCKING=y
# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_DEBUG=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
diff --git a/rpm/config.sh b/rpm/config.sh
index e74fe8a898..dae8f7d0c1 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.3-rc2-next-20190729
+SRCVERSION=5.3-rc2-next-20190730
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# Set to 1 if the tree does not contain any non-vanilla patches at all