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;
Date:   Tue, 5 Oct 2021 12:11:54 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Miller <davem@davemloft.net>
Cc:     netdev@vger.kernel.org, edumazet@google.com, weiwan@google.com,
        linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the net-next tree
Message-ID: <20211005121154.08641258@canb.auug.org.au>
In-Reply-To: <20211001.144046.309542880703739165.davem@davemloft.net>
References: <20211001161849.51b6deca@canb.auug.org.au>
        <20211001.144046.309542880703739165.davem@davemloft.net>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/K5PWtTQ4z25yGFL2XQT1aEi";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/K5PWtTQ4z25yGFL2XQT1aEi
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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
>=20
> > Hi all,
> >=20
> > After merging the net-next tree, today's linux-next build (sparc64
> > defconfig) failed like this:
> >=20
> > net/core/sock.c: In function 'sock_setsockopt':
> > net/core/sock.c:1417:7: error: 'SO_RESERVE_MEM' undeclared (first use i=
n 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 on=
ly 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 i=
n this function); did you mean 'IORESOURCE_MEM'?
> >   case SO_RESERVE_MEM:
> >        ^~~~~~~~~~~~~~
> >        IORESOURCE_MEM
> >=20
> > Caused by commit
> >=20
> >   2bb2f5fb21b0 ("net: add new socket option SO_RESERVE_MEM")
> >=20
> > arch/sparc/include/uapi/socket.h does not include uapi/asm/socket.h and
> > some other architectures do not as well.
> >=20
> > 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): =20
>=20
> 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 ...

--=20
Cheers,
Stephen Rothwell

--Sig_/K5PWtTQ4z25yGFL2XQT1aEi
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmFbploACgkQAVBC80lX
0Gyo1gf/dnSvjxx13Gkwpx84SSOykZFD7FbLiHsgn2ZK4E+dKRkMP+0SRvzrZcFB
+gPDB0AodxmtwtXX0G/kgoquYFBj/75Y5wNEUGti/C8KOn09ifsz1uP0GB76XRNG
wbU97JfEU9ndRvHjgKrpZg67b4ML6rJTNcTlh73L2QZca5Do4MpdlpER8bUc+42/
SWkir51JextoUOdaRyAHhHz9qad2Wec/owm1NZLRZuwUjpw2xntBK2ocokvmHckb
IZy37ZKT3x0pSVG4hl/MeXhPYEwLKQMNbgw1BzLPbfCPLNzlY7Xvf+sEZBnC7fav
M+VSB5841hft1hSrPjbsLRKhvLP25A==
=pHAX
-----END PGP SIGNATURE-----

--Sig_/K5PWtTQ4z25yGFL2XQT1aEi--