From: Boris Brezillon <bbrezillon@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Brian Norris <computersforpeace@gmail.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: Re: linux-next: manual merge of the mtd tree with Linus' tree
Date: Tue, 29 Jan 2019 15:12:09 +0100 [thread overview]
Message-ID: <20190129151209.16bf37f4@bbrezillon> (raw)
In-Reply-To: <20190129111700.7d50e369@canb.auug.org.au>
On Tue, 29 Jan 2019 11:17:00 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the mtd tree got a conflict in:
>
> drivers/mtd/mtdpart.c
>
> between commit:
>
> 2b6f0090a333 ("mtd: Check add_mtd_device() ret code")
>
> from Linus' tree and commit:
>
> 2c24c9af0f38 ("mtd: rework partitions handling")
I dropped this patch for now. I'll merge -rc2 before applying them next
time.
Thanks for the report.
Boris
next prev parent reply other threads:[~2019-01-29 14:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 0:17 linux-next: manual merge of the mtd tree with Linus' tree Stephen Rothwell
2019-01-29 14:12 ` Boris Brezillon [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-17 4:49 Stephen Rothwell
2021-08-17 8:15 ` Sean Young
2021-08-17 8:41 ` Miquel Raynal
2011-05-27 4:00 Stephen Rothwell
2011-05-27 7:47 ` Artem Bityutskiy
2011-05-27 4:00 Stephen Rothwell
2011-05-27 7:43 ` Artem Bityutskiy
2010-10-26 0:32 Stephen Rothwell
2010-08-07 3:37 Stephen Rothwell
2010-04-29 2:58 Stephen Rothwell
2009-06-01 4:00 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=20190129151209.16bf37f4@bbrezillon \
--to=bbrezillon@kernel.org \
--cc=computersforpeace@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=sfr@canb.auug.org.au \
/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.