| commit | 06741d055bb1a630f793e36a486a209698ea672b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Mar 12 18:26:58 2015 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu Mar 12 18:26:58 2015 -0400 |
| tree | c3b581a4c65b4e1dcad5f76138c252608c558360 | |
| parent | 80f1d68ccba70b1060c9c7360ca83da430f66bed [diff] | |
| parent | 0b65bd97ba5fc2c43fa4d077e7420f3ec09a40b3 [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>