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

2008-07-22 Thread Alan Cox
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

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

2008-07-22 Thread Stephen Rothwell
Hi Alan, On Tue, 22 Jul 2008 11:44:36 +0100 Alan Cox [EMAIL PROTECTED] 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

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

2008-07-22 Thread Alan Cox
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. True it didn't help in the merge that much this time. I don't think that is a problem with the linux-next tree but one of the lack of tty maintainer and tty tree letting

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

2008-07-22 Thread Stephen Rothwell
Hi Alan, On Tue, 22 Jul 2008 16:59:29 +0100 Alan Cox [EMAIL PROTECTED] wrote: I really expected to get the rest merged within an hour or two, but then it broke, then I was travelling and each time I got wireless access to resync the tree and work on it - it broke again and again and again.

[PATCH] serial: fix struct uart_info change fallout

2008-07-21 Thread Stephen Rothwell
Hi Linus, Alan, Today's linux-next (actually just Linus' tree) build (powerpc ppc64_defconfig) failed like this: drivers/serial/serial_txx9.c: In function 'receive_chars': drivers/serial/serial_txx9.c:275: error: 'struct uart_info' has no member named 'tty' drivers/serial/icom.c: In function

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

2008-07-21 Thread Dave Jones
On Tue, Jul 22, 2008 at 10:25:20AM +1000, Stephen Rothwell wrote: Hi Linus, Alan, Today's linux-next (actually just Linus' tree) build (powerpc ppc64_defconfig) failed like this: drivers/serial/serial_txx9.c: In function 'receive_chars': drivers/serial/serial_txx9.c:275: error:

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

2008-07-21 Thread Stephen Rothwell
Hi Dave, On Mon, 21 Jul 2008 20:38:14 -0400 Dave Jones [EMAIL PROTECTED] wrote: That's the same pair of patches I sent earlier, which apparently were Already in the ttydev tree which should be in linux-next ? Indeed. -- Cheers, Stephen Rothwell[EMAIL PROTECTED]

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

2008-07-21 Thread Alan Cox
On Tue, 22 Jul 2008 10:25:20 +1000 Stephen Rothwell [EMAIL PROTECTED] wrote: Hi Linus, Alan, Today's linux-next (actually just Linus' tree) build (powerpc ppc64_defconfig) failed like this: Yes I know. I've been trying to get the other patches merged but each of the five pulls of Linus

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

2008-07-21 Thread Stephen Rothwell
Hi Alan, On Tue, 22 Jul 2008 02:58:50 +0100 Alan Cox [EMAIL PROTECTED] wrote: Yes I know. Indeed, you knew before you pushed the breaking patches to Linus. I've been trying to get the other patches merged but each of the five pulls of Linus tree I have done has broken the tty patch merges