The patch titled Subject: linux-next-git-rejects has been removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: linux-next-git-rejects Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/s390/kernel/topology.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN arch/s390/kernel/topology.c~linux-next-git-rejects arch/s390/kernel/topology.c --- a/arch/s390/kernel/topology.c~linux-next-git-rejects +++ a/arch/s390/kernel/topology.c @@ -405,11 +405,7 @@ out: put_online_cpus(); return rc ? rc : count; } -<<<<<<< HEAD static DEVICE_ATTR(dispatching, 0644, dispatching_show, -======= -static DEIVCE_ATTR(dispatching, 0644, dispatching_show, ->>>>>>> linux-next/akpm-end dispatching_store); static ssize_t cpu_polarization_show(struct device *dev, _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes.patch mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault.patch mm-more-intensive-memory-corruption-debug.patch mm-exclude-reserved-pages-from-dirtyable-memory.patch mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma.patch mempool-fix-first-round-failure-behavior.patch backlight-convert-pwm_bl-to-dev_pm_ops.patch leds-add-driver-for-tca6507-led-controller.patch checkpatch-improve-memset-and-min-max-with-cast-checking.patch checkpatch-catch-all-occurances-of-type-and-cast-spacing-errors-per-line.patch drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc.patch drivers-rtc-rtc-mxcc-make-alarm-work.patch rtc-ab8500-add-calibration-attribute-to-ab8500-rtc.patch procfs-introduce-the-proc-pid-map_files-directory.patch workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name.patch linux-next.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-block-paride-bpck6c-fix-build.patch fs-nfs-nfs4procc-fix-printk-warnings.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-fix.patch mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix.patch drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes.patch drivers-platform-x86-sony-laptopc-fix-scancodes-v2-checkpatch-fixes.patch drivers-video-nvidia-nvidiac-fix-warning.patch drivers-scsi-mpt2sas-mpt2sas_scsihc-spell-primitive-correctly.patch drivers-usb-misc-emi26c-emi62c-fix-warnings.patch slub-document-setting-min-order-with-debug_guardpage_minorder-0-checkpatch-fixes.patch mm.patch mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch drivers-idle-intel_idlec-remove-redundant-local_irq_disable-call-fix.patch treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes.patch mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes.patch memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix.patch memcg-clear-pc-mem_cgorup-if-necessary-fix.patch memcg-clear-pc-mem_cgorup-if-necessary-fix-2-fix.patch memcg-simplify-lru-handling-by-new-rule-fix.patch memcg-simplify-lru-handling-by-new-rule-memcg-return-eintr-at-bypassing-try_charge-fix.patch mm-compaction-introduce-sync-light-migration-for-use-by-compaction-fix-fix.patch mm-compaction-introduce-sync-light-migration-for-use-by-compaction-fix-fix-3.patch kexec-remove-kmsg_dump_kexec.patch panic-dont-print-redundant-backtraces-on-oops-fix.patch drivers-parport-parport_pcc-fix-warnings.patch scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch memstick-add-support-for-legacy-memorysticks-fix.patch dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes.patch selftests-new-very-basic-kernel-selftests-directory.patch c-r-procfs-add-start_data-end_data-start_brk-members-to-proc-pid-stat-v4-fix.patch c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix.patch fixed-use-of-rounddown_pow_of_two-in-ramoops.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.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