summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bpf: fix cb access in socket filter programsAlexei Starovoitov2015-10-115-18/+51
* Merge branch 'net-non-modular'David S. Miller2015-10-094-56/+13
|\
| * drivers/net/ethernet: make ti/cpsw-phy-sel.c explicitly non-modularPaul Gortmaker2015-10-091-6/+4
| * net/sched: make sch_blackhole.c explicitly non-modularPaul Gortmaker2015-10-091-12/+3
| * net/dcb: make dcbnl.c explicitly non-modularPaul Gortmaker2015-10-091-27/+3
| * net/core: make sock_diag.c explicitly non-modularPaul Gortmaker2015-10-091-11/+3
|/
* Merge branch 'net-bool'David S. Miller2015-10-0911-61/+61
|\
| * net/core: lockdep_rtnl_is_held can be booleanYaowei Bai2015-10-092-4/+4
| * net/inetdevice: bad_mask can be booleanYaowei Bai2015-10-091-4/+4
| * net/inetdevice: inet_ifa_match can be booleanYaowei Bai2015-10-091-1/+1
| * net/dccp: dccp_bad_service_code can be booleanYaowei Bai2015-10-091-2/+2
| * net/dccp: dccp_list_has_service can be booleanYaowei Bai2015-10-091-3/+3
| * net/can: can_dropped_invalid_skb can be booleanYaowei Bai2015-10-091-3/+3
| * net/nfnetlink: lockdep_nfnl_is_held can be booleanYaowei Bai2015-10-092-4/+4
| * net/ieee80211: ieee80211_is_* can be booleanYaowei Bai2015-10-091-38/+38
| * net/netlink: lockdep_genl_is_held can be booleanYaowei Bai2015-10-092-2/+2
|/
* Merge branch 'mlx-next'David S. Miller2015-10-098-150/+194
|\
| * net/mlx4_core: Fix resource tracker error flow in add_res_rangeSaeed Mahameed2015-10-091-1/+3
| * net/mlx4_core: Fix mailbox leak in error flow when performing update qpJack Morgenstein2015-10-091-3/+3
| * net/mlx4_en: Add steering rules after RSS creationIdo Shamay2015-10-091-64/+80
| * net/mlx5_core: Use private health thread for each deviceEli Cohen2015-10-093-55/+52
| * net/mlx5_core: Use accessor functions to read from device memoryEli Cohen2015-10-091-13/+22
| * net/mlx5_core: Prepare cmd interface to system errors handlingEli Cohen2015-10-092-3/+23
| * net/mlx5_core: Improve mlx5 messagesEli Cohen2015-10-091-11/+11
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2015-10-0923-227/+567
|\
| * i40e: print neato new featuresJesse Brandeburg2015-10-081-0/+3
| * i40e/i40evf: pass QOS handle to VFMitch Williams2015-10-083-2/+6
| * i40evf: use capabilities flags properlyMitch Williams2015-10-081-2/+7
| * i40e: refactor code to remove indentJesse Brandeburg2015-10-081-40/+42
| * i40e/i40evf: clean up some codeJesse Brandeburg2015-10-0817-103/+124
| * i40evf: detect reset more reliablyMitch Williams2015-10-081-20/+16
| * i40e: Support FW CEE DCB UP to TC map nibble swapGreg Bowers2015-10-081-5/+8
| * i40e/i40evf: Explicitly assign enum index for VSI typeSerey Kong2015-10-082-16/+16
| * i40e: add switch for link pollingShannon Nelson2015-10-083-3/+29
| * i40e: Fix multiple link up messagesMatt Jared2015-10-083-3/+8
| * i40e: Fix for extra Flow Director filter in table after errorCarolyn Wyborny2015-10-083-1/+17
| * i40e/i40evf: Store CEE DCBX DesiredCfg and RemoteCfgNeerav Parikh2015-10-083-12/+42
| * i40e: Add parsing for CEE DCBX TLVsNeerav Parikh2015-10-082-0/+218
| * i40e: add more verbose error messagesMitch Williams2015-10-081-1/+3
| * i40e: inline interrupt enableJesse Brandeburg2015-10-082-19/+18
| * i40e: fix erroneous WARN_ONJesse Brandeburg2015-10-081-0/+10
|/
* Merge branch 'bpf_random32'David S. Miller2015-10-0812-96/+187
|\
| * bpf: split state from prandom_u32() and consolidate {c, e}BPF prngsDaniel Borkmann2015-10-085-13/+35
| * random32: add prandom_init_once helper for own rngsDaniel Borkmann2015-10-082-1/+7
| * random32: add prandom_seed_full_state helperDaniel Borkmann2015-10-081-16/+21
| * once: make helper generic for calling functions onceHannes Frederic Sowa2015-10-082-35/+76
| * net: move net_get_random_once to libHannes Frederic Sowa2015-10-085-67/+84
|/
* net: Do not drop to make_route if oif is l3mdevDavid Ahern2015-10-081-1/+2
* bpf, skb_do_redirect: clear sender_cpu before xmitDaniel Borkmann2015-10-081-0/+1
* net: hns: fix 32-bit build warningArnd Bergmann2015-10-081-6/+6
OpenPOWER on IntegriCloud