]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1c9335f 87608c4)
Merge branch 'fib_trie_table_merge_fixes'
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Mar 2015 22:26:58 +0000 (18:26 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Mar 2015 22:26:58 +0000 (18:26 -0400)
commita891e74f87a51b74372195f89f0eef65aa949e71
treec3b581a4c65b4e1dcad5f76138c252608c558360tree | snapshot
parent1c9335fa6f8f343e8a25f0545868073c7914f877commit | diff
parent87608c4958a07f540a5b32563fce5c5f95f41ec3commit | diff
Merge branch 'fib_trie_table_merge_fixes'

Alexander Duyck says:

====================
fib_trie: Minor fixes for table merge

This patch set addresses two issues reported with the tables merged, the
first is a NULL pointer dereference, and the other is to remove a WARN_ON
and set the ordering for aliases from different tables with the same slen
values.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Linux Kernel Source Tree.