mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 19:41:54 +00:00
3498d13b80
As we skipped the merge window for 3.6-rc1 for the tty tree, everything
is now settled down and working properly, so we are ready for 3.7-rc1.
Here's the patchset, it's big, but the large changes are removing a
firmware file and adding a staging tty driver (it depended on the tty
core changes, so it's going through this tree instead of the staging
tree.)
All of these patches have been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlBp36oACgkQMUfUDdst+yk4WgCdEy13hot8fI2Lqnc7W0LKu7GX
4p8AoLTjzrXhLosxdijskDQ9X1OtjrxU
=S5Ng
-----END PGP SIGNATURE-----
Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY changes from Greg Kroah-Hartman:
"As we skipped the merge window for 3.6-rc1 for the tty tree,
everything is now settled down and working properly, so we are ready
for 3.7-rc1. Here's the patchset, it's big, but the large changes are
removing a firmware file and adding a staging tty driver (it depended
on the tty core changes, so it's going through this tree instead of
the staging tree.)
All of these patches have been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fix up more-or-less trivial conflicts in
- drivers/char/pcmcia/synclink_cs.c:
tty NULL dereference fix vs tty_port_cts_enabled() helper function
- drivers/staging/{Kconfig,Makefile}:
add-add conflict (dgrp driver added close to other staging drivers)
- drivers/staging/ipack/devices/ipoctal.c:
"split ipoctal_channel from iopctal" vs "TTY: use tty_port_register_device"
* tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits)
tty/serial: Add kgdb_nmi driver
tty/serial/amba-pl011: Quiesce interrupts in poll_get_char
tty/serial/amba-pl011: Implement poll_init callback
tty/serial/core: Introduce poll_init callback
kdb: Turn KGDB_KDB=n stubs into static inlines
kdb: Implement disable_nmi command
kernel/debug: Mask KGDB NMI upon entry
serial: pl011: handle corruption at high clock speeds
serial: sccnxp: Make 'default' choice in switch last
serial: sccnxp: Remove mask termios caps for SW flow control
serial: sccnxp: Report actual baudrate back to core
serial: samsung: Add poll_get_char & poll_put_char
Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate
Powerpc 8xx CPM_UART maxidl should not depend on fifo size
Powerpc 8xx CPM_UART too many interrupts
Powerpc 8xx CPM_UART desynchronisation
serial: set correct baud_base for EXSYS EX-41092 Dual 16950
serial: omap: fix the reciever line error case
8250: blacklist Winbond CIR port
8250_pnp: do pnp probe before legacy probe
...
|
||
|---|---|---|
| .. | ||
| buffers.c | ||
| DefaultKeyAssignments | ||
| devsynth.c | ||
| fakekey.c | ||
| i18n.c | ||
| i18n.h | ||
| Kconfig | ||
| keyhelp.c | ||
| kobjects.c | ||
| main.c | ||
| Makefile | ||
| selection.c | ||
| serialio.c | ||
| serialio.h | ||
| speakup_acnt.h | ||
| speakup_acntpc.c | ||
| speakup_acntsa.c | ||
| speakup_apollo.c | ||
| speakup_audptr.c | ||
| speakup_bns.c | ||
| speakup_decext.c | ||
| speakup_decpc.c | ||
| speakup_dectlk.c | ||
| speakup_dtlk.c | ||
| speakup_dtlk.h | ||
| speakup_dummy.c | ||
| speakup_keypc.c | ||
| speakup_ltlk.c | ||
| speakup_soft.c | ||
| speakup_spkout.c | ||
| speakup_txprt.c | ||
| speakup.h | ||
| speakupmap.h | ||
| speakupmap.map | ||
| spk_priv_keyinfo.h | ||
| spk_priv.h | ||
| spk_types.h | ||
| spkguide.txt | ||
| synth.c | ||
| thread.c | ||
| TODO | ||
| varhandlers.c | ||