From fff891da21df06010bab1586e12d1f24191eee60 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 12 May 2021 17:22:08 +0200 Subject: dashboard/config/linux: update to v5.13 --- dashboard/config/linux/bits/base.yml | 3 ++- dashboard/config/linux/bits/debug.yml | 10 +++++----- dashboard/config/linux/bits/filesystems.yml | 3 +-- dashboard/config/linux/bits/kasan.yml | 2 +- dashboard/config/linux/bits/linux-next.yml | 2 +- dashboard/config/linux/bits/linux-upstream.yml | 2 +- dashboard/config/linux/bits/lsm.yml | 2 +- dashboard/config/linux/bits/subsystems.yml | 14 +++++++------- dashboard/config/linux/bits/subsystems_net.yml | 2 +- dashboard/config/linux/bits/wireless.yml | 8 ++++---- 10 files changed, 24 insertions(+), 24 deletions(-) (limited to 'dashboard/config/linux/bits') diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml index c6f8d22da..b3077ef5a 100644 --- a/dashboard/config/linux/bits/base.yml +++ b/dashboard/config/linux/bits/base.yml @@ -89,13 +89,14 @@ config: # CONFIG_REFCOUNT_FULL was removed in fb041bb7c0a9. - REFCOUNT_FULL: [v4.16, -v5.5] # Added in 919067cc845f ("net: add CONFIG_PCPU_DEV_REFCNT") and should appear in v5.13. - - PCPU_DEV_REFCNT: [n, linux-next] + - PCPU_DEV_REFCNT: [n, v5.13] # This config does not add any debug checks (only debug output). - DEBUG_KOBJECT: n - DEBUG_INFO - DEBUG_INFO_BTF + - DEBUG_INFO_REDUCED: n # This should make behavior more deterministic. - INIT_ON_ALLOC_DEFAULT_ON: [v4.16] diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml index 07ceac405..5f75b30a6 100644 --- a/dashboard/config/linux/bits/debug.yml +++ b/dashboard/config/linux/bits/debug.yml @@ -7,11 +7,11 @@ config: # Instances that use nonoise also ignore WARNINGs, so they don't want panic_on_warn. - CMDLINE: [append, "panic_on_warn=1"] - LOCKDEP - - LOCKDEP_BITS: [16, linux-next] - - LOCKDEP_CHAINS_BITS: [17, linux-next] - - LOCKDEP_STACK_TRACE_BITS: [20, linux-next] - - LOCKDEP_STACK_TRACE_HASH_BITS: [14, linux-next] - - LOCKDEP_CIRCULAR_QUEUE_BITS: [12, linux-next] + - LOCKDEP_BITS: [16, v5.13] + - LOCKDEP_CHAINS_BITS: [17, v5.13] + - LOCKDEP_STACK_TRACE_BITS: [20, v5.13] + - LOCKDEP_STACK_TRACE_HASH_BITS: [14, v5.13] + - LOCKDEP_CIRCULAR_QUEUE_BITS: [12, v5.13] - PROVE_LOCKING - DEBUG_ATOMIC_SLEEP - PROVE_RCU diff --git a/dashboard/config/linux/bits/filesystems.yml b/dashboard/config/linux/bits/filesystems.yml index a2e7705f0..9ee80f2af 100644 --- a/dashboard/config/linux/bits/filesystems.yml +++ b/dashboard/config/linux/bits/filesystems.yml @@ -81,8 +81,7 @@ config: - F2FS_FS_LZ4: [v5.5] - F2FS_FS_ZSTD: [v5.5] - F2FS_FS_LZORLE: [v5.5] - # TODO: change to v5.11 when merged. - - F2FS_FS_LZ4HC: [linux-next] + - F2FS_FS_LZ4HC: [v5.11] - OVERLAY_FS - OVERLAY_FS_REDIRECT_DIR diff --git a/dashboard/config/linux/bits/kasan.yml b/dashboard/config/linux/bits/kasan.yml index 03b457e07..3a6ea51c2 100644 --- a/dashboard/config/linux/bits/kasan.yml +++ b/dashboard/config/linux/bits/kasan.yml @@ -11,7 +11,7 @@ config: # This was historically enabled in the KASAN section without explanation. - SPARSEMEM_VMEMMAP: [-arm] # This is required to enable SPARSEMEM_VMEMMAP. - - SPARSEMEM_MANUAL: [-arm, -s390] + - SPARSEMEM_MANUAL: [-arm, -arm64, -s390] # This allows to get alloc/free stacks for UAFs on freed pages. # This also needs page_owner=on in cmdline. - PAGE_OWNER diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml index 52bbb3129..4316de15e 100644 --- a/dashboard/config/linux/bits/linux-next.yml +++ b/dashboard/config/linux/bits/linux-next.yml @@ -3,4 +3,4 @@ kernel: repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next-history.git - tag: next-20210504 + tag: next-20210512 diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml index a1cd19092..ead76dfde 100644 --- a/dashboard/config/linux/bits/linux-upstream.yml +++ b/dashboard/config/linux/bits/linux-upstream.yml @@ -3,4 +3,4 @@ kernel: repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git - tag: v5.12-rc7 + tag: 88b06399c9c766c283e070b022b5ceafa4f63f19 diff --git a/dashboard/config/linux/bits/lsm.yml b/dashboard/config/linux/bits/lsm.yml index 7fbb72374..0c62be4ba 100644 --- a/dashboard/config/linux/bits/lsm.yml +++ b/dashboard/config/linux/bits/lsm.yml @@ -14,7 +14,7 @@ config: - SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING - SECURITY_YAMA - SECURITY_SAFESETID - - SECURITY_LANDLOCK: [linux-next] + - SECURITY_LANDLOCK: [v5.13] - SECURITY_LOCKDOWN_LSM - SECURITY_LOCKDOWN_LSM_EARLY - INTEGRITY diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml index c1ff248ea..d7a139424 100644 --- a/dashboard/config/linux/bits/subsystems.yml +++ b/dashboard/config/linux/bits/subsystems.yml @@ -196,7 +196,7 @@ config: - NETFILTER_INGRESS - NETFILTER_ADVANCED - NF_CONNTRACK - - NF_LOG_NETDEV: [-linux-next] + - NF_LOG_NETDEV: [-v5.13] - NETWORK_SECMARK - NF_CONNTRACK_SECMARK - NF_CONNTRACK_ZONES @@ -707,7 +707,7 @@ config: - USB4: [v5.5] - USB4_NET: [v5.5] - NETDEVSIM - - INPUT_POLLDEV: [-v5.11, -linux-next] + - INPUT_POLLDEV: [-v5.11] - INPUT_MOUSEDEV - INPUT_MOUSEDEV_PSAUX - INPUT_JOYDEV @@ -729,11 +729,11 @@ config: - SERIAL_8250_RSA: [-s390] - SERIAL_NONSTANDARD # Removed in "tty: rocket, remove the driver". - - ROCKETPORT: [-linux-next] + - ROCKETPORT: [-v5.13] # Removed in "tty: cyclades, remove this orphan". - - CYCLADES: [-linux-next] + - CYCLADES: [-v5.13] # Removed in "tty: isicom, remove this orphan". - - ISI: [-linux-next] + - ISI: [-v5.13] - N_HDLC - N_GSM - NOZOMI @@ -807,7 +807,7 @@ config: - SND_DUMMY - SND_ALOOP - SND_VIRMIDI - - SND_VIRTIO: [linux-next] + - SND_VIRTIO: [v5.13] - SND_HDA_INTEL - SND_HDA_HWDEP - SND_HDA_INPUT_BEEP @@ -921,7 +921,7 @@ config: - VIRTIO_MMIO - VIRTIO_MMIO_CMDLINE_DEVICES - VDPA: [v5.5] - - VP_VDPA: [linux-next] + - VP_VDPA: [v5.13] - VHOST_NET - VHOST_VSOCK - VHOST_VDPA: [v5.5] diff --git a/dashboard/config/linux/bits/subsystems_net.yml b/dashboard/config/linux/bits/subsystems_net.yml index cab92c376..309b5504a 100644 --- a/dashboard/config/linux/bits/subsystems_net.yml +++ b/dashboard/config/linux/bits/subsystems_net.yml @@ -52,7 +52,7 @@ config: - NF_TABLES_BRIDGE - NFT_BRIDGE_META - NFT_BRIDGE_REJECT - - NF_LOG_BRIDGE: [-linux-next] + - NF_LOG_BRIDGE: [-v5.13] - NF_CONNTRACK_BRIDGE - BRIDGE_NF_EBTABLES - BRIDGE_EBT_BROUTE diff --git a/dashboard/config/linux/bits/wireless.yml b/dashboard/config/linux/bits/wireless.yml index e2d34abf0..a2a1e796e 100644 --- a/dashboard/config/linux/bits/wireless.yml +++ b/dashboard/config/linux/bits/wireless.yml @@ -53,7 +53,7 @@ config: - WLAN_VENDOR_TI: n - WLAN_VENDOR_ZYDAS: n - WLAN_VENDOR_QUANTENNA: n - - WWAN: [linux-next] - - WWAN_CORE: [linux-next] - - MHI_BUS: [linux-next] - - MHI_WWAN_CTRL: [linux-next] + - WWAN: [v5.13] + - WWAN_CORE: [v5.13] + - MHI_BUS: [v5.13] + - MHI_WWAN_CTRL: [v5.13] -- cgit mrf-deployment