From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Russell King <rmk+kernel@arm•linux.org.uk>,
Russell King <linux@arm•linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Russell King <rmk@arm•linux.org.uk>,
John Stultz <john.stultz@linaro•org>,
Jacob Pan <jacob.jun.pan@intel•com>,
Glauber Costa <glommer@redhat•com>,
Dimitri Sivanich <sivanich@sgi•com>,
Rusty Russell <rusty@rustcorp•com.au>,
Jeremy Fitzhardinge <jeremy@xensource•com>,
Chris McDermott <lcm@us•ibm.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>
Subject: Re: linux-next: manual merge of the tip tree with the arm tree
Date: Fri, 13 May 2011 10:06:34 +0200 [thread overview]
Message-ID: <20110513080634.GA13647@elte.hu> (raw)
In-Reply-To: <20110513131437.8999e8eb.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/x86/kernel/i8253.c between commit 3490f584b9ba ("clocksource: convert
> x86 to generic i8253 clocksource") from the arm tree and commit b01cc1b0eae0
> ("x86: Convert remaining x86 clocksources to clocksource_register_hz/khz")
> from the tip tree.
>
> The former seems to supercede the latter, so I used the former.
Russell, how the heck did this commit:
commit 3490f584b9ba5a0b6f63832fbc9c5ec72506697b
Author: Russell King <rmk+kernel@arm•linux.org.uk>
AuthorDate: Sun May 8 18:55:19 2011 +0100
Commit: Russell King <rmk+kernel@arm•linux.org.uk>
CommitDate: Tue May 10 08:20:54 2011 +0100
clocksource: convert x86 to generic i8253 clocksource
which has such a clearly x86 diffstat:
arch/x86/Kconfig | 1 +
arch/x86/include/asm/i8253.h | 2 +
arch/x86/kernel/i8253.c | 79 +-----------------------------------------
3 files changed, 4 insertions(+), 78 deletions(-)
end up in the ARM tree without an ack from an x86 maintainer??
Not only did it conflict with a 2 months old commit, but it also broke the
linux-next x86 build.
I see the commit has an ack from John but that feedback is not visible in the
lkml thread of this patch nor did John really realize the conflict nor the
build breakage. The patch was still in the to-be-reviewed queue of our patches.
Nor was it tested properly. The patch looks sane but your workflow sucks.
Please revert it and use a proper Git workflow to change arch/x86/ details ...
Thanks,
Ingo
next prev parent reply other threads:[~2011-05-13 8:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-13 3:14 linux-next: manual merge of the tip tree with the arm tree Stephen Rothwell
2011-05-13 8:06 ` Ingo Molnar [this message]
2011-05-13 8:37 ` Russell King - ARM Linux
2011-05-13 8:47 ` Thomas Gleixner
2011-05-13 9:26 ` Ingo Molnar
2011-05-13 10:04 ` Thomas Gleixner
2011-05-13 17:25 ` Russell King - ARM Linux
2011-05-16 7:21 ` Ingo Molnar
2011-05-13 21:36 ` Russell King - ARM Linux
2011-05-16 7:31 ` Ingo Molnar
2011-05-16 7:42 ` Russell King - ARM Linux
2011-05-16 9:17 ` Ingo Molnar
2011-05-16 9:19 ` Russell King - ARM Linux
2011-05-16 9:40 ` Ingo Molnar
2011-05-16 10:07 ` Russell King - ARM Linux
2011-05-16 11:06 ` Ingo Molnar
2011-05-16 11:37 ` Russell King - ARM Linux
2011-05-16 18:47 ` John Stultz
2011-05-17 11:56 ` Ingo Molnar
2011-05-17 18:28 ` Russell King - ARM Linux
-- strict thread matches above, loose matches on Subject: below --
2013-06-20 5:05 Stephen Rothwell
2020-05-29 5:29 Stephen Rothwell
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=20110513080634.GA13647@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=glommer@redhat$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jacob.jun.pan@intel$(echo .)com \
--cc=jeremy@xensource$(echo .)com \
--cc=john.stultz@linaro$(echo .)org \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=lcm@us$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=peterz@infradead$(echo .)org \
--cc=rmk+kernel@arm$(echo .)linux.org.uk \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sivanich@sgi$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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