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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_RED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D5BEC433ED for ; Thu, 20 May 2021 06:24:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46E3F60FDC for ; Thu, 20 May 2021 06:24:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229547AbhETG0K (ORCPT ); Thu, 20 May 2021 02:26:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:56518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230315AbhETG0K (ORCPT ); Thu, 20 May 2021 02:26:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 986ED60249; Thu, 20 May 2021 06:24:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1621491888; bh=iPVg+gBLpvkP9DJvaO9oJFb++Q3CduCh6EI0nY0MHIE=; h=Date:From:To:Subject:From; b=aqO04HNoi8Mu0A1Zn0C83F+/Jrzsb8hwoW1n1x88Tv6tDi7hfB/6TVTPBkvKZRlMF OOdViFEgV/sjs6lhRnta9eHiNt3JyGC01eNIAlW6mBcG2VmiPjvm4iW/Xqd++J/huq Oq8I5qpIB64rMWJqHwqGx18ksq7zS6TDpkBRZCKc= Date: Wed, 19 May 2021 23:24:48 -0700 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: <20210520062448.FbugPppjE%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 --- drivers/gpu/drm/i915/i915_mm.c | 5 ----- 1 file changed, 5 deletions(-) --- a/drivers/gpu/drm/i915/i915_mm.c~linux-next-git-rejects +++ a/drivers/gpu/drm/i915/i915_mm.c @@ -82,7 +82,6 @@ int remap_io_sg(struct vm_area_struct *v unsigned long addr, unsigned long size, struct scatterlist *sgl, resource_size_t iobase) { -<<<<<<< HEAD struct remap_pfn r = { .mm = vma->vm_mm, .prot = vma->vm_page_prot, @@ -90,10 +89,6 @@ int remap_io_sg(struct vm_area_struct *v .iobase = iobase, }; int err; -======= - unsigned long pfn, len, remapped = 0; - int err = 0; ->>>>>>> linux-next/akpm-base /* We rely on prevalidation of the io-mapping to skip track_pfn(). */ GEM_BUG_ON((vma->vm_flags & EXPECTED_FLAGS) != EXPECTED_FLAGS); _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm.patch mm-slub-kunit-add-a-kunit-test-for-slub-debugging-functionality-fix-2.patch mm-gup-pack-has_pinned-in-mmf_has_pinned-checkpatch-fixes.patch mm-memcg-optimize-user-context-object-stock-access-checkpatch-fixes.patch mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5-fix.patch mm-improve-mprotectrw-efficiency-on-pages-referenced-once-fix.patch binfmt-remove-in-tree-usage-of-map_executable-fix.patch mm-mmap-introduce-unlock_range-for-code-cleanup-fix.patch powerpc-mm-book3s64-update-tlb-flush-routines-to-take-a-page-walk-cache-flush-argument-fix.patch mm-mremap-use-range-flush-that-does-tlb-and-page-walk-cache-flush-fix.patch mm-memory_hotplug-disable-memmap_on_memory-when-hugetlb_free_vmemmap-enabled-fix.patch mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix.patch nommu-remove-__gfp_highmem-in-vmalloc-vzalloc-checkpatch-fixes.patch mm-madvise-introduce-madv_populate_readwrite-to-prefault-page-tables-checkpatch-fixes.patch kernelh-split-out-panic-and-oops-helpers-fix.patch lib-decompressors-remove-set-but-not-used-variabled-level-fix.patch mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas-fix.patch module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch linux-next-git-rejects.patch