From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Catalin Marinas <catalin.marinas@arm.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
AKASHI Takahiro <takahiro.akashi@linaro.org>,
Laura Abbott <labbott@redhat.com>
Subject: linux-next: manual merge of the akpm tree with the arm64 tree
Date: Fri, 7 Apr 2017 17:41:20 +1000 [thread overview]
Message-ID: <20170407174120.0b0baadf@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
arch/arm64/include/asm/cacheflush.h
between commit:
9b0aa14e3155 ("arm64: mm: add set_memory_valid()")
from the arm64 tree and patch:
"treewide: move set_memory_* functions away from cacheflush.h"
from the akpm tree.
I fixed it up (see below - not ideal ...) 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 arch/arm64/include/asm/cacheflush.h
index 728f933cef8c,7db6962fc4b4..000000000000
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@@ -150,10 -151,4 +151,6 @@@ static inline void flush_cache_vunmap(u
{
}
- int set_memory_ro(unsigned long addr, int numpages);
- int set_memory_rw(unsigned long addr, int numpages);
- int set_memory_x(unsigned long addr, int numpages);
- int set_memory_nx(unsigned long addr, int numpages);
+int set_memory_valid(unsigned long addr, unsigned long size, int enable);
+
#endif
next reply other threads:[~2017-04-07 7:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 7:41 Stephen Rothwell [this message]
2017-04-07 8:48 ` linux-next: manual merge of the akpm tree with the arm64 tree Catalin Marinas
2017-04-07 9:25 ` Stephen Rothwell
2020-01-23 5:43 Stephen Rothwell
2020-03-05 5:50 Stephen Rothwell
2020-03-05 9:21 ` Catalin Marinas
2020-11-26 7:06 Stephen Rothwell
2020-11-26 7:25 ` Peter Collingbourne
2020-11-30 7:28 Stephen Rothwell
2020-11-30 7:48 ` Stephen Rothwell
2020-11-30 11:58 ` Catalin Marinas
2021-01-28 8:08 Stephen Rothwell
2021-03-22 6:40 Stephen Rothwell
2021-03-22 18:03 ` Catalin Marinas
2021-06-07 9:25 Stephen Rothwell
2021-06-07 10:29 ` Will Deacon
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=20170407174120.0b0baadf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=labbott@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=takahiro.akashi@linaro.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 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).