Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20211001161849.51b6deca@canb.auug.org.au> <20211001.144046.309542880703739165.davem@davemloft.net>
 <20211005121154.08641258@canb.auug.org.au>
In-Reply-To: <20211005121154.08641258@canb.auug.org.au>
From:   Wei Wang <weiwan@google.com>
Date:   Mon, 4 Oct 2021 21:40:23 -0700
Message-ID: <CAEA6p_DG+TBWFwmPNG+vZqUqAsL-EpJs2kUEqF1CV1J=-wc6Gg@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the net-next tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     David Miller <davem@davemloft.net>, netdev@vger.kernel.org,
        edumazet@google.com, linux-kernel@vger.kernel.org,
        linux-next@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, Oct 4, 2021 at 6:12 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Dave,
>
> On Fri, 01 Oct 2021 14:40:46 +0100 (BST) David Miller <davem@davemloft.net> wrote:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 1 Oct 2021 16:18:49 +1000
> >
> > > Hi all,
> > >
> > > After merging the net-next tree, today's linux-next build (sparc64
> > > defconfig) failed like this:
> > >
> > > net/core/sock.c: In function 'sock_setsockopt':
> > > net/core/sock.c:1417:7: error: 'SO_RESERVE_MEM' undeclared (first use in this function); did you mean 'IORESOURCE_MEM'?
> > >   case SO_RESERVE_MEM:
> > >        ^~~~~~~~~~~~~~
> > >        IORESOURCE_MEM
> > > net/core/sock.c:1417:7: note: each undeclared identifier is reported only once for each function it appears in
> > > net/core/sock.c: In function 'sock_getsockopt':
> > > net/core/sock.c:1817:7: error: 'SO_RESERVE_MEM' undeclared (first use in this function); did you mean 'IORESOURCE_MEM'?
> > >   case SO_RESERVE_MEM:
> > >        ^~~~~~~~~~~~~~
> > >        IORESOURCE_MEM
> > >
> > > Caused by commit
> > >
> > >   2bb2f5fb21b0 ("net: add new socket option SO_RESERVE_MEM")
> > >
> > > arch/sparc/include/uapi/socket.h does not include uapi/asm/socket.h and
> > > some other architectures do not as well.
> > >
> > > I have added the following patch for today (I searched for SO_BUF_LOCK
> > > and, of these architectures, I have only compile tested sparc64 and
> > > sparc):
> >
> > I committed the sparc part into net-next today, thanks.
>
> Unfortunately, there is a typo in what you committed in bfaf03935f74
> ("sparc: add SO_RESERVE_MEM definition."), SO_RESEVE_MEM instead of
> SO_RESERVE_MEM ...
>

Thanks Stephen for the report and thanks a lot David for submitting
the fix. Let me know if I need to do the fix.


> --
> Cheers,
> Stephen Rothwell