From: David S. Miller <davem@davemloft.net>
Date: Thu, 12 Mar 2015 22:26:58 +0000 (-0400)
Subject: Merge branch 'fib_trie_table_merge_fixes'
X-Git-Tag: v4.1-rc1~128^2~256
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=06741d055bb1a630f793e36a486a209698ea672b;p=karo-tx-linux.git

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>
---

06741d055bb1a630f793e36a486a209698ea672b