kernel-ark/arch/sh
Linus Torvalds cb60e3e65c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem updates from James Morris:
 "New notable features:
   - The seccomp work from Will Drewry
   - PR_{GET,SET}_NO_NEW_PRIVS from Andy Lutomirski
   - Longer security labels for Smack from Casey Schaufler
   - Additional ptrace restriction modes for Yama by Kees Cook"

Fix up trivial context conflicts in arch/x86/Kconfig and include/linux/filter.h

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)
  apparmor: fix long path failure due to disconnected path
  apparmor: fix profile lookup for unconfined
  ima: fix filename hint to reflect script interpreter name
  KEYS: Don't check for NULL key pointer in key_validate()
  Smack: allow for significantly longer Smack labels v4
  gfp flags for security_inode_alloc()?
  Smack: recursive tramsmute
  Yama: replace capable() with ns_capable()
  TOMOYO: Accept manager programs which do not start with / .
  KEYS: Add invalidation support
  KEYS: Do LRU discard in full keyrings
  KEYS: Permit in-place link replacement in keyring list
  KEYS: Perform RCU synchronisation on keys prior to key destruction
  KEYS: Announce key type (un)registration
  KEYS: Reorganise keys Makefile
  KEYS: Move the key config into security/keys/Kconfig
  KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat
  Yama: remove an unused variable
  samples/seccomp: fix dependencies on arch macros
  Yama: add additional ptrace scopes
  ...
2012-05-21 20:27:36 -07:00
..
boards sh: fix up fallout from system.h disintegration. 2012-03-30 19:29:57 +09:00
boot Kbuild: centralize MKIMAGE and cmd_uimage definitions 2012-03-26 15:49:20 +02:00
cchips sh: Convert to new function names 2011-03-29 14:48:13 +02:00
configs sh: fix compile error using sh7757lcr_defconfig 2011-06-21 17:40:42 +09:00
drivers sh: dma: Fix up device attribute mismatch from sysdev fallout. 2012-03-30 19:36:03 +09:00
include sh-use-common-threadinfo-allocator 2012-05-08 14:08:45 +02:00
kernel Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 2012-05-21 20:27:36 -07:00
lib sh: Ensure ST40-300 BogoMIPS value is consistent 2011-02-15 16:24:05 +09:00
lib64 Fix common misspellings 2011-03-31 11:26:23 -03:00
math-emu Disintegrate asm/system.h for SH 2012-03-28 18:30:03 +01:00
mm sh: Fix error synchronising kernel page tables 2012-04-19 15:57:44 +09:00
oprofile oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue 2011-12-23 11:58:34 +01:00
tools
Kconfig sh: Remove cpu_idle_wait() 2012-05-08 12:35:07 +02:00
Kconfig.cpu
Kconfig.debug sh: dwarf unwinder depends on SHcompact. 2012-03-30 19:31:22 +09:00
Makefile sh: Use generic init_task 2012-05-05 13:00:25 +02:00