From: Arnd Bergmann <arnd@arndb.de>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: 'Olof Johansson' <olof@lixom.net>,
'Mark Brown' <broonie@opensource.wolfsonmicro.com>,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, ben-linux@fluff.org
Subject: Re: [GIT PULL] Samsung devel for v3.3
Date: Mon, 9 Jan 2012 15:56:34 +0000 [thread overview]
Message-ID: <201201091556.34817.arnd@arndb.de> (raw)
In-Reply-To: <01a301ccce6f$9bb51790$d31f46b0$%kim@samsung.com>
On Monday 09 January 2012, Kukjin Kim wrote:
> In my opinion, as you know, it would be better to us if you could send this in
> this merge window.
> Actually, it does not have any dependency with others, in addition, for a long
> time this has been included in linux-next for this
> merge window.
Your patches have caused too much problems already so far, with many complex
merges (multiple files combined into new files in the restart branch, but
modified in multiple other conflicting branches), and I would rather not
see *anything* besides fixes from you for late 3.3 patches. If it hadn't
been for the conflicts I mentioned, everything else from arm-soc could
have been sent last Saturday already, but this way I spent a national
holiday and a weekend day, both during my vacation, mostly trying to
understand what you were trying to do and get it into shape for upstream
submission, giving up in the end.
I don't consider it enough to have patches in linux-next before the merge
window, and I thought I had made it clear enough that everything has to be
in arm-soc before the merge window. I realize that sometimes there is stuff
that gets done last minute and really has to get merged, but since you have
had it in your own tree for so long, that certainly doesn't apply here.
> If this can be missed from sending list to Linus, please kindly let me know.
Sorry, but the chances are pretty slim this time.
> Let me send this to Linus at the end of this merge window.
No, if you do this, I will NAK that pull request.
Of course we will take all bug fixes. Just rebase the rest on top of 3.3-rc1
and we can take it right away for 3.4.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Samsung devel for v3.3
Date: Mon, 9 Jan 2012 15:56:34 +0000 [thread overview]
Message-ID: <201201091556.34817.arnd@arndb.de> (raw)
In-Reply-To: <01a301ccce6f$9bb51790$d31f46b0$%kim@samsung.com>
On Monday 09 January 2012, Kukjin Kim wrote:
> In my opinion, as you know, it would be better to us if you could send this in
> this merge window.
> Actually, it does not have any dependency with others, in addition, for a long
> time this has been included in linux-next for this
> merge window.
Your patches have caused too much problems already so far, with many complex
merges (multiple files combined into new files in the restart branch, but
modified in multiple other conflicting branches), and I would rather not
see *anything* besides fixes from you for late 3.3 patches. If it hadn't
been for the conflicts I mentioned, everything else from arm-soc could
have been sent last Saturday already, but this way I spent a national
holiday and a weekend day, both during my vacation, mostly trying to
understand what you were trying to do and get it into shape for upstream
submission, giving up in the end.
I don't consider it enough to have patches in linux-next before the merge
window, and I thought I had made it clear enough that everything has to be
in arm-soc before the merge window. I realize that sometimes there is stuff
that gets done last minute and really has to get merged, but since you have
had it in your own tree for so long, that certainly doesn't apply here.
> If this can be missed from sending list to Linus, please kindly let me know.
Sorry, but the chances are pretty slim this time.
> Let me send this to Linus at the end of this merge window.
No, if you do this, I will NAK that pull request.
Of course we will take all bug fixes. Just rebase the rest on top of 3.3-rc1
and we can take it right away for 3.4.
Arnd
next prev parent reply other threads:[~2012-01-09 15:56 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-03 23:33 [GIT PULL] Samsung devel for v3.3 Kukjin Kim
2012-01-03 23:33 ` Kukjin Kim
2012-01-06 21:58 ` Olof Johansson
2012-01-06 21:58 ` Olof Johansson
2012-01-07 10:09 ` Kukjin Kim
2012-01-07 10:09 ` Kukjin Kim
2012-01-08 20:49 ` Mark Brown
2012-01-08 20:49 ` Mark Brown
2012-01-09 1:21 ` Olof Johansson
2012-01-09 1:21 ` Olof Johansson
2012-01-09 1:40 ` Kukjin Kim
2012-01-09 1:40 ` Kukjin Kim
2012-01-09 2:03 ` Olof Johansson
2012-01-09 2:03 ` Olof Johansson
2012-01-09 15:56 ` Arnd Bergmann [this message]
2012-01-09 15:56 ` Arnd Bergmann
2012-01-09 16:11 ` Mark Brown
2012-01-09 16:11 ` Mark Brown
2012-01-10 9:06 ` Russell King - ARM Linux
2012-01-10 9:06 ` Russell King - ARM Linux
2012-01-10 18:31 ` Mark Brown
2012-01-10 18:31 ` Mark Brown
2012-01-10 18:44 ` Nicolas Pitre
2012-01-10 18:44 ` Nicolas Pitre
2012-01-10 18:46 ` Mark Brown
2012-01-10 18:46 ` Mark Brown
2012-01-10 19:00 ` Nicolas Pitre
2012-01-10 19:00 ` Nicolas Pitre
2012-01-10 20:13 ` Arnd Bergmann
2012-01-10 20:13 ` Arnd Bergmann
2012-01-10 22:37 ` Mark Brown
2012-01-10 22:37 ` Mark Brown
2012-01-11 0:11 ` Olof Johansson
2012-01-11 0:11 ` Olof Johansson
2012-01-11 6:39 ` Kukjin Kim
2012-01-11 6:39 ` Kukjin Kim
2012-01-11 16:19 ` Arnd Bergmann
2012-01-11 16:19 ` Arnd Bergmann
2012-01-11 16:50 ` Olof Johansson
2012-01-11 16:50 ` Olof Johansson
2012-01-11 17:29 ` Mark Brown
2012-01-11 17:29 ` Mark Brown
2012-01-11 6:20 ` Kukjin Kim
2012-01-11 6:20 ` Kukjin Kim
2012-01-09 8:26 ` Mark Brown
2012-01-09 8:26 ` Mark Brown
2012-01-17 6:40 ` Olof Johansson
2012-01-17 6:40 ` Olof Johansson
2012-01-17 7:23 ` Kukjin Kim
2012-01-17 7:23 ` Kukjin Kim
2012-01-17 7:24 ` Olof Johansson
2012-01-17 7:24 ` Olof Johansson
2012-01-17 10:53 ` Mark Brown
2012-01-17 10:53 ` Mark Brown
2012-01-09 9:58 ` Russell King - ARM Linux
2012-01-09 9:58 ` Russell King - ARM Linux
2012-01-09 23:24 ` Mark Brown
2012-01-09 23:24 ` Mark Brown
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=201201091556.34817.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=ben-linux@fluff.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=olof@lixom.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.