Re: linux-next: please clean up the livepatching tree

From	Jiri Kosina <jikos@kernel.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: please clean up the livepatching tree
Date	2016-08-05 15:20 +0200
Message-ID	<s2NcB-80H-7@gated-at.bofh.it> (permalink)
References	<s1RrX-2SO-3@gated-at.bofh.it> <s1RLo-2ZL-3@gated-at.bofh.it> <s1Tk6-42G-29@gated-at.bofh.it> <s21Ul-1q9-13@gated-at.bofh.it> <s2Hqy-4jk-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Fri, 5 Aug 2016, Takashi Iwai wrote:

> > Exactly to avoid Linus' tree being polluted by the extra merge commits.
> > 
> > My workflow is really simple -- development happens in (a lot of) topic 
> > branches, and each and every time any of the topic branches is updated by 
> > a new commit, that topic branch gets merged into for-next.
> > 
> > Once code should go to Linus, the branches are merged at once into 
> > 'for-linus' brach, and it's guaranteed to be code-wise the same as what 
> > was gradually appearing in for-next.
> > 
> > What other workflow do you suggest for maintainers like me, who are using 
> > a lot of topic branches?
> 
> Maybe refreshing merges in for-next branch at each time (or day)
> instead of incremental merges?

That slightly breaks for for-next downstreams, but one can successfully 
counter that by the fact that topic branches should be the only ones 
having downstreams, and for-next should be upstream solely for linux-next.

I'll experiment with this during the next cycle.

Thanks,

-- 
Jiri Kosina
SUSE Labs

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

Thread

linux-next: please clean up the livepatching tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-08-03 01:40 +0200
  Re: linux-next: please clean up the livepatching tree Jiri Kosina <jikos@kernel.org> - 2016-08-03 02:00 +0200
    Re: linux-next: please clean up the livepatching tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-08-03 03:40 +0200
      Re: linux-next: please clean up the livepatching tree Jiri Kosina <jikos@kernel.org> - 2016-08-03 12:50 +0200
        Re: linux-next: please clean up the livepatching tree Takashi Iwai <tiwai@suse.de> - 2016-08-05 09:10 +0200
          Re: linux-next: please clean up the livepatching tree Jiri Kosina <jikos@kernel.org> - 2016-08-05 15:20 +0200

csiph-web