git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 96524ea 1e1d926)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2019 18:00:14 +0000 (11:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2019 18:00:14 +0000 (11:00 -0700)
commita6cdeeb16bff89c8486324f53577db058cbe81ba
treede2d38e10f5768bdf1d2902112a4803d0ae767f3tree
parent96524ea4be04683bb3ad8ebaedcbe3a6e34302decommit | diff
parent1e1d926369545ea09c98c6c7f5d109aa4ee0cd0bcommit | diff
Merge git://git./linux/kernel/git/davem/net

Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.

Signed-off-by: David S. Miller <davem@davemloft.net>
113 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/i2c/i2c-core-acpi.c diff1 | diff2 | blob | history
drivers/isdn/hardware/mISDN/netjet.c diff1 | diff2 | blob | history
drivers/media/dvb-frontends/tua6100.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.h diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/global1.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/global1.h diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/global1_atu.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/global1_vtu.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/global2.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/global2.h diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/port.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/port.h diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/smi.c diff1 | diff2 | blob | history
drivers/net/dsa/sja1105/sja1105_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.c diff1 | diff2 | blob | history
drivers/net/ethernet/rocker/rocker_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/rocker/rocker_ofdpa.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c diff1 | diff2 | blob | history
drivers/net/macvlan.c diff1 | diff2 | blob | history
drivers/net/phy/phylink.c diff1 | diff2 | blob | history
drivers/net/phy/sfp.c diff1 | diff2 | blob | history
drivers/net/plip/plip.c diff1 | diff2 | blob | history
drivers/net/wan/hdlc_cisco.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/asyncdata.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/bas-gigaset.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/capi.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/common.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/dummyll.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/ev-layer.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/gigaset.h diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/interface.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/isocdata.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/proc.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/ser-gigaset.c diff1 | diff2 | blob | history
drivers/staging/isdn/gigaset/usb-gigaset.c diff1 | diff2 | blob | history
fs/afs/cmservice.c diff1 | diff2 | blob | history
fs/afs/internal.h diff1 | diff2 | blob | history
include/dt-bindings/net/ti-dp83867.h diff1 | diff2 | blob | history
include/linux/bpf.h diff1 | diff2 | blob | history
include/linux/bpf_verifier.h diff1 | diff2 | blob | history
include/linux/igmp.h diff1 | diff2 | blob | history
include/linux/phy.h diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/net/devlink.h diff1 | diff2 | blob | history
include/net/dsa.h diff1 | diff2 | blob | history
include/net/ip.h diff1 | diff2 | blob | history
include/net/ip6_fib.h diff1 | diff2 | blob | history
include/net/ip_fib.h diff1 | diff2 | blob | history
include/net/ipv6.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
include/net/tls.h diff1 | diff2 | blob | history
kernel/bpf/core.c diff1 | diff2 | blob | history
kernel/bpf/stackmap.c diff1 | diff2 | blob | history
kernel/cgroup/cgroup.c diff1 | diff2 | blob | history
net/8021q/vlan_dev.c diff1 | diff2 | blob | history
net/bridge/br_device.c diff1 | diff2 | blob | history
net/bridge/br_private.h diff1 | diff2 | blob | history
net/core/devlink.c diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/core/neighbour.c diff1 | diff2 | blob | history
net/core/pktgen.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/dsa/dsa2.c diff1 | diff2 | blob | history
net/dsa/dsa_priv.h diff1 | diff2 | blob | history
net/dsa/port.c diff1 | diff2 | blob | history
net/dsa/slave.c diff1 | diff2 | blob | history
net/ethernet/eth.c diff1 | diff2 | blob | history
net/ieee802154/6lowpan/reassembly.c diff1 | diff2 | blob | history
net/ipv4/devinet.c diff1 | diff2 | blob | history
net/ipv4/fib_frontend.c diff1 | diff2 | blob | history
net/ipv4/fib_rules.c diff1 | diff2 | blob | history
net/ipv4/fib_semantics.c diff1 | diff2 | blob | history
net/ipv4/fib_trie.c diff1 | diff2 | blob | history
net/ipv4/icmp.c diff1 | diff2 | blob | history
net/ipv4/igmp.c diff1 | diff2 | blob | history
net/ipv4/inet_connection_sock.c diff1 | diff2 | blob | history
net/ipv4/inet_fragment.c diff1 | diff2 | blob | history
net/ipv4/inet_hashtables.c diff1 | diff2 | blob | history
net/ipv4/proc.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv4/udp_offload.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/af_inet6.c diff1 | diff2 | blob | history
net/ipv6/icmp.c diff1 | diff2 | blob | history
net/ipv6/inet6_hashtables.c diff1 | diff2 | blob | history
net/ipv6/ip6_fib.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/ndisc.c diff1 | diff2 | blob | history
net/ipv6/netfilter/nf_conntrack_reasm.c diff1 | diff2 | blob | history
net/ipv6/proc.c diff1 | diff2 | blob | history
net/ipv6/reassembly.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
net/ipv6/udp.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_app.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_core.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_ctl.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_ftp.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_proto_tcp.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_proto_udp.c diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_xmit.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_broadcast.c diff1 | diff2 | blob | history
net/rds/ib.c diff1 | diff2 | blob | history
net/sctp/offload.c diff1 | diff2 | blob | history
net/socket.c diff1 | diff2 | blob | history
net/tls/tls_device.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/test_verifier.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.