From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - git-block-fixup.patch removed from -mm tree Date: Sat, 21 Apr 2007 21:59:22 -0700 Message-ID: <200704220501.l3M51xcD019925@shell0.pdx.osdl.net> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([65.172.181.25]:43790 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754082AbXDVFCc (ORCPT ); Sun, 22 Apr 2007 01:02:32 -0400 Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6]) by smtp1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id l3M522U0019247 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 21 Apr 2007 22:02:04 -0700 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org The patch titled git-block-fixup has been removed from the -mm tree. Its filename was git-block-fixup.patch This patch was dropped because it is obsolete ------------------------------------------------------ Subject: git-block-fixup From: Andrew Morton Signed-off-by: Andrew Morton --- block/cfq-iosched.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff -puN block/cfq-iosched.c~git-block-fixup block/cfq-iosched.c --- a/block/cfq-iosched.c~git-block-fixup +++ a/block/cfq-iosched.c @@ -1038,19 +1038,11 @@ __cfq_dispatch_requests(struct cfq_data * expire an async queue immediately if it has used up its slice. idle * queue always expire after 1 dispatch round. */ -<<<<<<< HEAD/block/cfq-iosched.c if (cfqd->busy_queues > 1 && ((!cfq_cfqq_sync(cfqq) && cfqd->dispatch_slice >= cfq_prio_to_maxrq(cfqd, cfqq)) || cfq_class_idle(cfqq))) { cfqq->slice_end = jiffies + 1; cfq_slice_expired(cfqd, 0, 0); -======= - if ((!cfq_cfqq_sync(cfqq) && - dispatched >= cfq_prio_to_maxrq(cfqd, cfqq)) || - cfq_class_idle(cfqq)) { - cfqq->slice_end = jiffies; - cfq_slice_expired(cfqd, 0); ->>>>>>> /block/cfq-iosched.c } return dispatched; @@ -1107,27 +1099,13 @@ static int cfq_dispatch_requests(request while ((cfqq = cfq_select_queue(cfqd)) != NULL) { int max_dispatch; -<<<<<<< HEAD/block/cfq-iosched.c if (cfqd->busy_queues > 1) { /* * Don't repeat dispatch from the previous queue. */ if (prev_cfqq == cfqq) break; -======= - max_dispatch = cfqd->cfq_quantum; - if (cfq_class_idle(cfqq)) - max_dispatch = 1; - - if (cfqq->dispatched >= max_dispatch) { - if (cfqd->busy_queues > 1) - break; - if (cfqq->dispatched >= 4 * max_dispatch) - break; - } ->>>>>>> /block/cfq-iosched.c -<<<<<<< HEAD/block/cfq-iosched.c /* * So we have dispatched before in this round, if the * next queue has idling enabled (must be sync), don't @@ -1136,10 +1114,6 @@ static int cfq_dispatch_requests(request if (cfqd->rq_in_driver && cfq_cfqq_idle_window(cfqq)) break; } -======= - if (cfqd->sync_flight && !cfq_cfqq_sync(cfqq)) - break; ->>>>>>> /block/cfq-iosched.c cfq_clear_cfqq_must_dispatch(cfqq); cfq_clear_cfqq_wait_request(cfqq); _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch taskstats-fix-the-structure-members-alignment-issue-fix.patch slab-introduce-krealloc-fix.patch git-acpi.patch git-alsa.patch git-alsa-fixup.patch git-agpgart.patch git-powerpc.patch ppc4xx_sgdma-needs-dma_mappingh.patch revert-gregkh-driver-remove-struct-subsystem-as-it-is-no-longer-needed.patch device_schedule_callback-needs-a-module-reference-fix.patch git-drm.patch git-dvb.patch applesmc-fix-crash-when-activating-a-led-trigger-on-the-keyboard-backlight-use-a-workqueue-fix.patch git-gfs2-nmw.patch git-ieee1394.patch git-input.patch git-input-fixup.patch git-kvm.patch git-libata-all.patch libata-acpi-add-infrastructure-for-drivers-to-use-fix.patch pata_acpi-restore-driver-fix.patch pata_acpi-restore-driver-fix-2.patch drivers-ata-pata_cmd640c-fix-build-with-config_pm=n.patch revert-rm-pointless-dmaengine-exports.patch git-md-accel-fix.patch git-mmc-versus-uevent-use-add_uevent_var-instead-of-open-coding-it.patch git-mtd.patch git-ubi.patch revert-gitpowerpc-ehea-changes.patch git-netdev-all.patch reapply-gitpowerpc-ehea-changes.patch vioc-warning-fix.patch vioc-cast-warning-fix.patch git-e1000.patch git-e1000-fixup-2.patch git-net.patch git-net-fixup.patch git-net-vs-git-netdev-all.patch input-rfkill-add-support-for-input-key-to-control-wireless-radio-fixes-fix.patch input-rfkill-add-support-for-input-key-to-control-wireless-radio-fixes-2.patch input-rfkill-add-support-for-input-key-to-control-wireless-radio-fixes-3.patch irda_device_dongle_init-fix-kzallocgfp_kernel-in-spinlock.patch rfcomm_worker-fix-wakeup-race.patch git-ocfs2.patch git-parisc.patch rm9000-serial-driver.patch fix-gregkh-pci-pci-remove-the-broken-pci_multithread_probe-option.patch git-pciseg.patch git-s390.patch git-s390-fixup.patch git-scsi-misc.patch scsi-fix-config_scsi_wait_scan=m-fix.patch scsi-fix-config_scsi_wait_scan=m-fix-fix.patch pci-error-recovery-symbios-scsi-base-support-fixes.patch pci-error-recovery-symbios-scsi-first-failure-fix.patch git-block-fixup.patch cxacru-add-documentation-file-fix.patch git-wireless.patch git-wireless-fixup.patch git-wireless-vs-git-net.patch git-wireless-vs-git-net-2.patch git-wireless-vs-git-net-3.patch revert-x86_64-mm-account-for-module-percpu-space-separately-from-kernel-percpu.patch rename-the-parainstructions-symbols-to-be-consistent-with-the-others-fix.patch x86_64-inhibit-machine-from-asserting-an-nmi-when-doing-alt-sysrq-m-operation-tidy.patch resurrect-the-vmi-lazy-mode-fixes-fix.patch i386-map-enough-initial-memory-to-create-lowmem-mappings-fix.patch xfs-clean-up-shrinker-games.patch acpi-thermal-fix-mod_timer-interval.patch add-__gfp_movable-for-callers-to-flag-allocations-from-high-memory-that-may-be-migrated-fix.patch mm-merge-populate-and-nopage-into-fault-fixes-nonlinear-tidy.patch mm-merge-nopfn-into-fault-fix.patch i386-use-pte_update_defer-in-ptep_test_and_clear_dirtyyoung-fix.patch smaps-add-clear_refs-file-to-clear-reference-fix.patch smaps-add-clear_refs-file-to-clear-reference-fix-fix-2.patch maps2-move-the-page-walker-code-to-lib-fix.patch bias-the-location-of-pages-freed-for-min_free_kbytes-in-the-same-max_order_nr_pages-blocks-tidy.patch mm-move-common-segment-checks-to-separate-helper-function-v7-tidy.patch slab-mark-set_up_list3s-__init.patch extend-print_symbol-capability-fix-fix.patch slub-core-tidy.patch slub-core-tidy-2.patch slub-core-tidy-3.patch slub-core-tidy-4.patch slub-core-tidy-5.patch slub-core-tidy-6.patch slub-core-tidy-7.patch slub-core-tidy-8.patch slub-core-tidy-9.patch slub-core-add-explanation-for-locking-fix.patch slub-core-explain-sizing-of-slabs-in-detail-fix.patch slub-core-more-statics.patch slub-enable-tracking-of-full-slabs-fix.patch slub-add-ability-to-list-alloc--free-callers-per-slab-tidy.patch slub-user-documentation-fix.patch mm-optimize-kill_bdev-fix.patch lazy-freeing-of-memory-through-madv_free-fix.patch lazy-freeing-of-memory-through-madv_free-vs-mm-madvise-avoid-exclusive-mmap_sem.patch driver_bfin_serial_core-update.patch srmcons-fix-kmallocgfp_kernel-inside-spinlock.patch uml-driver-formatting-fixes-fix.patch reduce-size-of-task_struct-on-64-bit-machines.patch mm-shrink-parent-dentries-when-shrinking-slab.patch merge-sys_clone-sys_unshare-nsproxy-and-namespace-fix-fix-fix.patch virtual_eisa_root_init-should-be-__init.patch proc-maps-protection-fix.patch proc-maps-protection-tidy.patch proc-maps-protection-fix-2.patch fix-cycladesh-for-x86_64-and-probably-others-fix.patch rtc-add-rtc-rs5c313-driver-tidy.patch rtc-add-rtc-rs5c313-driver-is-busted.patch move-die-notifier-handling-to-common-code-fixes-2.patch move-die-notifier-handling-to-common-code-fix-vmalloc_sync_all.patch fix-sscanf-%n-match-at-end-of-input-string-tidy.patch parport-dev-driver-model-support-powerpc-fix.patch cache-pipe-buf-page-address-for-non-highmem-arch-fix.patch cache-pipe-buf-page-address-for-non-highmem-arch-fix-tidy.patch add-support-for-deferrable-timers-respun-tidy.patch linux-sysdevh-needs-to-include-linux-moduleh.patch time-smp-friendly-alignment-of-struct-clocksource.patch move-timekeeping-code-to-timekeepingc-fix.patch fix-kevents-childs-priority-greediness-fix.patch display-all-possible-partitions-when-the-root-filesystem-failed-to-mount-fix.patch expose-range-checking-functions-from-arch-specific-update-fix.patch pad-irq_desc-to-internode-cacheline-size-fix.patch dtlk-fix-error-checks-in-module_init-fix.patch document-spin_lock_unlocked-rw_lock_unlocked-deprecation-fix.patch upper-32-bits.patch define-and-use-new-eventscpu_lock_acquire-and-cpu_lock_release.patch call-cpu_chain-with-cpu_down_failed-if-cpu_down_prepare-failed-vs-reduce-size-of-task_struct-on-64-bit-machines.patch kthread-dont-depend-on-work-queues-take-2-fix.patch speedup-divides-by-cpu_power-in-scheduler.patch revert-sched-redundant-reschedule-when-set_user_nice-boosts-a-prio-of-a-task-from-the-expired-array-update.patch revert-sched-redundant-reschedule-when-set_user_nice-boosts-a-prio-of-a-task-from-the-expired-array.patch lutimesat-compat-syscall-and-wire-up-on-x86_64.patch revert-rtc-add-rtc_merge_alarm.patch declare-struct-ktime.patch make-futex_wait-use-an-hrtimer-for-timeout-fix.patch sys_futex64-allows-64bit-futexes-workaround.patch kprobes-the-on-off-knob-thru-debugfs-updated-fix.patch kprobes-the-on-off-knob-thru-debugfs-updated-fix-fix-fix.patch atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc.patch local_t-powerpc-extension.patch linux-kernel-markers-i386-optimization-fix.patch signal-timer-event-fds-v9-signalfd-core-fix.patch signal-timer-event-fds-v9-signalfd-core-fix-fix.patch signal-timer-event-fds-v9-timerfd-core-fix.patch signal-timer-event-fds-v9-eventfd-core-fix.patch signal-timer-event-fds-v9-eventfd-core-fix-fix.patch revoke-core-code-fix-shared-mapping-revoke.patch revoke-wire-up-i386-system-calls-x86_64-fix.patch x86-serial-convert-legacy-com-ports-to-platform-devices-fix.patch lguest-the-host-code-vs-sys_futex64-allows-64bit-futexes-get_futex_key-must-check-proper-alignement-for-64bit-futexes.patch lguest-the-host-code-vs-x86_64-mm-i386-separate-hardware-defined-tss-from-linux-additions.patch lguest-the-host-code-vs-futex-new-private-futexes.patch fs-convert-core-functions-to-zero_user_page-pass-kmap-type.patch fs-convert-core-functions-to-zero_user_page-fix-2.patch ntfs-use-zero_user_page-fix.patch unprivileged-mounts-account-user-mounts-fix.patch unprivileged-mounts-propagate-error-values-from-clone_mnt-fix.patch unprivileged-mounts-allow-unprivileged-bind-mounts-fix.patch proc-maps-protection-vs-utrace.patch utrace-prep-2.patch undo-utrace-prep-2.patch utrace-vs-reduce-size-of-task_struct-on-64-bit-machines.patch utrace-printk-borkage.patch fbdev-hecuba-framebuffer-driver.patch vt-add-color-support-to-the-underline-and-italic-attributes-fix.patch integrity-new-hooks-fix.patch integrity-evm-as-an-integrity-service-provider-tidy.patch integrity-evm-as-an-integrity-service-provider-tidy-fix.patch integrity-evm-as-an-integrity-service-provider-tidy-fix-2.patch integrity-ima-integrity_measure-support-tidy.patch integrity-ima-integrity_measure-support-fix.patch integrity-ima-integrity_measure-support-fix-2.patch integrity-tpm-internal-kernel-interface-tidy.patch