From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Brian Norris <computersforpeace@gmail•com>
Cc: "Kalle Valo" <kvalo@codeaurora•org>,
"Rafał Miłecki" <zajec5@gmail•com>,
"linux-mtd@lists•infradead.org" <linux-mtd@lists•infradead.org>,
"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: Wed, 20 Jul 2016 09:36:41 +1000 [thread overview]
Message-ID: <20160720093641.2dbb1f83@canb.auug.org.au> (raw)
In-Reply-To: <20160719183913.GA88186@google.com>
Hi Brian,
On Tue, 19 Jul 2016 11:39:13 -0700 Brian Norris <computersforpeace@gmail•com> wrote:
>
> 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.
Linus and I should be able to cope. I will send my usual notification today.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2016-07-19 23:36 UTC|newest]
Thread overview: 36+ 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:30 ` Kalle Valo
2016-07-19 6:51 ` Rafał Miłecki
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 14:08 ` Kalle Valo
2016-07-19 18:39 ` Brian Norris
2016-07-19 23:36 ` Stephen Rothwell [this message]
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-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=20160720093641.2dbb1f83@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=computersforpeace@gmail$(echo .)com \
--cc=kvalo@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mtd@lists$(echo .)infradead.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=zajec5@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox