]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
projects / mirror_ubuntu-bionic-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf53458 d4c2e9f)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 4 Nov 2017 00:26:51 +0000 (09:26 +0900)
committerDavid S. Miller <davem@davemloft.net>
Sat, 4 Nov 2017 00:26:51 +0000 (09:26 +0900)
commit2a171788ba7bb61995e98e8163204fc7880f63b2
tree4150a94dd08323748116e5051e56ddee830d4812tree
parentbf5345882bd18bc1b4966d170c0491ebe5c9a7d6commit | diff
parentd4c2e9fca5b7db8d315d93a072e65d0847f8e0c5commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Files removed in 'net-next' had their license header updated
in 'net'.  We take the remove from 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
149 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/bcma/Kconfig diff1 | diff2 | blob | history
drivers/bluetooth/Kconfig diff1 | diff2 | blob | history
drivers/net/Makefile diff1 | diff2 | blob | history
drivers/net/dsa/lan9303.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bcm63xx_enet.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bcmsysport.c diff1 | diff2 | blob | history
drivers/net/ethernet/cavium/liquidio/Makefile diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/Makefile diff1 | diff2 | blob | history
drivers/net/ethernet/cisco/enic/enic_clsf.h diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fman/Makefile diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fs_enet/fs_enet.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/Makefile diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/Makefile diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/Makefile diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/Makefile diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c diff1 | diff2 | blob | history
drivers/net/ethernet/sun/sunvnet_common.h diff1 | diff2 | blob | history
drivers/net/phy/Makefile diff1 | diff2 | blob | history
drivers/net/vrf.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/Makefile diff1 | diff2 | blob | history
drivers/s390/net/qeth_core.h diff1 | diff2 | blob | history
drivers/s390/net/qeth_core_mpc.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_core_mpc.h diff1 | diff2 | blob | history
drivers/s390/net/qeth_l2.h diff1 | diff2 | blob | history
drivers/s390/net/qeth_l2_sys.c diff1 | diff2 | blob | history
drivers/s390/net/qeth_l3_sys.c diff1 | diff2 | blob | history
drivers/thunderbolt/ctl.c diff1 | diff2 | blob | history
drivers/thunderbolt/ctl.h diff1 | diff2 | blob | history
drivers/thunderbolt/nhi.h diff1 | diff2 | blob | history
drivers/thunderbolt/nhi_regs.h diff1 | diff2 | blob | history
drivers/thunderbolt/switch.c diff1 | diff2 | blob | history
drivers/thunderbolt/tb.h diff1 | diff2 | blob | history
include/linux/bpf-cgroup.h diff1 | diff2 | blob | history
include/linux/bpf_types.h diff1 | diff2 | blob | history
include/linux/brcmphy.h diff1 | diff2 | blob | history
include/linux/byteorder/generic.h diff1 | diff2 | blob | history
include/linux/dynamic_queue_limits.h diff1 | diff2 | blob | history
include/linux/ethtool.h diff1 | diff2 | blob | history
include/linux/filter.h diff1 | diff2 | blob | history
include/linux/if_macvlan.h diff1 | diff2 | blob | history
include/linux/if_phonet.h diff1 | diff2 | blob | history
include/linux/if_tap.h diff1 | diff2 | blob | history
include/linux/inetdevice.h diff1 | diff2 | blob | history
include/linux/mod_devicetable.h diff1 | diff2 | blob | history
include/linux/mroute.h diff1 | diff2 | blob | history
include/linux/once.h diff1 | diff2 | blob | history
include/linux/rtnetlink.h diff1 | diff2 | blob | history
include/linux/trace_events.h diff1 | diff2 | blob | history
include/net/act_api.h diff1 | diff2 | blob | history
include/net/addrconf.h diff1 | diff2 | blob | history
include/net/dn.h diff1 | diff2 | blob | history
include/net/dst.h diff1 | diff2 | blob | history
include/net/dst_metadata.h diff1 | diff2 | blob | history
include/net/inet_ecn.h diff1 | diff2 | blob | history
include/net/inet_frag.h diff1 | diff2 | blob | history
include/net/ip6_route.h diff1 | diff2 | blob | history
include/net/ip_tunnels.h diff1 | diff2 | blob | history
include/net/neighbour.h diff1 | diff2 | blob | history
include/net/netevent.h diff1 | diff2 | blob | history
include/net/netns/ipv4.h diff1 | diff2 | blob | history
include/net/netns/ipv6.h diff1 | diff2 | blob | history
include/net/pkt_cls.h diff1 | diff2 | blob | history
include/net/pkt_sched.h diff1 | diff2 | blob | history
include/net/rtnetlink.h diff1 | diff2 | blob | history
include/net/sch_generic.h diff1 | diff2 | blob | history
include/net/tc_act/tc_gact.h diff1 | diff2 | blob | history
include/net/tc_act/tc_ife.h diff1 | diff2 | blob | history
include/net/tc_act/tc_mirred.h diff1 | diff2 | blob | history
include/net/xfrm.h diff1 | diff2 | blob | history
include/trace/events/bpf.h diff1 | diff2 | blob | history
include/trace/events/fib6.h diff1 | diff2 | blob | history
include/trace/events/xdp.h diff1 | diff2 | blob | history
include/trace/perf.h diff1 | diff2 | blob | history
include/uapi/linux/bpf.h diff1 | diff2 | blob | history
include/uapi/linux/if_link.h diff1 | diff2 | blob | history
include/uapi/linux/if_tun.h diff1 | diff2 | blob | history
include/uapi/linux/if_tunnel.h diff1 | diff2 | blob | history
include/uapi/linux/in6.h diff1 | diff2 | blob | history
include/uapi/linux/ip6_tunnel.h diff1 | diff2 | blob | history
include/uapi/linux/ipv6_route.h diff1 | diff2 | blob | history
include/uapi/linux/openvswitch.h diff1 | diff2 | blob | history
include/uapi/linux/pkt_sched.h diff1 | diff2 | blob | history
include/uapi/linux/qrtr.h diff1 | diff2 | blob | history
include/uapi/linux/rtnetlink.h diff1 | diff2 | blob | history
include/uapi/linux/sctp.h diff1 | diff2 | blob | history
include/uapi/linux/tc_act/tc_mirred.h diff1 | diff2 | blob | history
include/uapi/linux/tcp.h diff1 | diff2 | blob | history
include/uapi/linux/tipc.h diff1 | diff2 | blob | history
kernel/bpf/Makefile diff1 | diff2 | blob | history
kernel/trace/trace_syscalls.c diff1 | diff2 | blob | history
lib/dynamic_queue_limits.c diff1 | diff2 | blob | history
lib/once.c diff1 | diff2 | blob | history
net/8021q/vlan.h diff1 | diff2 | blob | history
net/bluetooth/hci_sysfs.c diff1 | diff2 | blob | history
net/bridge/Makefile diff1 | diff2 | blob | history
net/core/datagram.c diff1 | diff2 | blob | history
net/core/net-traces.c diff1 | diff2 | blob | history
net/decnet/dn_dev.c diff1 | diff2 | blob | history
net/dsa/Makefile diff1 | diff2 | blob | history
net/ipv4/fib_semantics.c diff1 | diff2 | blob | history
net/ipv4/ip_fragment.c diff1 | diff2 | blob | history
net/ipv4/sysctl_net_ipv4.c diff1 | diff2 | blob | history
net/ipv4/tcp_fastopen.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_metrics.c diff1 | diff2 | blob | history
net/ipv4/tcp_nv.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv4/tcp_recovery.c diff1 | diff2 | blob | history
net/ipv6/addrlabel.c diff1 | diff2 | blob | history
net/ipv6/sysctl_net_ipv6.c diff1 | diff2 | blob | history
net/ipv6/xfrm6_policy.c diff1 | diff2 | blob | history
net/mac80211/Makefile diff1 | diff2 | blob | history
net/rds/ib.h diff1 | diff2 | blob | history
net/sched/Makefile diff1 | diff2 | blob | history
net/sched/act_api.c diff1 | diff2 | blob | history
net/sched/act_bpf.c diff1 | diff2 | blob | history
net/sched/act_ife.c diff1 | diff2 | blob | history
net/sched/act_mirred.c diff1 | diff2 | blob | history
net/sctp/Makefile diff1 | diff2 | blob | history
net/smc/smc_cdc.c diff1 | diff2 | blob | history
net/smc/smc_cdc.h diff1 | diff2 | blob | history
net/smc/smc_close.c diff1 | diff2 | blob | history
net/smc/smc_core.c diff1 | diff2 | blob | history
net/smc/smc_ib.c diff1 | diff2 | blob | history
net/smc/smc_tx.c diff1 | diff2 | blob | history
net/tipc/Makefile diff1 | diff2 | blob | history
net/vmw_vsock/Makefile diff1 | diff2 | blob | history
net/wireless/Makefile diff1 | diff2 | blob | history
net/wireless/chan.c diff1 | diff2 | blob | history
net/wireless/core.h diff1 | diff2 | blob | history
net/wireless/nl80211.h diff1 | diff2 | blob | history
net/wireless/sme.c diff1 | diff2 | blob | history
net/wireless/util.c diff1 | diff2 | blob | history
samples/bpf/Makefile diff1 | diff2 | blob | history
samples/bpf/bpf_load.c diff1 | diff2 | blob | history
samples/bpf/cgroup_helpers.c diff1 | diff2 | blob | history
samples/bpf/tracex6_user.c diff1 | diff2 | blob | history
samples/pktgen/pktgen_sample03_burst_single_flow.sh diff1 | diff2 | blob | history
scripts/mod/devicetable-offsets.c diff1 | diff2 | blob | history
security/selinux/include/classmap.h diff1 | diff2 | blob | history
tools/Makefile diff1 | diff2 | blob | history
tools/bpf/Makefile diff1 | | blob | history
tools/testing/selftests/bpf/Makefile diff1 | diff2 | blob | history
tools/testing/selftests/bpf/bpf_helpers.h diff1 | diff2 | blob | history
tools/testing/selftests/bpf/test_lpm_map.c diff1 | diff2 | blob | history
tools/testing/selftests/tc-testing/tdc.py diff1 | diff2 | blob | history
tools/testing/selftests/tc-testing/tdc_config.py diff1 | diff2 | blob | history
tools/testing/selftests/tc-testing/tdc_helper.py diff1 | diff2 | blob | history
ubuntu-bionic-kernel mirror