Subject: [folded-merged] block-support-embedded-device-command-line-partition-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,albert.wanglin@xxxxxxxxxx,axboe@xxxxxxxxx,caizhiyong@xxxxxxxxxx,dwmw2@xxxxxxxxxxxxx,kzak@xxxxxxxxxx,mag@xxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 14 Aug 2013 17:27:30 -0700 The patch titled Subject: block-support-embedded-device-command-line-partition-fix has been removed from the -mm tree. Its filename was block-support-embedded-device-command-line-partition-fix.patch This patch was dropped because it was folded into block-support-embedded-device-command-line-partition.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: block-support-embedded-device-command-line-partition-fix fix printk text Cc: "Wanglin (Albert)" <albert.wanglin@xxxxxxxxxx> Cc: Cai Zhiyong <caizhiyong@xxxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Karel Zak <kzak@xxxxxxxxxx> Cc: Marius Groeger <mag@xxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- block/partitions/cmdline.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN block/partitions/cmdline.c~block-support-embedded-device-command-line-partition-fix block/partitions/cmdline.c --- a/block/partitions/cmdline.c~block-support-embedded-device-command-line-partition-fix +++ a/block/partitions/cmdline.c @@ -134,7 +134,7 @@ static int parse_parts(struct cmdline_pa next = strchr(cmdline, ':'); if (!next) { - pr_warn("cmdline partition has not block device."); + pr_warn("cmdline partition has no block device."); goto fail; } @@ -162,7 +162,7 @@ static int parse_parts(struct cmdline_pa } if (!newparts->subpart) { - pr_warn("cmdline partition has not valid partition."); + pr_warn("cmdline partition has no valid partition."); goto fail; } @@ -207,7 +207,7 @@ static int parse_cmdline(struct cmdline_ } if (!*parts) { - pr_warn("cmdline partition has not valid partition."); + pr_warn("cmdline partition has no valid partition."); ret = -EINVAL; goto fail; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch revert-include-linux-smph-on_each_cpu-switch-back-to-a-macro.patch arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch block-support-embedded-device-command-line-partition.patch mm.patch swap-warn-when-a-swap-area-overflows-the-maximum-size-fix.patch mm-swapfilec-convert-to-pr_foo.patch mm-vmstats-track-tlb-flush-stats-on-up-too-fix.patch swap-make-swap-discard-async-checkpatch-fixes.patch swap-make-cluster-allocation-per-cpu-checkpatch-fixes.patch mm-page_alloc-restructure-free-page-stealing-code-and-fix-a-bug-fix.patch mm-hugetlb-decrement-reserve-count-if-vm_noreserve-alloc-page-cache-fix.patch mm-mempolicy-return-null-if-node-is-numa_no_node-in-get_task_policy.patch vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters-fix.patch genalloc-fix-overflow-of-ending-address-of-memory-chunk-fix.patch mm-use-zone_end_pfn-instead-of-zone_start_pfnspanned_pages-fix.patch mm-hotplug-verify-hotplug-memory-range-fix.patch lib-crc32-update-the-comments-of-crc32_bele_generic-checkpatch-fixes.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch fat-additions-to-support-fat_fallocate-fix.patch move-exit_task_namespaces-outside-of-exit_notify-fix.patch initmpfs-move-bdi-setup-from-init_rootfs-to-init_ramfs-fix.patch initmpfs-use-initramfs-if-rootfstype=-or-root=-specified-checkpatch-fixes.patch ipc-drop-ipcctl_pre_down-fix.patch ipcshm-make-shmctl_nolock-lockless-checkpatch-fixes.patch linux-next.patch revert-selinux-do-not-handle-seclabel-as-a-special-flag.patch drivers-staging-comedi-drivers-das16c-needs-slabh.patch memcg-trivial-cleanups.patch shrinker-convert-superblock-shrinkers-to-new-api-fix.patch xfs-convert-buftarg-lru-to-generic-code-fix.patch xfs-convert-dquot-cache-lru-to-list_lru-fix.patch fs-convert-fs-shrinkers-to-new-scan-count-api-fix.patch fs-convert-fs-shrinkers-to-new-scan-count-api-fix-fix-2.patch drivers-convert-shrinkers-to-new-count-scan-api-fix.patch drivers-convert-shrinkers-to-new-count-scan-api-fix-2.patch shrinker-convert-remaining-shrinkers-to-count-scan-api-fix.patch hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix.patch shrinker-kill-old-shrink-api-fix.patch debugging-keep-track-of-page-owners-fix-2-fix.patch debugging-keep-track-of-page-owners-fix-2-fix-fix-fix.patch journal_add_journal_head-debug.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.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