From: Michael Ellerman <mpe@ellerman•id.au>
To: Brian Norris <computersforpeace@gmail•com>
Cc: "Ralf Baechle" <ralf@linux-mips•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Rafał Miłecki" <zajec5@gmail•com>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the mips tree
Date: Fri, 12 Jun 2015 20:57:59 +1000 [thread overview]
Message-ID: <1434106679.20648.3.camel@ellerman.id.au> (raw)
In-Reply-To: <1434106220.20648.1.camel@ellerman.id.au>
On Fri, 2015-06-12 at 20:50 +1000, Michael Ellerman wrote:
> Hi Brian,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in MAINTAINERS
> between commit 68c2d21d0126 "MIPS: BCM47xx: Move NVRAM driver to the
> drivers/firmware/" from the mips tree and commit 02787daadbda "MAINTAINERS: add
> entry for new brcmnand/ directory" from the l2-mtd tree.
Gah sorry, sent this twice. Ignore this one.
cheers
next prev parent reply other threads:[~2015-06-12 10:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-12 10:50 linux-next: manual merge of the l2-mtd tree with the mips tree Michael Ellerman
2015-06-12 10:57 ` Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-12 3:27 Michael Ellerman
2011-07-29 3:49 Stephen Rothwell
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=1434106679.20648.3.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=computersforpeace@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)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