Subject: [folded-merged] wait-introduce-wait_event_commonwq-condition-state-timeout-checkpatch-fixes.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,oleg@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 18 Jun 2013 15:07:09 -0700 The patch titled Subject: wait-introduce-wait_event_commonwq-condition-state-timeout-checkpatch-fixes has been removed from the -mm tree. Its filename was wait-introduce-wait_event_commonwq-condition-state-timeout-checkpatch-fixes.patch This patch was dropped because it was folded into wait-introduce-wait_event_commonwq-condition-state-timeout.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: wait-introduce-wait_event_commonwq-condition-state-timeout-checkpatch-fixes WARNING: please, no space before tabs #173: FILE: include/linux/wait.h:241: +#define __wait_event(wq, condition) ^I^I^I^I^I\$ WARNING: please, no space before tabs #193: FILE: include/linux/wait.h:245: +#define wait_event(wq, condition) ^I^I^I^I^I\$ total: 0 errors, 2 warnings, 234 lines checked ./patches/wait-introduce-wait_event_commonwq-condition-state-timeout.patch has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/wait.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN include/linux/wait.h~wait-introduce-wait_event_commonwq-condition-state-timeout-checkpatch-fixes include/linux/wait.h --- a/include/linux/wait.h~wait-introduce-wait_event_commonwq-condition-state-timeout-checkpatch-fixes +++ a/include/linux/wait.h @@ -238,11 +238,11 @@ wait_queue_head_t *bit_waitqueue(void *, * wake_up() has to be called after changing any variable that could * change the result of the wait condition. */ -#define __wait_event(wq, condition) \ +#define __wait_event(wq, condition) \ __wait_event_common(wq, condition, \ TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT) \ -#define wait_event(wq, condition) \ +#define wait_event(wq, condition) \ wait_event_common(wq, condition, \ TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT) \ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are linux-next.patch arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch fput-task_work_add-can-fail-if-the-caller-has-passed-exit_task_work-fix.patch include-linux-smph-on_each_cpu-switch-back-to-a-macro.patch sound-soc-codecs-si476xc-dont-use-0bnnn.patch drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix.patch posix-timers-correctly-get-dying-task-time-sample-in-posix_cpu_timer_schedule.patch fput-turn-list_head-delayed_fput_list-into-llist_head.patch mm.patch clear_refs-sanitize-accepted-commands-declaration.patch mm-remove-compressed-copy-from-zram-in-memory-fix.patch mm-remove-compressed-copy-from-zram-in-memory-fix-2-fix.patch memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix.patch include-linux-mmh-add-page_aligned-helper.patch vmcore-allocate-buffer-for-elf-headers-on-page-size-alignment-fix.patch vmalloc-introduce-remap_vmalloc_range_partial-fix.patch vmcore-allocate-elf-note-segment-in-the-2nd-kernel-vmalloc-memory-fix.patch vmcore-allow-user-process-to-remap-elf-note-segment-buffer-fix.patch vmcore-support-mmap-on-proc-vmcore-fix.patch mm-remove-lru-parameter-from-__lru_cache_add-and-lru_cache_add_lru.patch mm-tune-vm_committed_as-percpu_counter-batching-size-fix.patch swap-discard-while-swapping-only-if-swap_flag_discard_pages-fix.patch mm-use-a-dedicated-lock-to-protect-totalram_pages-and-zone-managed_pages-fix.patch mm-correctly-update-zone-managed_pages-fix.patch mm-correctly-update-zone-managed_pages-fix-fix-fix.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 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 mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2-fix.patch include-linux-mmzoneh-cleanups.patch drop_caches-add-some-documentation-and-info-messsge.patch clean-up-scary-strncpydst-src-strlensrc-uses-fix.patch dump_stack-serialize-the-output-from-dump_stack-fix.patch panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix.patch rbtree-remove-unneeded-include-fix.patch checkpatch-warn-when-using-gccs-binary-constant-extension.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch fat-additions-to-support-fat_fallocate-fix.patch ptrace-add-ability-to-get-set-signal-blocked-mask-fix.patch move-exit_task_namespaces-outside-of-exit_notify-fix.patch wait-introduce-wait_event_commonwq-condition-state-timeout.patch wait-introduce-prepare_to_wait_event-checkpatch-fixes.patch dev-oldmem-remove-the-interface-fix.patch idr-print-a-stack-dump-after-ida_remove-warning-fix.patch shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix.patch ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation-checkpatch-fixes.patch partitions-add-aix-lvm-partition-support-files-checkpatch-fixes.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 reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix.patch lib-add-lz4-compressor-module-fix.patch crypto-add-lz4-cryptographic-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