The patch titled Subject: proc-make-the-proc_create-stubs-static-inlines-fix has been removed from the -mm tree. Its filename was proc-make-the-proc_create-stubs-static-inlines-fix.patch This patch was dropped because it was folded into proc-make-the-proc_create-stubs-static-inlines.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: proc-make-the-proc_create-stubs-static-inlines-fix fix CONFIG_PROC_FS=n Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Christian Brauner <christian@xxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Hans de Goede <hdegoede@xxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/proc_fs.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/include/linux/proc_fs.h~proc-make-the-proc_create-stubs-static-inlines-fix +++ a/include/linux/proc_fs.h @@ -179,12 +179,14 @@ static inline struct proc_dir_entry *pro #define proc_create_single(name, mode, parent, show) ({NULL;}) #define proc_create_single_data(name, mode, parent, show, data) ({NULL;}) -static inline struct proc_dir_entry *proc_create( - const char *, umode_t, struct proc_dir_entry *, const struct proc_ops *) +static inline struct proc_dir_entry * +proc_create(const char *name, umode_t mode, struct proc_dir_entry *parent, + const struct proc_ops *proc_ops) { return NULL; } -static inline struct proc_dir_entry *proc_create_data( - const char *, umode_t, struct proc_dir_entry *, const struct proc_ops *, void *) +static inline struct proc_dir_entry * +proc_create_data(const char *name, umode_t mode, struct proc_dir_entry *parent, + const struct proc_ops *proc_ops, void *data) { return NULL; } static inline void proc_set_size(struct proc_dir_entry *de, loff_t size) {} _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are proc-make-the-proc_create-stubs-static-inlines.patch proc-make-the-proc_create-stubs-static-inlines-fix2.patch proc-make-the-proc_create-stubs-static-inlines-fix2-fix.patch kernel-sys-only-take-tasklist_lock-for-get-setpriorityprio_pgrp-checkpatch-fixes.patch hashh-remove-unused-define-directive-fix.patch panic-use-error_report_end-tracepoint-on-warnings-fix.patch mm.patch documentation-vm-page_ownerrst-update-the-documentation-fix.patch mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch arch-x86-include-asm-pgtableh-needs-spinlockh.patch sysctl-move-some-boundary-constants-from-sysctlc-to-sysctl_vals-fix.patch firmware_loader-move-firmware-sysctl-to-its-own-files-fix.patch firmware_loader-move-firmware-sysctl-to-its-own-files-fix-fix.patch sysctl-add-helper-to-register-a-sysctl-mount-point-fix.patch sysctl-move-maxolduid-as-a-sysctl-specific-const-fix.patch proc-remove-pde_data-completely-fix.patch proc-remove-pde_data-completely-fix-fix.patch mm-remove-cleancache-fix.patch mm-simplify-try_to_unuse-fix.patch mutex-subsystem-synchro-test-module-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch