From: David S. Miller <davem@davemloft.net>
Date: Sun, 20 Oct 2019 05:51:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v5.10.7~3838^2~341
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f184393e0c2d409c62262f57f2a57efdf9370b8;p=platform%2Fkernel%2Flinux-rpi.git

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

Several cases of overlapping changes which were for the most
part trivially resolvable.

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

2f184393e0c2d409c62262f57f2a57efdf9370b8
diff --cc include/net/net_namespace.h
index 5ac2bb1,4c2cd93..c5d6829
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@@ -94,14 -102,14 +103,16 @@@ struct net 
  
  	struct uevent_sock	*uevent_sock;		/* uevent socket */
  
- 	struct list_head 	dev_base_head;
  	struct hlist_head 	*dev_name_head;
  	struct hlist_head	*dev_index_head;
 +	struct raw_notifier_head	netdev_chain;
 +
- 	unsigned int		dev_base_seq;	/* protected by rtnl_mutex */
- 	int			ifindex;
- 	unsigned int		dev_unreg_count;
+ 	/* Note that @hash_mix can be read millions times per second,
+ 	 * it is critical that it is on a read_mostly cache line.
+ 	 */
+ 	u32			hash_mix;
+ 
+ 	struct net_device       *loopback_dev;          /* The loopback */
  
  	/* core fib_rules */
  	struct list_head	rules_ops;
diff --cc net/rxrpc/peer_object.c
index bf4dd6c,64830d8..452163e
--- a/net/rxrpc/peer_object.c
+++ b/net/rxrpc/peer_object.c
@@@ -231,7 -230,6 +231,7 @@@ struct rxrpc_peer *rxrpc_alloc_peer(str
  			peer->cong_cwnd = 3;
  		else
  			peer->cong_cwnd = 4;
- 		trace_rxrpc_peer(peer, rxrpc_peer_new, 1, here);
++		trace_rxrpc_peer(peer->debug_id, rxrpc_peer_new, 1, here);
  	}
  
  	_leave(" = %p", peer);
diff --cc tools/lib/bpf/Makefile
index 75b5385,56ce6292..bfeafb9
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@@ -133,9 -143,7 +143,9 @@@ LIB_TARGET	:= $(addprefix $(OUTPUT),$(L
  LIB_FILE	:= $(addprefix $(OUTPUT),$(LIB_FILE))
  PC_FILE		:= $(addprefix $(OUTPUT),$(PC_FILE))
  
 +TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
 +
- GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN) | \
+ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \
  			   cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
  			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \
  			   sort -u | wc -l)
@@@ -149,7 -165,7 +159,7 @@@ all: fixde
  
  all_cmd: $(CMD_TARGETS) check
  
- $(BPF_IN): force elfdep bpfdep bpf_helper_defs.h
 -$(BPF_IN_SHARED): force elfdep bpfdep
++$(BPF_IN_SHARED): force elfdep bpfdep bpf_helper_defs.h
  	@(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \
  	(diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \
  	echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true
@@@ -165,26 -181,24 +175,29 @@@
  	@(test -f ../../include/uapi/linux/if_xdp.h -a -f ../../../include/uapi/linux/if_xdp.h && ( \
  	(diff -B ../../include/uapi/linux/if_xdp.h ../../../include/uapi/linux/if_xdp.h >/dev/null) || \
  	echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' differs from latest version at 'include/uapi/linux/if_xdp.h'" >&2 )) || true
- 	$(Q)$(MAKE) $(build)=libbpf
+ 	$(Q)$(MAKE) $(build)=libbpf OUTPUT=$(SHARED_OBJDIR) CFLAGS="$(CFLAGS) $(SHLIB_FLAGS)"
+ 
 -$(BPF_IN_STATIC): force elfdep bpfdep
++$(BPF_IN_STATIC): force elfdep bpfdep bpf_helper_defs.h
+ 	$(Q)$(MAKE) $(build)=libbpf OUTPUT=$(STATIC_OBJDIR)
  
 +bpf_helper_defs.h: $(srctree)/include/uapi/linux/bpf.h
 +	$(Q)$(srctree)/scripts/bpf_helpers_doc.py --header 		\
 +		--file $(srctree)/include/uapi/linux/bpf.h > bpf_helper_defs.h
 +
  $(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION)
  
- $(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN)
+ $(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN_SHARED)
 -	$(QUIET_LINK)$(CC) --shared -Wl,-soname,libbpf.so.$(LIBBPF_MAJOR_VERSION) \
 -				    -Wl,--version-script=$(VERSION_SCRIPT) $^ -lelf -o $@
 +	$(QUIET_LINK)$(CC) $(LDFLAGS) \
 +		--shared -Wl,-soname,libbpf.so.$(LIBBPF_MAJOR_VERSION) \
 +		-Wl,--version-script=$(VERSION_SCRIPT) $^ -lelf -o $@
  	@ln -sf $(@F) $(OUTPUT)libbpf.so
  	@ln -sf $(@F) $(OUTPUT)libbpf.so.$(LIBBPF_MAJOR_VERSION)
  
- $(OUTPUT)libbpf.a: $(BPF_IN)
+ $(OUTPUT)libbpf.a: $(BPF_IN_STATIC)
  	$(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^
  
 -$(OUTPUT)test_libbpf: test_libbpf.cpp $(OUTPUT)libbpf.a
 -	$(QUIET_LINK)$(CXX) $(INCLUDES) $^ -lelf -o $@
 +$(OUTPUT)test_libbpf: test_libbpf.c $(OUTPUT)libbpf.a
 +	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $^ -lelf -o $@
  
  $(OUTPUT)libbpf.pc:
  	$(QUIET_GEN)sed -e "s|@PREFIX@|$(prefix)|" \
@@@ -259,9 -268,9 +272,10 @@@ config-clean
  	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
  
  clean:
- 	$(call QUIET_CLEAN, libbpf) $(RM) $(CMD_TARGETS) \
 -	$(call QUIET_CLEAN, libbpf) $(RM) -rf $(TARGETS) $(CXX_TEST_TARGET) \
++	$(call QUIET_CLEAN, libbpf) $(RM) -rf $(CMD_TARGETS) \
  		*.o *~ *.a *.so *.so.$(LIBBPF_MAJOR_VERSION) .*.d .*.cmd \
- 		*.pc LIBBPF-CFLAGS bpf_helper_defs.h
 -		*.pc LIBBPF-CFLAGS $(SHARED_OBJDIR) $(STATIC_OBJDIR)
++		*.pc LIBBPF-CFLAGS bpf_helper_defs.h \
++		$(SHARED_OBJDIR) $(STATIC_OBJDIR)
  	$(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf