From: Ingo Molnar <mingo@elte.hu>
To: Russell King <rmk@arm.linux.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: [GIT PULL/NEXT] sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback
Date: Tue, 13 Mar 2012 13:44:33 +0100 [thread overview]
Message-ID: <20120313124433.GA15333@elte.hu> (raw)
In-Reply-To: <20120313121707.GA2174@flint.arm.linux.org.uk>
* Russell King <rmk@arm.linux.org.uk> wrote:
> On Tue, Mar 13, 2012 at 12:56:40PM +0100, Ingo Molnar wrote:
> > Look into the fine conflict report Russell: it conflicts with
> > *Linus's* tree, because it's based off some random
> > barely-beyond-rc1 development window -rc3 base. Even at the
> > commit date of Feb 27 we had a more stable base tree available -
> > and especially when you pulled it, several weeks down the line,
> > -rc3 was not a defensible base for the integrated result.
>
> I'm not going to ask someone to rebase their patches after
> they've been fully tested on a set of platforms. [...]
That's a new argument which might be a valid concern in general
*if you make that decision when you pull the tree* - but you
should admit that you werent even aware of the conflict and of
the root cause behind it, let alone be in the position to
consider whether a rebase is justified in that case ...
( Paradoxially, rebasing is exactly what *you* ended up forcing
others to do. I have not asked you or Catalin to rebase any
existing commit. I merely asked about future plans. )
So I think you are just making this up on the fly. Really, if I
push back on you in a 100% *permissive* fashion, and if my
complaint is justified, then the proper response is for you to
push back on your contributors - while we can keep all commits
in place.
Instead you first pushed back on *me*, then you claimed that you
are not responsible for what you pull, then you started zapping
patches and claiming that you will never pull them again,
blaming it all on me.
Again, a storm in a teacup IMO.
Thanks,
Ingo
next prev parent reply other threads:[~2012-03-13 12:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-13 0:08 linux-next: manual merge of the arm tree with Linus' tree Stephen Rothwell
2012-03-13 6:16 ` Ingo Molnar
2012-03-13 8:33 ` Russell King
2012-03-13 8:36 ` Ingo Molnar
2012-03-13 8:47 ` Russell King
2012-03-13 8:56 ` Ingo Molnar
2012-03-13 9:00 ` Russell King
2012-03-13 9:26 ` [GIT PULL/NEXT] sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback Ingo Molnar
2012-03-13 9:50 ` Russell King
2012-03-13 10:19 ` Ingo Molnar
2012-03-13 11:27 ` Russell King
2012-03-13 11:56 ` Ingo Molnar
2012-03-13 12:00 ` Russell King
2012-03-13 12:20 ` Ingo Molnar
2012-03-13 12:36 ` Russell King
2012-03-13 13:02 ` Ingo Molnar
2012-03-13 12:10 ` Ingo Molnar
2012-03-13 12:17 ` Russell King
2012-03-13 12:44 ` Ingo Molnar [this message]
2012-03-13 13:04 ` Russell King
2012-03-13 13:31 ` Ingo Molnar
2012-03-13 15:47 ` Ingo Molnar
2012-03-30 13:52 ` Catalin Marinas
2012-03-30 14:25 ` Ingo Molnar
2012-03-30 17:21 ` Catalin Marinas
2012-03-13 11:11 ` Catalin Marinas
2012-03-13 8:48 ` linux-next: manual merge of the arm tree with Linus' tree Ingo Molnar
2012-03-13 8:58 ` Russell King
2012-03-13 9:06 ` Ingo Molnar
2012-03-13 9:09 ` Russell King
2012-03-13 9:11 ` Russell King
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=20120313124433.GA15333@elte.hu \
--to=mingo@elte.hu \
--cc=a.p.zijlstra@chello.nl \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--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;
as well as URLs for NNTP newsgroup(s).