diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-19 01:42:06 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-19 01:42:06 +0400 |
| commit | 143c9054949436cb05e468439dc5e46231f33d09 (patch) | |
| tree | c2e972d8188fb1b36368e9acb5b6b59466c9d903 /lib | |
| parent | 0b6807034791160d5e584138943d2daea765436d (diff) | |
| parent | 35eecf052250f663f07a4cded7d3503fd1b50729 (diff) | |
| download | linux-143c9054949436cb05e468439dc5e46231f33d09.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/macvtap.c
Both minor merge hassles, simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/assoc_array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/assoc_array.c b/lib/assoc_array.c index 17edeaf19180..1b6a44f1ec3e 100644 --- a/lib/assoc_array.c +++ b/lib/assoc_array.c @@ -759,8 +759,8 @@ all_leaves_cluster_together: pr_devel("all leaves cluster together\n"); diff = INT_MAX; for (i = 0; i < ASSOC_ARRAY_FAN_OUT; i++) { - int x = ops->diff_objects(assoc_array_ptr_to_leaf(edit->leaf), - assoc_array_ptr_to_leaf(node->slots[i])); + int x = ops->diff_objects(assoc_array_ptr_to_leaf(node->slots[i]), + index_key); if (x < diff) { BUG_ON(x < 0); diff = x; |