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

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, 28 Nov 2011 00:38:19 +0000 (11:38 +1100)]

Merge remote-tracking branch 'at91/at91-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/at91sam9_alt_reset.S
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-cpu9krea.c
arch/arm/mach-at91/board-cpuat91.c
arch/arm/mach-at91/board-snapper9260.c
arch/arm/mach-at91/generic.h
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-at91/setup.c
include/linux/platform_data/macb.h

commit | commitdiff | tree

Stephen Rothwell [Sun, 27 Nov 2011 23:57:45 +0000 (10:57 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Sun, 27 Nov 2011 23:56:31 +0000 (10:56 +1100)]

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

Conflicts:
arch/arm/plat-omap/include/plat/common.h
arch/arm/tools/mach-types
drivers/net/ethernet/cadence/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Sun, 27 Nov 2011 23:43:44 +0000 (10:43 +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 [Sun, 27 Nov 2011 23:37:52 +0000 (10:37 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Sun, 27 Nov 2011 23:34:23 +0000 (10:34 +1100)]

Merge remote-tracking branch 'staging.current/staging-linus'

commit | commitdiff | tree

Stephen Rothwell [Sun, 27 Nov 2011 23:34:22 +0000 (10:34 +1100)]

Merge remote-tracking branch 'usb.current/usb-linus'

commit | commitdiff | tree

Stephen Rothwell [Sun, 27 Nov 2011 23:34:20 +0000 (10:34 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Sun, 27 Nov 2011 23:34:19 +0000 (10:34 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Sun, 27 Nov 2011 23:34:16 +0000 (10:34 +1100)]

Merge remote-tracking branch 'arm-current/fixes'

commit | commitdiff | tree

Amir Vadai [Sat, 26 Nov 2011 19:55:23 +0000 (19:55 +0000)]

net/mlx4_en: bug fix for the case of vlan id 0 and UP 0

When using vlan 0 and UP 0, vlan header wasn't placed.

Signed-off-by: Amir Vadai <amirv@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Amir Vadai [Sat, 26 Nov 2011 19:55:19 +0000 (19:55 +0000)]

net/mlx4_en: adding loopback support

Device must be in promiscuous mode or DMAC must be same as the host MAC, or
else packet will be dropped by the HW rx filtering.

Signed-off-by: Amir Vadai <amirv@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Oren Duer [Sat, 26 Nov 2011 19:55:15 +0000 (19:55 +0000)]

net/mlx4_en: fix WOL handlers were always looking at port2 capability bit

There are 2 capability bits for WOL, one for each port.
WOL handlers were looking only on the second bit, regardless of the port.

Signed-off-by: Oren Duer <oren@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Yevgeny Petrilin [Sat, 26 Nov 2011 19:55:10 +0000 (19:55 +0000)]

net/mlx4_en: using non collapsed CQ on TX

Moving to regular Completion Queue implementation (not collapsed)
Completion for each transmitted packet is written to new entry.

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Or Gerlitz [Sat, 26 Nov 2011 19:55:06 +0000 (19:55 +0000)]

net/mlx4_en: fix sparse warning on a cast which truncates bits from constant value

the MLX4_EN_WOL_DO_MODIFY flag which is defined through enum targets
bit 63, this triggers a "cast truncate bits from constant value
(8000000000000000 becomes 0)" warning from sparse, fix that by using
define instead of enum.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Or Gerlitz [Sat, 26 Nov 2011 19:55:02 +0000 (19:55 +0000)]

net/mlx4: fix UDP RSS related settings

Using RSS which takes into account UDP headers is controlled by
a module param, fix the setting of the HW RSS context to align
with that scheme. So far it was uncoditionally allowing hashing
on the UDP headers.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Or Gerlitz [Sat, 26 Nov 2011 19:54:58 +0000 (19:54 +0000)]

net/mlx4: move RSS related definitions to be global

Towards adding RSS support for IB drivers/application who use
the mlx4 HW, make the RSS related definitions global and change
the mlx4_en driver to use them.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Shlomo Pongratz <shlomop@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Tilman Schmidt [Sun, 27 Nov 2011 07:39:22 +0000 (07:39 +0000)]

isdn/gigaset: report ISDN4Linux interface only once

Move the "ISDN4Linux interface" message from device registration,
where it is emitted for each device, to driver registration, where
it is emitted only once, for consistency with the CAPI variant.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>

Linux kernel for KaRo TX COM modules

RSS Atom