diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-27 20:40:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-27 20:40:36 -0700 |
| commit | c35328632ed89efeb616603e7fa151ac730fafe4 (patch) | |
| tree | 7d031147aa2e47c68d6952b9110baa085642a23c /arch/m68k/configs/multi_defconfig | |
| parent | 5cf5240991bcea3c0f38e36e65e1742d6db7912c (diff) | |
| parent | f440518f379d22c95329e9e0e0fb6caaafa0f8b0 (diff) | |
| download | lwn-c35328632ed89efeb616603e7fa151ac730fafe4.tar.gz lwn-c35328632ed89efeb616603e7fa151ac730fafe4.zip | |
Merge tag 'm68k-for-v6.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- One more strscpy() conversion
- Fix detection of real Mac II
- defconfig updates
* tag 'm68k-for-v6.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: defconfig: Update defconfigs for v6.15-rc1
m68k: mac: Fix macintosh_config for Mac II
m68k: Replace strcpy() with strscpy() in hardware_proc_show()
Diffstat (limited to 'arch/m68k/configs/multi_defconfig')
| -rw-r--r-- | arch/m68k/configs/multi_defconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index f8ca490ee65a..6d3b20e9d0b2 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -665,7 +665,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m # CONFIG_CRYPTO_HW is not set -CONFIG_PRIME_NUMBERS=m CONFIG_XZ_DEC_TEST=m CONFIG_GLOB_SELFTEST=m # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set @@ -684,8 +683,6 @@ CONFIG_ATOMIC64_SELFTEST=m CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m -CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m @@ -695,7 +692,6 @@ CONFIG_TEST_IDA=m CONFIG_TEST_BITOPS=m CONFIG_TEST_VMALLOC=m CONFIG_TEST_BPF=m -CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_FIND_BIT_BENCHMARK=m CONFIG_TEST_FIRMWARE=m CONFIG_TEST_SYSCTL=m |