From: David S. Miller <davem@davemloft.net>
Date: Sun, 26 Apr 2020 02:24:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d483389678f9e03d53f226641ea39679debcbc81;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

Simple overlapping changes to linux/vermagic.h

Signed-off-by: David S. Miller <davem@davemloft.net>
---

d483389678f9e03d53f226641ea39679debcbc81
diff --cc include/linux/vermagic.h
index 7768d20ada394,dc236577b92f0..1eaaa93c37bff
--- a/include/linux/vermagic.h
+++ b/include/linux/vermagic.h
@@@ -1,10 -1,9 +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