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 29B7FC433F5 for ; Fri, 7 Jan 2022 22:23:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231148AbiAGWXc (ORCPT ); Fri, 7 Jan 2022 17:23:32 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:53956 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbiAGWXc (ORCPT ); Fri, 7 Jan 2022 17:23:32 -0500 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 ams.source.kernel.org (Postfix) with ESMTPS id 83E8FB80E3E for ; Fri, 7 Jan 2022 22:23:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EBD9C36AE9; Fri, 7 Jan 2022 22:23:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1641594210; bh=mFsu7v5E7hQ8psQ8F++pmtvRATD+YRT0sa8Jjkyy7jI=; h=Date:From:To:Subject:From; b=NE0+TdhFlUaXNeOj+DomFEXsF3W+BEGcdlmB/nbKB4YwiDY0excPJi1gqZ+jS8gde bStMbFg6/1LbNmdmBsLwPhnUaB3PfAJYHZ6lR5+rPcuZ8lizBmgX6ofyxHZWC0mCj+ 5op8OXGTd1pkNYGHWz60wUQd39w3MYViu42aCUQA= Date: Fri, 07 Jan 2022 14:23:29 -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: <20220107222329.iCjxsWn-P%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/infiniband/hw/mlx5/mlx5_ib.h | 3 --- 1 file changed, 3 deletions(-) --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h~linux-next-git-rejects +++ a/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -665,10 +665,7 @@ struct mlx5_ib_mr { /* User MR data */ struct mlx5_cache_ent *cache_ent; -<<<<<<< HEAD -======= /* Everything after cache_ent is zero'd when MR allocated */ ->>>>>>> linux-next/akpm-base struct ib_umem *umem; union { _ Patches currently in -mm which might be from akpm@linux-foundation.org are 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 shmem-fix-a-race-between-shmem_unused_huge_shrink-and-shmem_evict_inode-checkpatch-fixes.patch memcg-add-per-memcg-vmalloc-stat-v2-fix.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-page_allocc-do-not-warn-allocation-failure-on-zone-dma-if-no-managed-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 fs-f2fs-datac-fix-mess.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 sysctl-move-maxolduid-as-a-sysctl-specific-const-fix.patch proc-remove-pde_data-completely-fix.patch proc-remove-pde_data-completely-fix-fix.patch mm-simplify-try_to_unuse-fix.patch mutex-subsystem-synchro-test-module-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch linux-next-git-rejects.patch