From: David S. Miller <davem@davemloft.net>
Date: Mon, 28 Jun 2021 20:31:57 +0000 (-0700)
Subject: Merge branch 'tipc-next'
X-Git-Tag: v5.14-rc1~119^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c948b46a7dcd131e3ac3d4ed48f9cfaaa9103d58;p=thirdparty%2Flinux.git

Merge branch 'tipc-next'

Menglong Dong says:

====================
net: tipc: fix FB_MTU eat two pages and do some code cleanup

In the first patch, FB_MTU is redefined to make sure data size will not
exceed PAGE_SIZE. Besides, I removed the alignment for buf_size in
tipc_buf_acquire, because skb_alloc_fclone will do the alignment job.

In the second patch, I removed align() in msg.c and replace it with
ALIGN().

Changes since V5:
- remove blank line after Fixes in commit log in the first patch

Changes since V4:
- remove ONE_PAGE_SKB_SZ and replace it with one_page_mtu in the first
  patch.
- fix some code style problems for the second patch.
====================

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

c948b46a7dcd131e3ac3d4ed48f9cfaaa9103d58