From: David S. Miller Date: Mon, 15 Feb 2021 21:15:10 +0000 (-0800) Subject: Merge branch 'br-next-fixes' X-Git-Tag: iomap-folio-5.17-old~2097^2~44 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ca04422afd6998611a81d0ea1b61d5a5f4923f84;p=users%2Fwilly%2Flinux.git Merge branch 'br-next-fixes' Vladimir Oltean says: ==================== Fix buggy brport flags offload for SJA1105 DSA While testing the "Software fallback for bridging in DSA" on sja1105, I discovered that I managed to introduce two bugs in a single patch submitted recently to net-next. ==================== Signed-off-by: David S. Miller --- ca04422afd6998611a81d0ea1b61d5a5f4923f84