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

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

Pull m68k upddates from Geert Uytterhoeven:
 - assorted spelling fixes
 - defconfig updates

* tag 'm68k-for-v4.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Update defconfigs for v4.7-rc2
  m68k: Assorted spelling fixes
parents 7825e0c4 6bd80f37

arch/m68k/coldfire/head.S

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ _clear_bss: 
#endif



	/*

	 *	Assember start up done, start code proper.

	 *	Assembler start up done, start code proper.

	 */

	jsr	start_kernel			/* start Linux kernel */

arch/m68k/coldfire/m5272.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void __init config_BSP(char *commandp, int size) 
/***************************************************************************/



/*

 * Some 5272 based boards have the FEC ethernet diectly connected to

 * Some 5272 based boards have the FEC ethernet directly connected to

 * an ethernet switch. In this case we need to use the fixed phy type,

 * and we need to declare it early in boot.

 */

arch/m68k/coldfire/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static unsigned long iospace; 


/*

 * We need to be carefull probing on bus 0 (directly connected to host

 * bridge). We should only acccess the well defined possible devices in

 * bridge). We should only access the well defined possible devices in

 * use, ignore aliases and the like.

 */

static unsigned char mcf_host_slot2sid[32] = {

arch/m68k/configs/amiga_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_MODULES=y
@@ -359,6 +360,7 @@ CONFIG_MACVTAP=m 
CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_GTP=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y
@@ -553,7 +555,9 @@ CONFIG_TEST_STRING_HELPERS=m 
CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

arch/m68k/configs/apollo_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_USERFAULTFD=y

CONFIG_SLAB=y

CONFIG_MODULES=y
@@ -341,6 +342,7 @@ CONFIG_MACVTAP=m 
CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_GTP=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y
@@ -512,7 +514,9 @@ CONFIG_TEST_STRING_HELPERS=m 
CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_LKM=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE