linux-next: bad base of the h8300 tree

linux-next: bad base of the h8300 tree

[Stephen Rothwell]

Hi Yoshinori,

The h8300 tree today has been based on linux-next.  This cannto work.
Please rebase this onto Linus' tree (or some other stable base).

I cannot use your tree in this state, so it will be dropped from
linux-next until it is fixed.  Also, Linus cannot pull it in this state.

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

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

[Stephen Rothwell]

Hi Yoshinori,

On Mon, 31 Aug 2015 07:43:04 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The h8300 tree today has been based on linux-next.  This cannto work.
> Please rebase this onto Linus' tree (or some other stable base).
> 
> I cannot use your tree in this state, so it will be dropped from
> linux-next until it is fixed.  Also, Linus cannot pull it in this state.

And now your tree conatins lots and lots of very old commits that do
not even have Signed-off-by tags :-(.  The version I have been using
has a HEAD of commit:

99bcfda85f66 "Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time""

(which, it turns out" also has no Signed-off-by :-()

Maybe you should reset your tree to that and try to move on from there.

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

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

[Stephen Rothwell]

Hi Yoshinori,

On Tue, 1 Sep 2015 07:40:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 31 Aug 2015 07:43:04 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > The h8300 tree today has been based on linux-next.  This cannto work.
> > Please rebase this onto Linus' tree (or some other stable base).
> > 
> > I cannot use your tree in this state, so it will be dropped from
> > linux-next until it is fixed.  Also, Linus cannot pull it in this state.
> 
> And now your tree conatins lots and lots of very old commits that do
> not even have Signed-off-by tags :-(.  The version I have been using
> has a HEAD of commit:
> 
> 99bcfda85f66 "Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time""
> 
> (which, it turns out" also has no Signed-off-by :-()
> 
> Maybe you should reset your tree to that and try to move on from there.

Can you please clean this up ...

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

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

[Stephen Rothwell]

Hi Yoshinori,

On Mon, 14 Sep 2015 09:54:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 1 Sep 2015 07:40:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 31 Aug 2015 07:43:04 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > The h8300 tree today has been based on linux-next.  This cannto work.
> > > Please rebase this onto Linus' tree (or some other stable base).
> > > 
> > > I cannot use your tree in this state, so it will be dropped from
> > > linux-next until it is fixed.  Also, Linus cannot pull it in this state.
> > 
> > And now your tree conatins lots and lots of very old commits that do
> > not even have Signed-off-by tags :-(.  The version I have been using
> > has a HEAD of commit:
> > 
> > 99bcfda85f66 "Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time""
> > 
> > (which, it turns out" also has no Signed-off-by :-()
> > 
> > Maybe you should reset your tree to that and try to move on from there.
> 
> Can you please clean this up ...

I see it has changed, but it is still not right :-(

Please do "gitk 9751a9e449da..h8300-next" in your tree and look at
it (9751a9e449da is in Linus' tree).  As I suggested above, maybe you
should go back to commit 99bcfda85f66 and work forward from there
(after amending it have a SOB).  Or just start all over with v4.3 ...

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

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

[Stephen Rothwell]

Hi Yoshinori,

On Tue, 15 Sep 2015 09:10:30 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Please do "gitk 9751a9e449da..h8300-next" in your tree and look at
> it (9751a9e449da is in Linus' tree).  As I suggested above, maybe you
> should go back to commit 99bcfda85f66 and work forward from there
> (after amending it have a SOB).  Or just start all over with v4.3 ...

I meant v4.3-rc1, of course.

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

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

[Yoshinori Sato]

On Tue, 15 Sep 2015 08:12:01 +0900,
Stephen Rothwell wrote:
> 
> Hi Yoshinori,
> 
> On Tue, 15 Sep 2015 09:10:30 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Please do "gitk 9751a9e449da..h8300-next" in your tree and look at
> > it (9751a9e449da is in Linus' tree).  As I suggested above, maybe you
> > should go back to commit 99bcfda85f66 and work forward from there
> > (after amending it have a SOB).  Or just start all over with v4.3 ...
> 
> I meant v4.3-rc1, of course.

OK.
fixed it.

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

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

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

[Stephen Rothwell]

Hi Yoshinori,

On Fri, 02 Oct 2015 15:11:48 +0900 Yoshinori Sato <ysato@users.sourceforge.jp> wrote:
>
> On Tue, 15 Sep 2015 08:12:01 +0900,
> Stephen Rothwell wrote:
> > 
> > On Tue, 15 Sep 2015 09:10:30 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Please do "gitk 9751a9e449da..h8300-next" in your tree and look at
> > > it (9751a9e449da is in Linus' tree).  As I suggested above, maybe you
> > > should go back to commit 99bcfda85f66 and work forward from there
> > > (after amending it have a SOB).  Or just start all over with v4.3 ...
> > 
> > I meant v4.3-rc1, of course.
> 
> OK.
> fixed it.

Well, not really :-(

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).

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

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

[Stephen Rothwell]

Hi,

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.

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

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

[Stephen Rothwell]

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

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

[Yoshinori Sato]

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>

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

[Stephen Rothwell]

Hi Yoshinori,

On Tue, 20 Oct 2015 13:28:32 +0900 Yoshinori Sato <ysato@users.sourceforge.jp> wrote:
>
> OK.
> Fixed.

Thanks.

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