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 [Wed, 30 Nov 2011 00:39:07 +0000 (11:39 +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/at91sam926x_time.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/generic.h
arch/arm/mach-at91/gpio.c
arch/arm/mach-at91/include/mach/at91cap9.h
arch/arm/mach-at91/include/mach/at91sam9260.h
arch/arm/mach-at91/include/mach/at91sam9261.h
arch/arm/mach-at91/include/mach/at91sam9263.h
arch/arm/mach-at91/include/mach/at91sam9g45.h
arch/arm/mach-at91/include/mach/at91sam9rl.h
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-at91/pm.c
arch/arm/mach-at91/setup.c

commit | commitdiff | tree

Stephen Rothwell [Wed, 30 Nov 2011 00:13:48 +0000 (11:13 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 30 Nov 2011 00:12:27 +0000 (11:12 +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
arch/arm/plat-omap/include/plat/common.h
arch/arm/tools/mach-types

commit | commitdiff | tree

Stephen Rothwell [Wed, 30 Nov 2011 00:11:04 +0000 (11:11 +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 [Wed, 30 Nov 2011 00:05:11 +0000 (11:05 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 30 Nov 2011 00:01:35 +0000 (11:01 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 30 Nov 2011 00:01:34 +0000 (11:01 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 30 Nov 2011 00:01:32 +0000 (11:01 +1100)]

Merge remote-tracking branch 'wireless/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 30 Nov 2011 00:01:30 +0000 (11:01 +1100)]

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

commit | commitdiff | tree

Stephen Rothwell [Wed, 30 Nov 2011 00:01:29 +0000 (11:01 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 30 Nov 2011 00:01:25 +0000 (11:01 +1100)]

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

commit | commitdiff | tree

Igor Maravic [Fri, 25 Nov 2011 07:44:54 +0000 (07:44 +0000)]

net: Fix skb_update_prio RCU usage.

Change function rcu_dereference to rcu_dereference_bh to avoid warning

[ INFO: suspicious RCU usage. ]
-------------------------------
net/core/dev.c:2459 suspicious rcu_dereference_check() usage!

because we are locking with

rcu_read_lock_bh();

in function dev_queue_xmit(struct sk_buff *skb)

Signed-off-by: Igor Maravic <igorm@etf.rs>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Guennadi Liakhovetski [Tue, 29 Nov 2011 22:52:07 +0000 (23:52 +0100)]

PM / Domains: fix compilation failure for CONFIG_PM_GENERIC_DOMAINS unset

Fix the following compalitaion breakage:

In file included from linux/drivers/sh/pm_runtime.c:15:
linux/include/linux/pm_domain.h: In function 'dev_to_genpd':
linux/include/linux/pm_domain.h:142: error: implicit declaration of function 'ERR_PTR'
linux/include/linux/pm_domain.h:142: warning: return makes pointer from integer without a cast
In file included from linux/include/linux/sh_clk.h:10,
from linux/drivers/sh/pm_runtime.c:19:
linux/include/linux/err.h: At top level:
linux/include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
linux/include/linux/pm_domain.h:142: note: previous implicit declaration of 'ERR_PTR' was here
make[3]: *** [drivers/sh/pm_runtime.o] Error 1

Reported-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

commit | commitdiff | tree

Wolfram Sang [Wed, 23 Nov 2011 14:57:06 +0000 (15:57 +0100)]

mtd: gpmi: add missing include 'module.h'

Fixes:

drivers/mtd/nand/gpmi-nand/gpmi-nand.c: In function 'gpmi_nfc_init':
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1475:16: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1475:16: note: each undeclared identifier is reported only once for each function it appears in
drivers/mtd/nand/gpmi-nand/gpmi-nand.c: At top level:
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1617:15: error: expected declaration specifiers or '...' before string constant
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1617:1: warning: data definition has no type or storage class
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1617:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'

and some more...

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@intel.com>

commit | commitdiff | tree

Paul Moore [Tue, 29 Nov 2011 10:10:54 +0000 (10:10 +0000)]

netlabel: Fix build problems when IPv6 is not enabled

A recent fix to the the NetLabel code caused build problem with
configurations that did not have IPv6 enabled; see below:

netlabel_kapi.c: In function 'netlbl_cfg_unlbl_map_add':
netlabel_kapi.c:165:4:
error: implicit declaration of function 'netlbl_af6list_add'

This patch fixes this problem by making the IPv6 specific code conditional
on the IPv6 configuration flags as we done in the rest of NetLabel and the
network stack as a whole. We have to move some variable declarations
around as a result so things may not be quite as pretty, but at least it
builds cleanly now.

Some additional IPv6 conditionals were added to the NetLabel code as well
for the sake of consistency.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Paul Moore <pmoore@redhat.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Roland Dreier [Tue, 29 Nov 2011 21:37:18 +0000 (13:37 -0800)]

Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next

commit | commitdiff | tree

Eric Dumazet [Tue, 29 Nov 2011 21:31:23 +0000 (22:31 +0100)]

IB: Fix RCU lockdep splats

Commit f2c31e32b37 ("net: fix NULL dereferences in check_peer_redir()")
forgot to take care of infiniband uses of dst neighbours.

Many thanks to Marc Aurele who provided a nice bug report and feedback.

Reported-by: Marc Aurele La France <tsi@ualberta.ca>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: David Miller <davem@davemloft.net>
CC: Roland Dreier <roland@kernel.org>
Signed-off-by: Roland Dreier <roland@purestorage.com>

Linux kernel for KaRo TX COM modules

RSS Atom