From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + linux-next-git-rejects.patch added to -mm tree Date: Mon, 09 Nov 2009 11:36:22 -0800 Message-ID: <200911091936.nA9JaMMi011281@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:37833 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751353AbZKITgp (ORCPT ); Mon, 9 Nov 2009 14:36:45 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id nA9JaN2o023627 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 9 Nov 2009 11:36:24 -0800 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: akpm@linux-foundation.org The patch titled linux-next-git-rejects has been added to the -mm tree. Its filename is linux-next-git-rejects.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: linux-next-git-rejects From: Andrew Morton Signed-off-by: Andrew Morton --- include/linux/i2c.h | 8 -------- 1 file changed, 8 deletions(-) diff -puN include/linux/i2c.h~linux-next-git-rejects include/linux/i2c.h --- a/include/linux/i2c.h~linux-next-git-rejects +++ a/include/linux/i2c.h @@ -366,11 +366,7 @@ static inline void i2c_set_adapdata(stru */ static inline void i2c_lock_adapter(struct i2c_adapter *adapter) { -<<<<<<< HEAD:include/linux/i2c.h - mutex_lock(&adapter->bus_lock); -======= rt_mutex_lock(&adapter->bus_lock); ->>>>>>> FETCH_HEAD:include/linux/i2c.h } /** @@ -379,11 +375,7 @@ static inline void i2c_lock_adapter(stru */ static inline void i2c_unlock_adapter(struct i2c_adapter *adapter) { -<<<<<<< HEAD:include/linux/i2c.h - mutex_unlock(&adapter->bus_lock); -======= rt_mutex_unlock(&adapter->bus_lock); ->>>>>>> FETCH_HEAD:include/linux/i2c.h } /*flags for the client struct: */ _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch alpha-move-thread_size-definition-outside-ifndef-assembly.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch i-need-old-gcc.patch include-linux-compiler-gcc4h-gcc-402-doesnt-understand-__builtin_object_size.patch drivers-gpu-drm-i915-i915_dmac-fix-unused-var.patch arch-x86-kernel-cpu-cpufreq-acpi-cpufreqc-avoid-cross-cpu-interrupts-by-using-smp_call_function_any.patch cmpc_acpi-add-support-for-classmate-pc-acpi-devices-fix.patch acpi-remove-nid_inval-checkpatch-fixes.patch timer-stats-fix-del_timer_sync-and-try_to_del_timer_sync.patch 3x59x-fix-pci-resource-management.patch bluetooth-fix-for-acer-bluetooth-optical-rechargeable-mouse.patch include-trace-events-lockdeph-fix-do_div-warning.patch st-fix-test-of-value-range-in-st_set_options.patch scsi-add-hpsa-driver-for-hp-smart-array-controllers-fix.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch fs-improve-remountro-vs-buffercache-coherency.patch percpu-avoid-calling-__pcpu_ptr_to_addrnull.patch readahead-add-blk_run_backing_dev.patch mmap-dont-return-enomem-when-mapcount-is-temporarily-exceeded-in-munmap-checkpatch-fixes.patch dev-mem-cleanup-unxlate_dev_mem_ptr-calls-fix.patch dev-mem-cleanup-unxlate_dev_mem_ptr-calls-fix-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch floppy-add-an-extra-bound-check-on-ioctl-arguments-fix.patch drivers-misc-add-driver-for-texas-instruments-dac7512-update.patch rwsem-fix-rwsem_is_locked-bugs-fix.patch errh-add-helper-function-to-simplify-pointer-error-checking-fix.patch msm_sdccc-add-missing-include-fix-compilation-checkpatch-fixes.patch hwmon-w83627ehf-updates-checkpatch-fixes.patch spi-controller-driver-for-designware-spi-core-fix.patch gpiolib-add-names-file-in-gpio-chip-sysfs.patch mb862xxfb-add-acceleration-support-for-coral-p-coral-pa-imageblt-copyarea-fillrect-fix.patch ext2-avoid-warn-messages-when-failing-to-write-to-the-superblock-checkpatch-fixes.patch memcg-coalesce-charging-via-percpu-storage-fix.patch aio-dont-zero-out-the-pages-array-inside-struct-dio-fix.patch net-netfilter-ipvs-ip_vs_wrrc-use-lib-gcdc-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch fs-reiser4-contextc-current_is_pdflush-got-removed.patch reiser4-fix.patch reiser4-disable.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch