]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Fri, 4 Nov 2011 04:20:09 +0000 (15:20 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'

13 years agoMerge remote-tracking branch 'tmem/tmem'
Stephen Rothwell [Fri, 4 Nov 2011 04:14:53 +0000 (15:14 +1100)]
Merge remote-tracking branch 'tmem/tmem'

Conflicts:
mm/swapfile.c

13 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 04:13:07 +0000 (15:13 +1100)]
Merge remote-tracking branch 'regmap/for-next'

13 years agoMerge remote-tracking branch 'namespace/master'
Stephen Rothwell [Fri, 4 Nov 2011 04:11:40 +0000 (15:11 +1100)]
Merge remote-tracking branch 'namespace/master'

13 years agoMerge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Fri, 4 Nov 2011 04:10:14 +0000 (15:10 +1100)]
Merge remote-tracking branch 'sysctl/master'

13 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 04:08:40 +0000 (15:08 +1100)]
Merge remote-tracking branch 'percpu/for-next'

13 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 04:07:15 +0000 (15:07 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'

13 years agoMerge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Fri, 4 Nov 2011 04:01:37 +0000 (15:01 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
arch/x86/xen/Kconfig

13 years agoMerge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Fri, 4 Nov 2011 03:55:01 +0000 (14:55 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'

13 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 4 Nov 2011 03:49:15 +0000 (14:49 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/x86/kernel/cpu/amd.c
drivers/char/random.c

13 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:45:49 +0000 (14:45 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'

13 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:43:55 +0000 (14:43 +1100)]
Merge remote-tracking branch 'pm/linux-next'

13 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:43:43 +0000 (14:43 +1100)]
Merge remote-tracking branch 'osd/linux-next'

13 years agoMerge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Fri, 4 Nov 2011 03:37:32 +0000 (14:37 +1100)]
Merge remote-tracking branch 'cputime/cputime'

Conflicts:
fs/proc/stat.c
include/asm-generic/cputime.h
kernel/sched_stats.h

13 years agoMerge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:35:56 +0000 (14:35 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'

13 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:34:26 +0000 (14:34 +1100)]
Merge remote-tracking branch 'regulator/for-next'

13 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:34:04 +0000 (14:34 +1100)]
Merge remote-tracking branch 'md/for-next'

13 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:33:57 +0000 (14:33 +1100)]
Merge remote-tracking branch 'slab/for-next'

13 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:33:49 +0000 (14:33 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

13 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:32:30 +0000 (14:32 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
drivers/mmc/host/omap_hsmmc.c

13 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 4 Nov 2011 03:22:52 +0000 (14:22 +1100)]
Merge remote-tracking branch 'battery/master'

13 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:16:29 +0000 (14:16 +1100)]
Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/md/faulty.c
drivers/md/linear.c
drivers/md/md.c
drivers/md/md.h
drivers/md/multipath.c
drivers/md/raid0.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
drivers/staging/zram/zram_drv.c

13 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 4 Nov 2011 03:10:14 +0000 (14:10 +1100)]
Merge remote-tracking branch 'input/next'

13 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Fri, 4 Nov 2011 03:03:33 +0000 (14:03 +1100)]
Merge branch 'quilt/rr'

13 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Fri, 4 Nov 2011 03:03:24 +0000 (14:03 +1100)]
Merge remote-tracking branch 'cpufreq/next'

13 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:01:56 +0000 (14:01 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

13 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 03:01:53 +0000 (14:01 +1100)]
Merge remote-tracking branch 'sound/for-next'

13 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 4 Nov 2011 03:00:28 +0000 (14:00 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c
drivers/mtd/maps/lantiq-flash.c

13 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:55:34 +0000 (13:55 +1100)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
include/net/bluetooth/bluetooth.h
net/bluetooth/l2cap_sock.c

13 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 4 Nov 2011 02:47:32 +0000 (13:47 +1100)]
Merge remote-tracking branch 'slave-dma/next'

13 years agoMerge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Fri, 4 Nov 2011 02:46:10 +0000 (13:46 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'

13 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 02:44:45 +0000 (13:44 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

13 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:41:40 +0000 (13:41 +1100)]
Merge remote-tracking branch 'scsi/master'

13 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:41:28 +0000 (13:41 +1100)]
Merge remote-tracking branch 'ibft/master'

13 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:41:23 +0000 (13:41 +1100)]
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c

13 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 02:40:49 +0000 (13:40 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

13 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 02:34:08 +0000 (13:34 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

Conflicts:
drivers/net/ethernet/stmicro/stmmac/Kconfig

13 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:32:22 +0000 (13:32 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

13 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Fri, 4 Nov 2011 02:31:00 +0000 (13:31 +1100)]
Merge remote-tracking branch 'docs/docs-move'

13 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Fri, 4 Nov 2011 02:29:46 +0000 (13:29 +1100)]
Merge branch 'quilt/kernel-doc'

Conflicts:
Documentation/PCI/pci.txt

13 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 4 Nov 2011 02:28:25 +0000 (13:28 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

13 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Fri, 4 Nov 2011 02:27:09 +0000 (13:27 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c

13 years agoMerge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 02:24:05 +0000 (13:24 +1100)]
Merge remote-tracking branch 'pci/linux-next'

13 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 02:22:41 +0000 (13:22 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

13 years agoMerge remote-tracking branch 'squashfs/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:21:21 +0000 (13:21 +1100)]
Merge remote-tracking branch 'squashfs/master'

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 02:20:01 +0000 (13:20 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

Conflicts:
fs/ocfs2/xattr.c

13 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 02:18:23 +0000 (13:18 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:17:07 +0000 (13:17 +1100)]
Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:16:54 +0000 (13:16 +1100)]
Merge remote-tracking branch 'gfs2/master'

Conflicts:
fs/gfs2/file.c

13 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:15:30 +0000 (13:15 +1100)]
Merge remote-tracking branch 'cifs/master'

13 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:14:12 +0000 (13:14 +1100)]
Merge remote-tracking branch 'xtensa/master'

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 4 Nov 2011 02:12:54 +0000 (13:12 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 4 Nov 2011 02:11:38 +0000 (13:11 +1100)]
Merge remote-tracking branch 'tile/master'

Conflicts:
arch/tile/kernel/intvec_32.S
arch/tile/lib/atomic_asm_32.S

13 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Fri, 4 Nov 2011 01:57:50 +0000 (12:57 +1100)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 4 Nov 2011 01:56:36 +0000 (12:56 +1100)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch 'galak/next'
Stephen Rothwell [Fri, 4 Nov 2011 01:55:15 +0000 (12:55 +1100)]
Merge remote-tracking branch 'galak/next'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Fri, 4 Nov 2011 01:53:47 +0000 (12:53 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 4 Nov 2011 01:47:21 +0000 (12:47 +1100)]
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
drivers/tty/serial/8250.c

13 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:29:06 +0000 (12:29 +1100)]
Merge remote-tracking branch 'parisc/for-next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:27:45 +0000 (12:27 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:27:43 +0000 (12:27 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig.bus
arch/m68k/Kconfig.devices
arch/m68k/kernel/Makefile

13 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Fri, 4 Nov 2011 01:27:31 +0000 (12:27 +1100)]
Merge remote-tracking branch 'ia64/next'

13 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Fri, 4 Nov 2011 01:27:29 +0000 (12:27 +1100)]
Merge branch 'quilt/hexagon'

Conflicts:
arch/hexagon/Makefile
arch/hexagon/include/asm/Kbuild
arch/hexagon/include/asm/timex.h
arch/hexagon/include/asm/vdso.h
arch/hexagon/kernel/Makefile
arch/hexagon/kernel/head.S
arch/hexagon/kernel/hexagon_ksyms.c
arch/hexagon/kernel/kgdb.c
arch/hexagon/kernel/vdso.c
arch/hexagon/kernel/vm_vectors.S
arch/hexagon/kernel/vmlinux.lds.S
arch/hexagon/lib/memset.S
arch/hexagon/mm/Makefile
arch/hexagon/mm/pgalloc.c
arch/hexagon/mm/strnlen_user.S

13 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:25:12 +0000 (12:25 +1100)]
Merge remote-tracking branch 'cris/for-next'

13 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:18:38 +0000 (12:18 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

13 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Fri, 4 Nov 2011 01:17:23 +0000 (12:17 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

13 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:16:04 +0000 (12:16 +1100)]
Merge remote-tracking branch 'tegra/for-next'

13 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:14:50 +0000 (12:14 +1100)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile

13 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:13:17 +0000 (12:13 +1100)]
Merge remote-tracking branch 'i.MX/for-next'

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

13 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:11:48 +0000 (12:11 +1100)]
Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9g45.c
drivers/ata/pata_at91.c

13 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:08:16 +0000 (12:08 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/plat-omap/devices.c

13 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 01:06:04 +0000 (12:06 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c

13 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 4 Nov 2011 00:51:06 +0000 (11:51 +1100)]
Merge remote-tracking branch 'arm/for-next'

13 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Fri, 4 Nov 2011 00:46:28 +0000 (11:46 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

13 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Fri, 4 Nov 2011 00:46:18 +0000 (11:46 +1100)]
Merge remote-tracking branch 'ide/master'

13 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Fri, 4 Nov 2011 00:46:12 +0000 (11:46 +1100)]
Merge remote-tracking branch 'crypto-current/master'

13 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Fri, 4 Nov 2011 00:46:05 +0000 (11:46 +1100)]
Merge remote-tracking branch 'wireless/master'

13 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Fri, 4 Nov 2011 00:46:04 +0000 (11:46 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

13 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Fri, 4 Nov 2011 00:45:58 +0000 (11:45 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

13 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Fri, 4 Nov 2011 00:45:57 +0000 (11:45 +1100)]
Merge remote-tracking branch 'net/master'

13 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Fri, 4 Nov 2011 00:45:55 +0000 (11:45 +1100)]
Merge remote-tracking branch 'sparc/master'

13 years agoMerge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Fri, 4 Nov 2011 00:45:53 +0000 (11:45 +1100)]
Merge remote-tracking branch 'm68k-current/for-linus'

13 years agoMerge remote-tracking branch 'fixes/master'
Stephen Rothwell [Fri, 4 Nov 2011 00:39:31 +0000 (11:39 +1100)]
Merge remote-tracking branch 'fixes/master'

13 years agomodule,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
Ben Hutchings [Mon, 24 Oct 2011 13:12:28 +0000 (15:12 +0200)]
module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree

Use of the GPL or a compatible licence doesn't necessarily make the code
any good.  We already consider staging modules to be suspect, and this
should also be true for out-of-tree modules which may receive very
little review.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Reviewed-by: Dave Jones <davej@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (patched oops-tracing.txt)
13 years agomodule: Enable dynamic debugging regardless of taint
Ben Hutchings [Tue, 1 Nov 2011 03:59:33 +0000 (03:59 +0000)]
module: Enable dynamic debugging regardless of taint

Dynamic debugging is currently disabled for tainted modules, except
for TAINT_CRAP.  This prevents use of dynamic debugging for
out-of-tree modules once the next patch is applied.

This condition was apparently intended to avoid a crash if a force-
loaded module has an incompatible definition of dynamic debug
structures.  However, a administrator that forces us to load a module
is claiming that it *is* compatible even though it fails our version
checks.  If they are mistaken, there are any number of ways the module
could crash the system.

As a side-effect, proprietary and other tainted modules can now use
dynamic_debug.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
13 years agoPM / Freezer: Revert 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake TASK_K...
Tejun Heo [Fri, 4 Nov 2011 00:04:52 +0000 (01:04 +0100)]
PM / Freezer: Revert 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too"

Commit 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake
TASK_KILLABLE tasks too" updated fake_signal_wake_up() used by freezer
to wake up KILLABLE tasks.  Sending unsolicited wakeups to tasks in
killable sleep is dangerous as there are code paths which depend on
tasks not waking up spuriously from KILLABLE sleep.

For example. sys_read() or page can sleep in TASK_KILLABLE assuming
that wait/down/whatever _killable can only fail if we can not return
to the usermode.  TASK_TRACED is another obvious example.

The previous patch updated wait_event_freezekillable() such that it
doesn't depend on the spurious wakeup.  This patch reverts the
offending commit.

Note that the spurious KILLABLE wakeup had other implicit effects in
KILLABLE sleeps in nfs and cifs and those will need further updates to
regain freezekillable behavior.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
13 years agoPM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freeze...
Oleg Nesterov [Thu, 3 Nov 2011 23:07:49 +0000 (16:07 -0700)]
PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count

Commit 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake
TASK_KILLABLE tasks too" updated fake_signal_wake_up() used by freezer
to wake up KILLABLE tasks.  Sending unsolicited wakeups to tasks in
killable sleep is dangerous as there are code paths which depend on
tasks not waking up spuriously from KILLABLE sleep.

For example. sys_read() or page can sleep in TASK_KILLABLE assuming
that wait/down/whatever _killable can only fail if we can not return
to the usermode.  TASK_TRACED is another obvious example.

The offending commit was to resolve freezer hang during system PM
operations caused by KILLABLE sleeps in network filesystems.
wait_event_freezekillable(), which depends on the spurious KILLABLE
wakeup, was added by f06ac72e92 "cifs, freezer: add
wait_event_freezekillable and have cifs use it" to be used to
implement killable & freezable sleeps in network filesystems.

To prepare for reverting of 27920651fe, this patch reimplements
wait_event_freezekillable() using freezer_do_not_count/freezer_count()
so that it doesn't depend on the spurious KILLABLE wakeup.  This isn't
very nice but should do for now.

[tj: Refreshed patch to apply to linus/master and updated commit
    description on Rafael's request.]

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
13 years agoUSB: Update last_busy time after autosuspend fails
Alan Stern [Thu, 3 Nov 2011 23:52:46 +0000 (00:52 +0100)]
USB: Update last_busy time after autosuspend fails

Originally, the runtime PM core would send an idle notification
whenever a suspend attempt failed.  The idle callback routine could
then schedule a delayed suspend for some time later.

However this behavior was changed by commit
f71648d73c1650b8b4aceb3856bebbde6daa3b86 (PM / Runtime: Remove idle
notification after failing suspend).  No notifications were sent, and
there was no clear mechanism to retry failed suspends.

This caused problems for the usbhid driver, because it fails
autosuspend attempts as long as a key is being held down.  A companion
patch changes the PM core's behavior, but we also need to change the
USB core.  In particular, this patch (as1493) updates the device's
last_busy time when an autosuspend fails, so that the PM core will
retry the autosuspend in the future when the delay time expires
again.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Cc: <stable@kernel.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
13 years agoPM / Runtime: Automatically retry failed autosuspends
Alan Stern [Thu, 3 Nov 2011 22:39:18 +0000 (23:39 +0100)]
PM / Runtime: Automatically retry failed autosuspends

Originally, the runtime PM core would send an idle notification
whenever a suspend attempt failed.  The idle callback routine could
then schedule a delayed suspend for some time later.

However this behavior was changed by commit
f71648d73c1650b8b4aceb3856bebbde6daa3b86 (PM / Runtime: Remove idle
notification after failing suspend).  No notifications were sent, and
there was no clear mechanism to retry failed suspends.

This caused problems for the usbhid driver, because it fails
autosuspend attempts as long as a key is being held down.  Therefore
this patch (as1492) adds a mechanism for retrying failed
autosuspends.  If the callback routine updates the last_busy field so
that the next autosuspend expiration time is in the future, the
autosuspend will automatically be rescheduled.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Henrik Rydberg <rydberg@euromail.se>
Cc: <stable@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
13 years agoaf_packet: de-inline some helper functions
Olof Johansson [Wed, 2 Nov 2011 11:00:49 +0000 (11:00 +0000)]
af_packet: de-inline some helper functions

This popped some compiler errors due to mismatched prototypes. Just
remove most manual inlines, the compiler should be able to figure out
what makes sense to inline and not.

net/packet/af_packet.c:252: warning: 'prb_curr_blk_in_use' declared inline after being called
net/packet/af_packet.c:252: warning: previous declaration of 'prb_curr_blk_in_use' was here
net/packet/af_packet.c:258: warning: 'prb_queue_frozen' declared inline after being called
net/packet/af_packet.c:258: warning: previous declaration of 'prb_queue_frozen' was here
net/packet/af_packet.c:248: warning: 'packet_previous_frame' declared inline after being called
net/packet/af_packet.c:248: warning: previous declaration of 'packet_previous_frame' was here
net/packet/af_packet.c:251: warning: 'packet_increment_head' declared inline after being called
net/packet/af_packet.c:251: warning: previous declaration of 'packet_increment_head' was here

Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Chetan Loke <loke.chetan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agoMAINTAINERS: Add can-gw include to maintained files
Oliver Hartkopp [Wed, 2 Nov 2011 10:55:13 +0000 (10:55 +0000)]
MAINTAINERS: Add can-gw include to maintained files

Commit c1aabdf379bc2feeb0df7057ed5bad96f492133e (can-gw: add netlink based
CAN routing) added a new include file that's neither referenced by any of
the CAN maintainers.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agonet: Add back alignment for size for __alloc_skb
Tony Lindgren [Wed, 2 Nov 2011 13:40:28 +0000 (13:40 +0000)]
net: Add back alignment for size for __alloc_skb

Commit 87fb4b7b533073eeeaed0b6bf7c2328995f6c075 (net: more
accurate skb truesize) changed the alignment of size. This
can cause problems at least on some machines with NFS root:

Unhandled fault: alignment exception (0x801) at 0xc183a43a
Internal error: : 801 [#1] PREEMPT
Modules linked in:
CPU: 0    Not tainted  (3.1.0-08784-g5eeee4a #733)
pc : [<c02fbba0>]    lr : [<c02fbb9c>]    psr: 60000013
sp : c180fef8  ip : 00000000  fp : c181f580
r10: 00000000  r9 : c044b28c  r8 : 00000001
r7 : c183a3a0  r6 : c1835be0  r5 : c183a412  r4 : 000001f2
r3 : 00000000  r2 : 00000000  r1 : ffffffe6  r0 : c183a43a
Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
Control: 0005317f  Table: 10004000  DAC: 00000017
Process swapper (pid: 1, stack limit = 0xc180e270)
Stack: (0xc180fef8 to 0xc1810000)
fee0:                                                       00000024 00000000
ff00: 00000000 c183b9c0 c183b8e0 c044b28c c0507ccc c019dfc4 c180ff2c c0503cf8
ff20: c180ff4c c180ff4c 00000000 c1835420 c182c740 c18349c0 c05233c0 00000000
ff40: 00000000 c00e6bb8 c180e000 00000000 c04dd82c c0507e7c c050cc18 c183b9c0
ff60: c05233c0 00000000 00000000 c01f34f4 c0430d70 c019d364 c04dd898 c04dd898
ff80: c04dd82c c0507e7c c180e000 00000000 c04c584c c01f4918 c04dd898 c04dd82c
ffa0: c04ddd28 c180e000 00000000 c0008758 c181fa60 3231d82c 00000037 00000000
ffc0: 00000000 c04dd898 c04dd82c c04ddd28 00000013 00000000 00000000 00000000
ffe0: 00000000 c04b2224 00000000 c04b21a0 c001056c c001056c 00000000 00000000
Function entered at [<c02fbba0>] from [<c019dfc4>]
Function entered at [<c019dfc4>] from [<c01f34f4>]
Function entered at [<c01f34f4>] from [<c01f4918>]
Function entered at [<c01f4918>] from [<c0008758>]
Function entered at [<c0008758>] from [<c04b2224>]
Function entered at [<c04b2224>] from [<c001056c>]
Code: e1a00005 e3a01028 ebfa7cb0 e35a0000 (e5858028)

Here PC is at __alloc_skb and &shinfo->dataref is unaligned because
skb->end can be unaligned without this patch.

As explained by Eric Dumazet <eric.dumazet@gmail.com>, this happens
only with SLOB, and not with SLAB or SLUB:

* Eric Dumazet <eric.dumazet@gmail.com> [111102 15:56]:
>
> Your patch is absolutely needed, I completely forgot about SLOB :(
>
> since, kmalloc(386) on SLOB gives exactly ksize=386 bytes, not nearest
> power of two.
>
> [   60.305763] malloc(size=385)->ffff880112c11e38 ksize=386 -> nsize=2
> [   60.305921] malloc(size=385)->ffff88007c92ce28 ksize=386 -> nsize=2
> [   60.306898] malloc(size=656)->ffff88007c44ad28 ksize=656 -> nsize=272
> [   60.325385] malloc(size=656)->ffff88007c575868 ksize=656 -> nsize=272
> [   60.325531] malloc(size=656)->ffff88011c777230 ksize=656 -> nsize=272
> [   60.325701] malloc(size=656)->ffff880114011008 ksize=656 -> nsize=272
> [   60.346716] malloc(size=385)->ffff880114142008 ksize=386 -> nsize=2
> [   60.346900] malloc(size=385)->ffff88011c777690 ksize=386 -> nsize=2

Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agonet: add missing bh_unlock_sock() calls
Eric Dumazet [Wed, 2 Nov 2011 12:42:56 +0000 (12:42 +0000)]
net: add missing bh_unlock_sock() calls

Simon Kirby reported lockdep warnings and following messages :

[104661.897577] huh, entered softirq 3 NET_RX ffffffff81613740
preempt_count 00000101, exited with 00000102?

[104661.923653] huh, entered softirq 3 NET_RX ffffffff81613740
preempt_count 00000101, exited with 00000102?

Problem comes from commit 0e734419
(ipv4: Use inet_csk_route_child_sock() in DCCP and TCP.)

If inet_csk_route_child_sock() returns NULL, we should release socket
lock before freeing it.

Another lock imbalance exists if __inet_inherit_port() returns an error
since commit 093d282321da ( tproxy: fix hash locking issue when using
port redirection in __inet_inherit_port()) a backport is also needed for
>= 2.6.37 kernels.

Reported-by: Simon Kirby <sim@hostway.ca>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Tested-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Balazs Scheidler <bazsi@balabit.hu>
CC: KOVACS Krisztian <hidden@balabit.hu>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Simon Kirby <sim@hostway.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agol2tp: fix race in l2tp_recv_dequeue()
Eric Dumazet [Wed, 2 Nov 2011 22:47:44 +0000 (22:47 +0000)]
l2tp: fix race in l2tp_recv_dequeue()

Misha Labjuk reported panics occurring in l2tp_recv_dequeue()

If we release reorder_q.lock, we must not keep a dangling pointer (tmp),
since another thread could manipulate reorder_q.

Instead we must restart the scan at beginning of list.

Reported-by: Misha Labjuk <spiked.yar@gmail.com>
Tested-by: Misha Labjuk <spiked.yar@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agoMIPS: NXP: Remove unused source files.
Ralf Baechle [Wed, 22 Jun 2011 09:02:46 +0000 (10:02 +0100)]
MIPS: NXP: Remove unused source files.

The NXP code was moved for 2.6.36 but two files survived unused in the
old location.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
13 years agoMIPS: BCM47xxx: Fix build with GENERIC_GPIO configuration
Florian Fainelli [Thu, 3 Nov 2011 15:05:49 +0000 (16:05 +0100)]
MIPS: BCM47xxx: Fix build with GENERIC_GPIO configuration

Since eb9ae7f2 (gpio: fix build error in include/asm-generic/gpio.h)
the generic version of gpio.h calls __gpio_{set,get}_value which we
do not define. Get rid of asm-generic/gpio.h and define the missing
stubs directly for BCM47xx to build.

Reported-by: Ralf Baechle <ralf@linux-mips.org>
To: linux-mips@linux-mips.org
CC: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Patchwork: https://patchwork.linux-mips.org/patch/2883/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
13 years agoMIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check
Thomas Jarosch [Sat, 29 Oct 2011 13:45:56 +0000 (15:45 +0200)]
MIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check

Cause is a misplaced bracket.

The code

    strlen(buf+1)

will be two bytes less than

    strlen(buf)+1

The +1 is in this code to reserve space for an additional space character.

[ralf@linux-mips.org: Thomas' original patch fixed the issue only for
 Yosemite but the same bug exists also in Emma.]

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Patchwork: https://patchwork.linux-mips.org/patch/2861/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
13 years ago[media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
Timo Kokkonen [Tue, 18 Oct 2011 18:37:36 +0000 (15:37 -0300)]
[media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set

If the said config optio is not set, the compiler will spill out many
warnings about statements with no effect, such as:

Casting the zero to void will cure the warning.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] it913x [VER 1.07] Support for single ITE 9135 devices
Malcolm Priestley [Fri, 14 Oct 2011 22:54:11 +0000 (19:54 -0300)]
[media] it913x [VER 1.07] Support for single ITE 9135 devices

Support for single ITE 9135 device.

Only single devices have been tested.  Dual ITE 9135 devices
should work, but have not been tested.

TODOs
support for ver 2 chip
config for other tuner types.
rework of firmware file.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
13 years ago[media] Support for Terratec G1
Teka [Fri, 14 Oct 2011 08:40:29 +0000 (05:40 -0300)]
[media] Support for Terratec G1

Hi,

This is a little patch to support Terratec G1 (based on Terratec Grabby).

It works perfectly on my pc (Ubuntu 11.04 / Kernel 2.6.38).

Best regards,

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>