From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Mon, 25 Nov 2019 02:35:05 +0000 (-0800)
Subject: Merge branch 'mlxsw-Two-small-updates'
X-Git-Tag: v5.5-rc1~174^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bd85880197d2f0150b10baf2fdfea7eed13f4aa8;p=tomoyo%2Ftomoyo-test1.git

Merge branch 'mlxsw-Two-small-updates'

Ido Schimmel says:

====================
mlxsw: Two small updates

Patch #1 from Petr handles a corner case in GRE tunnel offload.

Patch #2 from Amit fixes a recent issue where the driver was programming
the device to use an adjacency index (for a nexthop) that was not
properly initialized.
====================

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---

bd85880197d2f0150b10baf2fdfea7eed13f4aa8