Re: linux-next: build failure after merge of the wireless-drivers-next tree

From: Stephen Rothwell
Date: Tue Jul 19 2016 - 19:36:49 EST

Hi Brian,

On Tue, 19 Jul 2016 11:39:13 -0700 Brian Norris <computersforpeace@xxxxxxxxx> wrote:
> I applied a trivial change to this same Kconfig entry:
> Subject: mtd: update description of MTD_BCM47XXSFLASH symbol
> 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.

Stephen Rothwell