diff options
| author | Linus Torvalds | 2017-02-23 11:36:06 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2017-02-23 11:36:06 -0800 |
| commit | 190c3ee06a0f0660839785b7ad8a830e832d9481 (patch) | |
| tree | cbdfaedfb2b5eca4869d796e4a7df722114934bd /lib | |
| parent | af17fe7a63db7e11d65f1296f0cbf156a89a2735 (diff) | |
| parent | 9c4713701c01e4cef6e2315c2818abc919ffb0de (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) Some 'const'ing in qlogic networking drivers, from Bhumika Goyal.
2) Fix scheduling while atomic in l2tp network namespace exit by
deferring the work to the workqueue. From Ridge Kennedy.
3) Fix use after free in dccp timewait handling, from Andrey Ryabinin.
4) mlx5e CQE compression engine not initialized properly, from Tariq
Toukan.
5) Some UAPI header fixes from Dmitry V. Levin.
6) Don't overwrite module parameter value in mlx4 driver, from Majd
Dibbiny.
7) Fix divide by zero in xt_hashlimit netfilter module, from Alban
Browaeys.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits)
bpf: Fix bpf_xdp_event_output
net/mlx4_en: Use __skb_fill_page_desc()
net/mlx4_core: Use cq quota in SRIOV when creating completion EQs
net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs
net/mlx4: Spoofcheck and zero MAC can't coexist
net/mlx4: Change ENOTSUPP to EOPNOTSUPP
uapi: fix linux/rds.h userspace compilation errors
uapi: fix linux/seg6.h and linux/seg6_iptunnel.h userspace compilation errors
lib: Remove string from parman config selection
forcedeth: Remove return from a void function
bpf: fix spelling mistake: "proccessed" -> "processed"
uapi: fix linux/llc.h userspace compilation error
uapi: fix linux/ip6_tunnel.h userspace compilation errors
net/mlx5e: Fix wrong CQE decompression
net/mlx5e: Update MPWQE stride size when modifying CQE compress state
net/mlx5e: Fix broken CQE compression initialization
net/mlx5e: Do not reduce LRO WQE size when not using build_skb
net/mlx5e: Register/unregister vport representors on interface attach/detach
net/mlx5e: s390 system compilation fix
tcp: account for ts offset only if tsecr not zero
...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 5d644f180fe5..f3552604e47a 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -551,6 +551,6 @@ config SBITMAP bool config PARMAN - tristate "parman" + tristate endmenu |