From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751228AbbJTE2g (ORCPT ); Tue, 20 Oct 2015 00:28:36 -0400 Received: from mail1.asahi-net.or.jp ([202.224.39.197]:38260 "EHLO mail1.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750797AbbJTE2f (ORCPT ); Tue, 20 Oct 2015 00:28:35 -0400 Date: Tue, 20 Oct 2015 13:28:32 +0900 Message-ID: <878u6yrwnj.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: bad base of the h8300 tree In-Reply-To: <20151020085743.4c7d4d3f@canb.auug.org.au> References: <20150831074304.0ce16f9f@canb.auug.org.au> <20150901074033.4282c9c4@canb.auug.org.au> <20150914095425.1c6c3470@canb.auug.org.au> <20150915091030.13b2a149@canb.auug.org.au> <20150915091201.6d1f620b@canb.auug.org.au> <87vbappzob.wl-ysato@users.sourceforge.jp> <20151003142838.4bcd9570@canb.auug.org.au> <20151015092157.757b4452@canb.auug.org.au> <20151020085743.4c7d4d3f@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/24.5 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 20 Oct 2015 06:57:43 +0900, Stephen Rothwell wrote: > > Hi, > > On Thu, 15 Oct 2015 09:21:57 +1100 Stephen Rothwell wrote: > > > > On Sat, 3 Oct 2015 14:28:38 +1000 Stephen Rothwell 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