Commit 1b74b460 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - Fix frame buffers backed by deferred I/O

 - defconfig updates

 - Minor fixes and improvements

* tag 'm68k-for-v5.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Disable fbdev on Sun3/3x
  m68k: defconfig: Update defconfigs for v5.17-rc3
  m68k: mm: Remove check for VM_IO to fix deferred I/O
  m68k: Add asm/config.h
parents 90ea15b7 0d52a01a

arch/m68k/amiga/config.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <asm/irq.h>

#include <asm/machdep.h>

#include <asm/io.h>

#include <asm/config.h>



static unsigned long amiga_model;

arch/m68k/apollo/config.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/apollohw.h>

#include <asm/irq.h>

#include <asm/machdep.h>

#include <asm/config.h>



u_long sio01_physaddr;

u_long sio23_physaddr;

arch/m68k/atari/config.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <asm/machdep.h>

#include <asm/hwtest.h>

#include <asm/io.h>

#include <asm/config.h>



u_long atari_mch_cookie;

EXPORT_SYMBOL(atari_mch_cookie);

arch/m68k/bvme6000/config.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/traps.h>

#include <asm/machdep.h>

#include <asm/bvme6000hw.h>

#include <asm/config.h>



static void bvme6000_get_model(char *model);

extern void bvme6000_sched_init(void);

arch/m68k/configs/amiga_defconfig

+2 −4
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ CONFIG_NF_TABLES_NETDEV=y 
CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_CONNLIMIT=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m
@@ -204,7 +203,6 @@ CONFIG_IP_SET_LIST_SET=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m
@@ -229,7 +227,6 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -435,6 +432,7 @@ CONFIG_FB_AMIGA_ECS=y 
CONFIG_FB_AMIGA_AGA=y

CONFIG_FB_FM2=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y

CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_DMASOUND_PAULA=m
@@ -643,7 +641,7 @@ CONFIG_TEST_UUID=m 
CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m