diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 08:06:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 08:06:34 -0700 |
| commit | 9c4e8363c9705e92791b59557e4d86a407b16e7f (patch) | |
| tree | e4ea131fa4d7d736d20baa39949af4353d650d67 /tty | |
| parent | 19f23bdac78b23931f45121dd246fedad57597b1 (diff) | |
| download | patches-9c4e8363c9705e92791b59557e4d86a407b16e7f.tar.gz | |
handle the initial .35 merge issues
this deletes a few patches, and fixes fuzz and conflicts on a
bunch of others.
Diffstat (limited to 'tty')
8 files changed, 13 insertions, 66 deletions
diff --git a/tty/serial-add-driver-for-the-altera-jtag-uart.patch b/tty/serial-add-driver-for-the-altera-jtag-uart.patch index 7f0e765d4e169e..8e4b2df39a9d0e 100644 --- a/tty/serial-add-driver-for-the-altera-jtag-uart.patch +++ b/tty/serial-add-driver-for-the-altera-jtag-uart.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1530,4 +1530,25 @@ config SERIAL_GRLIB_GAISLER_APBUART_CONS +@@ -1523,4 +1523,25 @@ config SERIAL_GRLIB_GAISLER_APBUART_CONS help Support for running a console on the GRLIB APBUART @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endmenu --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile -@@ -83,3 +83,4 @@ obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgd +@@ -82,3 +82,4 @@ obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgd obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o diff --git a/tty/serial-add-driver-for-the-altera-uart.patch b/tty/serial-add-driver-for-the-altera-uart.patch index fe318316e1f7e8..c0498e3e1ea0b5 100644 --- a/tty/serial-add-driver-for-the-altera-uart.patch +++ b/tty/serial-add-driver-for-the-altera-uart.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1551,4 +1551,35 @@ config SERIAL_ALTERA_JTAGUART_CONSOLE_BY +@@ -1544,4 +1544,35 @@ config SERIAL_ALTERA_JTAGUART_CONSOLE_BY Bypass console output and keep going even if there is no JTAG terminal connection with the host. @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endmenu --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile -@@ -84,3 +84,4 @@ obj-$(CONFIG_SERIAL_QE) += ucc_uart.o +@@ -83,3 +83,4 @@ obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o diff --git a/tty/serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch b/tty/serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch index 0ff1f293567ed5..d48a3b8891192a 100644 --- a/tty/serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch +++ b/tty/serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1450,24 +1450,48 @@ config SERIAL_BFIN_SPORT0_UART +@@ -1443,24 +1443,48 @@ config SERIAL_BFIN_SPORT0_UART help Enable UART over SPORT0 diff --git a/tty/serial-bfin_sport_uart-drop-redundant-cpu-depends.patch b/tty/serial-bfin_sport_uart-drop-redundant-cpu-depends.patch index dbf607148e73c0..ccd68704d9a533 100644 --- a/tty/serial-bfin_sport_uart-drop-redundant-cpu-depends.patch +++ b/tty/serial-bfin_sport_uart-drop-redundant-cpu-depends.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1446,7 +1446,7 @@ config SERIAL_BFIN_SPORT_CONSOLE +@@ -1439,7 +1439,7 @@ config SERIAL_BFIN_SPORT_CONSOLE config SERIAL_BFIN_SPORT0_UART bool "Enable UART over SPORT0" diff --git a/tty/serial-bfin_sport_uart-drop-the-experimental-markings.patch b/tty/serial-bfin_sport_uart-drop-the-experimental-markings.patch index c4214df95fe080..58bcaf145cd077 100644 --- a/tty/serial-bfin_sport_uart-drop-the-experimental-markings.patch +++ b/tty/serial-bfin_sport_uart-drop-the-experimental-markings.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig -@@ -1430,8 +1430,8 @@ config SERIAL_SC26XX_CONSOLE +@@ -1423,8 +1423,8 @@ config SERIAL_SC26XX_CONSOLE Support for Console on SC2681/SC2692 serial ports. config SERIAL_BFIN_SPORT diff --git a/tty/serial-tty-new-ldiscs-for-staging.patch b/tty/serial-tty-new-ldiscs-for-staging.patch index 3c6c2af982730e..721b039cd9bf09 100644 --- a/tty/serial-tty-new-ldiscs-for-staging.patch +++ b/tty/serial-tty-new-ldiscs-for-staging.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> */ #define NR_UNIX98_PTY_DEFAULT 4096 /* Default maximum for Unix98 ptys */ #define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */ --#define NR_LDISCS 20 +-#define NR_LDISCS 21 +#define NR_LDISCS 30 /* line disciplines */ diff --git a/tty/serial167-kill-unused-variables.patch b/tty/serial167-kill-unused-variables.patch deleted file mode 100644 index c30cc224382474..00000000000000 --- a/tty/serial167-kill-unused-variables.patch +++ /dev/null @@ -1,50 +0,0 @@ -From akpm@linux-foundation.org Tue May 4 13:04:49 2010 -From: Geert Uytterhoeven <geert@linux-m68k.org> -Date: Tue, 27 Apr 2010 14:16:40 -0700 -Subject: serial167: kill unused variables -To: greg@kroah.com -Cc: akpm@linux-foundation.org, geert@linux-m68k.org, alan@lxorguk.ukuu.org.uk -Message-ID: <201004272116.o3RLGexn020408@imap1.linux-foundation.org> - - -From: Geert Uytterhoeven <geert@linux-m68k.org> - -commits 638157bc1461f6718eeca06bedd9a09cf1f35c36 ("serial167: prepare to -push BKL down into drivers") and 4165fe4ef7305609a96c7f248cefb9c414d0ede5 -("tty: Fix up char drivers request_room usage") removed code without -removing the corresponding variables: - -| drivers/char/serial167.c: In function 'cd2401_rx_interrupt': -| drivers/char/serial167.c:630: warning: unused variable 'len' -| drivers/char/serial167.c: In function 'cy_ioctl': -| drivers/char/serial167.c:1531: warning: unused variable 'val' - -Remove the variables to kill the warnings. - -Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> -Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/serial167.c | 2 -- - 1 file changed, 2 deletions(-) - ---- a/drivers/char/serial167.c -+++ b/drivers/char/serial167.c -@@ -627,7 +627,6 @@ static irqreturn_t cd2401_rx_interrupt(i - char data; - int char_count; - int save_cnt; -- int len; - - /* determine the channel and change to that context */ - channel = (u_short) (base_addr[CyLICR] >> 2); -@@ -1528,7 +1527,6 @@ static int - cy_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) - { -- unsigned long val; - struct cyclades_port *info = tty->driver_data; - int ret_val = 0; - void __user *argp = (void __user *)arg; diff --git a/tty/tty-n_gsm-line-discipline.patch b/tty/tty-n_gsm-line-discipline.patch index a91bd12944b155..917bee1da1a342 100644 --- a/tty/tty-n_gsm-line-discipline.patch +++ b/tty/tty-n_gsm-line-discipline.patch @@ -25,8 +25,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/char/Makefile | 1 drivers/char/n_gsm.c | 2763 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/gsmmux.h | 25 - include/linux/tty.h | 3 - 5 files changed, 2799 insertions(+), 2 deletions(-) + include/linux/tty.h | 1 + 5 files changed, 2798 insertions(+), 1 deletion(-) --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -2856,14 +2856,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#endif --- a/include/linux/tty.h +++ b/include/linux/tty.h -@@ -46,8 +46,9 @@ - #define N_GIGASET_M101 16 /* Siemens Gigaset M101 serial DECT adapter */ - #define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */ +@@ -48,6 +48,7 @@ #define N_PPS 18 /* Pulse per Second */ -- #define N_V253 19 /* Codec control over voice modem */ -+#define N_GSM0710 20 /* GSM 0710 Mux */ -+ + #define N_CAIF 20 /* CAIF protocol for talking to modems */ ++#define N_GSM0710 21 /* GSM 0710 Mux */ /* * This character is the same as _POSIX_VDISABLE: it cannot be used as |