Merge branch 'akpm' (patches from Andrew)

1c9dbd46 · Linus Torvalds <[email protected]> · 2017-11-09 18:26:51 -08:00

Merge misc fixes from Andrew Morton:
 "2 fixes"

* emailed patches from Andrew Morton <[email protected]>:
  MAINTAINERS: update TPM driver infrastructure changes
  sysctl: add register_sysctl() dummy helper

Commit: 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20
Parents: 5cff3684 · 60fdb44a

Merge commit. Changes below are compared with the first parent: 5cff3684.

Changes

3 files changed · +15 −12

File	Status	Add	Del	Content
CREDITS	modified	+8	−1	View file
MAINTAINERS	modified	+2	−11	View file
include/linux/sysctl.h	modified	+5	−0	View file

CREDITS

View file

diff --git a/CREDITS b/CREDITS
index 9fbd2c7..a3ec0c7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2113,6 +2113,10 @@ S: J. Obrechtstr 23
 S: NL-5216 GP 's-Hertogenbosch
 S: The Netherlands
 
+N: Ashley Lai
+E: [email protected]
+D: IBM VTPM driver
+
 N: Savio Lam
 E: [email protected]
 D: Author of the dialog utility, foundation
@@ -3333,6 +3337,10 @@ S: Braunschweiger Strasse 79
 S: 31134 Hildesheim
 S: Germany
 
+N: Marcel Selhorst
+E: [email protected]
+D: TPM driver
+
 N: Darren Senn
 E: [email protected]
 D: Whatever I notice needs doing (so far: itimers, /proc)
@@ -4128,7 +4136,6 @@ D: MD driver
 D: EISA/sysfs subsystem
 S: France
 
-
 # Don't add your name here, unless you really _are_ after Marc
 # alphabetically. Leonard used to be very proud of being the 
 # last entry, and he'll get positively pissed if he can't even

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 164cf01..2811a21 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13611,23 +13611,14 @@ F:	drivers/platform/x86/toshiba-wmi.c
 
 TPM DEVICE DRIVER
 M:	Peter Huewe <[email protected]>
-M:	Marcel Selhorst <[email protected]>
 M:	Jarkko Sakkinen <[email protected]>
 R:	Jason Gunthorpe <[email protected]>
-W:	http://tpmdd.sourceforge.net
-L:	[email protected] (moderated for non-subscribers)
-Q:	https://patchwork.kernel.org/project/tpmdd-devel/list/
+L:	[email protected]
+Q:	https://patchwork.kernel.org/project/linux-integrity/list/
 T:	git git://git.infradead.org/users/jjs/linux-tpmdd.git
 S:	Maintained
 F:	drivers/char/tpm/
 
-TPM IBM_VTPM DEVICE DRIVER
-M:	Ashley Lai <[email protected]>
-W:	http://tpmdd.sourceforge.net
-L:	[email protected] (moderated for non-subscribers)
-S:	Maintained
-F:	drivers/char/tpm/tpm_ibmvtpm*
-
 TRACING
 M:	Steven Rostedt <[email protected]>
 M:	Ingo Molnar <[email protected]>

include/linux/sysctl.h

View file

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 74f91ee..b769ecf 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -213,6 +213,11 @@ static inline struct ctl_table_header *register_sysctl_paths(
 	return NULL;
 }
 
+static inline struct ctl_table_header *register_sysctl(const char *path, struct ctl_table *table)
+{
+	return NULL;
+}
+
 static inline void unregister_sysctl_table(struct ctl_table_header * table)
 {
 }