From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree Date: Thu, 12 Oct 2017 20:12:15 +0100 Message-ID: <20171012191215.hstb7oapb7gcemsf@sirena.co.uk> References: <20171012172512.tlsdjhppfz2hu4vr@sirena.co.uk> <1507832979.5497.4.camel@coelho.fi> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mmucsx4ii4livhqa" Return-path: Content-Disposition: inline In-Reply-To: <1507832979.5497.4.camel@coelho.fi> Sender: linux-kernel-owner@vger.kernel.org To: Luca Coelho Cc: Kalle Valo , Chaya Rachel Ivgi , Shahar S Matityahu , Wireless , Linux-Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org --mmucsx4ii4livhqa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 12, 2017 at 09:29:39PM +0300, Luca Coelho wrote: > On Thu, 2017-10-12 at 18:25 +0100, Mark Brown wrote: > > @@@ -382,7 -371,9 +384,8 @@@ struct iwl_cfg=20 > > use_tfh:1, > > gen2:1, > > cdb:1, > > - ext_nvm:1, > nvm_type seems to be missing from here? Oh bother. Either my error or git's... but it does seem to be building so I'm a bit confused about what's going on there. --mmucsx4ii4livhqa Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlnfvo4ACgkQJNaLcl1U h9BJ8wf/ZXUID+Vz81/XckoSgZCc15JQqd2rTmIy8IPcb/BNam6fmle6Z0zT9sZf 4580E2jIePjzHT+k2D874e9FMkEZ/mFOzzvcf1E2BxUeEglOgdux5UR6w71lQu5h lATnbBInyzB53z7FuF7dtr570Xzx74sOxu7zzLXBGegcE1bbH6r1faqMHHVpPqP2 nOowtvNlJaVZVFHueQmU4Uj5n46mYPCituCHBUc/l95bok5L/1e+uVGG6x4q4Ir8 2RJ91MaVF5N1qH1ODbJFWvSHddA5rstnC+2IxpLx96FJbOkXl3+RbXXOmMFWycLT 5APpSuk+/atc/Qmzb5shG8sXRWyfcA== =3k+x -----END PGP SIGNATURE----- --mmucsx4ii4livhqa--