Re: linux-next: bad base of the h8300 tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: bad base of the h8300 tree
Date	2015-10-20 00:00 +0200
Message-ID	<qlqDf-qp-9@gated-at.bofh.it> (permalink)
References	(3 earlier) <q8Lct-3TM-1@gated-at.bofh.it> <q8Lcu-3TM-19@gated-at.bofh.it> <qf2aB-3Qn-3@gated-at.bofh.it> <qfmCl-7Vm-3@gated-at.bofh.it> <qjCIy-3T7-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Re: linux-next: bad base of the h8300 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-20 00:00 +0200
  Re: linux-next: bad base of the h8300 tree Yoshinori Sato <ysato@users.sourceforge.jp> - 2015-10-20 06:30 +0200
    Re: linux-next: bad base of the h8300 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-20 22:50 +0200

csiph-web