linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Russell King <rmk@arm.linux.org.uk>
Cc: 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: linux-next: manual merge of the arm tree with Linus' tree
Date: Tue, 13 Mar 2012 09:56:28 +0100	[thread overview]
Message-ID: <20120313085628.GB6991@elte.hu> (raw)
In-Reply-To: <20120313084713.GB27560@flint.arm.linux.org.uk>


* Russell King <rmk@arm.linux.org.uk> wrote:

> Sorry, you're blaming the wrong person.  I got the commit via 
> a pull, not via a patch.

This is the most idiotic excuse I've ever read.

Dammit, don't pull code you don't maintain and which you have 
not checked the background of, *especially* not if the 
originating discussion very clearly asked *you* to do it in 
another way.

We were modifying that very code in this development cycle, in 
the scheduler tree - a fact highlighted by the conflict - which 
you could have seen yourself, had you even attempted to 
test-merge your tree to linux-next ...

Let me quote PeterZ again:

> > Russell, what's the status of these patches? I'd like to see 
> > them land in 3.4 if possible. I'm fine either way, I'll
> >
> > probably ask Ingo to pull your tree so that I can stack some 
> > other patches on top.

Russell, read and reply to your mail in a timely and reliable 
fashion, that will avoid such mixups in the future.

> If that's how you want to run your bit of the kernel, then 
> please be more responsive when you're sent patches and say how 
> you want to handle things. Don't ignore patches and then blame 
> people when conflicts happen.

Stop blaming others for your own mistakes, one of the the 
scheduler maintainers replied to the patches a month ago, in an 
absolutely constructive fashion:

  http://lkml.org/lkml/2012/2/16/232

You never replied to PeterZ that I can see.

Again, fortunately it's not a big deal right now - both the 
commit and the conflict is trivial - but your current attitute 
towards applying patches and following discussions is rather sad 
and could cause bigger problems in the future.

Thanks,

	Ingo

  reply	other threads:[~2012-03-13  8:56 UTC|newest]

Thread overview: 58+ 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 [this message]
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
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
  -- strict thread matches above, loose matches on Subject: below --
2025-03-26 23:50 Stephen Rothwell
2022-03-08 22:35 Stephen Rothwell
2020-05-27 23:09 Stephen Rothwell
2020-05-27 23:22 ` Russell King - ARM Linux admin
2020-05-28  7:01   ` Ard Biesheuvel
2020-05-30  8:41     ` Russell King - ARM Linux admin
2020-05-30  8:51       ` Ard Biesheuvel
2020-05-30  9:17         ` Russell King - ARM Linux admin
2020-05-30  9:53           ` Stephen Rothwell
2020-05-30 10:25           ` Ard Biesheuvel
2016-06-01  0:07 Stephen Rothwell
2016-06-01  8:52 ` Russell King
2012-03-30  0:11 Stephen Rothwell
2012-03-26  0:05 Stephen Rothwell
2012-01-29 23:38 Stephen Rothwell
2012-01-08 23:53 Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus tree Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus' tree Stephen Rothwell
2011-12-20 23:08 Stephen Rothwell
2011-09-21  0:33 Stephen Rothwell
2011-09-21  9:31 ` Linus Walleij
2010-07-13  0:51 Stephen Rothwell
2010-03-03 23:49 Stephen Rothwell
2010-03-04  1:16 ` Eric Miao
2010-03-03 23:33 Stephen Rothwell
2009-07-31  0:33 Stephen Rothwell
2009-07-31  0:41 ` H Hartley Sweeten

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=20120313085628.GB6991@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 \
    /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).