]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 17 Aug 2012 02:17:41 +0000 (12:17 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:17:35 +0000 (12:17 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Fri, 17 Aug 2012 02:17:27 +0000 (12:17 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Fri, 17 Aug 2012 02:15:45 +0000 (12:15 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:08:49 +0000 (12:08 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:02:38 +0000 (12:02 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:01:05 +0000 (12:01 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 02:01:01 +0000 (12:01 +1000)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:59:32 +0000 (11:59 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:57:52 +0000 (11:57 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:57:46 +0000 (11:57 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:55:39 +0000 (11:55 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:54:03 +0000 (11:54 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:52:14 +0000 (11:52 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:50:42 +0000 (11:50 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:49:10 +0000 (11:49 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:47:38 +0000 (11:47 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:45:04 +0000 (11:45 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:45:01 +0000 (11:45 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:43:28 +0000 (11:43 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:38:19 +0000 (11:38 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/s390/Kconfig
arch/xtensa/Kconfig
Stephen Rothwell [Fri, 17 Aug 2012 01:36:42 +0000 (11:36 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:35:02 +0000 (11:35 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:35:00 +0000 (11:35 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:33:25 +0000 (11:33 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:31:48 +0000 (11:31 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:30:14 +0000 (11:30 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:28:42 +0000 (11:28 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:21:35 +0000 (11:21 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 17 Aug 2012 01:20:01 +0000 (11:20 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:19:53 +0000 (11:19 +1000)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Fri, 17 Aug 2012 01:18:11 +0000 (11:18 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Conflicts:
drivers/ata/libata-core.c
Stephen Rothwell [Fri, 17 Aug 2012 01:16:42 +0000 (11:16 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:15:11 +0000 (11:15 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:13:36 +0000 (11:13 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 17 Aug 2012 01:13:29 +0000 (11:13 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
Stephen Rothwell [Fri, 17 Aug 2012 01:11:54 +0000 (11:11 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:10:21 +0000 (11:10 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:10:13 +0000 (11:10 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 01:00:51 +0000 (11:00 +1000)]
Merge commit 'refs/next/
20120816 /v4l-dvb'
Stephen Rothwell [Fri, 17 Aug 2012 00:52:42 +0000 (10:52 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:51:20 +0000 (10:51 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 17 Aug 2012 00:49:55 +0000 (10:49 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 17 Aug 2012 00:48:27 +0000 (10:48 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:47:03 +0000 (10:47 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Fri, 17 Aug 2012 00:45:32 +0000 (10:45 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:43:57 +0000 (10:43 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:42:30 +0000 (10:42 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:40:52 +0000 (10:40 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 17 Aug 2012 00:39:24 +0000 (10:39 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 17 Aug 2012 00:37:58 +0000 (10:37 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Fri, 17 Aug 2012 00:36:29 +0000 (10:36 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:35:04 +0000 (10:35 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Fri, 17 Aug 2012 00:33:40 +0000 (10:33 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 17 Aug 2012 00:32:16 +0000 (10:32 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 17 Aug 2012 00:29:50 +0000 (10:29 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Fri, 17 Aug 2012 00:28:25 +0000 (10:28 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Fri, 17 Aug 2012 00:27:00 +0000 (10:27 +1000)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:25:37 +0000 (10:25 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:24:14 +0000 (10:24 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:22:44 +0000 (10:22 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:21:17 +0000 (10:21 +1000)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:19:49 +0000 (10:19 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Fri, 17 Aug 2012 00:18:25 +0000 (10:18 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:49 +0000 (10:14 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:47 +0000 (10:14 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:40 +0000 (10:14 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:37 +0000 (10:14 +1000)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:36 +0000 (10:14 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:35 +0000 (10:14 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:34 +0000 (10:14 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:33 +0000 (10:14 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:32 +0000 (10:14 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:31 +0000 (10:14 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:30 +0000 (10:14 +1000)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Fri, 17 Aug 2012 00:14:28 +0000 (10:14 +1000)]
Merge remote-tracking branch 'arm-current/fixes'
Ralf Baechle [Thu, 16 Aug 2012 22:25:33 +0000 (00:25 +0200)]
Merge branches 'next/for-linus', 'next/generic', 'next/lantiq' and 'next/trace' into mips-for-linux-next
Ralf Baechle [Thu, 16 Aug 2012 16:23:13 +0000 (18:23 +0200)]
MIPS: Add support for syscall tracepoints.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 16 Aug 2012 16:23:13 +0000 (18:23 +0200)]
MIPS: Add support for SECCOMP_FILTER.
Enable tasks to build secure computing environments defined in terms
of Berkeley Packet Filter programs which implement task-defined system
call filtering polices.
See Documentation/prctl/seccomp_filter.txt for details.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 16 Aug 2012 16:23:13 +0000 (18:23 +0200)]
MIPS: ptrace: Switch syscall reporting to tracehook_report_syscall_entry().
Set ret just so __must_check is satisfied but don't use the variable for
anything yet.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 16 Aug 2012 16:23:13 +0000 (18:23 +0200)]
MIPS: Move audit_arch() helper function to __syscall_get_arch().
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 16 Aug 2012 16:23:01 +0000 (18:23 +0200)]
MIPS: Enable HAVE_ARCH_TRACEHOOK.
This enables /proc/<pid>/syscall and the ptrace PTRACE_GETREGSET and
PTRACE_SETREGSET operations.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 2 Aug 2012 13:41:09 +0000 (15:41 +0200)]
MIPS: ptrace.h: Add commit to #endif of long ifdef block.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 2 Aug 2012 13:18:32 +0000 (15:18 +0200)]
MIPS: Switch ELF core dumper to use regsets.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 2 Aug 2012 12:44:11 +0000 (14:44 +0200)]
MIPS: Implement task_user_regset_view.
There are no users yet of task_user_regset_view. yet; users will be
implemented rsp activated in subsequent commits.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Tue, 17 Jul 2012 17:43:58 +0000 (19:43 +0200)]
MIPS: ptrace: Use tracehook helpers.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Sat, 14 Jul 2012 07:22:05 +0000 (09:22 +0200)]
MIPS: O32 / 32-bit: Always copy 4 stack arguments.
This gets us rid of the hard to maintain table of the number of syscall
arguments and paves the way for further restructuring of the syscall
code.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 13 Jul 2012 21:38:17 +0000 (23:38 +0200)]
MIPS: Provide arch_syscall_addr.
The generic version is wrong for MIPS.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 13 Jul 2012 19:16:37 +0000 (21:16 +0200)]
MIPS: N32: Delete unused re-definition of SIGILL.
Originally and unnecessarilly added in
dd8c35f40cda31dc8c027a62b73301a310b8b529 (lmo) [N32 ...]
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 13 Jul 2012 19:01:12 +0000 (21:01 +0200)]
MIPS: N32: Kill definition PT_TRACESYS for good.
Originally killed in
75ddbae069832b2ef15fb9678347ce7f5fbbbf95 (lmo) [Merge
with Linux 2.5.3.] then unnecessarily added back in
dd8c35f40cda31dc8c027a62b73301a310b8b529 (lmo) [N32 ...] This predates
Linus' git history ...
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Fri, 13 Jul 2012 11:36:40 +0000 (13:36 +0200)]
MIPS: 32-bit: Remove unused gas macros fifty and mille.
These are a leftover of the IRIX compat code which was removed in
2957c9e61ee9c37e7ebf2c8acab03e073fe942fd (kernel.org) rsp.
b934da913f236bca00c41d9e386e980586000461 (lmo) [[MIPS] IRIX: Goodbye
and thanks for all the fish].
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 12 Jul 2012 15:13:15 +0000 (17:13 +0200)]
MIPS: Enable entries for SIGSYS in struct siginfo.
This is necessary because MIPS doesn't use HAVE_ARCH_SIGINFO_T for
historical reasons.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 12 Jul 2012 12:06:46 +0000 (14:06 +0200)]
MIPS: 64-bit: Mark native syscall table as data object.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 12 Jul 2012 12:02:41 +0000 (14:02 +0200)]
MIPS: compat: Mark N32 syscall table as data object.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 12 Jul 2012 12:01:31 +0000 (14:01 +0200)]
MIPS: compat: Export O32 syscall table and rename to avoid duplicate symbol.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
John Fastabend [Tue, 14 Aug 2012 12:34:35 +0000 (12:34 +0000)]
net: netprio: fix cgrp create and write priomap race
A race exists where creating cgroups and also updating the priomap
may result in losing a priomap update. This is because priomap
writers are not protected by rtnl_lock.
Move priority writer into rtnl_lock()/rtnl_unlock().
CC: Neil Horman <nhorman@tuxdriver.com>
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
John Fastabend [Tue, 14 Aug 2012 12:34:30 +0000 (12:34 +0000)]
net: netprio: fd passed in SCM_RIGHTS datagram not set correctly
A socket fd passed in a SCM_RIGHTS datagram was not getting
updated with the new tasks cgrp prioidx. This leaves IO on
the socket tagged with the old tasks priority.
To fix this add a check in the scm recvmsg path to update the
sock cgrp prioidx with the new tasks value.
Thanks to Al Viro for catching this.
CC: Neil Horman <nhorman@tuxdriver.com>
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
John Fastabend [Tue, 14 Aug 2012 12:34:24 +0000 (12:34 +0000)]
net: netprio: fix files lock and remove useless d_path bits
Add lock to prevent a race with a file closing and also remove
useless and ugly sscanf code. The extra code was never needed
and the case it supposedly protected against is in fact handled
correctly by sock_from_file as pointed out by Al Viro.
CC: Neil Horman <nhorman@tuxdriver.com>
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jason Wang [Wed, 15 Aug 2012 20:44:27 +0000 (20:44 +0000)]
act_mirred: do not drop packets when fails to mirror it
We drop packet unconditionally when we fail to mirror it. This is not intended
in some cases. Consdier for kvm guest, we may mirror the traffic of the bridge
to a tap device used by a VM. When kernel fails to mirror the packet in
conditions such as when qemu crashes or stop polling the tap, it's hard for the
management software to detect such condition and clean the the mirroring
before. This would lead all packets to the bridge to be dropped and break the
netowrk of other virtual machines.
To solve the issue, the patch does not drop packets when kernel fails to mirror
it, and only drop the redirected packets.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Linus Torvalds [Thu, 16 Aug 2012 21:51:24 +0000 (14:51 -0700)]
Linux 3.6-rc2