tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 1c9dbd46 5cff3684

+15 -12
+8 -1
CREDITS
··· 2113 2113 S: NL-5216 GP 's-Hertogenbosch 2114 2114 S: The Netherlands 2115 2115 2116 + N: Ashley Lai 2117 + E: ashleydlai@gmail.com 2118 + D: IBM VTPM driver 2119 + 2116 2120 N: Savio Lam 2117 2121 E: lam836@cs.cuhk.hk 2118 2122 D: Author of the dialog utility, foundation ··· 3337 3333 S: 31134 Hildesheim 3338 3334 S: Germany 3339 3335 3336 + N: Marcel Selhorst 3337 + E: tpmdd@selhorst.net 3338 + D: TPM driver 3339 + 3340 3340 N: Darren Senn 3341 3341 E: sinster@darkwater.com 3342 3342 D: Whatever I notice needs doing (so far: itimers, /proc) ··· 4135 4127 D: MD driver 4136 4128 D: EISA/sysfs subsystem 4137 4129 S: France 4138 - 4139 4130 4140 4131 # Don't add your name here, unless you really _are_ after Marc 4141 4132 # alphabetically. Leonard used to be very proud of being the
+2 -11
MAINTAINERS
··· 13611 13611 13612 13612 TPM DEVICE DRIVER 13613 13613 M: Peter Huewe <peterhuewe@gmx.de> 13614 - M: Marcel Selhorst <tpmdd@selhorst.net> 13615 13614 M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> 13616 13615 R: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> 13617 - W: http://tpmdd.sourceforge.net 13618 - L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) 13619 - Q: https://patchwork.kernel.org/project/tpmdd-devel/list/ 13616 + L: linux-integrity@vger.kernel.org 13617 + Q: https://patchwork.kernel.org/project/linux-integrity/list/ 13620 13618 T: git git://git.infradead.org/users/jjs/linux-tpmdd.git 13621 13619 S: Maintained 13622 13620 F: drivers/char/tpm/ 13623 - 13624 - TPM IBM_VTPM DEVICE DRIVER 13625 - M: Ashley Lai <ashleydlai@gmail.com> 13626 - W: http://tpmdd.sourceforge.net 13627 - L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) 13628 - S: Maintained 13629 - F: drivers/char/tpm/tpm_ibmvtpm* 13630 13621 13631 13622 TRACING 13632 13623 M: Steven Rostedt <rostedt@goodmis.org>
+5
include/linux/sysctl.h
··· 213 213 return NULL; 214 214 } 215 215 216 + static inline struct ctl_table_header *register_sysctl(const char *path, struct ctl_table *table) 217 + { 218 + return NULL; 219 + } 220 + 216 221 static inline void unregister_sysctl_table(struct ctl_table_header * table) 217 222 { 218 223 }