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: Tue, 28 Oct 2008 12:06:46 -0700 Message-ID: <200810281906.m9SJ6kFx023631@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:60060 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752372AbYJ1THQ (ORCPT ); Tue, 28 Oct 2008 15:07:16 -0400 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 m9SJ6kYB013445 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 28 Oct 2008 12:06:47 -0700 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/kvm_host.h | 5 ----- virt/kvm/kvm_main.c | 4 ---- 2 files changed, 9 deletions(-) diff -puN include/linux/kvm_host.h~linux-next-git-rejects include/linux/kvm_host.h --- a/include/linux/kvm_host.h~linux-next-git-rejects +++ a/include/linux/kvm_host.h @@ -316,12 +316,7 @@ void kvm_set_irq(struct kvm *kvm, int ir void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi); void kvm_register_irq_ack_notifier(struct kvm *kvm, struct kvm_irq_ack_notifier *kian); -<<<<<<< HEAD:include/linux/kvm_host.h -void kvm_unregister_irq_ack_notifier(struct kvm *kvm, - struct kvm_irq_ack_notifier *kian); -======= void kvm_unregister_irq_ack_notifier(struct kvm_irq_ack_notifier *kian); ->>>>>>> FETCH_HEAD:include/linux/kvm_host.h int kvm_request_irq_source_id(struct kvm *kvm); void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id); diff -puN virt/kvm/kvm_main.c~linux-next-git-rejects virt/kvm/kvm_main.c --- a/virt/kvm/kvm_main.c~linux-next-git-rejects +++ a/virt/kvm/kvm_main.c @@ -143,11 +143,7 @@ static void kvm_free_assigned_device(str if (irqchip_in_kernel(kvm) && assigned_dev->irq_requested) free_irq(assigned_dev->host_irq, (void *)assigned_dev); -<<<<<<< HEAD:virt/kvm/kvm_main.c - kvm_unregister_irq_ack_notifier(kvm, &assigned_dev->ack_notifier); -======= kvm_unregister_irq_ack_notifier(&assigned_dev->ack_notifier); ->>>>>>> FETCH_HEAD:virt/kvm/kvm_main.c kvm_free_irq_source_id(kvm, assigned_dev->irq_source_id); if (cancel_work_sync(&assigned_dev->interrupt_work)) _ Patches currently in -mm which might be from akpm@linux-foundation.org are epoll-avoid-double-inserts-in-case-of-efault-checkpatch-fixes.patch freezer_cg-use-thaw_process-in-unfreeze_cgroup-fix.patch fs-remove-prepare_write-commit_write-fix.patch mm-write_cache_pages-writepage-error-fix.patch mm-remove-the-might_sleep-from-lock_page.patch linux-next.patch next-remove-localversion.patch linux-next-git-rejects.patch arch-x86-kernel-setupc-omit-dmi_low_memory_corruption-when-it-is-unneeded.patch tick-schedc-suppress-needless-timer-reprogramming.patch linux-timexh-cleanup-for-userspace-checkpatch-fixes.patch drivers-input-touchscreen-ucb1400_tsc-needs-gpio.patch kbuild-prevent-modpost-from-looking-for-a-cmd-file-for-a-static-library-linked-into-a-module.patch led-driver-for-leds-on-pcengines-alix2-and-alix3-boards.patch drivers-rtc-rtc-ds1286c-is-borked.patch drivers-rtc-rtc-m48t35c-is-borked-too.patch drivers-net-sfc-falconc-fix-min-warnings.patch pci-uninline-pci_ioremap_bar.patch autofs4-collect-version-check-return-checkpatch-fixes.patch maintainers-make-ioat-easier-to-find.patch add-new-framebuffer-driver-for-fujitsu-mb862xx-gdcs-fix.patch scsi-dpt_i2o-is-bust-on-ia64.patch mm-cleanup-to-make-remove_memory-arch-neutral-fix-fix.patch mm-invoke-oom-killer-from-page-fault-fix.patch mm-invoke-oom-killer-from-page-fault-fix-fix-2.patch fs-truncate-blocks-outside-i_size-after-generic_file_direct_write-error-fix.patch init-properly-placing-noinline-keyword.patch spi_gpio-driver-cleanups.patch rtc-rtc-wm8350-add-support-for-wm8350-rtc.patch ext3-add-support-for-non-native-signed-unsigned-htree-hash-algorithms-checkpatch-fixes.patch quota-convert-union-in-mem_dqinfo-to-a-pointer-cleanup.patch w1-export-w1_read_8-function-checkpatch-fixes.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch reiser4-track-upstream-changes.patch reiser4-broke.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.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 profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.patch