Re: No big TTY/serial patch merge for 3.6-rc1
On Thu, 26 Jul 2012 14:28:07 -0700 Greg KH wrote: > On Thu, Jul 26, 2012 at 10:23:13PM +0100, Alan Cox wrote: > > On Thu, 26 Jul 2012 12:08:14 -0700 > > Greg KH wrote: > > > > > tty: Move the handling of the tty release logic > > > > Can we lose that one specifically. I've chased down Ian Abbotts problem > > and replicated it and that is the offending patch not the lock localise > > (which still needs to be kept out as it depends upon this one) > > > > I have it fixed but it's not had enough testing for -rc1 and moving the > > termios data has enough spectacular hits all drivers fallout for 3.6 > > Yes, I can go revert it. I'm working on building up a small tty-linus > branch at the moment for just the "must haves" for 3.6. Right now it's > just 10 patches listed below. Any objection to me sending these after > a round trip through linux-next? All look good to me -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: No big TTY/serial patch merge for 3.6-rc1
On Thu, Jul 26, 2012 at 10:23:13PM +0100, Alan Cox wrote: > On Thu, 26 Jul 2012 12:08:14 -0700 > Greg KH wrote: > > > tty: Move the handling of the tty release logic > > Can we lose that one specifically. I've chased down Ian Abbotts problem > and replicated it and that is the offending patch not the lock localise > (which still needs to be kept out as it depends upon this one) > > I have it fixed but it's not had enough testing for -rc1 and moving the > termios data has enough spectacular hits all drivers fallout for 3.6 Yes, I can go revert it. I'm working on building up a small tty-linus branch at the moment for just the "must haves" for 3.6. Right now it's just 10 patches listed below. Any objection to me sending these after a round trip through linux-next? thanks, greg k-h .../devicetree/bindings/tty/serial/of-serial.txt |1 + drivers/tty/serial/8250/8250.c |8 +++ drivers/tty/serial/of_serial.c |1 + drivers/tty/serial/pch_uart.c | 59 +--- drivers/tty/serial/samsung.c |4 +- drivers/tty/serial/serial_core.c |6 +- drivers/tty/tty_ldisc.c|2 +- drivers/tty/vt/vt_ioctl.c | 47 +++- include/linux/serial_core.h|3 +- 9 files changed, 93 insertions(+), 38 deletions(-) --- Alan Cox (1): pch_uart: Fix missing break for 16 byte fifo Corbin (1): serial_core: Update buffer overrun statistics. Darren Hart (1): pch_uart: Add eg20t_port lock field, avoid recursive spinlocks Kyoungil Kim (1): serial: samsung: Fixed wrong comparison for baudclk_rate Rabin Vincent (1): vt: fix race in vt_waitactive() Roland Stigge (2): serial/8250: Add LPC3220 standard UART type serial/of-serial: Add LPC3220 standard UART compatible string Shachar Shemesh (1): tty ldisc: Close/Reopen race prevention should check the proper flag Tomoya MORINAGA (2): pch_uart: Fix rx error interrupt setting issue pch_uart: Fix parity setting issue -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: No big TTY/serial patch merge for 3.6-rc1
On Thu, 26 Jul 2012 12:08:14 -0700 Greg KH wrote: > tty: Move the handling of the tty release logic Can we lose that one specifically. I've chased down Ian Abbotts problem and replicated it and that is the offending patch not the lock localise (which still needs to be kept out as it depends upon this one) I have it fixed but it's not had enough testing for -rc1 and moving the termios data has enough spectacular hits all drivers fallout for 3.6 Alan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: No big TTY/serial patch merge for 3.6-rc1
On 07/26/2012 09:20 PM, Greg KH wrote: > I'll just be ignoring any new stuff > until then, with the exception of patches to fix build errors in the > tty-next tree :) Hehe, OK :). -- js suse labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: No big TTY/serial patch merge for 3.6-rc1
On Thu, Jul 26, 2012 at 09:12:29PM +0200, Jiri Slaby wrote: > On 07/26/2012 09:08 PM, Greg KH wrote: > > Jiri, I know this postpones your patches from being merged, sorry about > > that, but this gives us a few more months to ensure that they are > > working properly :) > > Fine with me. > > When should I send you 3.7 material I have in my local queue -- now or > after 3.6-rc1 is out as usual? After 3.6-rc1 is out is good, as I'll just be ignoring any new stuff until then, with the exception of patches to fix build errors in the tty-next tree :) thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: No big TTY/serial patch merge for 3.6-rc1
On Thu, Jul 26, 2012 at 12:08 PM, Greg KH wrote: > > I don't really feel comfortable sending you the tty tree at the present > time to have merged for 3.6-rc1. Good. This is what I like to see. If it's not ready to be merged, let's not merge it. I don't think anybody will mind horribly. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: No big TTY/serial patch merge for 3.6-rc1
On 07/26/2012 09:08 PM, Greg KH wrote: > Jiri, I know this postpones your patches from being merged, sorry about > that, but this gives us a few more months to ensure that they are > working properly :) Fine with me. When should I send you 3.7 material I have in my local queue -- now or after 3.6-rc1 is out as usual? thanks, -- js suse labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
No big TTY/serial patch merge for 3.6-rc1
Hi Linus, I don't really feel comfortable sending you the tty tree at the present time to have merged for 3.6-rc1. It contains some tty changes that are still causing build problems, as Stephen has pointed out over the past week. These fixes are being resolved by Alan, but I don't feel that they have had the time to fully be tested, and given the late arrival of them (i.e. the past few days), and the lack of real amount of time testing in linux-next, I'd really like to postpone the whole merge until 3.7. Right now, this really isn't a whole lot of patches, there are only 62 patches in the tty-next tree. I've included below the full diffstat and shortlog of them if anyone wants to see them. There are maybe a few patches below that I think I should cherry-pick and have you pull, but that's just a handful, and are only for a few drivers, nothing in the tty core code at all. Jiri, I know this postpones your patches from being merged, sorry about that, but this gives us a few more months to ensure that they are working properly :) Alan, please keep sending me patches to fix these merge issues, but for now, I think it's best to wait until 3.7 for this to go to Linus. thanks, greg k-h -- .../bindings/tty/serial/nxp-lpc32xx-hsuart.txt | 14 + .../devicetree/bindings/tty/serial/of-serial.txt |3 + arch/ia64/hp/sim/simserial.c |2 +- arch/um/drivers/chan_kern.c|4 +- arch/um/drivers/line.c | 32 +- arch/um/drivers/line.h |3 +- drivers/bluetooth/hci_ath.c|2 +- drivers/char/mwave/mwavedd.c | 16 +- drivers/char/pcmcia/synclink_cs.c | 24 +- drivers/isdn/gigaset/interface.c |4 +- drivers/isdn/i4l/isdn_tty.c| 16 +- drivers/misc/ibmasm/uart.c | 16 +- drivers/mmc/card/sdio_uart.c | 20 +- drivers/net/ethernet/sgi/ioc3-eth.c| 22 +- drivers/net/irda/irtty-sir.c | 10 +- drivers/net/usb/hso.c | 12 +- drivers/tty/amiserial.c| 20 +- drivers/tty/cyclades.c | 82 +- drivers/tty/hvc/hvsi_lib.c |2 +- drivers/tty/isicom.c |8 +- drivers/tty/moxa.c | 10 +- drivers/tty/mxser.c| 20 +- drivers/tty/n_gsm.c|8 +- drivers/tty/n_tty.c|8 +- drivers/tty/pty.c | 144 ++-- drivers/tty/rocket.c | 18 +- drivers/tty/serial/8250/8250.c | 88 +-- drivers/tty/serial/8250/8250.h | 31 +- drivers/tty/serial/8250/8250_acorn.c | 22 +- drivers/tty/serial/8250/8250_dw.c | 38 +- drivers/tty/serial/8250/8250_gsc.c | 26 +- drivers/tty/serial/8250/8250_hp300.c | 26 +- drivers/tty/serial/8250/8250_pci.c | 126 +-- drivers/tty/serial/8250/8250_pnp.c | 28 +- drivers/tty/serial/8250/serial_cs.c| 30 +- drivers/tty/serial/Kconfig | 19 + drivers/tty/serial/Makefile|1 + drivers/tty/serial/amba-pl011.c| 34 +- drivers/tty/serial/bfin_uart.c |2 +- drivers/tty/serial/crisv10.c | 26 +- drivers/tty/serial/imx.c |2 +- drivers/tty/serial/ioc4_serial.c |2 +- drivers/tty/serial/jsm/jsm_tty.c |8 +- drivers/tty/serial/lpc32xx_hs.c| 823 drivers/tty/serial/of_serial.c | 14 +- drivers/tty/serial/pch_uart.c | 59 +- drivers/tty/serial/pxa.c | 14 + drivers/tty/serial/samsung.c | 30 +- drivers/tty/serial/serial_core.c | 34 +- drivers/tty/synclink.c | 36 +- drivers/tty/synclink_gt.c | 24 +- drivers/tty/synclinkmp.c | 24 +- drivers/tty/tty_io.c | 104 +-- drivers/tty/tty_ioctl.c| 100 +-- drivers/tty/tty_ldisc.c| 12 +- drivers/tty/tty_port.c | 23 +- drivers/tty/vt/keyboard.c | 50 +- drivers/tty/vt/vt.c| 63 +- drivers/tty/vt/vt_ioctl.c | 47 +- drivers/usb/class/cdc-acm.c|2 +- drivers/usb/serial/ark3116.c
