From: David S. Miller <davem@davemloft.net>
Date: Mon, 13 Apr 2015 01:25:14 +0000 (-0400)
Subject: Merge branch 'fou-next'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1ceb0b8ca5be40d32b0fcf57b117cfb595c9bbfa;p=linux-beck.git

Merge branch 'fou-next'

Cong Wang says:

====================
fou: some fixes and updates

Patch 1~3 fix some minor bugs in net/ipv4/fou.c, the only
thing I am not sure is if it's too late to change the
byte order of FOU_ATTR_PORT, if so we have to fix iproute2
instead of kernel.

Patch 4~5 add some new features to make it complete.

v2: make fou->port be16 too
====================

Acked-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

1ceb0b8ca5be40d32b0fcf57b117cfb595c9bbfa