mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: Linux 3.2-rc1
Date: Mon, 07 Nov 2011 22:50:14 -0800	[thread overview]
Message-ID: <1320735014.30780.172.camel@haakon2.linux-iscsi.org> (raw)
In-Reply-To: <CA+55aFzytqbGcOzWvYAo-EnJCeK5mFqdCF5OjMTeM5UBfeyCXw@mail.gmail.com>

On Mon, 2011-11-07 at 18:10 -0800, Linus Torvalds wrote:
> So it's been two weeks since 3.1, and you know how it works by now.
> 
> I have to say, this wasn't my favorite merge window ever. I really
> wanted to take only things that had been in -next, but verifying it
> was fairly painful, since a lot of the trees had been rebased, and the
> ones that hadn't been rebased often had some extra patches that still
> showed up when I did my "git log linux-next..FETCH_HEAD" thing.
> 
> On the whole, most of it was all good, and I didn't really end up
> complaining to people. I'm pretty sure that there were trees I
> shouldn't have let through, but the majority really had been in -next.
> 
> The other point of irritation was that there really was a lot of stuff
> that came in yesterday and basically treated the merge window as some
> kind of high-tech limbo dance. If it hadn't been for a few trees I
> wanted to pull, I had actually planned to do the -rc1 release Sunday
> afternoon instead, just to cut those annoying last-minute pull
> requests off.
> 
> And some trees didn't get pulled. You know who you are, and you can
> try to appeal to my softer side if you think it was unfair. Of course,
> if you *do* find my softer side, please tell my wife and kids too,
> they'll be thrilled.
> 
> But the main reason some trees didn't get pulled was that they
> generated long flame-wars, and I just felt like I really didn't need
> the aggravation this time around, especially as I knew I had plenty
> other trees to pull.
> 

Hi Linus,

(Just asking once more, so if you're really over it please ignore the
following..)

Is there any chance to get a merge window exception for the ib_srpt
driver..?  We (Roland, Bart + myself) have agreed on the userspace
configfs API, and we collectively made forward progress without any
extra controversy or flames this time around.  A first in the history of
mainline target mode code development!

That said, ib_srpt has been getting build testing in linux-next and is a
stand-alone driver that does not modify any existing external code, so
the merge risk is nill.  The main reason I'm asking for the exception is
that we have a very time and resource intensive effort underway for v3.3
to get the qla2xxx FC target merged.  So if your not completely joking
about appealing to the benevolent dictator here, please consider making
an one time exception for ib_srpt.

Thank you for the extra consideration,

--nab


  parent reply	other threads:[~2011-11-08  6:50 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-08  2:10 Linus Torvalds
2011-11-08  3:12 ` Al Viro
2011-11-08  4:26   ` Linus Torvalds
2011-11-08 10:52     ` Geert Uytterhoeven
2011-11-08  6:50 ` Nicholas A. Bellinger [this message]
2011-11-08 13:43 ` Udo Steinberg
2011-11-08 14:47   ` Ming Lei
2011-11-08 22:10     ` Rafael J. Wysocki
2011-11-08 14:53 ` Alessandro Suardi
2011-11-08 20:13   ` Linus Torvalds
2011-11-08 20:15     ` Matthew Garrett
2011-11-08 20:44     ` Linus Torvalds
2011-11-08 14:55 ` Nick Bowler
2011-11-08 20:23   ` Linus Torvalds
2011-11-09  7:40     ` Takashi Iwai
2011-11-09 12:03       ` Wu Fengguang
2011-11-10 11:57       ` Wu Fengguang
2011-11-08 19:06 ` Thomas Bächler
2011-11-08 23:00 ` Steven Rostedt
2011-11-08 23:53   ` Linus Torvalds
2011-11-09  8:09   ` Borislav Petkov
2011-11-09 13:11   ` Valdis.Kletnieks
2011-11-09 14:20 ` Paul Rolland
2011-11-09 23:23   ` Linus Torvalds
2011-11-09 17:18 ` Randy Dunlap
2011-11-09 17:28   ` Josh Boyer
2011-11-22  1:41     ` Boaz Harrosh
2011-11-22 16:10       ` Josh Boyer
2011-11-22 18:05       ` Alan Cox
2011-11-22 18:29         ` Boaz Harrosh

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=1320735014.30780.172.camel@haakon2.linux-iscsi.org \
    --to=nab@linux-iscsi.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.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

Powered by JetHome