The patch titled Subject: auditsc-use-kzalloc-instead-of-kmallocmemset-fix has been removed from the -mm tree. Its filename was auditsc-use-kzalloc-instead-of-kmallocmemset-fix.patch This patch was dropped because it was folded into auditsc-use-kzalloc-instead-of-kmallocmemset.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: auditsc-use-kzalloc-instead-of-kmallocmemset-fix remove audit_set_context() altogether - fold it into its caller Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Eric Paris <eparis@xxxxxxxxxx> Cc: Rakib Mullick <rakib.mullick@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/auditsc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff -puN kernel/auditsc.c~auditsc-use-kzalloc-instead-of-kmallocmemset-fix kernel/auditsc.c --- a/kernel/auditsc.c~auditsc-use-kzalloc-instead-of-kmallocmemset-fix +++ a/kernel/auditsc.c @@ -1034,13 +1034,6 @@ static inline void audit_free_aux(struct } } -static inline void audit_set_context(struct audit_context *context, - enum audit_state state) -{ - context->state = state; - context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0; -} - static inline struct audit_context *audit_alloc_context(enum audit_state state) { struct audit_context *context; @@ -1048,7 +1041,8 @@ static inline struct audit_context *audi context = kzalloc(sizeof(*context), GFP_KERNEL); if (!context) return NULL; - audit_set_context(context, state); + context->state = state; + context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0; INIT_LIST_HEAD(&context->killed_trees); INIT_LIST_HEAD(&context->names_list); return context; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch auditsc-use-kzalloc-instead-of-kmallocmemset.patch kernel-audit_treec-tree-will-leak-memory-when-failure-occurs-in-audit_trim_trees-fix.patch drivers-video-implement-a-simple-framebuffer-driver-fix.patch mm-shmemc-remove-an-ifdef.patch memcg-relax-memcg-iter-caching-checkpatch-fixes.patch mm-hugetlb-add-more-arch-defined-huge_pte-functions-fix.patch mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation.patch kexec-vmalloc-export-additional-vmalloc-layer-information-fix.patch mm-hugetlb-include-hugepages-in-meminfo-checkpatch-fixes.patch mm-speedup-in-__early_pfn_to_nid.patch mm-speedup-in-__early_pfn_to_nid-fix.patch include-linux-memoryh-implement-register_hotmemory_notifier.patch ipc-utilc-use-register_hotmemory_notifier.patch mm-slubc-use-register_hotmemory_notifier.patch drivers-base-nodec-switch-to-register_hotmemory_notifier.patch fs-proc-kcorec-use-register_hotmemory_notifier.patch kernel-cpusetc-use-register_hotmemory_notifier.patch mm-limit-growth-of-3%-hardcoded-other-user-reserve.patch mm-replace-hardcoded-3%-with-admin_reserve_pages-knob.patch mm-reinititalise-user-and-admin-reserves-if-memory-is-added-or-removed.patch mm-reinititalise-user-and-admin-reserves-if-memory-is-added-or-removed-v9-checkpatch-fixes.patch resource-add-release_mem_region_adjustable-fix.patch resource-add-release_mem_region_adjustable-fix-fix.patch resource-add-release_mem_region_adjustable-fix-fix-fix.patch mm-madvise-complete-input-validation-before-taking-lock-fix.patch clear_refs-sanitize-accepted-commands-declaration-fix.patch memcg-add-memorypressure_level-events-checkpatch-fixes.patch memcg-add-memorypressure_level-events-fix.patch mm-thp-add-split-tail-pages-to-shrink-page-list-in-page-reclaim-fix-fix.patch thp-fix-huge-zero-page-logic-for-page-with-pfn-==-0-fix.patch mm-swap-mark-swap-pages-writeback-before-queueing-for-direct-io-fix.patch mm-swap-mark-swap-pages-writeback-before-queueing-for-direct-io-fix-fix.patch mem-hotunplug-fix-kfree-of-bootmem-memory-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