From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Apr 2015 18:08:27 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d488d3a4ce08e96dad5cb3b6117517d57ccec98f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull security subsystem updates from James Morris:
 "Highlights for this window:

   - improved AVC hashing for SELinux by John Brooks and Stephen Smalley

   - addition of an unconfined label to Smack

   - Smack documentation update

   - TPM driver updates"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (28 commits)
  lsm: copy comm before calling audit_log to avoid race in string printing
  tomoyo: Do not generate empty policy files
  tomoyo: Use if_changed when generating builtin-policy.h
  tomoyo: Use bin2c to generate builtin-policy.h
  selinux: increase avtab max buckets
  selinux: Use a better hash function for avtab
  selinux: convert avtab hash table to flex_array
  selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()
  selinux: remove unnecessary pointer reassignment
  Smack: Updates for Smack documentation
  tpm/st33zp24/spi: Add missing device table for spi phy.
  tpm/st33zp24: Add proper wait for ordinal duration in case of irq mode
  smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.c
  Smack: Allow an unconfined label in bringup mode
  Smack: getting the Smack security context of keys
  Smack: Assign smack_known_web as default smk_in label for kernel thread's socket
  tpm/tpm_infineon: Use struct dev_pm_ops for power management
  MAINTAINERS: Add Jason as designated reviewer for TPM
  tpm: Update KConfig text to include TPM2.0 FIFO chips
  tpm/st33zp24/dts/st33zp24-spi: Add dts documentation for st33zp24 spi phy
  ...
---

d488d3a4ce08e96dad5cb3b6117517d57ccec98f
diff --cc drivers/char/tpm/tpm_infineon.c
index 29ba520ac24d,922f60e1e0a0..6c488e635fdd
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@@ -632,12 -615,24 +615,13 @@@ static struct pnp_driver tpm_inf_pnp_dr
  	.name = "tpm_inf_pnp",
  	.id_table = tpm_inf_pnp_tbl,
  	.probe = tpm_inf_pnp_probe,
- 	.suspend = tpm_inf_pnp_suspend,
- 	.resume = tpm_inf_pnp_resume,
- 	.remove = tpm_inf_pnp_remove
+ 	.remove = tpm_inf_pnp_remove,
+ 	.driver = {
+ 		.pm = &tpm_inf_pm,
+ 	}
  };
  
 -static int __init init_inf(void)
 -{
 -	return pnp_register_driver(&tpm_inf_pnp_driver);
 -}
 -
 -static void __exit cleanup_inf(void)
 -{
 -	pnp_unregister_driver(&tpm_inf_pnp_driver);
 -}
 -
 -module_init(init_inf);
 -module_exit(cleanup_inf);
 +module_pnp_driver(tpm_inf_pnp_driver);
  
  MODULE_AUTHOR("Marcel Selhorst <tpmdd@sirrix.com>");
  MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2");