]>
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: remove memory info from list before freeing it
We free info, but we forget to remove it from the list. It will cause
unexpected problems when we access the list next time.
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: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, 10 Oct 2012 03:49:23 +0000 (14:49 +1100)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Wed, 10 Oct 2012 03:41:53 +0000 (14:41 +1100)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/alpha/Kconfig
arch/arm/Kconfig
arch/arm/include/asm/thread_info.h
arch/avr32/include/asm/Kbuild
arch/c6x/Kconfig
arch/cris/include/asm/Kbuild
arch/frv/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/ia64/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/m68k/Kconfig
arch/microblaze/include/asm/Kbuild
arch/mn10300/Kconfig
arch/mn10300/include/asm/Kbuild
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
arch/xtensa/include/asm/Kbuild
fs/exec.c
Stephen Rothwell [Wed, 10 Oct 2012 03:35:54 +0000 (14:35 +1100)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:34:06 +0000 (14:34 +1100)]
Merge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:32:24 +0000 (14:32 +1100)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:30:41 +0000 (14:30 +1100)]
Merge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Wed, 10 Oct 2012 03:30:33 +0000 (14:30 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/mach-exynos/clock-exynos5.c
Stephen Rothwell [Wed, 10 Oct 2012 03:28:44 +0000 (14:28 +1100)]
Merge remote-tracking branch 'renesas/next'
Conflicts:
arch/arm/Kconfig
Stephen Rothwell [Wed, 10 Oct 2012 03:26:50 +0000 (14:26 +1100)]
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, 10 Oct 2012 03:26:40 +0000 (14:26 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:25:01 +0000 (14:25 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:23:15 +0000 (14:23 +1100)]
Merge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:23:07 +0000 (14:23 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Wed, 10 Oct 2012 03:21:04 +0000 (14:21 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:14:41 +0000 (14:14 +1100)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:12:31 +0000 (14:12 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:10:40 +0000 (14:10 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:10:37 +0000 (14:10 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:08:40 +0000 (14:08 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:06:49 +0000 (14:06 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Stephen Rothwell [Wed, 10 Oct 2012 03:06:41 +0000 (14:06 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Conflicts:
mm/kmemleak.c
Stephen Rothwell [Wed, 10 Oct 2012 02:58:43 +0000 (13:58 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 10 Oct 2012 02:51:17 +0000 (13:51 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
mm/huge_memory.c
mm/mempolicy.c
Stephen Rothwell [Wed, 10 Oct 2012 02:17:36 +0000 (13:17 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Wed, 10 Oct 2012 02:17:24 +0000 (13:17 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Wed, 10 Oct 2012 02:15:25 +0000 (13:15 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Wed, 10 Oct 2012 02:13:44 +0000 (13:13 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Wed, 10 Oct 2012 02:11:34 +0000 (13:11 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Wed, 10 Oct 2012 02:09:48 +0000 (13:09 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 10 Oct 2012 02:09:42 +0000 (13:09 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Wed, 10 Oct 2012 02:07:54 +0000 (13:07 +1100)]
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, 10 Oct 2012 02:06:12 +0000 (13:06 +1100)]
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, 10 Oct 2012 01:24:58 +0000 (12:24 +1100)]
Merge remote-tracking branch 'md/for-next'
Conflicts:
drivers/md/raid0.c
fs/bio.c
Stephen Rothwell [Wed, 10 Oct 2012 01:22:54 +0000 (12:22 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 10 Oct 2012 01:21:14 +0000 (12:21 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Conflicts:
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/omap.c
Stephen Rothwell [Wed, 10 Oct 2012 01:19:23 +0000 (12:19 +1100)]
Merge branch 'quilt/device-mapper'
Conflicts:
drivers/md/dm-thin.c
drivers/md/dm.c
Stephen Rothwell [Wed, 10 Oct 2012 01:00:53 +0000 (12:00 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
init/Kconfig
Stephen Rothwell [Wed, 10 Oct 2012 01:00:44 +0000 (12:00 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:58:41 +0000 (11:58 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 10 Oct 2012 00:53:14 +0000 (11:53 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Conflicts:
Makefile
arch/Kconfig
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/x86/Kconfig
arch/x86/um/Kconfig
arch/xtensa/Kconfig
init/Kconfig
lib/Makefile
Stephen Rothwell [Wed, 10 Oct 2012 00:48:25 +0000 (11:48 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:46:44 +0000 (11:46 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:44:58 +0000 (11:44 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 10 Oct 2012 00:43:16 +0000 (11:43 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Wed, 10 Oct 2012 00:41:33 +0000 (11:41 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 10 Oct 2012 00:39:49 +0000 (11:39 +1100)]
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, 10 Oct 2012 00:37:55 +0000 (11:37 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:35:57 +0000 (11:35 +1100)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:34:13 +0000 (11:34 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:34:03 +0000 (11:34 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Wed, 10 Oct 2012 00:32:22 +0000 (11:32 +1100)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Wed, 10 Oct 2012 00:30:20 +0000 (11:30 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:28:28 +0000 (11:28 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-davinci/include/mach/da8xx.h
Stephen Rothwell [Wed, 10 Oct 2012 00:26:43 +0000 (11:26 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:25:10 +0000 (11:25 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 10 Oct 2012 00:23:42 +0000 (11:23 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Conflicts:
drivers/i2c/busses/i2c-omap.c
Stephen Rothwell [Wed, 10 Oct 2012 00:23:33 +0000 (11:23 +1100)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-multitouch.c
Stephen Rothwell [Wed, 10 Oct 2012 00:21:38 +0000 (11:21 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 10 Oct 2012 00:19:57 +0000 (11:19 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:18:14 +0000 (11:18 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:16:31 +0000 (11:16 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:14:43 +0000 (11:14 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:13:07 +0000 (11:13 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 10 Oct 2012 00:11:22 +0000 (11:11 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:09:53 +0000 (11:09 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 10 Oct 2012 00:08:15 +0000 (11:08 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 00:06:40 +0000 (11:06 +1100)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Wed, 10 Oct 2012 00:06:38 +0000 (11:06 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Conflicts:
arch/xtensa/boot/boot-elf/Makefile
scripts/mod/modpost.c
Stephen Rothwell [Wed, 10 Oct 2012 00:01:49 +0000 (11:01 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 10 Oct 2012 00:00:17 +0000 (11:00 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 9 Oct 2012 23:58:24 +0000 (10:58 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Tue, 9 Oct 2012 23:56:53 +0000 (10:56 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 9 Oct 2012 23:55:25 +0000 (10:55 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 9 Oct 2012 23:53:50 +0000 (10:53 +1100)]
Merge remote-tracking branch 'ia64/next'
Conflicts:
arch/ia64/include/asm/Kbuild
Stephen Rothwell [Tue, 9 Oct 2012 23:52:18 +0000 (10:52 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Tue, 9 Oct 2012 23:50:52 +0000 (10:50 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 9 Oct 2012 23:50:46 +0000 (10:50 +1100)]
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-omap2/devices.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c
Stephen Rothwell [Tue, 9 Oct 2012 23:24:02 +0000 (10:24 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 9 Oct 2012 23:17:18 +0000 (10:17 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Tue, 9 Oct 2012 23:17:08 +0000 (10:17 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Tue, 9 Oct 2012 23:16:49 +0000 (10:16 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Tue, 9 Oct 2012 23:16:43 +0000 (10:16 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 9 Oct 2012 23:16:40 +0000 (10:16 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 9 Oct 2012 23:16:39 +0000 (10:16 +1100)]
Merge remote-tracking branch 'sparc/master'
Stephen Rothwell [Tue, 9 Oct 2012 23:16:37 +0000 (10:16 +1100)]
Merge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Tue, 9 Oct 2012 23:10:43 +0000 (10:10 +1100)]
Revert "memory-hotplug: suppress "Trying to free nonexistent resource <XXXXXXXXXXXXXXXX-YYYYYYYYYYYYYYYY>" warning"
This reverts commit
d760afd4d2570653891f94e13b848e97150dc5a6 .
Eric W. Biederman [Tue, 9 Oct 2012 22:11:55 +0000 (15:11 -0700)]
userns: Fix posix_acl_file_xattr_userns gid conversion
The code needs to be from_kgid(make_kgid(...)...) not
from_kuid(make_kgid(...)...). Doh!
Reported-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Jan Kara [Tue, 9 Oct 2012 21:30:17 +0000 (23:30 +0200)]
quota: Silence warning about PRJQUOTA not being handled in need_print_warning()
PRJQUOTA value of quota type should never reach need_print_warning() since XFS
(which is the only fs which uses that type) doesn't use generic functions
calling this function. Anyway, add PRJQUOTA case to the switch to make gcc
happy.
Signed-off-by: Jan Kara <jack@suse.cz>
Zhao Hongjiang [Tue, 9 Oct 2012 05:48:47 +0000 (13:48 +0800)]
ext3: fix return values on parse_options() failure
parse_options() in ext3 should return 0 when parse the mount options fails.
Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Zhao Hongjiang [Tue, 9 Oct 2012 05:44:36 +0000 (13:44 +0800)]
ext2: fix return values on parse_options() failure
parse_options() in ext2 should return 0 when parse the mount options fails.
Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Carlos Maiolino [Wed, 3 Oct 2012 02:59:23 +0000 (23:59 -0300)]
ext3: ext3_bread usage audit
This is the ext3 version of the same patch applied to Ext4, where such goal is
to audit the usage of ext3_bread() due a possible misinterpretion of its return
value.
Focused on directory blocks, a NULL value returned from ext3_bread() means a
hole, which cannot exist into a directory inode. It can pass undetected after a
fix in an uninitialized error variable.
The (now) initialized variable into ext3_getblk() may lead to a zero'ed return
value of ext3_bread() to its callers, which can make the caller do not detect
the hole in the directory inode.
This patch creates a new wrapper function ext3_dir_bread() which checks for
holes properly, reports error, and returns EIO in that case.
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Carlos Maiolino [Mon, 1 Oct 2012 19:50:54 +0000 (16:50 -0300)]
ext3: fix possible non-initialized variable on htree_dirblock_to_tree()
This is a backport of ext4 commit
90b0a9732 which fixes a possible
non-initialized variable on htree_dirblock_to_tree().
Ext3 has the same non initialized variable, but, in any case it will be
initialized by ext3_get_blocks_handle(), which will avoid the bug to be
triggered, but, the non-initialized variable by htree_dirblock_to_tree() is
still a bug.
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>