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

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

Pull m68k updates from Geert Uytterhoeven:

  - miscellaneous NuBus fixes and improvements

  - defconfig updates

* tag 'm68k-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v6.4-rc1
  nubus: Don't list slot resources by default
  nubus: Remove proc entries before adding them
  nubus: Partially revert proc_create_single_data() conversion
parents 19300488 4055eabe

arch/m68k/configs/amiga_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ CONFIG_IOSCHED_BFQ=m 
CONFIG_BINFMT_MISC=m

CONFIG_SLAB=y

# CONFIG_COMPACTION is not set

CONFIG_DMAPOOL_TEST=m

CONFIG_USERFAULTFD=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -454,7 +455,6 @@ CONFIG_OCFS2_FS=m 
# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_AUTOFS_FS=m

CONFIG_FUSE_FS=m

CONFIG_CUSE=m

arch/m68k/configs/apollo_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ CONFIG_IOSCHED_BFQ=m 
CONFIG_BINFMT_MISC=m

CONFIG_SLAB=y

# CONFIG_COMPACTION is not set

CONFIG_DMAPOOL_TEST=m

CONFIG_USERFAULTFD=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -411,7 +412,6 @@ CONFIG_OCFS2_FS=m 
# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_AUTOFS_FS=m

CONFIG_FUSE_FS=m

CONFIG_CUSE=m

arch/m68k/configs/atari_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ CONFIG_IOSCHED_BFQ=m 
CONFIG_BINFMT_MISC=m

CONFIG_SLAB=y

# CONFIG_COMPACTION is not set

CONFIG_DMAPOOL_TEST=m

CONFIG_USERFAULTFD=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -431,7 +432,6 @@ CONFIG_OCFS2_FS=m 
# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_AUTOFS_FS=m

CONFIG_FUSE_FS=m

CONFIG_CUSE=m

arch/m68k/configs/bvme6000_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ CONFIG_IOSCHED_BFQ=m 
CONFIG_BINFMT_MISC=m

CONFIG_SLAB=y

# CONFIG_COMPACTION is not set

CONFIG_DMAPOOL_TEST=m

CONFIG_USERFAULTFD=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -403,7 +404,6 @@ CONFIG_OCFS2_FS=m 
# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_AUTOFS_FS=m

CONFIG_FUSE_FS=m

CONFIG_CUSE=m

arch/m68k/configs/hp300_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ CONFIG_IOSCHED_BFQ=m 
CONFIG_BINFMT_MISC=m

CONFIG_SLAB=y

# CONFIG_COMPACTION is not set

CONFIG_DMAPOOL_TEST=m

CONFIG_USERFAULTFD=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -413,7 +414,6 @@ CONFIG_OCFS2_FS=m 
# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_AUTOFS_FS=m

CONFIG_FUSE_FS=m

CONFIG_CUSE=m