Stephen Rothwell
b1fa650c7e
seccomp: use a static inline for a function stub ...
Fixes this error message when CONFIG_SECCOMP is not set:
arch/powerpc/kernel/ptrace.c: In function 'do_syscall_trace_enter':
arch/powerpc/kernel/ptrace.c:1713:2: error: statement with no effect [-Werror=unused-value]
Signed-off-by: Stephen Rothwell <sfr@ozlabs.au.ibm.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
2012-04-17 13:22:36 +10:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
seccomp: Add SECCOMP_RET_TRAP
2012-04-14 11:13:21 +10:00
crypto: user - Fix lookup of algorithms with IV generator
2012-03-29 19:52:47 +08:00
Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux
2012-04-03 10:13:34 -07:00
seccomp: use a static inline for a function stub
2012-04-17 13:22:36 +10:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
Merge branch 'master' of git://1984.lsi.us.es/net
2012-04-03 19:15:48 -04:00
Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next
2012-03-19 09:50:33 -07:00
SCSI updates on 20120331
2012-03-31 13:31:23 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
target: Use array_zalloc for device_list
2012-03-15 19:15:51 -07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-04-04 10:04:42 -07:00
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
2012-03-27 18:17:02 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
b1fa650c7e