linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Torsten Duwe <duwe@lst.de>
Subject: linux-next: manual merge of the tip tree with the arm64 tree
Date: Mon, 15 Apr 2019 14:25:14 +1000	[thread overview]
Message-ID: <20190415142514.6ca10bb5@canb.auug.org.au> (raw)

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

Hi all,

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

  mm/kasan/Makefile

between commit:

  e2092740b723 ("kasan: Makefile: Replace -pg with CC_FLAGS_FTRACE")

from the arm64 tree and commit:

  57b78a62e7f2 ("x86/uaccess, kasan: Fix KASAN vs SMAP")

from the tip 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/kasan/Makefile
index f06ee820d356,613dfe681e9f..000000000000
--- a/mm/kasan/Makefile
+++ b/mm/kasan/Makefile
@@@ -5,9 -6,10 +6,10 @@@ UBSAN_SANITIZE_generic_report.o := 
  UBSAN_SANITIZE_tags.o := n
  KCOV_INSTRUMENT := n
  
 -CFLAGS_REMOVE_common.o = -pg
 -CFLAGS_REMOVE_generic.o = -pg
 -CFLAGS_REMOVE_generic_report.o = -pg
 -CFLAGS_REMOVE_tags.o = -pg
 +CFLAGS_REMOVE_common.o = $(CC_FLAGS_FTRACE)
 +CFLAGS_REMOVE_generic.o = $(CC_FLAGS_FTRACE)
++CFLAGS_REMOVE_generic_report.o = $(CC_FLAGS_FTRACE)
 +CFLAGS_REMOVE_tags.o = $(CC_FLAGS_FTRACE)
  
  # Function splitter causes unnecessary splits in __asan_load1/__asan_store1
  # see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63533

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

             reply	other threads:[~2019-04-15  4:25 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-15  4:25 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-13 16:45 linux-next: manual merge of the tip tree with the arm64 tree broonie
2021-08-27  4:09 Stephen Rothwell
2020-05-22  6:11 Stephen Rothwell
2020-03-18  4:27 Stephen Rothwell
2020-03-18  8:50 ` Catalin Marinas
2020-03-10  1:49 Stephen Rothwell
2019-04-15  4:21 Stephen Rothwell
2017-11-01  5:47 Stephen Rothwell
2017-11-13 22:52 ` Stephen Rothwell
2017-08-22  3:38 Stephen Rothwell
2017-09-04  5:29 ` Stephen Rothwell
2017-06-16  3:25 Stephen Rothwell
2017-07-03  1:29 ` Stephen Rothwell
2017-03-31  3:02 Stephen Rothwell
2017-03-31  9:32 ` Arnd Bergmann
2017-03-31 11:24   ` Stephen Rothwell
2016-09-12  2:54 Stephen Rothwell
2016-05-12  2:00 Stephen Rothwell
2016-04-29  3:56 Stephen Rothwell
2016-04-29  9:04 ` Matt Fleming
2016-02-26  1:53 Stephen Rothwell
2016-02-26  1:53 Stephen Rothwell
2015-10-22  2:26 Stephen Rothwell
2015-10-22 12:06 ` Suzuki K. Poulose
2015-10-22 15:32   ` Catalin Marinas
2015-10-31 22:17     ` Stephen Rothwell
2015-10-15  3:05 Stephen Rothwell
2015-10-13  2:10 Stephen Rothwell
2015-10-13  9:50 ` Will Deacon
2014-05-23  6:44 Stephen Rothwell
2014-05-23  9:23 ` Catalin Marinas
2014-05-23  6:28 Stephen Rothwell
2014-05-23  8:41 ` Catalin Marinas

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=20190415142514.6ca10bb5@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=catalin.marinas@arm.com \
    --cc=duwe@lst.de \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=will.deacon@arm.com \
    /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).