All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rusty Russell <rusty@rustcorp.com.au>, Michal Marek <mmarek@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nicolas Boichat <drinkcat@chromium.org>,
	Andi Kleen <ak@linux.intel.com>
Subject: linux-next: manual merge of the modules tree with the kbuild tree
Date: Sun, 1 Nov 2015 19:31:10 +1100	[thread overview]
Message-ID: <20151101193110.5b803cab@canb.auug.org.au> (raw)

Hi Rusty,

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

  scripts/Makefile.modpost

between commit:

  19a3cc83353e ("Kbuild, lto: Add Link Time Optimization support v3")

from the kbuild tree and commit:

  47490ec141b9 ("modpost: Add flag -E for making section mismatches fatal")

from the modules tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc scripts/Makefile.modpost
index 9c40daea846c,1366a94b6c39..000000000000
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@@ -77,8 -77,8 +77,9 @@@ modpost = scripts/mod/modpos
   $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
   $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
   $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
+  $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)  \
 - $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
 + $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \
 + $(if $(CONFIG_LTO),-w)
  
  MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))
  

             reply	other threads:[~2015-11-01  8:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-01  8:31 Stephen Rothwell [this message]
2019-09-15 22:05 linux-next: manual merge of the modules tree with the kbuild tree Mark Brown
2022-05-23  2:08 Stephen Rothwell
2023-10-04  0:43 Stephen Rothwell
2023-11-02 22:24 ` 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=20151101193110.5b803cab@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ak@linux.intel.com \
    --cc=drinkcat@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mmarek@suse.cz \
    --cc=rusty@rustcorp.com.au \
    /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.