summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-07-051901-35701/+98363
|\
| * Merge branch 'phy-dp83867-workaround-incorrect-RX_CTRL-pin-strap'David S. Miller2017-07-052-0/+18
| |\
| | * net: phy: dp83867: add workaround for incorrect RX_CTRL pin strapMurali Karicheri2017-07-051-0/+11
| | * dt-bindings: phy: dp83867: provide a workaround for incorrect RX_CTRL pin strapMurali Karicheri2017-07-051-0/+7
| |/
| * Merge branch 'cxgb4-ptp'David S. Miller2017-07-0510-14/+900
| |\
| | * cxgb4: Support for get_ts_info ethtool methodAtul Gupta2017-07-051-1/+18
| | * cxgb4: Add PTP Hardware Clock (PHC) supportAtul Gupta2017-07-052-0/+287
| | * cxgb4: time stamping interface for PTPAtul Gupta2017-07-059-13/+595
| |/
| * Merge branch 'nfp-port-enumeration-change-and-FW-ABI-adjustment'David S. Miller2017-07-056-49/+28
| |\
| | * nfp: default to chained metadata prepend formatJakub Kicinski2017-07-051-1/+8
| | * nfp: remove legacy MAC address lookupJakub Kicinski2017-07-054-34/+8
| | * nfp: improve order of interfaces in breakout modeJakub Kicinski2017-07-053-14/+12
| |/
| * net: macb: remove extraneous return when MACB_EXT_DESC is definedColin Ian King2017-07-051-1/+0
| * bpf: add missing break in for the TCP_BPF_SNDCWND_CLAMP caseColin Ian King2017-07-051-0/+1
| * bpf: fix return in load_bpf_fileLawrence Brakmo2017-07-051-2/+6
| * mpls: fix rtm policy in mpls_getrouteRoopa Prabhu2017-07-052-2/+1
| * Merge branch 'net-subsystem-misc-refcounter-conversions'David S. Miller2017-07-0461-209/+223
| |\
| | * net, ax25: convert ax25_cb.refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * net, ax25: convert ax25_route.refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * net, ax25: convert ax25_uid_assoc.refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-5/+5
| | * net, sctp: convert sctp_ep_common.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-043-7/+7
| | * net, sctp: convert sctp_transport.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-5/+5
| | * net, sctp: convert sctp_chunk.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * net, sctp: convert sctp_datamsg.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * net, sctp: convert sctp_auth_bytes.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+5
| | * net, xfrm: convert sec_path.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-5/+5
| | * net, xfrm: convert xfrm_policy.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-043-6/+6
| | * net, xfrm: convert xfrm_state.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-6/+7
| | * net, x25: convert x25_neigh.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * net, x25: convert x25_route.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+5
| | * net, rds: convert rds_message.m_refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-7/+7
| | * net, rds: convert rds_mr.r_refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-7/+7
| | * net, rds: convert rds_incoming.i_refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-7/+8
| | * net, rds: convert rds_ib_device.refcount from atomic_t to refcount_tReshetova, Elena2017-07-043-9/+9
| | * net, sunrpc: convert gss_upcall_msg.count from atomic_t to refcount_tReshetova, Elena2017-07-041-11/+11
| | * net, sunrpc: convert gss_cl_ctx.count from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+5
| | * net, netrom: convert nr_node.refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * net, netrom: convert nr_neigh.refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-5/+6
| | * net, ipx: convert ipx_route.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * net, ipx: convert ipx_interface.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-043-7/+8
| | * net, lapb: convert lapb_cb.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+5
| | * net, sched: convert Qdisc.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-043-9/+10
| | * net, calipso: convert calipso_doi.refcount from atomic_t to refcount_tReshetova, Elena2017-07-042-8/+8
| | * net, bridge: convert net_bridge_vlan.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-5/+6
| | * net, atm: convert eg_cache_entry.use from atomic_t to refcount_tReshetova, Elena2017-07-042-8/+8
| | * net, atm: convert in_cache_entry.use from atomic_t to refcount_tReshetova, Elena2017-07-042-7/+8
| | * net, atm: convert lec_arp_table.usage from atomic_t to refcount_tReshetova, Elena2017-07-042-4/+4
| | * net, atm: convert atm_dev.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-043-5/+6
| | * net, decnet: convert dn_fib_info.fib_clntref from atomic_t to refcount_tReshetova, Elena2017-07-042-5/+6
| | * net, vxlan: convert vxlan_sock.refcnt from atomic_t to refcount_tReshetova, Elena2017-07-042-6/+6