git.karo-electronics.de Git - karo-tx-linux.git/log

Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-s3c64xx/mach-crag6410.c

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:28:18 +0000 (10:28 +1100)]

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:25:38 +0000 (10:25 +1100)]

Merge remote-tracking branch 'arm-perf/for-next/perf'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:24:16 +0000 (10:24 +1100)]

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:22:56 +0000 (10:22 +1100)]

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/mm/ioremap.c

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:17:05 +0000 (10:17 +1100)]

Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/plat-omap/include/plat/common.h
arch/arm/tools/mach-types

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:10:21 +0000 (10:10 +1100)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:10:19 +0000 (10:10 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Mon, 5 Dec 2011 23:10:18 +0000 (10:10 +1100)]

Merge remote-tracking branch 'sparc/master'

commit | commitdiff | tree

David Miller [Fri, 2 Dec 2011 16:52:44 +0000 (16:52 +0000)]

infiniband: ipoib: Sanitize neighbour handling in ipoib_main.c

Reduce the number of dst_get_neighbour_noref() calls within a single
call chain. Primarily by passing the neighbour pointer down to the
helper functions.

Handle dst_get_neighbour_noref() returning NULL in ipoib_start_xmit()
by incrementing the dropped counter and freeing the packet. We don't
want it to fall through into the ARP/RARP/multicast handling, since
that should only happen when skb_dst() is NULL.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>

commit | commitdiff | tree

David Miller [Fri, 2 Dec 2011 16:52:39 +0000 (16:52 +0000)]

cxgb4i: Handle dst_get_neighbour_noref() returning NULL.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>

commit | commitdiff | tree

David Miller [Fri, 2 Dec 2011 16:52:35 +0000 (16:52 +0000)]

libcxgbi: Handle dst_get_neighbour_noref() returning NULL.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>

commit | commitdiff | tree

David Miller [Fri, 2 Dec 2011 16:52:31 +0000 (16:52 +0000)]

infiniband: cxgb4: Consolidate 3 copies of the same operation into 1 helper function.

Three pieces of code do the same thing, create a l2t entry and then
import this information into the c4iw_ep object.

Create a helper function and call it from these 3 locations instead.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>

commit | commitdiff | tree

David Miller [Fri, 2 Dec 2011 16:52:27 +0000 (16:52 +0000)]

infiniband: nes: Use dst's neighbour entry.

Do this instead of performing a by-hand lookup.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>

commit | commitdiff | tree

David Miller [Fri, 2 Dec 2011 16:52:22 +0000 (16:52 +0000)]

cxgb3: Handle NULL dst neighbour in cxgb3_offload.c

Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

David Miller [Fri, 2 Dec 2011 16:52:18 +0000 (16:52 +0000)]

cxgb3: Rework t3_l2t_get to take a dst_entry instead of a neighbour.

This way we consolidate the RCU locking down into the place where it
actually matters, and also we can make the code handle
dst_get_neighbour_noref() returning NULL properly.

Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

David Miller [Fri, 2 Dec 2011 16:52:14 +0000 (16:52 +0000)]

infiniband: addr: Consolidate code to fetch neighbour hardware address from dst.

IPV4 should do exactly what the IPV6 code does here, which is
use the neighbour obtained via the dst entry.

And now that the two code paths do the same thing, use a common
helper function to perform the operation.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Roland Dreier <roland@purestorage.com>

commit | commitdiff | tree

David Miller [Fri, 2 Dec 2011 16:52:08 +0000 (16:52 +0000)]

net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.

To reflect the fact that a refrence is not obtained to the
resulting neighbour entry.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>

commit | commitdiff | tree

Ingo Molnar [Mon, 5 Dec 2011 19:49:27 +0000 (20:49 +0100)]

Merge branch 'x86/urgent' into auto-latest

commit | commitdiff | tree

Ingo Molnar [Mon, 5 Dec 2011 19:49:09 +0000 (20:49 +0100)]

Merge branch 'x86/platform' into auto-latest

commit | commitdiff | tree

Ingo Molnar [Mon, 5 Dec 2011 19:49:07 +0000 (20:49 +0100)]

Merge branch 'x86/mm' into auto-latest

commit | commitdiff | tree

Ingo Molnar [Mon, 5 Dec 2011 19:49:04 +0000 (20:49 +0100)]

Merge branch 'x86/debug' into auto-latest

commit | commitdiff | tree

Ingo Molnar [Mon, 5 Dec 2011 19:49:02 +0000 (20:49 +0100)]

Merge branch 'x86/cleanups' into auto-latest

Linux kernel for KaRo TX COM modules

RSS Atom