The patch titled knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks has been removed from the -mm tree. Its filename is knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks.patch This patch was dropped because it was folded into knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers.patch ------------------------------------------------------ Subject: knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks From: Andrew Morton <akpm@xxxxxxxx> Cc: Neil Brown <neilb@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/nfsd/nfssvc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN fs/nfsd/nfssvc.c~knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks fs/nfsd/nfssvc.c --- a/fs/nfsd/nfssvc.c~knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks +++ a/fs/nfsd/nfssvc.c @@ -195,8 +195,7 @@ void nfsd_reset_versions(void) } } - -static inline int nfsd_create_serv(void) +static int nfsd_create_serv(void) { int err = 0; lock_kernel(); @@ -218,7 +217,7 @@ static inline int nfsd_create_serv(void) return err; } -static inline int nfsd_init_socks(int port) +static int nfsd_init_socks(int port) { int error; if (!list_empty(&nfsd_serv->sv_permsocks)) _ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch list-module-taint-flags-in-oops-panic.patch move-pidmap-to-pspaceh.patch isdn-work-around-excessive-udelay.patch knfsd-add-a-callback-for-when-last-rpc-thread-finishes.patch knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers.patch knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks.patch knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-fix.patch knfsd-drop-serv-option-to-svc_recv-and-svc_process-nfs-callback-fix-nfs-callback-fix.patch knfsd-move-tempsock-aging-to-a-timer-tidy.patch namespaces-add-nsproxy.patch namespaces-utsname-switch-to-using-uts-namespaces.patch namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch namespaces-utsname-use-init_utsname-when-appropriate.patch namespaces-utsname-implement-utsname-namespaces.patch namespaces-utsname-sysctl-hack.patch ipc-namespace-core.patch rename-the-provided-execve-functions-to-kernel_execve-headers-fix.patch replace-cad_pid-by-a-struct-pid-fixes.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html