Subject: linux-next: manual merge of the net-next tree with the kbuild-current tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 23 Apr 2020 11:43:13 +1000

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