All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: bad base of the h8300 tree
Date: Tue, 20 Oct 2015 13:28:32 +0900	[thread overview]
Message-ID: <878u6yrwnj.wl-ysato@users.sourceforge.jp> (raw)
In-Reply-To: <20151020085743.4c7d4d3f@canb.auug.org.au>

On Tue, 20 Oct 2015 06:57:43 +0900,
Stephen Rothwell wrote:
> 
> Hi,
> 
> On Thu, 15 Oct 2015 09:21:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Sat, 3 Oct 2015 14:28:38 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > It is now based on next-20150925.  As I have said before, you cannot
> > > base your linux-next included branch on a linux-next release.  You
> > > should either base it on Linus' tree, or one of the other linux-next
> > > included branches (as long as that other branch is never rebased).  
> > 
> > OK, now your tree is no longer based on a linux-next release (thanks).
> > However, you have managed to rebase a whole string of post v4.3-rc5
> > commits from Linus' tree into your tree.  This would mean that we would
> > end up with duplicates of those patches.  Please just rebase your
> > patches (and just your patches) onto some part of Linus' tree.
> 
> And now that you have merged in v4.3-rc6, just do a "git rebase
> v4.3-rc6", please (you still have duplicates of some of the patches in
> Linus' tree between -rc5 and -rc6.
> 

OK.
Fixed.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

-- 
Yoshinori Sato
<ysato@users.sourceforge.jp>

  reply	other threads:[~2015-10-20  4:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-30 21:43 linux-next: bad base of the h8300 tree Stephen Rothwell
2015-08-31 21:40 ` Stephen Rothwell
2015-09-13 23:54   ` Stephen Rothwell
2015-09-14 23:10     ` Stephen Rothwell
2015-09-14 23:12       ` Stephen Rothwell
2015-10-02  6:11         ` Yoshinori Sato
2015-10-03  4:28           ` Stephen Rothwell
2015-10-14 22:21             ` Stephen Rothwell
2015-10-19 21:57               ` Stephen Rothwell
2015-10-20  4:28                 ` Yoshinori Sato [this message]
2015-10-20 20:42                   ` 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=878u6yrwnj.wl-ysato@users.sourceforge.jp \
    --to=ysato@users.sourceforge.jp \
    --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.