Subject: [folded-merged] clean-up-scary-strncpydst-src-strlensrc-uses-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,blaschka@xxxxxxxxxxxxxxxxxx,gregkh@xxxxxxxxxxxxxxxxxxx,heiko.carstens@xxxxxxxxxx,keescook@xxxxxxxxxxxx,rafael.j.wysocki@xxxxxxxxx,richard@xxxxxx,schwidefsky@xxxxxxxxxx,ursula.braun@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 03 Jul 2013 14:37:17 -0700 The patch titled Subject: clean-up-scary-strncpydst-src-strlensrc-uses-fix has been removed from the -mm tree. Its filename was clean-up-scary-strncpydst-src-strlensrc-uses-fix.patch This patch was dropped because it was folded into clean-up-scary-strncpydst-src-strlensrc-uses.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: clean-up-scary-strncpydst-src-strlensrc-uses-fix revert getdelays.c part due to missing bsd/string.h Cc: Frank Blaschka <blaschka@xxxxxxxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> [staging] Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> [acpi] Cc: Richard Weinberger <richard@xxxxxx> Acked-by: Ursula Braun <ursula.braun@xxxxxxxxxx> [s390] Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/accounting/getdelays.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN Documentation/accounting/getdelays.c~clean-up-scary-strncpydst-src-strlensrc-uses-fix Documentation/accounting/getdelays.c --- a/Documentation/accounting/getdelays.c~clean-up-scary-strncpydst-src-strlensrc-uses-fix +++ a/Documentation/accounting/getdelays.c @@ -23,7 +23,6 @@ #include <sys/socket.h> #include <sys/wait.h> #include <signal.h> -#include <bsd/string.h> #include <linux/genetlink.h> #include <linux/taskstats.h> @@ -300,7 +299,7 @@ int main(int argc, char *argv[]) break; case 'C': containerset = 1; - strlcpy(containerpath, optarg, sizeof(containerpath)); + strncpy(containerpath, optarg, strlen(optarg) + 1); break; case 'w': logfile = strdup(optarg); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch include-linux-smph-on_each_cpu-switch-back-to-a-macro.patch sound-soc-codecs-si476xc-dont-use-0bnnn.patch ocfs2-xattr-remove-useless-free-space-checking.patch ocfs2-rework-transaction-rollback-in-ocfs2_relink_block_group-fix.patch ocfs2-fix-readonly-issue-in-ocfs2_unlink.patch ocfs2-adjust-switch_case-syntax-at-o2net_state_change.patch clear_refs-sanitize-accepted-commands-declaration.patch mm-remove-compressed-copy-from-zram-in-memory.patch memory_hotplug-use-pgdat_resize_lock-in-__offline_pages.patch include-linux-mmh-add-page_aligned-helper.patch vmcore-allocate-buffer-for-elf-headers-on-page-size-alignment.patch vmalloc-introduce-remap_vmalloc_range_partial.patch vmcore-allocate-elf-note-segment-in-the-2nd-kernel-vmalloc-memory.patch vmcore-allow-user-process-to-remap-elf-note-segment-buffer.patch vmcore-support-mmap-on-proc-vmcore.patch mm-remove-lru-parameter-from-__lru_cache_add-and-lru_cache_add_lru.patch mm-tune-vm_committed_as-percpu_counter-batching-size.patch swap-discard-while-swapping-only-if-swap_flag_discard_pages.patch mm-use-a-dedicated-lock-to-protect-totalram_pages-and-zone-managed_pages.patch mm-correctly-update-zone-managed_pages.patch clean-up-scary-strncpydst-src-strlensrc-uses.patch dump_stack-serialize-the-output-from-dump_stack-fix.patch checkpatch-warn-when-using-gccs-binary-constant-extension.patch rtc-add-nxp-pcf2127-support-i2c-fix.patch ptrace-add-ability-to-get-set-signal-blocked-mask-fix.patch dev-oldmem-remove-the-interface-fix.patch idr-print-a-stack-dump-after-ida_remove-warning-fix.patch documentation-accounting-getdelaysc-avoid-strncpy-in-accounting-tool-fix.patch drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix.patch tools-testing-selftests-dont-assume-the-x-bit-is-set-on-scripts.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