git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Sat, 13 Oct 2018 04:38:46 +0000 (21:38 -0700)
committer	David S. Miller <davem@davemloft.net>
	Sat, 13 Oct 2018 04:38:46 +0000 (21:38 -0700)
commit	d864991b220b7c62e81d21209e1fd978fd67352c
tree	b570a1ad6fc1b959c5bcda6ceca0b321319c01e0	tree \| snapshot
parent	a688c53a0277d8ea21d86a5c56884892e3442c5e	commit \| diff
parent	bab5c80b211035739997ebd361a679fa85b39465	commit \| diff

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

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

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

25 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/hci_qca.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_eth_com.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/usb.c	diff1 \|	diff2 \|	blob \| history
fs/afs/internal.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/devlink.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_fib.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/devlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_semantics.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/ar-internal.h	diff1 \|	diff2 \|	blob \| history
net/rxrpc/call_accept.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/input.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/peer_event.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_u32.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_cake.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/hci_qca.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_eth_com.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amazon/ena/ena_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mediatek/mt76/usb.c	diff1 \|	diff2 \|	blob \| history
fs/afs/internal.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/devlink.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_fib.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/devlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_semantics.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_fib.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/ar-internal.h	diff1 \|	diff2 \|	blob \| history
net/rxrpc/call_accept.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/input.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/peer_event.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_u32.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_cake.c	diff1 \|	diff2 \|	blob \| history
net/tipc/socket.c	diff1 \|	diff2 \|	blob \| history