Re: [PATCH] serial: fix struct uart_info change fallout

From: Stephen Rothwell
Date: Tue Jul 22 2008 - 11:49:29 EST

Hi Alan,

On Tue, 22 Jul 2008 11:44:36 +0100 Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> 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.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature