From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Jul 2013 21:04:58 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v3.11-rc1~103
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f39d420f672f99ad9a0fe7deb951a0030d4f0d9e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull security subsystem updates from James Morris:
 "In this update, Smack learns to love IPv6 and to mount a filesystem
  with a transmutable hierarchy (i.e.  security labels are inherited
  from parent directory upon creation rather than creating process).

  The rest of the changes are maintenance"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (37 commits)
  tpm/tpm_i2c_infineon: Remove unused header file
  tpm: tpm_i2c_infinion: Don't modify i2c_client->driver
  evm: audit integrity metadata failures
  integrity: move integrity_audit_msg()
  evm: calculate HMAC after initializing posix acl on tmpfs
  maintainers:  add Dmitry Kasatkin
  Smack: Fix the bug smackcipso can't set CIPSO correctly
  Smack: Fix possible NULL pointer dereference at smk_netlbl_mls()
  Smack: Add smkfstransmute mount option
  Smack: Improve access check performance
  Smack: Local IPv6 port based controls
  tpm: fix regression caused by section type conflict of tpm_dev_release() in ppc builds
  maintainers: Remove Kent from maintainers
  tpm: move TPM_DIGEST_SIZE defintion
  tpm_tis: missing platform_driver_unregister() on error in init_tis()
  security: clarify cap_inode_getsecctx description
  apparmor: no need to delay vfree()
  apparmor: fix fully qualified name parsing
  apparmor: fix setprocattr arg processing for onexec
  apparmor: localize getting the security context to a few macros
  ...
---

f39d420f672f99ad9a0fe7deb951a0030d4f0d9e
diff --cc Documentation/kernel-parameters.txt
index 7310b08,cb5daa1..3c80382
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1158,8 -1153,11 +1153,13 @@@ bytes respectively. Such letter suffixe
  	inport.irq=	[HW] Inport (ATI XL and Microsoft) busmouse driver
  			Format: <irq>
  
 +	int_pln_enable  [x86] Enable power limit notification interrupt
 +
+ 	integrity_audit=[IMA]
+ 			Format: { "0" | "1" }
+ 			0 -- basic integrity auditing messages. (Default)
+ 			1 -- additional integrity auditing messages.
+ 
  	intel_iommu=	[DMAR] Intel IOMMU driver (DMAR) option
  		on
  			Enable intel iommu driver.