From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 Nov 2018 00:14:56 +0000 (-0800)
Subject: Merge branch 'smc-fixes'
X-Git-Tag: Ubuntu-5.2.0-15.16~3113^2~16
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=395048ebd4547d3cced71807b8aabfbde000fe55;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'smc-fixes'

Ursula Braun says:

====================
net/smc: fixes 2018-11-12

here is V4 of some net/smc fixes in different areas for the net tree.

v1->v2:
   do not define 8-byte alignment for union smcd_cdc_cursor in
   patch 4/5 "net/smc: atomic SMCD cursor handling"
v2->v3:
   stay with 8-byte alignment for union smcd_cdc_cursor in
   patch 4/5 "net/smc: atomic SMCD cursor handling", but get rid of
   __packed for struct smcd_cdc_msg
v3->v4:
   get rid of another __packed for struct smc_cdc_msg in
   patch 4/5 "net/smc: atomic SMCD cursor handling"
====================

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

395048ebd4547d3cced71807b8aabfbde000fe55