From: David S. Miller <davem@davemloft.net>
Date: Mon, 25 Apr 2016 19:09:12 +0000 (-0400)
Subject: Merge branch 'nla_align-set-2'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e7157f28ced492accf6e665ba0f748162757779f;p=linux-beck.git

Merge branch 'nla_align-set-2'

Nicolas Dichtel says:

====================
netlink: align attributes when needed (patchset #2)

This is the continuation (series #2) of the work done to align netlink
attributes when these attributes contain some 64-bit fields.

In patch #3, I didn't modify the function ila_encap_nlsize(). I was waiting
feedback for this patch: http://patchwork.ozlabs.org/patch/613766/
If it's approved, there will be an update to switch nla_total_size() to
nla_total_size_64bit() after the merge of net in net-next.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

e7157f28ced492accf6e665ba0f748162757779f