summaryrefslogtreecommitdiffstats
path: root/arch/arc/configs/nsimosci_hs_defconfig
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-10-27 15:37:56 -0700
committerJakub Kicinski <kuba@kernel.org>2022-10-27 16:56:36 -0700
commit31f1aa4f740fc591450777f4ff94d6e062b6f632 (patch)
treeb6bfe700d8338b3c88f4d8413b624d0d5fd78e4a /arch/arc/configs/nsimosci_hs_defconfig
parent12d6c1d3a2ad0c199ec57c201cdc71e8e157a232 (diff)
parent23758867219c8d84c8363316e6dd2f9fd7ae3049 (diff)
downloadlinux-31f1aa4f740fc591450777f4ff94d6e062b6f632.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c 2871edb32f46 ("can: kvaser_usb: Fix possible completions during init_completion") abb8670938b2 ("can: kvaser_usb_leaf: Ignore stale bus-off after start") 8d21f5927ae6 ("can: kvaser_usb_leaf: Fix improved state not being reported") Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/arc/configs/nsimosci_hs_defconfig')
-rw-r--r--arch/arc/configs/nsimosci_hs_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig
index 31b6ec3683c6..f721cc3997d0 100644
--- a/arch/arc/configs/nsimosci_hs_defconfig
+++ b/arch/arc/configs/nsimosci_hs_defconfig
@@ -63,4 +63,3 @@ CONFIG_TMPFS=y
# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y
-# CONFIG_ENABLE_MUST_CHECK is not set