All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Norris <computersforpeace@gmail.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: "Rafał Miłecki" <zajec5@gmail.com>,
	"linux-mtd@lists.infradead.org" <linux-mtd@lists.infradead.org>,
	"Stephen Rothwell" <sfr@canb.auug.org.au>,
	"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
	linux-next <linux-next@vger.kernel.org>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the wireless-drivers-next tree
Date: Tue, 19 Jul 2016 11:39:13 -0700	[thread overview]
Message-ID: <20160719183913.GA88186@google.com> (raw)
In-Reply-To: <87h9blvhxg.fsf@kamboji.qca.qualcomm.com>

Just to head this off, since I noticed it...

On Tue, Jul 19, 2016 at 05:08:59PM +0300, Kalle Valo wrote:
> Rafał Miłecki <zajec5@gmail.com> 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.
> 
> 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 apply
> it later tonight and hopefully it will be in tomorrow's linux-next
> build. Thanks for the quick fix, very much appreciated.
> 
> [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/0a526341fee054c1e2b9f0e4b2b424ae81707d4c

It's a trivial conflict, so should we just let Linus work it out? I can
note it my MTD pull request, if wireless lands first.

Brian

  reply	other threads:[~2016-07-19 18:39 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-19  6:08 linux-next: build failure after merge of the wireless-drivers-next tree Stephen Rothwell
2016-07-19  6:08 ` Stephen Rothwell
2016-07-19  6:30 ` Kalle Valo
2016-07-19  6:51   ` Rafał Miłecki
2016-07-19  7:09     ` Kalle Valo
2016-07-19  7:09       ` Kalle Valo
     [not found]       ` <871t2qw1cz.fsf-HodKDYzPHsUD5k0oWYwrnHL1okKdlPRT@public.gmane.org>
2016-07-19  7:11         ` Rafał Miłecki
2016-07-19  7:11           ` Rafał Miłecki
2016-07-19 14:08           ` Kalle Valo
2016-07-19 14:08             ` Kalle Valo
2016-07-19 18:39             ` Brian Norris [this message]
2016-07-19 23:36               ` Stephen Rothwell
2016-07-20 18:31               ` Kalle Valo
  -- strict thread matches above, loose matches on Subject: below --
2020-12-08  8:49 Stephen Rothwell
2020-12-08  8:54 ` Kalle Valo
2018-08-03  8:29 Stephen Rothwell
2018-08-03  9:09 ` Kalle Valo
2018-08-03  9:11 ` Stanislaw Gruszka
2018-08-03  9:21   ` Stanislaw Gruszka
2017-06-08  2:27 Stephen Rothwell
2017-06-08  2:43 ` Igor Mitsyanko
2017-06-08  2:57   ` Stephen Rothwell
2017-06-08 12:07     ` Kalle Valo
2017-06-08 12:47       ` Stephen Rothwell
2017-06-13  2:00 ` Stephen Rothwell
2017-06-15 16:08   ` David Miller
2017-06-15 18:25     ` Stephen Rothwell
2016-02-18 23:10 Stephen Rothwell
2016-02-19  8:08 ` Kalle Valo
2015-08-07  3:16 Stephen Rothwell
2015-08-09  8:41 ` Kalle Valo
2015-07-22  0:32 Stephen Rothwell
2015-07-22  6:07 ` Kalle Valo
2015-07-27  5:41 ` Kalle Valo
2015-07-27  6:04   ` Stephen Rothwell
2015-05-27  2:03 Stephen Rothwell
2015-05-27  9:08 ` Arend van Spriel
2015-05-27  9:08   ` Arend van Spriel
2015-05-28  1:38   ` Stephen Rothwell
2015-05-28  1:38     ` Stephen Rothwell
2015-01-27  8:03 Stephen Rothwell
2015-01-27  8:13 ` Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160719183913.GA88186@google.com \
    --to=computersforpeace@gmail.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=zajec5@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.