]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Wen Congyang [Fri, 28 Sep 2012 00:18:49 +0000 (10:18 +1000)]
acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
If acpi_memory_enable_device() fails, acpi_memory_enable_device() will
return a non-zero value, which means we fail to bind the memory device to
this driver. So we should free memory device before
acpi_memory_device_add() returns.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Len Brown <lenb@kernel.org>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: Yasuaki ISIMATU <isimatu.yasuaki@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Wen Congyang [Fri, 28 Sep 2012 00:18:48 +0000 (10:18 +1000)]
acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
We allocate memory to store acpi_memory_info, so we should free it before
freeing mem_device.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Len Brown <lenb@kernel.org>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: Yasuaki ISIMATU <isimatu.yasuaki@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Fri, 28 Sep 2012 00:18:48 +0000 (10:18 +1000)]
cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
make acpi_unmap_lsapic __ref
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Wen Congyang [Fri, 28 Sep 2012 00:18:48 +0000 (10:18 +1000)]
x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
When a cpu is hotplugged, we call acpi_map_cpu2node() in
_acpi_map_lsapic() to store the cpu's node. But we don't clear the cpu's
node in acpi_unmap_lsapic() when this cpu is hotremoved. If the node is
also hotremoved, We will get the following messages:
[ 1646.771485] kernel BUG at include/linux/gfp.h:329!
[ 1646.828729] invalid opcode: 0000 [#1] SMP
[ 1646.877872] Modules linked in: ebtable_nat ebtables ipt_MASQUERADE iptable_nat nf_nat xt_CHECKSUM iptable_mangle bridge stp llc sunrpc ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables binfmt_misc dm_mirror dm_region_hash dm_log dm_mod vhost_net macvtap macvlan tun uinput iTCO_wdt iTCO_vendor_support coretemp kvm_intel kvm crc32c_intel microcode pcspkr i2c_i801 i2c_core lpc_ich mfd_core ioatdma e1000e i7core_edac edac_core sg acpi_memhotplug igb dca sd_mod crc_t10dif megaraid_sas mptsas mptscsih mptbase scsi_transport_sas scsi_mod
[ 1647.588773] Pid: 3126, comm: init Not tainted 3.6.0-rc3-tangchen-hostbridge+ #13 FUJITSU-SV PRIMEQUEST 1800E/SB
[ 1647.711545] RIP: 0010:[<
ffffffff811bc3fd >] [<
ffffffff811bc3fd >] allocate_slab+0x28d/0x300
[ 1647.810492] RSP: 0018:
ffff88078a049cf8 EFLAGS:
00010246
[ 1647.874028] RAX:
0000000000000000 RBX:
0000000000000001 RCX:
0000000000000000
[ 1647.959339] RDX:
0000000000000001 RSI:
0000000000000001 RDI:
0000000000000246
[ 1648.044659] RBP:
ffff88078a049d38 R08:
00000000000040d0 R09:
0000000000000001
[ 1648.129953] R10:
0000000000000000 R11:
0000000000000b5f R12:
00000000000052d0
[ 1648.215259] R13:
ffff8807c1417300 R14:
0000000000030038 R15:
0000000000000003
[ 1648.300572] FS:
00007fa9b1b44700 (0000) GS:
ffff8807c3800000 (0000) knlGS:
0000000000000000
[ 1648.397272] CS: 0010 DS: 0000 ES: 0000 CR0:
000000008005003b
[ 1648.465985] CR2:
00007fa9b09acca0 CR3:
000000078b855000 CR4:
00000000000007e0
[ 1648.551265] DR0:
0000000000000000 DR1:
0000000000000000 DR2:
0000000000000000
[ 1648.636565] DR3:
0000000000000000 DR6:
00000000ffff0ff0 DR7:
0000000000000400
[ 1648.721838] Process init (pid: 3126, threadinfo
ffff88078a048000 , task
ffff8807bb6f2650 )
[ 1648.818534] Stack:
[ 1648.842548]
ffff8807c39d7fa0 ffffffff000040d0 00000000000000bb 00000000000080d0
[ 1648.931469]
ffff8807c1417300 ffff8807c39d7fa0 ffff8807c1417300 0000000000000001
[ 1649.020410]
ffff88078a049d88 ffffffff811bc4a0 ffff8807c1410c80 0000000000000000
[ 1649.109464] Call Trace:
[ 1649.138713] [<
ffffffff811bc4a0 >] new_slab+0x30/0x1b0
[ 1649.199075] [<
ffffffff811bc978 >] __slab_alloc+0x358/0x4c0
[ 1649.264683] [<
ffffffff810b71c0 >] ? alloc_fair_sched_group+0xd0/0x1b0
[ 1649.341695] [<
ffffffff811be7d4 >] kmem_cache_alloc_node_trace+0xb4/0x1e0
[ 1649.421824] [<
ffffffff8109d188 >] ? hrtimer_init+0x48/0x100
[ 1649.488414] [<
ffffffff810b71c0 >] ? alloc_fair_sched_group+0xd0/0x1b0
[ 1649.565402] [<
ffffffff810b71c0 >] alloc_fair_sched_group+0xd0/0x1b0
[ 1649.640297] [<
ffffffff810a8bce >] sched_create_group+0x3e/0x110
[ 1649.711040] [<
ffffffff810bdbcd >] sched_autogroup_create_attach+0x4d/0x180
[ 1649.793260] [<
ffffffff81089614 >] sys_setsid+0xd4/0xf0
[ 1649.854694] [<
ffffffff8167a029 >] system_call_fastpath+0x16/0x1b
[ 1649.926483] Code: 89 c4 e9 73 fe ff ff 31 c0 89 de 48 c7 c7 45 de 9e 81 44 89 45 c8 e8 22 05 4b 00 85 db 44 8b 45 c8 0f 89 4f ff ff ff 0f 0b eb fe <0f> 0b 90 eb fd 0f 0b eb fe 89 de 48 c7 c7 45 de 9e 81 31 c0 44
[ 1650.161454] RIP [<
ffffffff811bc3fd >] allocate_slab+0x28d/0x300
[ 1650.232348] RSP <
ffff88078a049cf8 >
[ 1650.274029] ---[ end trace
adf84c90f3fea3e5 ]---
The reason is that: the cpu's node is not NUMA_NO_NODE, we will call
alloc_pages_exact_node() to alloc memory on the node, but the node is
offlined.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
NeilBrown [Fri, 28 Sep 2012 00:18:47 +0000 (10:18 +1000)]
vfs: d_obtain_alias() needs to use "/" as default name.
NFS appears to use d_obtain_alias() to create the root dentry rather than
d_make_root. This can cause 'prepend_path()' to complain that the root
has a weird name if an NFS filesystem is lazily unmounted. e.g. if
"/mnt" is an NFS mount then
{ cd /mnt; umount -l /mnt ; ls -l /proc/self/cwd; }
will cause a WARN message like
WARNING: at /home/git/linux/fs/dcache.c:2624 prepend_path+0x1d7/0x1e0()
...
Root dentry has weird name <>
to appear in kernel logs.
So change d_obtain_alias() to use "/" rather than "" as the anonymous
name.
Signed-off-by: NeilBrown <neilb@suse.de>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Dave Jones [Fri, 28 Sep 2012 00:18:47 +0000 (10:18 +1000)]
selinux: fix sel_netnode_insert() suspicious rcu dereference
===============================
[ INFO: suspicious RCU usage. ]
3.5.0-rc1+ #63 Not tainted
-------------------------------
security/selinux/netnode.c:178 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 1, debug_locks = 0
1 lock held by trinity-child1/8750:
#0: (sel_netnode_lock){+.....}, at: [<
ffffffff812d8f8a >] sel_netnode_sid+0x16a/0x3e0
stack backtrace:
Pid: 8750, comm: trinity-child1 Not tainted 3.5.0-rc1+ #63
Call Trace:
[<
ffffffff810cec2d >] lockdep_rcu_suspicious+0xfd/0x130
[<
ffffffff812d91d1 >] sel_netnode_sid+0x3b1/0x3e0
[<
ffffffff812d8e20 >] ? sel_netnode_find+0x1a0/0x1a0
[<
ffffffff812d24a6 >] selinux_socket_bind+0xf6/0x2c0
[<
ffffffff810cd1dd >] ? trace_hardirqs_off+0xd/0x10
[<
ffffffff810cdb55 >] ? lock_release_holdtime.part.9+0x15/0x1a0
[<
ffffffff81093841 >] ? lock_hrtimer_base+0x31/0x60
[<
ffffffff812c9536 >] security_socket_bind+0x16/0x20
[<
ffffffff815550ca >] sys_bind+0x7a/0x100
[<
ffffffff816c03d5 >] ? sysret_check+0x22/0x5d
[<
ffffffff810d392d >] ? trace_hardirqs_on_caller+0x10d/0x1a0
[<
ffffffff8133b09e >] ? trace_hardirqs_on_thunk+0x3a/0x3f
[<
ffffffff816c03a9 >] system_call_fastpath+0x16/0x1b
This patch below does what Paul McKenney suggested in the previous thread.
Signed-off-by: Dave Jones <davej@redhat.com>
Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Cc: Eric Paris <eparis@parisplace.org>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Corey Minyard [Fri, 28 Sep 2012 00:18:47 +0000 (10:18 +1000)]
CRIS: Fix I/O macros
The inb/outb macros for CRIS are broken from a number of points of view,
missing () around parameters and they have an unprotected if statement in
them. This was breaking the compile of IPMI on CRIS and thus I was being
annoyed by build regressions, so I fixed them.
Plus I don't think they would have worked at all, since the data values
were missing "&" and the outsl had a "3" instead of a "4" for the size.
From what I can tell, this stuff is not used at all, so this can't be any
more broken than it was before, anyway.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Wed, 3 Oct 2012 06:36:00 +0000 (16:36 +1000)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/alpha/Kconfig
arch/arm/Kconfig
arch/arm/include/asm/thread_info.h
arch/c6x/Kconfig
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/m68k/Kconfig
arch/mn10300/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/um/kernel/exec.c
arch/x86/Kconfig
arch/x86/kernel/process_32.c
arch/x86/kernel/signal.c
fs/exec.c
Stephen Rothwell [Wed, 3 Oct 2012 06:30:37 +0000 (16:30 +1000)]
Merge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 06:27:39 +0000 (16:27 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 06:24:41 +0000 (16:24 +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 [Wed, 3 Oct 2012 06:24:26 +0000 (16:24 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/mach-exynos/clock-exynos5.c
Stephen Rothwell [Wed, 3 Oct 2012 06:21:18 +0000 (16:21 +1000)]
Merge remote-tracking branch 'renesas/next'
Conflicts:
arch/arm/Kconfig
Stephen Rothwell [Wed, 3 Oct 2012 06:18:12 +0000 (16:18 +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 [Wed, 3 Oct 2012 06:18:05 +0000 (16:18 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 3 Oct 2012 06:15:06 +0000 (16:15 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 06:12:02 +0000 (16:12 +1000)]
Merge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 06:11:54 +0000 (16:11 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Wed, 3 Oct 2012 06:08:39 +0000 (16:08 +1000)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Wed, 3 Oct 2012 06:01:01 +0000 (16:01 +1000)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Wed, 3 Oct 2012 05:57:33 +0000 (15:57 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 05:54:26 +0000 (15:54 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 3 Oct 2012 05:54:22 +0000 (15:54 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 05:39:02 +0000 (15:39 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/arm/Kconfig
arch/arm/mach-vexpress/Makefile.boot
drivers/xen/Makefile
Stephen Rothwell [Wed, 3 Oct 2012 05:31:44 +0000 (15:31 +1000)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Wed, 3 Oct 2012 05:28:38 +0000 (15:28 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Conflicts:
arch/s390/include/asm/processor.h
arch/x86/kvm/i8259.c
Stephen Rothwell [Wed, 3 Oct 2012 05:25:26 +0000 (15:25 +1000)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Wed, 3 Oct 2012 05:16:26 +0000 (15:16 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 3 Oct 2012 05:12:10 +0000 (15:12 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Conflicts:
drivers/of/base.c
include/linux/of.h
Stephen Rothwell [Wed, 3 Oct 2012 05:11:58 +0000 (15:11 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Wed, 3 Oct 2012 05:08:45 +0000 (15:08 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 3 Oct 2012 05:05:49 +0000 (15:05 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Wed, 3 Oct 2012 04:56:49 +0000 (14:56 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/include/mach/common.h
Stephen Rothwell [Wed, 3 Oct 2012 04:53:23 +0000 (14:53 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 3 Oct 2012 04:50:29 +0000 (14:50 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 3 Oct 2012 04:47:29 +0000 (14:47 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 3 Oct 2012 04:47:23 +0000 (14:47 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 3 Oct 2012 04:41:33 +0000 (14:41 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
kernel/auditsc.c
security/integrity/ima/ima_policy.c
Stephen Rothwell [Wed, 3 Oct 2012 04:38:36 +0000 (14:38 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
drivers/video/omap/lcd_ams_delta.c
drivers/video/omap2/displays/panel-taal.c
drivers/video/omap2/dss/dispc.c
Stephen Rothwell [Wed, 3 Oct 2012 04:35:35 +0000 (14:35 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-real6410.c
drivers/video/epson1355fb.c
drivers/video/msm/mddi.c
drivers/video/msm/mdp.c
drivers/video/msm/mdp_hw.h
Stephen Rothwell [Wed, 3 Oct 2012 04:29:55 +0000 (14:29 +1000)]
Merge remote-tracking branch 'battery/master'
Conflicts:
include/linux/mfd/88pm860x.h
Stephen Rothwell [Wed, 3 Oct 2012 04:12:00 +0000 (14:12 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
drivers/mfd/88pm860x-core.c
drivers/mfd/db8500-prcmu.c
drivers/mfd/max8925-core.c
drivers/mfd/tc3589x.c
drivers/mfd/tps65217.c
drivers/regulator/anatop-regulator.c
drivers/video/backlight/88pm860x_bl.c
Stephen Rothwell [Wed, 3 Oct 2012 04:02:40 +0000 (14:02 +1000)]
Merge remote-tracking branch 'md/for-next'
Conflicts:
drivers/md/raid0.c
fs/bio.c
Stephen Rothwell [Wed, 3 Oct 2012 03:54:19 +0000 (13:54 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 03:51:17 +0000 (13:51 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 3 Oct 2012 03:48:26 +0000 (13:48 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Conflicts:
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/omap.c
Stephen Rothwell [Wed, 3 Oct 2012 03:39:48 +0000 (13:39 +1000)]
Merge branch 'quilt/device-mapper'
Conflicts:
drivers/md/dm-thin.c
drivers/md/dm.c
Stephen Rothwell [Wed, 3 Oct 2012 03:31:41 +0000 (13:31 +1000)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
init/Kconfig
Stephen Rothwell [Wed, 3 Oct 2012 03:23:07 +0000 (13:23 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 03:23:02 +0000 (13:23 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 3 Oct 2012 03:20:17 +0000 (13:20 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 3 Oct 2012 03:13:58 +0000 (13:13 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Conflicts:
arch/Kconfig
arch/x86/Kconfig
arch/x86/um/Kconfig
arch/xtensa/Kconfig
Stephen Rothwell [Wed, 3 Oct 2012 03:12:09 +0000 (13:12 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 03:07:12 +0000 (13:07 +1000)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/arm/mach-davinci/davinci.h
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
sound/soc/omap/igep0020.c
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-pcm.c
sound/soc/omap/omap3beagle.c
sound/soc/omap/omap3evm.c
sound/soc/omap/overo.c
Stephen Rothwell [Wed, 3 Oct 2012 03:03:45 +0000 (13:03 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 3 Oct 2012 03:02:04 +0000 (13:02 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Wed, 3 Oct 2012 03:00:20 +0000 (13:00 +1000)]
Merge remote-tracking branch 'mtd/master'
Conflicts:
MAINTAINERS
arch/arm/configs/bcmring_defconfig
arch/arm/mach-imx/clk-imx51-imx53.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
Stephen Rothwell [Wed, 3 Oct 2012 02:48:14 +0000 (12:48 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 3 Oct 2012 02:46:21 +0000 (12:46 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/mmp_tdma.c
drivers/mmc/host/davinci_mmc.c
drivers/spi/spi-davinci.c
Stephen Rothwell [Wed, 3 Oct 2012 02:44:18 +0000 (12:44 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 02:40:48 +0000 (12:40 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_nx.c
Stephen Rothwell [Wed, 3 Oct 2012 02:27:19 +0000 (12:27 +1000)]
Merge commit 'refs/next/
20121002 /ubi'
Stephen Rothwell [Wed, 3 Oct 2012 02:13:49 +0000 (12:13 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 02:12:15 +0000 (12:12 +1000)]
Merge remote-tracking branch 'thermal/next'
Conflicts:
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/thermal/thermal_sys.c
Stephen Rothwell [Wed, 3 Oct 2012 02:12:04 +0000 (12:12 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Wed, 3 Oct 2012 02:10:07 +0000 (12:10 +1000)]
Merge remote-tracking branch 'acpi/next'
Conflicts:
drivers/usb/core/usb-acpi.c
Stephen Rothwell [Wed, 3 Oct 2012 02:08:26 +0000 (12:08 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Wed, 3 Oct 2012 02:08:17 +0000 (12:08 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 02:06:36 +0000 (12:06 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 3 Oct 2012 02:04:52 +0000 (12:04 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 02:02:53 +0000 (12:02 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
Documentation/feature-removal-schedule.txt
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-omap2/board-rx51-peripherals.c
Stephen Rothwell [Wed, 3 Oct 2012 01:54:01 +0000 (11:54 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:52:38 +0000 (11:52 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 3 Oct 2012 01:51:10 +0000 (11:51 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Conflicts:
drivers/i2c/busses/i2c-omap.c
Stephen Rothwell [Wed, 3 Oct 2012 01:47:53 +0000 (11:47 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 3 Oct 2012 01:47:51 +0000 (11:47 +1000)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-multitouch.c
Stephen Rothwell [Wed, 3 Oct 2012 01:46:11 +0000 (11:46 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Wed, 3 Oct 2012 01:43:37 +0000 (11:43 +1000)]
Merge remote-tracking branch 'powerpc/next'
Conflicts:
drivers/scsi/ipr.c
Stephen Rothwell [Wed, 3 Oct 2012 01:36:45 +0000 (11:36 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
drivers/staging/android/binder.c
net/socket.c
Stephen Rothwell [Wed, 3 Oct 2012 01:35:09 +0000 (11:35 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:33:41 +0000 (11:33 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Conflicts:
fs/ubifs/debug.c
Stephen Rothwell [Wed, 3 Oct 2012 01:32:13 +0000 (11:32 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:30:38 +0000 (11:30 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:29:06 +0000 (11:29 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:27:31 +0000 (11:27 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:26:05 +0000 (11:26 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 3 Oct 2012 01:24:40 +0000 (11:24 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:23:06 +0000 (11:23 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:21:31 +0000 (11:21 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 3 Oct 2012 01:19:57 +0000 (11:19 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 3 Oct 2012 01:18:24 +0000 (11:18 +1000)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Wed, 3 Oct 2012 01:16:57 +0000 (11:16 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Wed, 3 Oct 2012 01:15:30 +0000 (11:15 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 3 Oct 2012 01:14:02 +0000 (11:14 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 3 Oct 2012 01:12:23 +0000 (11:12 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 3 Oct 2012 01:10:53 +0000 (11:10 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Conflicts:
drivers/net/ethernet/octeon/octeon_mgmt.c
drivers/pinctrl/Makefile
Stephen Rothwell [Wed, 3 Oct 2012 01:09:23 +0000 (11:09 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:07:54 +0000 (11:07 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 3 Oct 2012 01:07:46 +0000 (11:07 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Conflicts:
arch/arm/kernel/hw_breakpoint.c
arch/arm/mach-bcmring/arch.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c
Stephen Rothwell [Wed, 3 Oct 2012 01:02:03 +0000 (11:02 +1000)]
Merge remote-tracking branch 'arm/for-next'
Conflicts:
arch/arm/include/asm/timex.h
arch/arm/kernel/smp.c
arch/arm/mach-integrator/integrator_cp.c