OSDN Git Service

Merge Linux 4.4.203-rc1 into 10
authorsbwml <984419930@qq.com>
Wed, 20 Nov 2019 17:57:07 +0000 (01:57 +0800)
committersbwml <984419930@qq.com>
Wed, 20 Nov 2019 17:57:07 +0000 (01:57 +0800)
1  2 
Makefile
drivers/bluetooth/hci_ldisc.c
drivers/bluetooth/hci_uart.h
drivers/net/wireless/ath/ath10k/wmi.c
fs/ecryptfs/inode.c
kernel/events/uprobes.c
mm/shmem.c
net/bluetooth/l2cap_core.c
sound/soc/soc-pcm.c
sound/usb/endpoint.c
sound/usb/mixer.c

diff --cc Makefile
Simple merge
@@@ -537,17 -512,10 +537,18 @@@ static void hci_uart_tty_close(struct t
                                hci_unregister_dev(hdev);
                        hci_free_dev(hdev);
                }
 +              hci_uart_proto_lock(hu);
                hu->proto->close(hu);
 +              hu->proto = NULL;
 +              hci_uart_proto_unlock(hu);
        }
+       clear_bit(HCI_UART_PROTO_SET, &hu->flags);
  
 +      cancel_work_sync(&hu->write_work);
 +
 +      if (hdev)
 +              hci_free_dev(hdev);
 +      mutex_destroy(&hu->proto_lock);
        kfree(hu);
  }
  
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/shmem.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge