You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/mlme.c
This commit is contained in:
+1
-1
@@ -376,7 +376,7 @@ errcopy:
|
||||
hlist_for_each_safe(p, q, &newtbl->hash_buckets[i])
|
||||
tbl->free_node(p, 0);
|
||||
}
|
||||
__mesh_table_free(tbl);
|
||||
__mesh_table_free(newtbl);
|
||||
endgrow:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user