LKML Archive on
help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Matthew Wilcox <>,
	"Darrick J. Wong" <>,
	David Chinner <>,
Cc: Dave Chinner <>,
	Linux Kernel Mailing List <>,
	Linux Next Mailing List <>
Subject: linux-next: manual merge of the folio tree with the xfs tree
Date: Wed, 11 Aug 2021 17:42:31 +1000	[thread overview]
Message-ID: <> (raw)

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

Hi all,

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


between commit:

  de2860f46362 ("mm: Add kvrealloc()")

from the xfs tree and commit:

  3bc0556bade4 ("mm: Add folio_raw_mapping()")

from the folio 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.

Stephen Rothwell

diff --cc mm/util.c
index d06e48b28eec,e8fa30e48447..000000000000
--- a/mm/util.c
+++ b/mm/util.c
@@@ -660,31 -635,6 +660,21 @@@ void kvfree_sensitive(const void *addr
 +void *kvrealloc(const void *p, size_t oldsize, size_t newsize, gfp_t flags)
 +	void *newp;
 +	if (oldsize >= newsize)
 +		return (void *)p;
 +	newp = kvmalloc(newsize, flags);
 +	if (!newp)
 +		return NULL;
 +	memcpy(newp, p, oldsize);
 +	kvfree(p);
 +	return newp;
- static inline void *__page_rmapping(struct page *page)
- {
- 	unsigned long mapping;
- 	mapping = (unsigned long)page->mapping;
- 	mapping &= ~PAGE_MAPPING_FLAGS;
- 	return (void *)mapping;
- }
  /* Neutral page->mapping pointer to address_space or anon_vma or other */
  void *page_rmapping(struct page *page)

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

             reply	other threads:[~2021-08-11  7:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-11  7:42 Stephen Rothwell [this message]
2021-08-11 14:43 ` Darrick J. Wong
2021-08-11 14:44   ` Darrick J. Wong

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:

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

  git send-email \ \ \ \ \ \ \ \ \ \
    --subject='Re: linux-next: manual merge of the folio tree with the xfs tree' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).