From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kalle Valo Subject: Re: linux-next: build failure after merge of the wireless-drivers-next tree Date: Wed, 20 Jul 2016 21:31:48 +0300 Message-ID: <87shv4qhyj.fsf@kamboji.qca.qualcomm.com> References: <20160719160831.79c0303f@canb.auug.org.au> <8760s2w369.fsf@kamboji.qca.qualcomm.com> <871t2qw1cz.fsf@kamboji.qca.qualcomm.com> <87h9blvhxg.fsf@kamboji.qca.qualcomm.com> <20160719183913.GA88186@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20160719183913.GA88186@google.com> (Brian Norris's message of "Tue, 19 Jul 2016 11:39:13 -0700") Sender: linux-kernel-owner@vger.kernel.org To: Brian Norris Cc: =?utf-8?Q?Rafa=C5=82_Mi=C5=82ecki?= , "linux-mtd@lists.infradead.org" , Stephen Rothwell , "linux-wireless@vger.kernel.org" , linux-next , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org Brian Norris writes: > Just to head this off, since I noticed it... > > On Tue, Jul 19, 2016 at 05:08:59PM +0300, Kalle Valo wrote: >> Rafa=C5=82 Mi=C5=82ecki writes: >> > I sent a patch seconds ago, you may just take a look at it. If you >> > still prefer to revert my commit, go ahead. >>=20 >> Ok, let's try your fix. We still have few days. I applied the patch[= 1] >> to the pending branch this morning and if I don't see any errors I a= pply >> it later tonight and hopefully it will be in tomorrow's linux-next >> build. Thanks for the quick fix, very much appreciated. >>=20 >> [1] "mtd: add arch dependency for MTD_BCM47XXSFLASH symbol" >> https://patchwork.kernel.org/patch/9236053/ > > I applied a trivial change to this same Kconfig entry: > > Subject: mtd: update description of MTD_BCM47XXSFLASH symbol > http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0= e4b2b424ae81707d4c > > It's a trivial conflict, so should we just let Linus work it out? I c= an > note it my MTD pull request, if wireless lands first. Sounds good to me. Do note that Linus doesn't pull wireless-drivers-nex= t directly, it goes through net-next. But I'll let Dave also know about this when I send him the pull request. --=20 Kalle Valo