Commit dd9a887b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



drivers/net/phy/bcm7xxx.c
  d88fd1b5 ("net: phy: bcm7xxx: Fixed indirect MMD operations")
  f68d08c4 ("net: phy: bcm7xxx: Add EPHY entry for 72165")

net/sched/sch_api.c
  b193e15a ("net: prevent user from passing illegal stab size")
  69508d43 ("net_sched: Use struct_size() and flex_array_size() helpers")

Both cases trivial - adjacent code additions.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b0517302 4de593fb

Documentation/core-api/irq/irq-domain.rst

+3 −2
Original line number Diff line number Diff line
@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that 
case the Linux IRQ numbers cannot be dynamically assigned and the legacy

mapping should be used.



As the name implies, the *_legacy() functions are deprecated and only

As the name implies, the \*_legacy() functions are deprecated and only

exist to ease the support of ancient platforms. No new users should be

added.

added. Same goes for the \*_simple() functions when their use results

in the legacy behaviour.



The legacy map assumes a contiguous range of IRQ numbers has already

been allocated for the controller and that the IRQ number can be

MAINTAINERS

+13 −19
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ F: Documentation/devicetree/bindings/dma/altr,msgdma.yaml 
F:	drivers/dma/altera-msgdma.c









ALTERA PIO DRIVER









M:	Joyce Ooi <joyce.ooi@intel.com>









M:	Mun Yew Tham <mun.yew.tham@intel.com>









L:	linux-gpio@vger.kernel.org









S:	Maintained









F:	drivers/gpio/gpio-altera.c








@@ -977,12 +977,12 @@ L:	platform-driver-x86@vger.kernel.org







S:	Maintained









F:	drivers/platform/x86/amd-pmc.*

















AMD POWERPLAY









AMD POWERPLAY AND SWSMU









M:	Evan Quan <evan.quan@amd.com>









L:	amd-gfx@lists.freedesktop.org









S:	Supported









T:	git https://gitlab.freedesktop.org/agd5f/linux.git









F:	drivers/gpu/drm/amd/pm/powerplay/









F:	drivers/gpu/drm/amd/pm/

















AMD PTDMA DRIVER









M:	Sanjay R Mehta <sanju.mehta@amd.com>








@@ -2961,7 +2961,7 @@ F:	crypto/async_tx/







F:	include/linux/async_tx.h

















AT24 EEPROM DRIVER









M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-i2c@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git








@@ -3384,9 +3384,11 @@ F:	Documentation/networking/filter.rst







F:	Documentation/userspace-api/ebpf/









F:	arch/*/net/*









F:	include/linux/bpf*









F:	include/linux/btf*









F:	include/linux/filter.h









F:	include/trace/events/xdp.h









F:	include/uapi/linux/bpf*









F:	include/uapi/linux/btf*









F:	include/uapi/linux/filter.h









F:	kernel/bpf/









F:	kernel/trace/bpf_trace.c








@@ -3820,7 +3822,6 @@ F:	drivers/scsi/mpi3mr/















BROADCOM NETXTREME-E ROCE DRIVER









M:	Selvin Xavier <selvin.xavier@broadcom.com>









M:	Naresh Kumar PBS <nareshkumar.pbs@broadcom.com>









L:	linux-rdma@vger.kernel.org









S:	Supported









W:	http://www.broadcom.com








@@ -7985,7 +7986,7 @@ F:	include/linux/gpio/regmap.h















GPIO SUBSYSTEM









M:	Linus Walleij <linus.walleij@linaro.org>









M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-gpio@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git








@@ -11366,7 +11367,7 @@ F:	Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.yaml







F:	drivers/iio/proximity/mb1232.c

















MAXIM MAX77650 PMIC MFD DRIVER









M:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/*/*max77650.yaml








@@ -16650,13 +16651,6 @@ M:	Lubomir Rintel <lkundrak@v3.sk>







S:	Supported









F:	drivers/char/pcmcia/scr24x_cs.c

















SCSI CDROM DRIVER









M:	Jens Axboe <axboe@kernel.dk>









L:	linux-scsi@vger.kernel.org









S:	Maintained









W:	http://www.kernel.dk









F:	drivers/scsi/sr*

















SCSI RDMA PROTOCOL (SRP) INITIATOR









M:	Bart Van Assche <bvanassche@acm.org>









L:	linux-rdma@vger.kernel.org








@@ -17890,7 +17884,8 @@ M:	Olivier Moysan <olivier.moysan@foss.st.com>







M:	Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Maintained









F:	Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml









F:	Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml









F:	Documentation/devicetree/bindings/sound/st,stm32-*.yaml









F:	sound/soc/stm/

















STM32 TIMER/LPTIMER DRIVERS








@@ -18689,7 +18684,7 @@ F:	include/linux/clk/ti.h















TI DAVINCI MACHINE SUPPORT









M:	Sekhar Nori <nsekhar@ti.com>









R:	Bartosz Golaszewski <bgolaszewski@baylibre.com>









R:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git








@@ -19288,13 +19283,12 @@ S:	Maintained







F:	drivers/usb/misc/chaoskey.c

















USB CYPRESS C67X00 DRIVER









M:	Peter Korsgaard <jacmet@sunsite.dk>









L:	linux-usb@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/usb/c67x00/

















USB DAVICOM DM9601 DRIVER









M:	Peter Korsgaard <jacmet@sunsite.dk>









M:	Peter Korsgaard <peter@korsgaard.com>









L:	netdev@vger.kernel.org









S:	Maintained









W:	http://www.linux-usb.org/usbnet

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 5









PATCHLEVEL = 15









SUBLEVEL = 0









EXTRAVERSION = -rc2









EXTRAVERSION = -rc3









NAME = Opossums on Parade



















# *DOCUMENTATION*
































arch/arm/kernel/signal.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -628,7 +628,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)







				uprobe_notify_resume(regs);









			} else {









				tracehook_notify_resume(regs);









				rseq_handle_notify_resume(NULL, regs);









			}









		}









		local_irq_disable();
































arch/arm64/boot/dts/qcom/ipq8074.dtsi



+0
−2






























Original line number
Diff line number
Diff line







@@ -487,7 +487,6 @@







				interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;









				phys = <&qusb_phy_0>, <&usb0_ssphy>;









				phy-names = "usb2-phy", "usb3-phy";









				tx-fifo-resize;









				snps,is-utmi-l1-suspend;









				snps,hird-threshold = /bits/ 8 <0x0>;









				snps,dis_u2_susphy_quirk;








@@ -528,7 +527,6 @@







				interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;









				phys = <&qusb_phy_1>, <&usb1_ssphy>;









				phy-names = "usb2-phy", "usb3-phy";









				tx-fifo-resize;









				snps,is-utmi-l1-suspend;









				snps,hird-threshold = /bits/ 8 <0x0>;









				snps,dis_u2_susphy_quirk;