mirror of
https://github.com/torvalds/linux.git
synced 2026-07-06 21:32:20 +02: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
...
|
||
|---|---|---|
| .. | ||
| .gitignore | ||
| alpha_ksyms.c | ||
| asm-offsets.c | ||
| binfmt_loader.c | ||
| console.c | ||
| core_apecs.c | ||
| core_cia.c | ||
| core_irongate.c | ||
| core_lca.c | ||
| core_marvel.c | ||
| core_mcpcia.c | ||
| core_polaris.c | ||
| core_t2.c | ||
| core_titan.c | ||
| core_tsunami.c | ||
| core_wildfire.c | ||
| entry.S | ||
| err_common.c | ||
| err_ev6.c | ||
| err_ev7.c | ||
| err_impl.h | ||
| err_marvel.c | ||
| err_titan.c | ||
| es1888.c | ||
| gct.c | ||
| head.S | ||
| io.c | ||
| irq_alpha.c | ||
| irq_i8259.c | ||
| irq_impl.h | ||
| irq_pyxis.c | ||
| irq_srm.c | ||
| irq.c | ||
| machvec_impl.h | ||
| Makefile | ||
| module.c | ||
| osf_sys.c | ||
| pc873xx.c | ||
| pc873xx.h | ||
| pci_impl.h | ||
| pci_iommu.c | ||
| pci-noop.c | ||
| pci-sysfs.c | ||
| pci.c | ||
| perf_event.c | ||
| process.c | ||
| proto.h | ||
| ptrace.c | ||
| setup.c | ||
| signal.c | ||
| smc37c93x.c | ||
| smc37c669.c | ||
| smp.c | ||
| srm_env.c | ||
| srmcons.c | ||
| sys_alcor.c | ||
| sys_cabriolet.c | ||
| sys_dp264.c | ||
| sys_eb64p.c | ||
| sys_eiger.c | ||
| sys_jensen.c | ||
| sys_marvel.c | ||
| sys_miata.c | ||
| sys_mikasa.c | ||
| sys_nautilus.c | ||
| sys_noritake.c | ||
| sys_rawhide.c | ||
| sys_ruffian.c | ||
| sys_rx164.c | ||
| sys_sable.c | ||
| sys_sio.c | ||
| sys_sx164.c | ||
| sys_takara.c | ||
| sys_titan.c | ||
| sys_wildfire.c | ||
| systbls.S | ||
| time.c | ||
| traps.c | ||
| vmlinux.lds.S | ||