The patch titled Subject: audith-replace-defines-with-c-stubs-fix has been removed from the -mm tree. Its filename was audith-replace-defines-with-c-stubs-fix.patch This patch was dropped because it was folded into audith-replace-defines-with-c-stubs.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: audith-replace-defines-with-c-stubs-fix Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/audit.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN include/linux/audit.h~audith-replace-defines-with-c-stubs-fix include/linux/audit.h --- a/include/linux/audit.h~audith-replace-defines-with-c-stubs-fix +++ a/include/linux/audit.h @@ -530,7 +530,7 @@ extern int auditsc_get_stamp(struct audi struct timespec *t, unsigned int *serial); extern int audit_set_loginuid(kuid_t loginuid); -static inline int audit_get_loginuid(struct task_struct *tsk) +static inline kuid_t audit_get_loginuid(struct task_struct *tsk) { return tsk->loginuid; } @@ -677,7 +677,7 @@ static inline int auditsc_get_stamp(stru { return 0; } -static inline int audit_get_loginuid(struct task_struct *tsk) +static inline kuid_t audit_get_loginuid(struct task_struct *tsk) { return INVALID_UID; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch audith-replace-defines-with-c-stubs.patch sections-fix-section-conflicts-in-arch-h8300-checkpatch-fixes.patch sections-fix-section-conflicts-in-drivers-macintosh-checkpatch-fixes.patch sectons-fix-const-sections-for-crc32-table-checkpatch-fixes.patch backlight-add-backlight-driver-for-lm3630-chip-fix.patch backlight-add-new-lm3639-backlight-driver-fix.patch backlight-platform-lcd-add-support-for-device-tree-based-probe-fix.patch idr-rename-max_level-to-max_idr_level-fix.patch idr-rename-max_level-to-max_idr_level-fix-fix-2.patch lib-parserc-avoid-overflow-in-match_number-fix.patch lib-spinlock_debug-avoid-livelock-in-do_raw_spin_lock-fix.patch rtc-add-dallas-ds2404-driver-fix.patch rtc-snvs-add-freescale-rtc-snvs-driver-fix.patch fs-fat-fix-all-other-checkpatch-issues-in-dirc-fix.patch fat-simplify-writeback_inode-checkpatch-fixes.patch fat-simplify-writeback_inode-checkpatch-fixes-fix.patch coredump-make-core-dump-functionality-optional-fix-fix.patch coredump-use-suid_dumpable_enabled-rather-than-hardcoded-1-checkpatch-fixes.patch proc-use-kzalloc-instead-of-kmalloc-and-memset-fix.patch rapidio-run-discovery-as-an-asynchronous-process-fix.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