summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* sctp: rename sctp_diag.c as diag.cXin Long2018-02-132-0/+2
* mlxsw: spectrum: Use NL_SET_ERR_MSG_MODArkadi Sharshevsky2018-02-133-24/+16
* Merge branch 'mlxsw-SPAN-cleanups'David S. Miller2018-02-136-351/+433
|\
| * mlxsw: spectrum: Move SPAN code to separate modulePetr Machata2018-02-136-348/+433
| * mlxsw: spectrum: Drop struct span_entry.usedPetr Machata2018-02-132-5/+2
| * mlxsw: spectrum: Fix a coding style nitPetr Machata2018-02-131-2/+2
|/
* Merge branch 'mlxsw-IPIP-cleanups'David S. Miller2018-02-133-91/+73
|\
| * mlxsw: spectrum: Distinguish between IPv4/6 tunnelsPetr Machata2018-02-133-91/+72
| * mlxsw: spectrum_ipip: Add a forgotten includePetr Machata2018-02-131-0/+1
|/
* dpaa_eth: fix incorrect commentJake Moroni2018-02-131-1/+1
* Merge branch 'Replacing-net_mutex-with-rw_semaphore'David S. Miller2018-02-1345-41/+116
|\
| * net: Convert netlink_tap_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert diag_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert default_device_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert loopback_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert addrconf_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert ipv4_sysctl_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert packet_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert unix_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert pernet_subsys, registered from inet_init()Kirill Tkhai2018-02-1318-0/+23
| * net: Convert sysctl_core_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert wext_pernet_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert genl_pernet_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert subsys_initcall() registered pernet_operations from net/schedKirill Tkhai2018-02-132-0/+2
| * net: Convert fib_* pernet_operations, registered via subsys_initcallKirill Tkhai2018-02-132-0/+2
| * net: Convert pernet_subsys ops, registered via net_dev_init()Kirill Tkhai2018-02-132-0/+3
| * net: Convert proto_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert uevent_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert audit_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert rtnetlink_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert netlink_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert net_defaults_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert net_inuse_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert nf_log_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert netfilter_net_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert sysctl_pernet_opsKirill Tkhai2018-02-131-0/+1
| * net: Convert net_ns_ops methodsKirill Tkhai2018-02-131-0/+1
| * net: Convert proc_net_ns_opsKirill Tkhai2018-02-131-0/+1
| * net: Allow pernet_operations to be executed in parallelKirill Tkhai2018-02-132-10/+26
| * net: Move mutex_unlock() in cleanup_net() upKirill Tkhai2018-02-131-1/+2
| * net: Introduce net_sem for protection of pernet_listKirill Tkhai2018-02-133-15/+29
| * net: Cleanup in copy_net_ns()Kirill Tkhai2018-02-131-11/+9
| * net: Assign net to net_namespace_list in setup_net()Kirill Tkhai2018-02-131-10/+3
|/
* Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe...David S. Miller2018-02-1212-457/+769
|\
| * i40e/i40evf: Add support for new mechanism of updating adaptive ITRAlexander Duyck2018-02-128-257/+528
| * i40e/i40evf: Split container ITR into current_itr and target_itrAlexander Duyck2018-02-128-86/+115
| * i40evf: Correctly populate rxitr_idx and txitr_idxAlexander Duyck2018-02-121-9/+15
| * i40e/i40evf: Use usec value instead of reg value for ITR definesAlexander Duyck2018-02-126-56/+79
| * i40e/i40evf: Don't bother setting the CLEARPBA bitAlexander Duyck2018-02-122-2/+20
| * i40e/i40evf: Clean-up of bits related to using q_vector->reg_idxAlexander Duyck2018-02-123-15/+15