All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Mike Rapoport <rppt@kernel.org>,
	Mike Rapoport <rppt@linux.ibm.com>
Subject: linux-next: manual merge of the akpm tree with the arm64 tree
Date: Thu, 28 Jan 2021 19:08:43 +1100	[thread overview]
Message-ID: <20210128190843.0d2bf730@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]

Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  mm/filemap.c

between commit:

  f9ce0be71d1f ("mm: Cleanup faultaround and finish_fault() codepaths")

from the arm64 tree and patch:

  "secretmem: add memcg accounting"

from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc mm/filemap.c
index 4d0b7a122850,4417fd15d633..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -42,7 -42,7 +42,8 @@@
  #include <linux/psi.h>
  #include <linux/ramfs.h>
  #include <linux/page_idle.h>
 +#include <asm/pgalloc.h>
+ #include <linux/secretmem.h>
  #include "internal.h"
  
  #define CREATE_TRACE_POINTS

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2021-01-28  8:13 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-28  8:08 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-06-07  9:25 linux-next: manual merge of the akpm tree with the arm64 tree Stephen Rothwell
2021-06-07 10:29 ` Will Deacon
2021-03-22  6:40 Stephen Rothwell
2021-03-22 18:03 ` Catalin Marinas
2020-11-30  7:28 Stephen Rothwell
2020-11-30  7:48 ` Stephen Rothwell
2020-11-30 11:58   ` Catalin Marinas
2020-11-26  7:06 Stephen Rothwell
2020-11-26  7:25 ` Peter Collingbourne
2020-03-05  5:50 Stephen Rothwell
2020-03-05  9:21 ` Catalin Marinas
2020-01-23  5:43 Stephen Rothwell
2017-04-07  7:41 Stephen Rothwell
2017-04-07  8:48 ` Catalin Marinas
2017-04-07  9:25   ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210128190843.0d2bf730@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=catalin.marinas@arm.com \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rppt@kernel.org \
    --cc=rppt@linux.ibm.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.