Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Simple overlapping changes to linux/vermagic.h

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

diff --cc Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_tx.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/macvlan.c
Simple merge

diff --cc drivers/net/phy/marvell10g.c
Simple merge

diff --cc include/linux/vermagic.h
index 7768d20ada39436080856ebff6701f9d7410d741,dc236577b92f0959a76a797cc3421be99925b391..1eaaa93c37bff4cf5d17888732c74983b58a0dc6
--- 1/include/linux/vermagic.h
--- 2/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

diff --cc net/dsa/slave.c
Simple merge

diff --cc tools/testing/selftests/net/fib_nexthops.sh
Simple merge