tree f3a8e41d923583b0df37b48898be106eadf70671
parent d296ba60d8e2de23a350796a567a3aa90fe1cb6e
parent 2dad624e6dd65c6048a9bbe0e16559fce182c87c
author David S. Miller <davem@davemloft.net> 1461611352 -0400
committer David S. Miller <davem@davemloft.net> 1461611352 -0400

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>