diff options
author | Alex Williamson <alex.williamson@redhat.com> | 2021-02-22 20:14:24 +0300 |
---|---|---|
committer | Alex Williamson <alex.williamson@redhat.com> | 2021-02-22 20:14:24 +0300 |
commit | 72d6e4871f0457dc9e498f8437ea344ee6b78075 (patch) | |
tree | 44a6975d7f0818086e34b8e84e3164527fac36f4 /arch/m68k/configs/sun3_defconfig | |
parent | b9abef43a08ef7faa33477cccb0c08c64eb2b8bf (diff) | |
parent | 3e10585335b7967326ca7b4118cada0d2d00a2ab (diff) | |
download | linux-72d6e4871f0457dc9e498f8437ea344ee6b78075.tar.xz |
Merge commit '3e10585335b7967326ca7b4118cada0d2d00a2ab' into v5.12/vfio/next
Update to new follow_pte() definition
Diffstat (limited to 'arch/m68k/configs/sun3_defconfig')
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index e6afbeee7c4a..6da97e28c48e 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -118,6 +118,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 @@ -605,7 +606,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 |