[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mips-cvs
Subject:    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
From:       linux-mips () linux-mips ! org
Date:       2016-06-30 15:02:35
Message-ID: S23992911AbcF3PCme1h40/20160630150242Z+298 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Thu Jun 30 17:00:06 2016 +0200
Commit: 5a8f143a671befc633766e008e2bbfc1d131fe06
Gitweb: https://git.linux-mips.org/g/ralf/linux/5a8f143a671b
Branch: master

---

 MAINTAINERS                                        |    3 
 arch/s390/include/asm/fpu/api.h                    |    2 
 arch/s390/kernel/ipl.c                             |    7 -
 drivers/ata/ahci_seattle.c                         |    2 
 drivers/ata/sata_mv.c                              |    2 
 drivers/connector/cn_proc.c                        |   43 ++--
 drivers/gpio/gpio-tegra.c                          |    9 +
 drivers/hid/hid-multitouch.c                       |   21 +-
 drivers/net/bonding/bond_3ad.c                     |   64 ++++--
 drivers/net/can/at91_can.c                         |    5 
 drivers/net/can/c_can/c_can.c                      |   38 +++
 drivers/net/can/dev.c                              |    9 +
 drivers/net/can/usb/Kconfig                        |    5 
 drivers/net/can/usb/gs_usb.c                       |   14 +
 drivers/net/can/usb/kvaser_usb.c                   |    8 +
 drivers/net/ethernet/amd/au1000_eth.c              |    4 
 drivers/net/ethernet/atheros/alx/alx.h             |    4 
 drivers/net/ethernet/atheros/alx/main.c            |   61 +----
 drivers/net/ethernet/broadcom/bgmac.c              |    8 -
 drivers/net/ethernet/cavium/thunder/nic_main.c     |   16 +
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c  |   91 +++++---
 drivers/net/ethernet/cavium/thunder/thunder_bgx.h  |    2 
 drivers/net/ethernet/ibm/ibmvnic.c                 |   14 +
 drivers/net/ethernet/intel/e1000e/netdev.c         |   15 +
 drivers/net/ethernet/mediatek/mtk_eth_soc.c        |   61 ++++-
 drivers/net/ethernet/mediatek/mtk_eth_soc.h        |    3 
 drivers/net/ethernet/mellanox/mlx4/cmd.c           |    1 
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |   46 +++-
 drivers/net/ethernet/mellanox/mlx4/main.c          |    6 -
 drivers/net/ethernet/mellanox/mlx5/core/cmd.c      |    1 
 drivers/net/ethernet/mellanox/mlx5/core/en.h       |    2 
 .../net/ethernet/mellanox/mlx5/core/en_ethtool.c   |   34 +--
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |   35 +--
 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c    |    4 
 drivers/net/ethernet/mellanox/mlx5/core/en_stats.h |  228 +++++++++-----------
 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c    |    4 
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |    3 
 drivers/net/ethernet/mellanox/mlx5/core/vxlan.c    |    3 
 drivers/net/ethernet/mellanox/mlx5/core/wq.c       |   15 +
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c     |    6 -
 drivers/net/ethernet/mellanox/mlxsw/switchx2.c     |    5 
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |    6 -
 drivers/net/ethernet/qlogic/qed/qed_hsi.h          |    1 
 drivers/net/ethernet/qlogic/qed/qed_l2.c           |    8 -
 drivers/net/ethernet/qlogic/qed/qed_main.c         |    1 
 drivers/net/ethernet/qlogic/qed/qed_spq.c          |   31 ++-
 drivers/net/ethernet/qlogic/qede/qede_main.c       |    7 -
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c     |    2 
 drivers/net/ethernet/sfc/farch.c                   |    3 
 drivers/net/ethernet/smsc/smsc911x.c               |    2 
 drivers/net/ethernet/ti/cpsw.c                     |    4 
 drivers/net/ethernet/tile/tilegx.c                 |    6 -
 drivers/net/fddi/skfp/Makefile                     |    2 
 drivers/net/geneve.c                               |   22 +-
 drivers/net/macsec.c                               |   49 +++-
 drivers/net/phy/fixed_phy.c                        |   22 +-
 drivers/net/phy/marvell.c                          |   82 ++++++-
 drivers/net/phy/smsc.c                             |   17 -
 drivers/net/team/team.c                            |    2 
 drivers/net/usb/r8152.c                            |   37 ++-
 drivers/net/vrf.c                                  |    4 
 drivers/net/vxlan.c                                |   58 +++--
 drivers/net/wireless/ath/ath10k/core.c             |    2 
 drivers/net/wireless/ath/ath10k/htt_rx.c           |    1 
 drivers/net/wireless/ath/ath10k/mac.c              |    2 
 drivers/net/wireless/ath/ath9k/reg.h               |    8 -
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |    8 -
 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c      |    4 
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c      |    2 
 drivers/net/wireless/intel/iwlwifi/mvm/sta.c       |   16 +
 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c |    2 
 drivers/pinctrl/Makefile                           |    2 
 drivers/pinctrl/freescale/pinctrl-imx.c            |    4 
 drivers/pinctrl/intel/pinctrl-baytrail.c           |    6 -
 drivers/pinctrl/pinctrl-single.c                   |    3 
 drivers/pinctrl/tegra/Makefile                     |    2 
 fs/nfs/dir.c                                       |   11 +
 fs/nfs/direct.c                                    |   10 +
 fs/nfs/inode.c                                     |    1 
 fs/nfs/nfs4proc.c                                  |   18 +-
 fs/nfs/nfs4state.c                                 |    2 
 fs/nfs/pnfs.c                                      |   10 +
 fs/nfs/pnfs_nfs.c                                  |   12 +
 fs/nfs/read.c                                      |    4 
 include/linux/audit.h                              |   24 --
 include/linux/bpf.h                                |   32 +++
 include/linux/inet_diag.h                          |    6 +
 include/linux/mlx4/device.h                        |    1 
 include/linux/net.h                                |    3 
 include/linux/qed/qed_eth_if.h                     |    1 
 include/linux/sock_diag.h                          |    6 +
 include/net/gre.h                                  |    2 
 include/net/netfilter/nf_tables.h                  |    1 
 include/net/tc_act/tc_ife.h                        |    6 -
 include/uapi/linux/netfilter/Kbuild                |    1 
 include/uapi/linux/netfilter/xt_SYNPROXY.h         |    2 
 kernel/audit.c                                     |   17 +
 kernel/audit.h                                     |    4 
 kernel/auditsc.c                                   |    8 -
 kernel/bpf/verifier.c                              |   41 +---
 kernel/cgroup.c                                    |  148 +++++++------
 kernel/events/core.c                               |    2 
 kernel/trace/bpf_trace.c                           |   10 +
 net/ax25/af_ax25.c                                 |    3 
 net/ax25/ax25_ds_timer.c                           |    5 
 net/ax25/ax25_std_timer.c                          |    5 
 net/ax25/ax25_subr.c                               |    3 
 net/batman-adv/routing.c                           |    1 
 net/batman-adv/soft-interface.c                    |    9 +
 net/batman-adv/translation-table.c                 |   50 ++++
 net/batman-adv/types.h                             |    2 
 net/bridge/br_input.c                              |   15 +
 net/bridge/br_multicast.c                          |    4 
 net/bridge/br_netlink.c                            |    2 
 net/bridge/br_private.h                            |   23 ++
 net/core/filter.c                                  |   16 +
 net/core/neighbour.c                               |    6 -
 net/ipv4/esp4.c                                    |   52 +++--
 net/ipv4/gre_demux.c                               |   10 -
 net/ipv4/ip_gre.c                                  |   26 +-
 net/ipv4/ipconfig.c                                |    4 
 net/ipv4/ipmr.c                                    |    4 
 net/ipv4/tcp_output.c                              |    7 +
 net/ipv4/udp.c                                     |   80 ++-----
 net/ipv6/icmp.c                                    |    2 
 net/ipv6/ip6_checksum.c                            |    7 -
 net/ipv6/ip6_gre.c                                 |    2 
 net/ipv6/ip6mr.c                                   |    1 
 net/ipv6/route.c                                   |    2 
 net/ipv6/sit.c                                     |    4 
 net/ipv6/tcp_ipv6.c                                |    4 
 net/ipv6/udp.c                                     |   71 +-----
 net/kcm/kcmproc.c                                  |    1 
 net/mac80211/mesh.c                                |    7 -
 net/netfilter/nf_conntrack_core.c                  |    2 
 net/netfilter/nf_tables_api.c                      |   24 +-
 net/netfilter/nf_tables_core.c                     |    2 
 net/netfilter/nft_hash.c                           |    3 
 net/netfilter/nft_rbtree.c                         |    3 
 net/openvswitch/conntrack.c                        |   14 +
 net/rds/ib_cm.c                                    |    2 
 net/rds/loop.c                                     |    5 
 net/rds/sysctl.c                                   |    3 
 net/rds/tcp.h                                      |    2 
 net/rds/tcp_connect.c                              |   26 +-
 net/rds/tcp_listen.c                               |    2 
 net/rds/tcp_recv.c                                 |    2 
 net/rds/tcp_send.c                                 |   14 +
 net/rds/transport.c                                |    3 
 net/sched/act_api.c                                |    2 
 net/sched/act_ife.c                                |   53 +++--
 net/sched/act_ipt.c                                |    7 -
 net/sched/sch_fifo.c                               |    4 
 net/sched/sch_htb.c                                |    2 
 net/sched/sch_netem.c                              |   12 +
 net/sched/sch_prio.c                               |   67 ++----
 net/sctp/sctp_diag.c                               |    6 -
 net/tipc/bearer.c                                  |    2 
 net/tipc/link.c                                    |    3 
 net/tipc/msg.c                                     |    6 +
 net/tipc/msg.h                                     |   11 -
 net/tipc/socket.c                                  |   54 ++++-
 net/vmw_vsock/af_vsock.c                           |   12 +
 net/wireless/util.c                                |    2 
 164 files changed, 1451 insertions(+), 1042 deletions(-)

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic