Commit b811b410 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v5.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

 - fix ADB autopoll regression

 - defconfig updates

* tag 'm68k-for-v5.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  macintosh/adb-iop: Use big-endian autopoll mask
  m68k: defconfig: Update defconfigs for v5.11-rc1
parents 99ca0edb c396dd2e

arch/m68k/configs/amiga_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ CONFIG_NFT_SYNPROXY=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m
@@ -655,7 +656,9 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_BITFIELD_KUNIT=m

CONFIG_RESOURCE_KUNIT_TEST=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CMDLINE_KUNIT_TEST=m

CONFIG_BITS_TEST=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

arch/m68k/configs/apollo_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ CONFIG_NFT_SYNPROXY=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m
@@ -611,7 +612,9 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_BITFIELD_KUNIT=m

CONFIG_RESOURCE_KUNIT_TEST=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CMDLINE_KUNIT_TEST=m

CONFIG_BITS_TEST=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

arch/m68k/configs/atari_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ CONFIG_NFT_SYNPROXY=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m
@@ -633,7 +634,9 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_BITFIELD_KUNIT=m

CONFIG_RESOURCE_KUNIT_TEST=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CMDLINE_KUNIT_TEST=m

CONFIG_BITS_TEST=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

arch/m68k/configs/bvme6000_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ CONFIG_NFT_SYNPROXY=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m
@@ -604,7 +605,9 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_BITFIELD_KUNIT=m

CONFIG_RESOURCE_KUNIT_TEST=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CMDLINE_KUNIT_TEST=m

CONFIG_BITS_TEST=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

arch/m68k/configs/hp300_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ CONFIG_NFT_SYNPROXY=m 
CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NFT_FIB_NETDEV=m

CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XT_SET=m
@@ -613,7 +614,9 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_BITFIELD_KUNIT=m

CONFIG_RESOURCE_KUNIT_TEST=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CMDLINE_KUNIT_TEST=m

CONFIG_BITS_TEST=m

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m