From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
Masahiro Yamada <masahiroy@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Leon Romanovsky <leonro@mellanox•com>
Subject: linux-next: manual merge of the net-next tree with the kbuild-current tree
Date: Thu, 23 Apr 2020 11:43:13 +1000 [thread overview]
Message-ID: <20200423114313.634bf6cd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/vermagic.h
between commit:
e3459da6c363 ("arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h>")
from the kbuild-current tree and commit:
51161bfc66a6 ("kernel/module: Hide vermagic header file from general use")
from the net-next 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 include/linux/vermagic.h
index dc236577b92f,7768d20ada39..000000000000
--- a/include/linux/vermagic.h
+++ b/include/linux/vermagic.h
@@@ -1,9 -1,10 +1,13 @@@
/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_VERMAGIC_H
+#define _LINUX_VERMAGIC_H
+ #ifndef INCLUDE_VERMAGIC
+ #error "This header can be included from kernel/module.c or *.mod.c only"
+ #endif
+
#include <generated/utsrelease.h>
+#include <asm/vermagic.h>
/* Simply sanity version stamp for modules. */
#ifdef CONFIG_SMP
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2020-04-23 1:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200423114313.634bf6cd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=leonro@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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