linux-kernel - Re: Helping with backports: linux-next, linux, linux-stable

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120921081614.GA17547@kroah.com>
Date:	Fri, 21 Sep 2012 09:16:14 +0100
From:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:	"Luis R. Rodriguez" <mcgrof@...not-panic.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Konstantin Ryabitsev <mricon@...nel.org>,
	linux-kernel@...r.kernel.org, backports@...r.kernel.org,
	"H. Peter Anvin" <hpa@...or.com>
Subject: Re: Helping with backports: linux-next, linux, linux-stable - a few
 enhancements

On Thu, Sep 20, 2012 at 03:45:46PM -0700, Luis R. Rodriguez wrote:
> Greg, Stephen, Konstantin,
> 
> so for the Linux backports project [0] we rely on a few git trees:
> 
>   * linux-next.git
>   * linux-stable.git
>   * linux.git
> 
> The linux.git tree is required for RC releases. The linux-stable.git
> tree for extraversion stable releases, and the linux-next.git tree for
> daily snapshots. There is a trick for stable releases whereby we
> accelerate the integration of pending-stable patches by cherry picking
> them out of linux-next.git if the commit log entry has the
> 'stable@...r.kernel.org' on the commit log, and if the stable patch
> does not apply we require the developers to provide a backport
> compatible port. This trick works swell on linux-next.git for RC
> release given that we can query for rc releases there as linux-next
> carries them but linux-next.git does not carry extra version tags.
> Additionally the requirement of linux.git is only there given that at
> times there are delays between which linux-stable.git will not have an
> RC release on it. I have a way to address all these issues, namely to
> add linux.git as a remote for my local linux-stable tree, and also by
> adding linux-stable as a local remote for my linux-next tree. Now, I
> document how I resolve this for backport package consumers / builders
> but it occurs to me perhaps we can simplify this if we had:
> 
>   * linux-next - pulling in linux-stable packs / tags
>   * a new linux-releases.git - which has both linux.git and
> linux-stable pulled together through a cronjob
> 
> Would this be reasonable to accommodate to help ease of use or shall
> we just live with folks having to do the remote / local remote hacks?

I pull the linux.git tree into linux-stable.git every few -rc releases,
and as it's based on linux.git, it's really not a big deal.

I don't see how pulling linux-stable into linux-next really helps anyone
out, linux-stable is so far behind what is in linux-next it's not funny.

But, if you really want it all in a single tree, can't you just do this
with a few 'remote' markings in your git configuration file for the repo
and do it locally if you want to?

Otherwise I don't see the real question here.

confused probably due to a bad case of jet lag,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/