On Mon, Aug 30, 2021 at 8:42 AM Dongliang Mu <mudongliangabcd@xxxxxxxxx> wrote: > > On Mon, Aug 30, 2021 at 8:01 PM Sasha Levin <sashal@xxxxxxxxxx> wrote: > > > > From: 王贇 <yun.wang@xxxxxxxxxxxxxxxxx> > > > > [ Upstream commit 733c99ee8be9a1410287cdbb943887365e83b2d6 ] > > > > Hi Sasha, > > Michael Wang has sent a v2 patch [1] for this bug and it is merged > into netdev/net-next.git. However, the v1 patch is already in the > upstream tree. > > How do you guys handle such a issue? > > [1] https://lkml.org/lkml/2021/8/30/229 Ugh. Michael can you please work with netdev to fix this in the upstream, and hopefully -stable, kernels? My guess is you will need to rebase your v2 patch on top of the v1 patch (basically what exists in upstream) and send that back out. -- paul moore www.paul-moore.com
