diff options
author | Greg Kroah-Hartman | 2015-05-18 23:08:58 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2015-05-18 23:08:58 +0200 |
commit | 02730d3c053a9af1d402e1c8dc8bbbc5a1340406 (patch) | |
tree | db289a08de50eb4b5caf7840d5b7356ddfa1c51f /net/netlink/af_netlink.c | |
parent | vt: Don't check KD_GRAPHICS when binding/unbinding (diff) | |
parent | Linux 4.1-rc4 (diff) | |
download | kernel-qcow2-linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.tar.gz kernel-qcow2-linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.tar.xz kernel-qcow2-linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.zip |
Merge 4.1-rc4 into tty-next
This resolves some tty driver merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/netlink/af_netlink.c')
-rw-r--r-- | net/netlink/af_netlink.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index ec4adbdcb9b4..daa0b818174b 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -3139,7 +3139,6 @@ static const struct rhashtable_params netlink_rhashtable_params = { .key_len = netlink_compare_arg_len, .obj_hashfn = netlink_hash, .obj_cmpfn = netlink_compare, - .max_size = 65536, .automatic_shrinking = true, }; |