public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alan Cox <alan@lxorguk•ukuu.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation•org>,
	linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
	ppc-dev <linuxppc-dev@ozlabs•org>
Subject: Re: [PATCH] serial: fix struct uart_info change fallout
Date: Wed, 23 Jul 2008 01:49:10 +1000	[thread overview]
Message-ID: <20080723014910.7351c495.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080722114436.2c13edea@lxorguk.ukuu.org.uk>

[-- Attachment #1: Type: text/plain, Size: 1361 bytes --]

Hi Alan,

On Tue, 22 Jul 2008 11:44:36 +0100 Alan Cox <alan@lxorguk•ukuu.org.uk> wrote:
>
> > What is your problem with the linux-next tree.  The problem was
> > discovered and reported when I first merged the ttydev tree into
> > linux-next on July 1.  The fixes were in linux-next on July 2.
> 
> Yes .. and ? The clashes kept happening despite that when I was doing the
> merges (and going on holiday for a week and trying to sort it out with
> limited time and internet access)
> 
> Sorry I don't follow your line of discussion at all here ?

I interpreted your "So much for the linux-next tree" as saying "well,
that has been no help".  I am sorry if I got that wrong.

But my point above is that you had a fix for the current breakage in
Linus' tree a couple of weeks before you sent the patches to Linus that
broke the powerpc build (i.e. linux-next did its job) and yet you didn't
combine the fix with the original patch or send the fix with the original
patch.  So we end up with a powerpc tree that won't build in the middle
of the merge window while more powerpc patches are trying to be
tested ... I understand that this could easily happen because of
forgetfulness, tiredness or accident.

More care was needed.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

  reply	other threads:[~2008-07-22 15:49 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-22  0:25 [PATCH] serial: fix struct uart_info change fallout Stephen Rothwell
2008-07-22  0:38 ` Dave Jones
2008-07-22  1:34   ` Stephen Rothwell
2008-07-22  2:00   ` Alan Cox
2008-07-22  1:58 ` Alan Cox
2008-07-22  3:01   ` Stephen Rothwell
2008-07-22 10:44     ` Alan Cox
2008-07-22 15:49       ` Stephen Rothwell [this message]
2008-07-22 15:59         ` Alan Cox
2008-07-22 16:22           ` 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=20080723014910.7351c495.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=alan@lxorguk$(echo .)ukuu.org.uk \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linuxppc-dev@ozlabs$(echo .)org \
    --cc=torvalds@linux-foundation$(echo .)org \
    /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