Merge commit 'v3.6' into fixes

2026-10-16 22:39:48 +00:00 · 2012-10-04 23:59:32 +01:00 · 2012-10-04 23:59:32 +01:00 · d5e4cc8faf
commit d5e4cc8faf
parent 7253b85cc6 a0d271cbfe
41 changed files with 507 additions and 292 deletions
--- a/2
+++ b/2
--- a/arch/um/include/asm/processor-generic.h
+++ b/arch/um/include/asm/processor-generic.h
--- a/arch/um/include/shared/common-offsets.h
+++ b/arch/um/include/shared/common-offsets.h
--- a/arch/um/include/shared/user.h
+++ b/arch/um/include/shared/user.h
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
--- a/arch/um/kernel/signal.c
+++ b/arch/um/kernel/signal.c
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
--- a/arch/x86/um/shared/sysdep/kernel-offsets.h
+++ b/arch/x86/um/shared/sysdep/kernel-offsets.h
--- a/arch/x86/um/shared/sysdep/syscalls.h
+++ b/arch/x86/um/shared/sysdep/syscalls.h
--- a/arch/x86/um/signal.c
+++ b/arch/x86/um/signal.c
--- a/arch/x86/um/sys_call_table_32.c
+++ b/arch/x86/um/sys_call_table_32.c
--- a/arch/x86/um/syscalls_32.c
+++ b/arch/x86/um/syscalls_32.c
--- a/arch/x86/um/syscalls_64.c
+++ b/arch/x86/um/syscalls_64.c
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
--- a/drivers/md/dm-verity.c
+++ b/drivers/md/dm-verity.c
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
--- a/fs/dcache.c
+++ b/fs/dcache.c
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
--- a/fs/namespace.c
+++ b/fs/namespace.c
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c