---

yaml
---
r: 64547
b: refs/heads/master
c: 1bd4b28
h: refs/heads/master
i:
  64545: 300148d
  64543: 07be55a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28d9aa613daa65b295a099a8433df97de1c56a2f
+refs/heads/master: 1bd4b280394cdd14f82efc00808c6d77b097285a

trunk/MAINTAINERS

@@ -2661,12 +2661,6 @@ L:	netdev@vger.kernel.org
 T:	git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:	Maintained
 
-NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
-P:	Paul Moore
-M:	paul.moore@hp.com
-L:	netdev@vger.kernel.org
-S:	Maintained
-
 NETWORKING [WIRELESS]
 P:	John W. Linville
 M:	linville@tuxdriver.com

trunk/arch/mips/Kconfig

@@ -28,6 +28,7 @@ config BASLER_EXCITE
 	select MIPS_RM9122
 	select SYS_HAS_CPU_RM9000
 	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_64BIT_KERNEL
 	select SYS_SUPPORTS_BIG_ENDIAN
 	select SYS_SUPPORTS_KGDB
 	help
@@ -125,7 +126,6 @@ config LEMOTE_FULONG
 	select SYS_SUPPORTS_HIGHMEM
 	select SYS_HAS_EARLY_PRINTK
 	select GENERIC_HARDIRQS_NO__DO_IRQ
-	select GENERIC_ISA_DMA_SUPPORT_BROKEN
 	select CPU_HAS_WB
 	help
 	  Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
@@ -192,7 +192,8 @@ config MIPS_MALTA
 	  board.
 
 config MIPS_SEAD
-	bool "MIPS SEAD board"
+	bool "MIPS SEAD board (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
 	select IRQ_CPU
 	select DMA_NONCOHERENT
 	select SYS_HAS_EARLY_PRINTK
@@ -527,7 +528,6 @@ config TOSHIBA_JMR3927
 	select DMA_NONCOHERENT
 	select HW_HAS_PCI
 	select MIPS_TX3927
-	select IRQ_TXX9
 	select SWAP_IO_SPACE
 	select SYS_HAS_CPU_TX39XX
 	select SYS_SUPPORTS_32BIT_KERNEL
@@ -540,9 +540,7 @@ config TOSHIBA_RBTX4927
 	select DMA_NONCOHERENT
 	select HAS_TXX9_SERIAL
 	select HW_HAS_PCI
-	select IRQ_CPU
-	select IRQ_TXX9
-	select I8259 if TOSHIBA_FPCIB0
+	select I8259
 	select SWAP_IO_SPACE
 	select SYS_HAS_CPU_TX49XX
 	select SYS_SUPPORTS_32BIT_KERNEL
@@ -557,11 +555,12 @@ config TOSHIBA_RBTX4927
 
 config TOSHIBA_RBTX4938
 	bool "Toshiba RBTX4938 board"
+	select HAVE_STD_PC_SERIAL_PORT
 	select DMA_NONCOHERENT
+	select GENERIC_ISA_DMA
 	select HAS_TXX9_SERIAL
 	select HW_HAS_PCI
-	select IRQ_CPU
-	select IRQ_TXX9
+	select I8259
 	select SWAP_IO_SPACE
 	select SYS_HAS_CPU_TX49XX
 	select SYS_SUPPORTS_32BIT_KERNEL
@@ -605,6 +604,7 @@ source "arch/mips/sibyte/Kconfig"
 source "arch/mips/tx4927/Kconfig"
 source "arch/mips/tx4938/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
+source "arch/mips/philips/pnx8550/common/Kconfig"
 
 endmenu
 
@@ -693,9 +693,9 @@ config EARLY_PRINTK
 config SYS_HAS_EARLY_PRINTK
 	bool
 
-config HOTPLUG_CPU
+config GENERIC_ISA_DMA
 	bool
-	default n
+	select ZONE_DMA
 
 config I8259
 	bool
@@ -712,13 +712,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
 config NO_IOPORT
 	def_bool n
 
-config GENERIC_ISA_DMA
-	bool
-	select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n
-
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
 	bool
-	select GENERIC_ISA_DMA
+	select ZONE_DMA
 
 config GENERIC_GPIO
 	bool
@@ -772,9 +768,6 @@ config IRQ_MSP_SLP
 config IRQ_MSP_CIC
 	bool
 
-config IRQ_TXX9
-	bool
-
 config MIPS_BOARDS_GEN
 	bool
 
@@ -1434,7 +1427,8 @@ config SB1_PASS_2_1_WORKAROUNDS
 	default y
 
 config 64BIT_PHYS_ADDR
-	bool
+	bool "Support for 64-bit physical address space"
+	depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT
 
 config CPU_HAS_LLSC
 	bool

trunk/arch/mips/au1000/Kconfig

@@ -136,7 +136,6 @@ config SOC_AU1200
 
 config SOC_AU1X00
 	bool
-	select 64BIT_PHYS_ADDR
 	select SYS_HAS_CPU_MIPS32_R1
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_APM_EMULATION

trunk/arch/mips/au1000/common/gpio.c

@@ -131,12 +131,12 @@ int au1xxx_gpio_direction_input(unsigned gpio)
 {
 	if (gpio >= AU1XXX_GPIO_BASE)
 #if defined(CONFIG_SOC_AU1000)
-		return -ENODEV;
+		;
 #else
 		return au1xxx_gpio2_direction_input(gpio);
 #endif
-
-	return au1xxx_gpio1_direction_input(gpio);
+	else
+		return au1xxx_gpio1_direction_input(gpio);
 }
 
 EXPORT_SYMBOL(au1xxx_gpio_direction_input);
@@ -145,12 +145,12 @@ int au1xxx_gpio_direction_output(unsigned gpio, int value)
 {
 	if (gpio >= AU1XXX_GPIO_BASE)
 #if defined(CONFIG_SOC_AU1000)
-		return -ENODEV;
+		;
 #else
 		return au1xxx_gpio2_direction_output(gpio, value);
 #endif
-
-	return au1xxx_gpio1_direction_output(gpio, value);
+	else
+		return au1xxx_gpio1_direction_output(gpio, value);
 }
 
 EXPORT_SYMBOL(au1xxx_gpio_direction_output);

trunk/arch/mips/configs/bigsur_defconfig

@@ -663,8 +663,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
 # CONFIG_SX is not set
 # CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
-CONFIG_SERIAL_SB1250_DUART=y
-CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
+CONFIG_SIBYTE_SB1250_DUART=y
+CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
 
 #
 # Serial drivers