]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 20 Sep 2012 05:30:30 +0000 (15:30 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:28:48 +0000 (15:28 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:27:08 +0000 (15:27 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:19:56 +0000 (15:19 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Conflicts:
drivers/hid/hid-picolcd.c
drivers/isdn/mISDN/hwchannel.c
drivers/video/omap2/displays/panel-taal.c
Stephen Rothwell [Thu, 20 Sep 2012 05:05:42 +0000 (15:05 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:03:58 +0000 (15:03 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:02:16 +0000 (15:02 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/processor.h
arch/x86/kvm/i8259.c
Stephen Rothwell [Thu, 20 Sep 2012 05:00:30 +0000 (15:00 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Thu, 20 Sep 2012 04:53:14 +0000 (14:53 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Conflicts:
arch/Kconfig
arch/x86/Kconfig
kernel/rcutree.h
kernel/rcutree_plugin.h
kernel/sched/core.c
Stephen Rothwell [Thu, 20 Sep 2012 04:45:50 +0000 (14:45 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/Kconfig
arch/s390/Kconfig
Stephen Rothwell [Thu, 20 Sep 2012 04:44:07 +0000 (14:44 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Conflicts:
drivers/mmc/host/mxs-mmc.c
Stephen Rothwell [Thu, 20 Sep 2012 04:42:03 +0000 (14:42 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 04:41:56 +0000 (14:41 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Thu, 20 Sep 2012 04:41:41 +0000 (14:41 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Thu, 20 Sep 2012 04:40:06 +0000 (14:40 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Thu, 20 Sep 2012 04:32:50 +0000 (14:32 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/cpufreq/powernow-k8.c
Stephen Rothwell [Thu, 20 Sep 2012 04:26:29 +0000 (14:26 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/video/backlight/88pm860x_bl.c
Stephen Rothwell [Thu, 20 Sep 2012 04:24:44 +0000 (14:24 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Thu, 20 Sep 2012 04:23:02 +0000 (14:23 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 20 Sep 2012 04:21:25 +0000 (14:21 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 20 Sep 2012 04:21:19 +0000 (14:21 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 20 Sep 2012 04:16:52 +0000 (14:16 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 20 Sep 2012 04:15:10 +0000 (14:15 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
Stephen Rothwell [Thu, 20 Sep 2012 04:13:33 +0000 (14:13 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 04:11:56 +0000 (14:11 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Thu, 20 Sep 2012 04:10:12 +0000 (14:10 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 20 Sep 2012 04:03:11 +0000 (14:03 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/max8925-core.c
drivers/mfd/tc3589x.c
drivers/regulator/anatop-regulator.c
Stephen Rothwell [Thu, 20 Sep 2012 03:38:46 +0000 (13:38 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 03:37:05 +0000 (13:37 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 03:35:29 +0000 (13:35 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 20 Sep 2012 03:33:52 +0000 (13:33 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 20 Sep 2012 03:32:09 +0000 (13:32 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 20 Sep 2012 03:25:41 +0000 (13:25 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 03:21:24 +0000 (13:21 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 03:19:44 +0000 (13:19 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 20 Sep 2012 03:13:48 +0000 (13:13 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Thu, 20 Sep 2012 03:12:08 +0000 (13:12 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Thu, 20 Sep 2012 03:10:13 +0000 (13:10 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 03:08:27 +0000 (13:08 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_sdvo.c
Stephen Rothwell [Thu, 20 Sep 2012 02:10:41 +0000 (12:10 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Thu, 20 Sep 2012 02:08:59 +0000 (12:08 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 20 Sep 2012 02:07:17 +0000 (12:07 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Thu, 20 Sep 2012 02:05:41 +0000 (12:05 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 20 Sep 2012 01:58:20 +0000 (11:58 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
net/ipv4/fib_frontend.c
net/ipv4/route.c
net/socket.c
Stephen Rothwell [Thu, 20 Sep 2012 01:56:38 +0000 (11:56 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 20 Sep 2012 01:54:57 +0000 (11:54 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:52:57 +0000 (11:52 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_nx.c
Stephen Rothwell [Thu, 20 Sep 2012 01:51:22 +0000 (11:51 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 20 Sep 2012 01:49:48 +0000 (11:49 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:48:11 +0000 (11:48 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 20 Sep 2012 01:48:04 +0000 (11:48 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Thu, 20 Sep 2012 01:46:23 +0000 (11:46 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Thu, 20 Sep 2012 01:44:41 +0000 (11:44 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:42:59 +0000 (11:42 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 20 Sep 2012 01:41:25 +0000 (11:41 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:39:42 +0000 (11:39 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:37:40 +0000 (11:37 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Thu, 20 Sep 2012 01:30:33 +0000 (11:30 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:29:05 +0000 (11:29 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 20 Sep 2012 01:27:39 +0000 (11:27 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:26:10 +0000 (11:26 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Thu, 20 Sep 2012 01:24:24 +0000 (11:24 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:22:57 +0000 (11:22 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Thu, 20 Sep 2012 01:21:21 +0000 (11:21 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 20 Sep 2012 01:18:50 +0000 (11:18 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 20 Sep 2012 01:15:32 +0000 (11:15 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Thu, 20 Sep 2012 01:11:19 +0000 (11:11 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:09:45 +0000 (11:09 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:08:16 +0000 (11:08 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:06:48 +0000 (11:06 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:05:12 +0000 (11:05 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:03:41 +0000 (11:03 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:02:15 +0000 (11:02 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 20 Sep 2012 01:00:49 +0000 (11:00 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 20 Sep 2012 00:59:24 +0000 (10:59 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Thu, 20 Sep 2012 00:57:56 +0000 (10:57 +1000)]
Merge remote-tracking branch 'gfs2/master'
Conflicts:
fs/gfs2/rgrp.c
Stephen Rothwell [Thu, 20 Sep 2012 00:56:21 +0000 (10:56 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 00:54:51 +0000 (10:54 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 20 Sep 2012 00:53:27 +0000 (10:53 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Thu, 20 Sep 2012 00:51:55 +0000 (10:51 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 00:50:25 +0000 (10:50 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 20 Sep 2012 00:48:57 +0000 (10:48 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Thu, 20 Sep 2012 00:43:50 +0000 (10:43 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 20 Sep 2012 00:42:23 +0000 (10:42 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Thu, 20 Sep 2012 00:40:57 +0000 (10:40 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 20 Sep 2012 00:39:33 +0000 (10:39 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 00:38:08 +0000 (10:38 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 00:36:41 +0000 (10:36 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 20 Sep 2012 00:35:16 +0000 (10:35 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 00:30:10 +0000 (10:30 +1000)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 20 Sep 2012 00:28:39 +0000 (10:28 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Conflicts:
arch/arm/kernel/hw_breakpoint.c
Stephen Rothwell [Thu, 20 Sep 2012 00:27:10 +0000 (10:27 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 00:23:35 +0000 (10:23 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Thu, 20 Sep 2012 00:23:33 +0000 (10:23 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Thu, 20 Sep 2012 00:23:23 +0000 (10:23 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Thu, 20 Sep 2012 00:23:22 +0000 (10:23 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Thu, 20 Sep 2012 00:23:20 +0000 (10:23 +1000)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 20 Sep 2012 00:23:19 +0000 (10:23 +1000)]
Merge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Thu, 20 Sep 2012 00:23:18 +0000 (10:23 +1000)]
Merge remote-tracking branch 'arm-current/fixes'
Peter Senna Tschudin [Mon, 17 Sep 2012 17:31:17 +0000 (19:31 +0200)]
drivers/virtio/virtio_pci.c: fix error return code
Convert a nonnegative error return code to a negative one, as returned
elsewhere in the function.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
projects / karo-tx-linux.git / log