Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Wed, 27 Jun 2018 07:42:17 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23990437AbeF0FmTsxvnw/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed Jun 27 07:40:45 2018 +0200 Commit: 263593200eb775dd95c85dd1df5bdb5c67079f77 Gitweb: https://git.linux-mips.org/g/ralf/linux/263593200eb7 Branch: master --- Documentation/networking/e100.rst | 112 ++++++++++++----------- Documentation/networking/e1000.rst | 76 ++++++++-------- Documentation/networking/strparser.txt | 2 MAINTAINERS | 1 crypto/asymmetric_keys/x509_cert_parser.c | 9 ++ drivers/net/ethernet/amd/Kconfig | 2 drivers/net/ethernet/apm/xgene-v2/Kconfig | 1 drivers/net/ethernet/apm/xgene/Kconfig | 1 drivers/net/ethernet/arc/Kconfig | 6 + drivers/net/ethernet/broadcom/Kconfig | 2 drivers/net/ethernet/cadence/macb_ptp.c | 5 - drivers/net/ethernet/calxeda/Kconfig | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 drivers/net/ethernet/hisilicon/Kconfig | 2 drivers/net/ethernet/marvell/Kconfig | 8 +- drivers/net/ethernet/marvell/mvneta.c | 2 drivers/net/ethernet/mellanox/mlxsw/Kconfig | 2 drivers/net/ethernet/mscc/ocelot.c | 11 +- drivers/net/ethernet/realtek/r8169.c | 2 drivers/net/ethernet/renesas/Kconfig | 2 drivers/net/ethernet/sfc/efx.c | 1 drivers/net/ethernet/ti/davinci_cpdma.c | 2 drivers/net/ethernet/ti/davinci_emac.c | 4 + drivers/net/ipvlan/ipvlan_main.c | 3 - drivers/net/usb/qmi_wwan.c | 1 drivers/net/wireless/broadcom/brcm80211/Kconfig | 1 drivers/net/wireless/quantenna/qtnfmac/Kconfig | 2 drivers/net/xen-netfront.c | 11 +- drivers/vhost/net.c | 3 - fs/btrfs/extent_io.c | 5 + fs/btrfs/inode.c | 4 + fs/btrfs/ioctl.c | 10 +- include/linux/filter.h | 4 + net/bpfilter/Makefile | 2 net/dccp/ccids/ccid3.c | 16 ++- net/ipv6/mcast.c | 9 +- net/packet/af_packet.c | 16 +-- net/sched/cls_flower.c | 21 +++- net/sched/sch_hfsc.c | 4 - net/sctp/chunk.c | 4 + net/strparser/strparser.c | 5 - net/vmw_vsock/virtio_transport.c | 2 security/smack/smack_lsm.c | 1 tools/testing/selftests/net/.gitignore | 1 tools/testing/selftests/net/config | 2 45 files changed, 212 insertions(+), 172 deletions(-)