Jakub Kicinski f4083a752a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h 9e26680733 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp") 9e518f2580 ("bnxt_en: 1PPS functions to configure TSIO pins") 099fdeda65 ("bnxt_en: Event handler for PPS events") kernel/bpf/helpers.c include/linux/bpf-cgroup.h a2baf4e8bb ("bpf: Fix potentially incorrect results with bpf_get_local_storage()") c7603cfa04 ("bpf: Add ambient BPF runtime context stored in current") drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c 5957cc557d ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray") 2d0b41a376 ("net/mlx5: Refcount mlx5_irq with integer") MAINTAINERS 7b637cd52f ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo") 7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-08-13 06:41:22 -07:00
..
hvc	TTY / Serial patches for 5.14-rc1	2021-07-05 14:08:24 -07:00
ipwireless	ipwireless: remove unused ipw_tty::closing	2021-06-15 14:02:43 +02:00
serdev	tty: serdev: core: Fix misspelled function name __serdev_device_driver_register()	2021-05-20 17:05:34 +02:00
serial	serial: 8250_pci: Avoid irq sharing for MSI(-X) interrupts.	2021-07-30 13:06:19 +02:00
vt	Merge 5.13-rc4 into tty-next	2021-05-31 09:44:28 +02:00
amiserial.c	tty: make tty_operations::chars_in_buffer return uint	2021-05-13 18:29:11 +02:00
ehv_bytechan.c	tty: make tty_operations::write_room return uint	2021-05-13 17:03:20 +02:00
goldfish.c	tty: make tty_operations::chars_in_buffer return uint	2021-05-13 18:29:11 +02:00
Kconfig	This pull request contains the following changes for UML:	2021-07-09 10:19:13 -07:00
Makefile	tty: remove broken r3964 line discipline	2021-05-13 16:57:15 +02:00
mips_ejtag_fdc.c	tty: make tty_operations::chars_in_buffer return uint	2021-05-13 18:29:11 +02:00
moxa.c	tty: make tty_operations::chars_in_buffer return uint	2021-05-13 18:29:11 +02:00
moxa.h
mxser.c	mxser: introduce mxser_16550A_or_MUST helper	2021-06-18 13:10:03 +02:00
n_gsm.c	tty: n_gsm: Fix function naming and provide missing param descriptions	2021-05-20 17:06:17 +02:00
n_hdlc.c	tty: n_hdlc: Fix a little doc-rot in n_hdlc_tty_read()	2021-05-20 17:06:17 +02:00
n_null.c	tty: make tty_ldisc_ops a param in tty_unregister_ldisc	2021-05-13 16:57:16 +02:00
n_tty.c	tty: drop tty_ldisc_ops::refcount	2021-05-13 16:57:17 +02:00
nozomi.c	tty: nozomi: Fix the error handling path of 'nozomi_card_init()'	2021-05-27 15:20:02 +02:00
pty.c	tty: pty: correct function name pty_resize()	2021-05-20 16:33:06 +02:00
synclink_gt.c	net: split out ndo_siowandev ioctl	2021-07-27 20:11:45 +01:00
sysrq.c	tty/sysrq: Fix issues of code indent should use tabs	2021-04-10 10:33:00 +02:00
tty_audit.c	tty: audit: move some local functions out of tty.h	2021-04-15 10:24:58 +02:00
tty_baudrate.c	tty: tty_baudrate: Fix coding style issues of block comments	2021-05-13 18:29:12 +02:00
tty_buffer.c	tty: tty_buffer: Fix incorrectly documented function __tty_buffer_request_room()	2021-05-20 17:06:15 +02:00
tty_io.c	tty: fix kernel-doc for {start,stop}_tty	2021-05-20 16:59:14 +02:00
tty_ioctl.c	tty: make tty_get_{char,frame}_size available	2021-06-15 14:03:26 +02:00
tty_jobctrl.c	tty: tty_jobctrl: Fix 2 incorrectly documented functions	2021-05-20 17:06:15 +02:00
tty_ldisc.c	tty: tty_ldisc: fix doc warnings in tty_ldisc.c	2021-06-09 14:43:23 +02:00
tty_ldsem.c
tty_mutex.c	tty: move some internal tty lock enums and functions out of tty.h	2021-04-15 10:26:58 +02:00
tty_port.c	tty: tty_port: Fix coding style issues of block comments	2021-05-13 18:29:13 +02:00
tty.h	tty: clean include/linux/tty.h up	2021-04-15 10:32:17 +02:00
ttynull.c	tty: make tty_operations::write_room return uint	2021-05-13 17:03:20 +02:00
vcc.c	TTY / Serial patches for 5.14-rc1	2021-07-05 14:08:24 -07:00