diff options
| author | David S. Miller | 2018-08-02 10:55:32 -0700 |
|---|---|---|
| committer | David S. Miller | 2018-08-02 10:55:32 -0700 |
| commit | 89b1698c93a9dee043154f33d96bca9964e705f1 (patch) | |
| tree | dd9dcb1965baae8edcf0b496aaa6a70609b6fc11 /lib | |
| parent | ffd7ce3cd9c294f1ff49ec02cdbd1bc7cb913db6 (diff) | |
| parent | e30cb13c5a09ff5f043a6570c32e49b063bea6a1 (diff) | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.
The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.kasan | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index c253c1b46c6b..befb127507c0 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -5,7 +5,7 @@ if HAVE_ARCH_KASAN config KASAN bool "KASan: runtime memory debugger" - depends on SLUB || (SLAB && !DEBUG_SLAB) + depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) select SLUB_DEBUG if SLUB select CONSTRUCTORS select STACKDEPOT |