Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next

Conflicts:
    include/linux/ssb/ssb_driver_gige.h

Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.

3 files changed, 3 insertions, 6 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6fe9a188c49f..9eb7eaa355ba 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -4,7 +4,6 @@ config MIPS
         select HAVE_GENERIC_DMA_COHERENT
         select HAVE_IDE
         select HAVE_OPROFILE
-        select HAVE_IRQ_WORK
         select HAVE_PERF_EVENTS
         select PERF_USE_VMALLOC
         select HAVE_ARCH_KGDB
@@ -2162,7 +2161,6 @@ source "mm/Kconfig"
 config SMP
         bool "Multi-Processing support"
         depends on SYS_SUPPORTS_SMP
-        select IRQ_PER_CPU
         select USE_GENERIC_SMP_HELPERS
         help
           This enables support for systems with more than one CPU. If you have
diff --git a/arch/mips/bcm47xx/serial.c b/arch/mips/bcm47xx/serial.c
index 57981e4fe2bc..b8ef965705cf 100644
--- a/arch/mips/bcm47xx/serial.c
+++ b/arch/mips/bcm47xx/serial.c
@@ -62,7 +62,7 @@ static int __init uart8250_init_bcma(void)
 
                 p->mapbase = (unsigned int) bcma_port->regs;
                 p->membase = (void *) bcma_port->regs;
-                p->irq = bcma_port->irq + 2;
+                p->irq = bcma_port->irq;
                 p->uartclk = bcma_port->baud_base;
                 p->regshift = bcma_port->reg_shift;
                 p->iotype = UPIO_MEM;
diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h
index cc208f9f8920..47132f44c955 100644
--- a/arch/mips/include/uapi/asm/socket.h
+++ b/arch/mips/include/uapi/asm/socket.h
@@ -28,9 +28,7 @@
 #define SO_LINGER       0x0080  /* Block on close of a reliable
                                    socket to transmit pending data.  */
 #define SO_OOBINLINE 0x0100     /* Receive out-of-band data in-band.  */
-#if 0
-To add: #define SO_REUSEPORT 0x0200     /* Allow local address and port reuse.  */
-#endif
+#define SO_REUSEPORT 0x0200     /* Allow local address and port reuse.  */
 
 #define SO_TYPE         0x1008  /* Compatible name for SO_STYLE.  */
 #define SO_STYLE        SO_TYPE /* Synonym */
@@ -90,5 +88,6 @@ To add: #define SO_REUSEPORT 0x0200	/* Allow local address and port reuse.	*/
 /* Instruct lower device to use last 4-bytes of skb data as FCS */
 #define SO_NOFCS                43
 
+#define SO_LOCK_FILTER          44
 
 #endif /* _UAPI_ASM_SOCKET_H */