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>

commit | commitdiff | tree

Mark Brown [Sun, 27 Nov 2011 19:56:52 +0000 (19:56 +0000)]

ASoC: Convert WM8962 to devm_kzalloc()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit | commitdiff | tree

Pekka Enberg [Sun, 27 Nov 2011 20:08:45 +0000 (22:08 +0200)]

Merge branch 'slab/next' into for-next

commit | commitdiff | tree

Eric Dumazet [Tue, 22 Nov 2011 05:59:09 +0000 (06:59 +0100)]

slub: fix slub_max_order Documentation

slub_max_order default is 3 (aka PAGE_ALLOC_COSTLY_ORDER), not 1

Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

commit | commitdiff | tree

Shaohua Li [Fri, 11 Nov 2011 06:54:14 +0000 (14:54 +0800)]

slub: add missed accounting

With per-cpu partial list, slab is added to partial list first and then moved
to node list. The __slab_free() code path for add/remove_partial is almost
deprecated(except for slub debug). But we forget to account add/remove_partial
when move per-cpu partial pages to node list, so the statistics for such events
are always 0. Add corresponding accounting.

This is against the patch "slub: use correct parameter to add a page to
partial list tail"

Acked-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

commit | commitdiff | tree

Pekka Enberg [Sun, 27 Nov 2011 20:08:03 +0000 (22:08 +0200)]

Merge branch 'slab/urgent' into slab/next

commit | commitdiff | tree

Linus Torvalds [Sun, 27 Nov 2011 20:05:56 +0000 (12:05 -0800)]

Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6

* 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6:
  viafb: correct sync polarity for OLPC DCON
  video:da8xx-fb: Disable and reset sequence on version2 of LCDC
  OMAPDSS: DISPC: skip scaling calculations when not scaling
  OMAPFB: fix compilation warnings due to missing include
  OMAPDSS: HDMI: fix returned HDMI pixel clock

commit | commitdiff | tree

Rafael J. Wysocki [Sat, 26 Nov 2011 22:37:43 +0000 (23:37 +0100)]

ath9k: Revert change that broke AR928X on Acer Ferrari One

Revert a hunk in drivers/net/wireless/ath/ath9k/hw.c introduced by
commit 2577c6e8f232 ("ath9k_hw: Add support for AR946/8x chipsets") that
caused a nasty regression to appear on my Acer Ferrari One (the box
locks up entirely at random times after the wireless has been started
without any way to get debug information out of it).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit | commitdiff | tree

Mark Brown [Sun, 27 Nov 2011 19:47:03 +0000 (19:47 +0000)]

Merge remote-tracking branch 'regulator/topic/dt' into regulator-next

Linux kernel for KaRo TX COM modules

RSS Atom