From: Jason Cooper <jason@lakedaemon.net>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: ksummit-2013-discuss@lists.linuxfoundation.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: KS Topic request: Handling the Stable kernel, let's dump the cc: stable tag
Date: Mon, 15 Jul 2013 16:20:37 -0400 [thread overview]
Message-ID: <20130715202037.GB12062@titan.lakedaemon.net> (raw)
In-Reply-To: <1373916476.2748.69.camel@dabdike>
On Mon, Jul 15, 2013 at 11:27:56PM +0400, James Bottomley wrote:
...
> The solution, to me, looks simple: Let's co-opt a process we already
> know how to do: mailing list review and tree handling. So the proposal
> is simple:
>
> 1. Drop the cc: stable@ tag: it makes it way too easy to add an ill
> reviewed patch to stable
> 2. All patches to stable should follow current review rules: They
> should go to the mailing list the original patch was sent to
> once the original is upstream as a request for stable.
> 3. Following debate on the list, the original maintainer would be
> responsible for collecting the patches (including the upstream
> commit) adjudicating on them and passing them on to stable after
> list review (either by git tree pull or email to stable@).
>
> I contend this raises the bar for adding patches to stable much higher,
> which seems to be needed, and adds a review stage which involves all the
> original reviewers.
If I may expand on the 'tree-handling' with an idea:
When I'm collecting up patches for mvebu, the first thing I do is
classify the patch as a fix for the current -rc cycle, or for next. It
would be very easy to maintain a stable branch "ahead of" fixes. More
accurately, one for each stable version. eg:
stable-3.2
stable-3.4
stable-3.9
stable-3.10
fixes
cleanup (or next)
...
Each branch would need to be based on a commit in the mainline tree, eg
stable-3.2 would be based on v3.2, not v3.2.48.
Anything I suspect is stable material goes in the earliest relevant
stable branch, and I send an email series to the linux-stable list.
Discussion ensues, maybe I remove one or two patches from the stable
branch and only put them in fixes (so, for -rcX), and send the PR. The
stable team can then merge the PR, once they see the commit in mainline.
The big advantage of this proposal is that the patch would have the same
commit id in both trees. 'git branch -a --contains <commit-ish>' would
work.
The main problem with this is that maintainers would need to do the
legwork themselves to figure out how far back a patch is relevant for.
Maybe this would be a feature? ;-)
Unfortunately, since most of the time there's just a single patch, I'm
not sure the cost of the merge commits is worth the benefit of having
the same commit id in stable and mainline.
thx,
Jason.
next prev parent reply other threads:[~2013-07-15 20:20 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-15 19:27 James Bottomley
2013-07-15 19:45 ` [Ksummit-2013-discuss] " Steven Rostedt
2013-07-15 19:55 ` Willy Tarreau
2013-07-15 20:56 ` Steven Rostedt
2013-07-15 21:09 ` Joe Perches
2013-07-15 21:21 ` Steven Rostedt
2013-07-15 21:34 ` Joe Perches
2013-07-21 4:06 ` Rob Landley
2013-07-15 21:52 ` Willy Tarreau
2013-07-15 20:15 ` Mark Brown
2013-07-15 21:07 ` Steven Rostedt
2013-07-15 20:19 ` Guenter Roeck
2013-07-15 22:04 ` David Woodhouse
2013-07-15 22:07 ` Guenter Roeck
2013-07-15 22:38 ` H. Peter Anvin
2013-07-15 23:22 ` Guenter Roeck
2013-07-16 0:13 ` H. Peter Anvin
2013-07-16 0:21 ` Greg KH
2013-07-16 0:25 ` H. Peter Anvin
2013-07-16 15:50 ` Paul Gortmaker
2013-07-15 20:20 ` Jason Cooper [this message]
2013-07-15 21:44 ` Greg KH
2013-07-15 21:55 ` Greg KH
2013-07-15 22:01 ` H. Peter Anvin
2013-07-15 23:08 ` Greg KH
2013-07-16 0:40 ` [Ksummit-2013-discuss] " Rafael J. Wysocki
2013-07-16 9:06 ` Jiri Kosina
2013-07-15 22:01 ` Steven Rostedt
2013-07-16 0:06 ` Greg KH
2013-07-16 2:09 ` Steven Rostedt
2013-07-16 2:41 ` Ben Hutchings
2013-07-16 3:27 ` Dave Airlie
2013-07-16 3:43 ` Steven Rostedt
2013-07-16 4:10 ` Ben Hutchings
2013-07-16 6:23 ` Greg KH
2013-07-16 6:10 ` James Bottomley
2013-07-16 6:28 ` Greg KH
2013-07-15 22:22 ` Jiri Kosina
2013-07-15 23:40 ` Jiri Kosina
2013-07-15 23:59 ` Greg KH
2013-07-16 2:30 ` Ben Hutchings
2013-07-16 6:13 ` Greg KH
2013-07-16 9:11 ` Jiri Kosina
2013-07-16 16:36 ` Greg KH
2013-07-17 3:53 ` Ben Hutchings
2013-07-17 4:24 ` Greg KH
2013-07-16 5:17 ` James Bottomley
2013-07-16 6:20 ` Greg KH
2013-07-16 7:43 ` [Ksummit-2013-discuss] " James Bottomley
2013-07-16 9:46 ` Jiri Kosina
2013-07-16 12:43 ` Ben Hutchings
2013-07-16 16:35 ` Greg KH
2013-07-16 23:15 ` Jiri Kosina
2013-07-16 13:14 ` Josh Boyer
2013-07-17 15:08 ` John W. Linville
2013-07-18 7:45 ` Kalle Valo
2013-07-16 10:02 ` Jan Kara
2013-07-16 6:24 ` David Lang
2013-07-16 16:45 ` [Ksummit-2013-discuss] " Steven Rostedt
2013-07-16 2:00 ` Ben Hutchings
2013-07-16 9:53 ` Mark Brown
2013-07-21 4:11 ` Rob Landley
2013-07-21 15:09 ` [Ksummit-2013-discuss] " Ben Hutchings
2013-07-22 21:24 ` KOSAKI Motohiro
2013-07-23 2:29 ` Li Zefan
2013-07-23 2:40 ` Myklebust, Trond
2013-07-23 2:47 ` James Bottomley
2013-07-23 2:57 ` Myklebust, Trond
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130715202037.GB12062@titan.lakedaemon.net \
--to=jason@lakedaemon.net \
--cc=James.Bottomley@HansenPartnership.com \
--cc=ksummit-2013-discuss@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®