diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-02-23 02:24:56 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-02-23 02:29:26 +0300 |
| commit | fecc51559a844b7f74119159c3cdb25b80b4e2c6 (patch) | |
| tree | 2cf1e49810eb0c58e552f722cc2ab2742e62cf43 /MAINTAINERS | |
| parent | 0fb848d1a41e0d3895cb157810862db6046063dd (diff) | |
| parent | 6714ebb922ab15a209dfc3c1ed29d4bb0abc9f02 (diff) | |
| download | linux-fecc51559a844b7f74119159c3cdb25b80b4e2c6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
net/ipv4/udp.c
f796feabb9f5 ("udp: add local "peek offset enabled" flag")
56667da7399e ("net: implement lockless setsockopt(SO_PEEK_OFF)")
Adjacent changes:
net/unix/garbage.c
aa82ac51d633 ("af_unix: Drop oob_skb ref before purging queue in GC.")
11498715f266 ("af_unix: Remove io_uring code for GC.")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ac771f6e4a3a..cfe44a876d8a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5613,6 +5613,11 @@ S: Maintained F: Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml F: drivers/net/can/ctucanfd/ +CVE ASSIGNMENT CONTACT +M: CVE Assignment Team <cve@kernel.org> +S: Maintained +F: Documentation/process/cve.rst + CW1200 WLAN driver S: Orphan F: drivers/net/wireless/st/cw1200/ @@ -15257,6 +15262,8 @@ F: Documentation/networking/ F: Documentation/networking/net_cachelines/ F: Documentation/process/maintainer-netdev.rst F: Documentation/userspace-api/netlink/ +F: include/linux/framer/framer-provider.h +F: include/linux/framer/framer.h F: include/linux/in.h F: include/linux/indirect_call_wrapper.h F: include/linux/net.h @@ -16857,6 +16864,7 @@ F: drivers/pci/controller/dwc/*designware* PCI DRIVER FOR TI DRA7XX/J721E M: Vignesh Raghavendra <vigneshr@ti.com> +R: Siddharth Vadapalli <s-vadapalli@ti.com> L: linux-omap@vger.kernel.org L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -22036,6 +22044,14 @@ F: Documentation/devicetree/bindings/media/i2c/ti,ds90* F: drivers/media/i2c/ds90* F: include/media/i2c/ds90* +TI HDC302X HUMIDITY DRIVER +M: Javier Carrasco <javier.carrasco.cruz@gmail.com> +M: Li peiyu <579lpy@gmail.com> +L: linux-iio@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/iio/humidity/ti,hdc3020.yaml +F: drivers/iio/humidity/hdc3020.c + TI ICSSG ETHERNET DRIVER (ICSSG) R: MD Danish Anwar <danishanwar@ti.com> R: Roger Quadros <rogerq@kernel.org> |