diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-04-08 17:26:21 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-04-08 17:26:21 -0400 |
| commit | 462b69b1e43ceccab68a47d65b1e46520cd0fdc0 (patch) | |
| tree | 3c961fcb5889c5ab14ab36d8ef7421fc96c95959 /net/netlink/af_netlink.c | |
| parent | d8bf368d0631d4bc2612d8bf2e4e8e74e620d0cc (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
Merge branch 'linus' into irq/core to get the GIC updates which
conflict with pending GIC changes.
Conflicts:
drivers/usb/isp1760/isp1760-core.c
Diffstat (limited to 'net/netlink/af_netlink.c')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 2702673f0f23..05919bf3f670 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
| @@ -3126,8 +3126,6 @@ static int __init netlink_proto_init(void) | |||
| 3126 | .key_len = sizeof(u32), /* portid */ | 3126 | .key_len = sizeof(u32), /* portid */ |
| 3127 | .hashfn = jhash, | 3127 | .hashfn = jhash, |
| 3128 | .max_shift = 16, /* 64K */ | 3128 | .max_shift = 16, /* 64K */ |
| 3129 | .grow_decision = rht_grow_above_75, | ||
| 3130 | .shrink_decision = rht_shrink_below_30, | ||
| 3131 | }; | 3129 | }; |
| 3132 | 3130 | ||
| 3133 | if (err != 0) | 3131 | if (err != 0) |