From: David S. Miller Date: Mon, 26 Jun 2023 09:36:48 +0000 (+0100) Subject: Merge branch 'sfc-next' X-Git-Tag: v6.5-rc1~163^2~10 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=771ca3de25028c477332bf8b8c2db3a4dd769de2;p=linux-block.git Merge branch 'sfc-next' Edward Cree says: ==================== sfc: fix unaligned access in loopback selftests Arnd reported that the sfc drivers each define a packed loopback_payload structure with an ethernet header followed by an IP header, whereas the kernel definition of iphdr specifies that this is 4-byte aligned, causing a W=1 warning. Fix this in each case by adding two bytes of leading padding to the struct, taking care that these are not sent on the wire. Tested on EF10; build-tested on Siena and Falcon. Changed in v2: * added __aligned(4) to payload struct definitions (Arnd) * fixed dodgy whitespace (checkpatch) ==================== Signed-off-by: David S. Miller --- 771ca3de25028c477332bf8b8c2db3a4dd769de2