linux-kernel - Re: linux-next: rebase/rewrite of the renesas tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20130711103752.ccf481354c83001a4233cb68@canb.auug.org.au>
Date:	Thu, 11 Jul 2013 10:37:52 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Simon Horman <horms@...ge.net.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: rebase/rewrite of the renesas tree

Hi Simon,

On Thu, 11 Jul 2013 09:31:33 +0900 Simon Horman <horms@...ge.net.au> wrote:
>
> I am not planning to send any pull requests for v3.11,
> at least not for the branches that I rebased.

Then none of that stuff should be in -next at the moment (not until after
v3.11-rc1 is released).  It just mucks up possible tesing for stuff that
is still to be merged.

> I can rewind the next branch if you like. If so, would rewinding
> it to the point it was at for next-20130709 make sense?

See above.

> Also, on this topic, could you clarify when it would be appropriate
> to do any rebasing. Obviously I am not clear on this.

I notice that you seem to use topic branches that you then merge for
inclusion in -next (and presumably arm-soc).  You should endeavour to not
rebase those topic branches once they have been published.  Sometimes it
may be very necessary, but generally it should not (as you would have
done review and testing on them before publishing them, right? ;-)).

You should definitely *not* rebase those branches after you have asked
the arm-soc guys to merge them (unless that rebase is just to pick a new
starting point (though you should generally be able to get that by fast
forwarding into the arm soc tree after the spot where your stuff was
merged).  You should also not rebase them if others are using them as a
base for development.

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

Content of type "application/pgp-signature" skipped