All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Sean Young <sean@mess.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Richard Weinberger <richard.weinberger@gmail.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Zhihao Cheng <chengzhihao1@huawei.com>
Subject: Re: linux-next: manual merge of the mtd tree with Linus' tree
Date: Tue, 17 Aug 2021 10:41:02 +0200	[thread overview]
Message-ID: <20210817104102.1fd78cf0@xps13> (raw)
In-Reply-To: <20210817081558.GA14856@gofer.mess.org>

Hi Sean,

Sean Young <sean@mess.org> wrote on Tue, 17 Aug 2021 09:15:59 +0100:

> On Tue, Aug 17, 2021 at 02:49:07PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the mtd tree got a conflict in:
> > 
> >   drivers/mtd/mtd_blkdevs.c
> > 
> > between commit:
> > 
> >   2b6d2833cd1d ("mtd: mtd_blkdevs: Initialize rq.limits.discard_granularity")
> > 
> > from Linus' tree and commit:
> > 
> >   c7c12c7ce6c1 ("mtd: blk_devs: make discard work on FTLs")
> > 
> > from the mtd tree.
> > 
> > I fixed it up (I (arbitrarily) used the former version)  
> 
> The former is slightly better, and also already merged upstream. My commit
> c7c12c7ce6c1 should be dropped from mtd/next, I think.

Dropped, thanks for the check.

Thanks,
Miquèl

  reply	other threads:[~2021-08-17  8:41 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-17  4:49 linux-next: manual merge of the mtd tree with Linus' tree Stephen Rothwell
2021-08-17  8:15 ` Sean Young
2021-08-17  8:41   ` Miquel Raynal [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-01-29  0:17 Stephen Rothwell
2019-01-29 14:12 ` Boris Brezillon
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=20210817104102.1fd78cf0@xps13 \
    --to=miquel.raynal@bootlin.com \
    --cc=chengzhihao1@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=richard.weinberger@gmail.com \
    --cc=sean@mess.org \
    --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.