Commit 1c9dbd46 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "2 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MAINTAINERS: update TPM driver infrastructure changes
  sysctl: add register_sysctl() dummy helper
parents 5cff3684 60fdb44a
...@@ -2113,6 +2113,10 @@ S: J. Obrechtstr 23 ...@@ -2113,6 +2113,10 @@ S: J. Obrechtstr 23
S: NL-5216 GP 's-Hertogenbosch S: NL-5216 GP 's-Hertogenbosch
S: The Netherlands S: The Netherlands
N: Ashley Lai
E: ashleydlai@gmail.com
D: IBM VTPM driver
N: Savio Lam N: Savio Lam
E: lam836@cs.cuhk.hk E: lam836@cs.cuhk.hk
D: Author of the dialog utility, foundation D: Author of the dialog utility, foundation
...@@ -3333,6 +3337,10 @@ S: Braunschweiger Strasse 79 ...@@ -3333,6 +3337,10 @@ S: Braunschweiger Strasse 79
S: 31134 Hildesheim S: 31134 Hildesheim
S: Germany S: Germany
N: Marcel Selhorst
E: tpmdd@selhorst.net
D: TPM driver
N: Darren Senn N: Darren Senn
E: sinster@darkwater.com E: sinster@darkwater.com
D: Whatever I notice needs doing (so far: itimers, /proc) D: Whatever I notice needs doing (so far: itimers, /proc)
...@@ -4128,7 +4136,6 @@ D: MD driver ...@@ -4128,7 +4136,6 @@ D: MD driver
D: EISA/sysfs subsystem D: EISA/sysfs subsystem
S: France S: France
# Don't add your name here, unless you really _are_ after Marc # Don't add your name here, unless you really _are_ after Marc
# alphabetically. Leonard used to be very proud of being the # alphabetically. Leonard used to be very proud of being the
# last entry, and he'll get positively pissed if he can't even # last entry, and he'll get positively pissed if he can't even
......
...@@ -13611,23 +13611,14 @@ F: drivers/platform/x86/toshiba-wmi.c ...@@ -13611,23 +13611,14 @@ F: drivers/platform/x86/toshiba-wmi.c
TPM DEVICE DRIVER TPM DEVICE DRIVER
M: Peter Huewe <peterhuewe@gmx.de> M: Peter Huewe <peterhuewe@gmx.de>
M: Marcel Selhorst <tpmdd@selhorst.net>
M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
R: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> R: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
W: http://tpmdd.sourceforge.net L: linux-integrity@vger.kernel.org
L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) Q: https://patchwork.kernel.org/project/linux-integrity/list/
Q: https://patchwork.kernel.org/project/tpmdd-devel/list/
T: git git://git.infradead.org/users/jjs/linux-tpmdd.git T: git git://git.infradead.org/users/jjs/linux-tpmdd.git
S: Maintained S: Maintained
F: drivers/char/tpm/ F: drivers/char/tpm/
TPM IBM_VTPM DEVICE DRIVER
M: Ashley Lai <ashleydlai@gmail.com>
W: http://tpmdd.sourceforge.net
L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
S: Maintained
F: drivers/char/tpm/tpm_ibmvtpm*
TRACING TRACING
M: Steven Rostedt <rostedt@goodmis.org> M: Steven Rostedt <rostedt@goodmis.org>
M: Ingo Molnar <mingo@redhat.com> M: Ingo Molnar <mingo@redhat.com>
......
...@@ -213,6 +213,11 @@ static inline struct ctl_table_header *register_sysctl_paths( ...@@ -213,6 +213,11 @@ static inline struct ctl_table_header *register_sysctl_paths(
return NULL; 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) static inline void unregister_sysctl_table(struct ctl_table_header * table)
{ {
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment