Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

CREDITS

+8 −1
Original line number Diff line number Diff line
@@ -2113,6 +2113,10 @@ S: J. Obrechtstr 23 
S: NL-5216 GP 's-Hertogenbosch

S: The Netherlands



N: Ashley Lai

E: ashleydlai@gmail.com

D: IBM VTPM driver



N: Savio Lam

E: lam836@cs.cuhk.hk

D: Author of the dialog utility, foundation
@@ -3333,6 +3337,10 @@ S: Braunschweiger Strasse 79 
S: 31134 Hildesheim

S: Germany



N: Marcel Selhorst

E: tpmdd@selhorst.net

D: TPM driver



N: Darren Senn

E: sinster@darkwater.com

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

+2 −11
Original line number Diff line number Diff line
@@ -13611,23 +13611,14 @@ F: drivers/platform/x86/toshiba-wmi.c 


TPM DEVICE DRIVER

M:	Peter Huewe <peterhuewe@gmx.de>

M:	Marcel Selhorst <tpmdd@selhorst.net>

M:	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

R:	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>

W:	http://tpmdd.sourceforge.net

L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)

Q:	https://patchwork.kernel.org/project/tpmdd-devel/list/

L:	linux-integrity@vger.kernel.org

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 <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

M:	Steven Rostedt <rostedt@goodmis.org>

M:	Ingo Molnar <mingo@redhat.com>

include/linux/sysctl.h

+5 −0
Original line number Diff line number Diff line
@@ -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)

{

}