Re: [PATCH] tools: Fixed MIPS builds due to struct flock re-definition

[Florian Fainelli]

On 7/19/2022 2:15 PM, Arnd Bergmann wrote:
> On Tue, Jul 19, 2022 at 9:05 PM Florian Fainelli <f.fainelli@xxxxxxxxx> wrote:
> > On 7/19/2022 12:42 AM, Arnd Bergmann wrote:
>
> > > I applied this to the asm-generic tree, but now I'm having second thoughts, as
> > > this only changes the tools/include/ version but not the version we ship to user
> > > space. Normally these are meant to be kept in sync.
> >
> > Thanks! Just to be clear, applying just your patch is not enough as the
> > original build issue is still present, so we would need my change plus
> > yours, I think that is what you intended but just wanted to double
> > confirm.
>
> Yes, this was just the diff on top of your patch, I've folded it into a single
> commit now.
>
> > On a side note your tree at:
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git/refs/heads
> >
> > does not appear to have it included/pushed out yet, should I be looking
> > at another git tree?
>
> Pushed it out now. There is the main asm-generic branch that is in
> linux-next, and the asm-generic-fixes branch that I should send after
> the build bots report success.
>
> I've merged the fixes branch into the main branch for testing for the
> moment, but will undo the merge when I forward the contents.

All good, thanks a lot!
--
Florian