]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Andrew Morton [Thu, 13 Sep 2012 00:58:12 +0000 (10:58 +1000)]
idr-rename-max_level-to-max_idr_level-fix
repair fallout
Cc: Bernd Petrovitsch <bernd@petrovitsch.priv.at>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Glauber Costa <glommer@parallels.com>
Cc: walter harms <wharms@bfs.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Fengguang Wu [Thu, 13 Sep 2012 00:58:12 +0000 (10:58 +1000)]
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
To avoid name conflicts:
drivers/video/riva/fbdev.c:281:9: sparse: preprocessor token MAX_LEVEL redefined
While at it, also make the other names more consistent and add
parentheses.
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Bernd Petrovitsch <bernd@petrovitsch.priv.at>
Cc: walter harms <wharms@bfs.de>
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Thu, 20 Sep 2012 06:54:33 +0000 (16:54 +1000)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/sh/kernel/cpu/sh5/entry.S
arch/sh/kernel/entry-common.S
arch/x86/kernel/process_32.c
arch/x86/kernel/signal.c
Stephen Rothwell [Thu, 20 Sep 2012 06:44:05 +0000 (16:44 +1000)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 06:42:23 +0000 (16:42 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 06:40:46 +0000 (16:40 +1000)]
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
Conflicts:
Documentation/devicetree/bindings/ata/ahci-platform.txt
arch/arm/boot/dts/highbank.dts
Stephen Rothwell [Thu, 20 Sep 2012 06:39:04 +0000 (16:39 +1000)]
Merge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Thu, 20 Sep 2012 06:37:33 +0000 (16:37 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Conflicts:
arch/arm/mach-tegra/devices.c
Stephen Rothwell [Thu, 20 Sep 2012 06:34:40 +0000 (16:34 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
drivers/pinctrl/Makefile
Stephen Rothwell [Thu, 20 Sep 2012 06:32:57 +0000 (16:32 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Thu, 20 Sep 2012 06:32:52 +0000 (16:32 +1000)]
Merge remote-tracking branch 'msm/for-next'
Conflicts:
arch/arm/mach-vt8500/include/mach/restart.h
Stephen Rothwell [Thu, 20 Sep 2012 06:27:40 +0000 (16:27 +1000)]
Merge remote-tracking branch 'ixp4xx/next'
Conflicts:
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
Stephen Rothwell [Thu, 20 Sep 2012 06:11:05 +0000 (16:11 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Thu, 20 Sep 2012 06:06:31 +0000 (16:06 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-ux500/cpu-db8500.c
drivers/i2c/busses/i2c-omap.c
drivers/input/keyboard/omap-keypad.c
drivers/mmc/host/omap.c
drivers/mtd/nand/Kconfig
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/video/omap2/dss/dispc.c
drivers/w1/masters/omap_hdq.c
sound/soc/omap/igep0020.c
sound/soc/omap/omap3beagle.c
sound/soc/omap/omap3evm.c
sound/soc/omap/overo.c
Stephen Rothwell [Thu, 20 Sep 2012 05:57:17 +0000 (15:57 +1000)]
Merge remote-tracking branch 'gpio-lw/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:55:39 +0000 (15:55 +1000)]
Merge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:55:31 +0000 (15:55 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Thu, 20 Sep 2012 05:53:46 +0000 (15:53 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:52:03 +0000 (15:52 +1000)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:50:23 +0000 (15:50 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:48:39 +0000 (15:48 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:44:04 +0000 (15:44 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/staging/serqt_usb2/serqt_usb2.c
Stephen Rothwell [Thu, 20 Sep 2012 05:41:47 +0000 (15:41 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/io_ti.c
drivers/usb/serial/kl5kusb105.c
drivers/usb/serial/mos7720.c
drivers/usb/serial/mos7840.c
Stephen Rothwell [Thu, 20 Sep 2012 05:39:27 +0000 (15:39 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Thu, 20 Sep 2012 05:32:22 +0000 (15:32 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
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'
projects / karo-tx-linux.git / log