Merge remote-tracking branch 'tty/tty-next'

diff --cc drivers/misc/pti.c
index e5f295a38a346d28a8f742e1094857fd45ff0a3a,96a25e3b4847f83c60c468b8a5b527b345411a70..8653bd0b1a33ca68b541c8161338ce8ee9e5357d
--- 1/drivers/misc/pti.c
--- 2/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@@ -472,14 -492,12 +493,14 @@@ static int pti_tty_install(struct tty_d
                        return -ENOMEM;
  
                if (idx == PTITTY_MINOR_START)
-                       pti_tty_data->mc = pti_request_masterchannel(0);
+                       pti_tty_data->mc = pti_request_masterchannel(0, NULL);
                else
-                       pti_tty_data->mc = pti_request_masterchannel(2);
+                       pti_tty_data->mc = pti_request_masterchannel(2, NULL);
  
 -              if (pti_tty_data->mc == NULL)
 +              if (pti_tty_data->mc == NULL) {
 +                      kfree(pti_tty_data);
                        return -ENXIO;
 +              }
                tty->driver_data = pti_tty_data;
        }
  

diff --cc drivers/tty/n_gsm.c
index 19b4ae052af8eaf2f803bb7bd8b9e49e3e4151ca,14522ee8a91fb6670dca4303f296d18c003d7049..8a50e4eebf1818ded4a1ed602223ab48d8bb2df6
--- 1/drivers/tty/n_gsm.c
--- 2/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@@ -875,11 -904,12 +904,13 @@@ static int gsm_dlci_data_output_framed(
                *dp++ = last << 7 | first << 6 | 1;     /* EA */
                len--;
        }
 -      memcpy(dp, skb_pull(dlci->skb, len), len);
 +      memcpy(dp, dlci->skb->data, len);
 +      skb_pull(dlci->skb, len);
        __gsm_data_queue(dlci, msg);
-       if (last)
+       if (last) {
+               kfree_skb(dlci->skb);
                dlci->skb = NULL;
+       }
        return size;
  }
  

diff --cc drivers/tty/n_tty.c
Simple merge

diff --cc drivers/tty/serial/8250.c
Simple merge

diff --cc drivers/tty/serial/8250_pci.c
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/tty/serial/pch_uart.c
Simple merge

diff --cc drivers/tty/serial/s5pv210.c
Simple merge

diff --cc drivers/tty/serial/samsung.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge