lkml.org 
[lkml]   [2011]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next base Linus tag
On Thu, Dec 8, 2011 at 1:57 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Luis,
>
> On Thu, 8 Dec 2011 13:39:16 -0800 "Luis R. Rodriguez" <mcgrof@frijolero.org> wrote:
>>
>> If I know a linux-next tag, say next-20110928, how can I extract the
>> Linus tag you used to start that set of merges for linux-next for?
>> That is, I am assuming you base your daily linux-next merges on that
>> day's latest Linus's rc cycle (not just Linus's master tag of that
>> day). Is that right? If so how can I get that tag?
>
> In each linux-next, there is a file called Next/SHA1s, and in there is a
> SHA1 for "origin" - that is the point in Linus' tree that I started for
> that day.  I just use the latest available version of Linus' tree each
> day.
>
>> For example for next-20110928 I see in Next/quilt-import.log:
>
> For the quilt series, the owner of the series puts a BASE or NEXT_BASE
> comment in the series to tell me what their series is based on.  I import
> each quilt series staring from that base into a branch and then merge
> that branch.
>
> For the git trees, I just fetch and merge them.

Thanks for all the details!

Last question, do you do merge conflicts manually? I was also trying
to see if I can simulate a linux-next merge myself to see what you do
but I didn't see the scripts you use, any pointers would be
appreciated.

Luis
--
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/

\
 
 \ /
  Last update: 2011-12-09 00:13    [W:0.048 / U:0.628 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site