git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'slab-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka...
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
configs
/
hp300_defconfig
diff --git
a/arch/m68k/configs/hp300_defconfig
b/arch/m68k/configs/hp300_defconfig
index 2d1bbac680662884631d47e65cbab678b1afb53f..4add7ab9973b1497e5adfff132a12dbb889c8981 100644
(file)
--- a/
arch/m68k/configs/hp300_defconfig
+++ b/
arch/m68k/configs/hp300_defconfig
@@
-36,7
+36,6
@@
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_BINFMT_MISC=m
-CONFIG_SLAB=y
# CONFIG_COMPACTION is not set
CONFIG_DMAPOOL_TEST=m
CONFIG_USERFAULTFD=y