Hi all,

After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/net/ethernet/mediatek/mtk_ppe_offload.c: In function 'mtk_flow_get_wdma_info':
drivers/net/ethernet/mediatek/mtk_ppe_offload.c:93:26: error: initialization of 'unsigned char' from 'const u8 *' {aka 'const unsigned char *'} makes integer from pointer without a cast [-Werror=int-conversion]
   93 |                 .daddr = addr,
      |                          ^~~~
drivers/net/ethernet/mediatek/mtk_ppe_offload.c:93:26: note: (near initialization for 'ctx.daddr[0]')
drivers/net/ethernet/mediatek/mtk_ppe_offload.c:91:42: error: missing braces around initializer [-Werror=missing-braces]
   91 |         struct net_device_path_ctx ctx = {
      |                                          ^
   92 |                 .dev = dev,
   93 |                 .daddr = addr,
      |                          {
   94 |         };
      |         }

Caused by commit

  cf2df74e202d ("net: fix dev_fill_forward_path with pppoe + bridge")

from Linus' tree interacting with commit

  a333215e10cb ("net: ethernet: mtk_eth_soc: implement flow offloading to WED devices")

from the net-next tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 May 2022 14:49:44 +1000
Subject: [PATCH] fis up for "net: fix dev_fill_forward_path with pppoe + bridge"

interacting with commit a333215e10cb "net: ethernet: mtk_eth_soc: implement flow offloading to WED devices"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
index 1fe31058b0f2..d4a0126082f2 100644
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
@@ -90,7 +90,6 @@ mtk_flow_get_wdma_info(struct net_device *dev, const u8 *addr, struct mtk_wdma_i
 {
 	struct net_device_path_ctx ctx = {
 		.dev = dev,
-		.daddr = addr,
 	};
 	struct net_device_path path = {};
 
@@ -100,6 +99,7 @@ mtk_flow_get_wdma_info(struct net_device *dev, const u8 *addr, struct mtk_wdma_i
 	if (!dev->netdev_ops->ndo_fill_forward_path)
 		return -1;
 
+	memcpy(ctx.daddr, addr, sizeof(ctx.daddr));
 	if (dev->netdev_ops->ndo_fill_forward_path(&ctx, &path))
 		return -1;
 
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

On Fri, 20 May 2022 14:59:57 +1000 Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

FWIW just merged the fix, if you pull again you'll get this and a fix
for the netfilter warning about ctnetlink_dump_one_entry().

On Thu, May 19, 2022 at 10:20:44PM -0700, Jakub Kicinski wrote:
> On Fri, 20 May 2022 14:59:57 +1000 Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the net-next tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> 
> FWIW just merged the fix, if you pull again you'll get this and a fix
> for the netfilter warning about ctnetlink_dump_one_entry().

Thanks.

Felix forgot to include the update for the mtk driver in his batch it
seems.

On 20.05.22 09:39, Pablo Neira Ayuso wrote:
> On Thu, May 19, 2022 at 10:20:44PM -0700, Jakub Kicinski wrote:
>> On Fri, 20 May 2022 14:59:57 +1000 Stephen Rothwell wrote:
>> > Hi all,
>> > 
>> > After merging the net-next tree, today's linux-next build (x86_64
>> > allmodconfig) failed like this:
>> 
>> FWIW just merged the fix, if you pull again you'll get this and a fix
>> for the netfilter warning about ctnetlink_dump_one_entry().
> 
> Thanks.
> 
> Felix forgot to include the update for the mtk driver in his batch it
> seems.
I didn't forget. It was in the series I posted for -next but I had to 
remove it to rebase the patch onto nf (as requested by you).
The affected code didn't exist in nf.git.

- Felix

On Fri, May 20, 2022 at 03:49:36PM +0200, Felix Fietkau wrote:
> 
> On 20.05.22 09:39, Pablo Neira Ayuso wrote:
> > On Thu, May 19, 2022 at 10:20:44PM -0700, Jakub Kicinski wrote:
> > > On Fri, 20 May 2022 14:59:57 +1000 Stephen Rothwell wrote:
> > > > Hi all,
> > > > > After merging the net-next tree, today's linux-next build
> > > (x86_64
> > > > allmodconfig) failed like this:
> > > 
> > > FWIW just merged the fix, if you pull again you'll get this and a fix
> > > for the netfilter warning about ctnetlink_dump_one_entry().
> > 
> > Thanks.
> > 
> > Felix forgot to include the update for the mtk driver in his batch it
> > seems.
>
> I didn't forget. It was in the series I posted for -next but I had to remove
> it to rebase the patch onto nf (as requested by you).
> The affected code didn't exist in nf.git.

Next time better if all the patches are handled through the same tree.