From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08225C433EF for ; Tue, 21 Dec 2021 21:18:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236150AbhLUVSG (ORCPT ); Tue, 21 Dec 2021 16:18:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230326AbhLUVSG (ORCPT ); Tue, 21 Dec 2021 16:18:06 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F75AC061574 for ; Tue, 21 Dec 2021 13:18:06 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BDFD0617A9 for ; Tue, 21 Dec 2021 21:18:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B1F6C36AE8; Tue, 21 Dec 2021 21:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1640121485; bh=Ojpk0a2Z/8nG6d5Ln14Zv2GpugJEsTHeIVq5TPbrVqc=; h=Date:From:To:Subject:From; b=pZe4/wrLAHoI0p3C9sgj4bZOGZrnq28h0xRvaNCp1FvmPNGVjxfgmfScITZl/lOV8 2TJWPtodVPm9RyQygdyX9H+YisjOZWmZi8QnOriiYkiO9N4NgMuWX1Uhl9qHJwmg9r agW0drYeZkG6BaWbwGmQNvyH8Wt2KOLhxnjjD3Cw= Date: Tue, 21 Dec 2021 13:18:04 -0800 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org Subject: + linux-next-git-rejects.patch added to -mm tree Message-ID: <20211221211804.IPQG20alH%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: linux-next-git-rejects has been added to the -mm tree. Its filename is linux-next-git-rejects.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/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/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- arch/x86/kvm/vmx/vmx.c | 4 ---- 1 file changed, 4 deletions(-) --- a/arch/x86/kvm/vmx/vmx.c~linux-next-git-rejects +++ a/arch/x86/kvm/vmx/vmx.c @@ -3994,9 +3994,6 @@ static int vmx_deliver_posted_interrupt( if (pi_test_and_set_on(&vmx->pi_desc)) return 0; -<<<<<<< HEAD - if (!kvm_vcpu_trigger_posted_interrupt(vcpu, false)) -======= /* * The implied barrier in pi_test_and_set_on() pairs with the smp_mb_*() * after setting vcpu->mode in vcpu_enter_guest(), thus the vCPU is @@ -4005,7 +4002,6 @@ static int vmx_deliver_posted_interrupt( */ if (vcpu != kvm_get_running_vcpu() && !kvm_vcpu_trigger_posted_interrupt(vcpu, false)) ->>>>>>> linux-next/akpm-base kvm_vcpu_kick(vcpu); return 0; _ Patches currently in -mm which might be from akpm@linux-foundation.org are shmem-fix-a-race-between-shmem_unused_huge_shrink-and-shmem_evict_inode-checkpatch-fixes.patch kthread-add-the-helper-function-kthread_run_on_cpu-fix.patch mm.patch kmemleak-fix-kmemleak-false-positive-report-with-hw-tag-based-kasan-enable-fix.patch device-dax-remove-pfn-from-__dev_dax_ptepmdpud_fault-fix.patch documentation-vm-page_ownerrst-update-the-documentation-fix.patch mm-shmem-dont-truncate-page-if-memory-failure-happens-checkpatch-fixes.patch mm-remove-redundant-check-about-fault_flag_allow_retry-bit-checkpatch-fixes.patch mm-vmalloc-allocate-small-pages-for-area-pages-fix.patch mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch mm-memcg-percpu-account-extra-objcg-space-to-memory-cgroups-fix.patch mm-rmap-fix-potential-batched-tlb-flush-race-fix.patch proc-make-the-proc_create-stubs-static-inlines-fix.patch proc-make-the-proc_create-stubs-static-inlines-fix2.patch proc-make-the-proc_create-stubs-static-inlines-fix2-fix.patch kernel-sys-only-take-tasklist_lock-for-get-setpriorityprio_pgrp-checkpatch-fixes.patch hashh-remove-unused-define-directive-fix.patch panic-use-error_report_end-tracepoint-on-warnings-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch drivers-gpu-drm-vmwgfx-vmwgfx_gemc-printk-fix.patch sysctl-move-some-boundary-constants-from-sysctlc-to-sysctl_vals-fix.patch firmware_loader-move-firmware-sysctl-to-its-own-files-fix.patch firmware_loader-move-firmware-sysctl-to-its-own-files-fix-fix.patch sysctl-add-helper-to-register-a-sysctl-mount-point-fix.patch proc-remove-pde_data-completely-fix.patch proc-remove-pde_data-completely-fix-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch