All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Matias Bjørling" <m@bjorling.me>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jens Axboe <axboe@kernel.dk>
Subject: Re: linux-next: please clean up the lightnvm tree
Date: Fri, 8 Jul 2016 06:30:59 +0200	[thread overview]
Message-ID: <577F2C83.4060704@bjorling.me> (raw)
In-Reply-To: <20160708142251.650e3756@canb.auug.org.au>

On 07/08/2016 06:22 AM, Stephen Rothwell wrote:
> Hi Matias,
>
> I noticed that the commits in the lightnvm tree have been applied
> to the block tree as a series of patches (i.e. effectively rebased).
> Could you please remove all the duplicate patches from the lightnvm tree
> (which I think is the whole tree, curretly) before they start causing
> merge conflicts for me.
>
> One way to do this would be to rebase your tree on top of the block tree.
>

Thanks Stephen. Updated the for-next. I will make sure they are taken 
off if applied directly to the block tree in the future.

  reply	other threads:[~2016-07-08  4:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-08  4:22 linux-next: please clean up the lightnvm tree Stephen Rothwell
2016-07-08  4:30 ` Matias Bjørling [this message]
2016-07-08  6:23   ` 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=577F2C83.4060704@bjorling.me \
    --to=m@bjorling.me \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.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.