Commit 7c826727 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Cross-merge networking fixes after downstream PR.

Conflicts:

net/sched/act_ct.c
  26488172 ("net/sched: Fix UAF when resolving a clash")
  3abbd7ed ("act_ct: prepare for stolen verdict coming from conntrack and nat engine")

No adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a6a9fcb1 51df8e0c

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ Li Yang <leoyang.li@nxp.com> <leoli@freescale.com> 
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>

Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>

Lorenzo Stoakes <lorenzo.stoakes@oracle.com> <lstoakes@gmail.com>

Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Luo Jie <quic_luoj@quicinc.com> <luoj@codeaurora.org>

CREDITS

+3 −1
Original line number Diff line number Diff line
@@ -3150,9 +3150,11 @@ S: Triftstra=DFe 55 
S: 13353 Berlin

S: Germany



N: Gustavo Pimental

N: Gustavo Pimentel

E: gustavo.pimentel@synopsys.com

D: PCI driver for Synopsys DesignWare

D: Synopsys DesignWare eDMA driver

D: Synopsys DesignWare xData traffic generator



N: Emanuel Pirker

E: epirker@edu.uni-klu.ac.at

Documentation/arch/riscv/cmodx.rst

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ cmodx.c:: 
		printf("Value before cmodx: %d\n", value);



		// Call prctl before first fence.i is called inside modify_instruction

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX_ON, PR_RISCV_CTX_SW_FENCEI, PR_RISCV_SCOPE_PER_PROCESS);

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI_ON, PR_RISCV_SCOPE_PER_PROCESS);

		modify_instruction();

		// Call prctl after final fence.i is called in process

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX_OFF, PR_RISCV_CTX_SW_FENCEI, PR_RISCV_SCOPE_PER_PROCESS);

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI_OFF, PR_RISCV_SCOPE_PER_PROCESS);



		value = get_value();

		printf("Value after cmodx: %d\n", value);

Documentation/networking/devlink/devlink-region.rst

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ example usage 
    $ devlink region show [ DEV/REGION ]

    $ devlink region del DEV/REGION snapshot SNAPSHOT_ID

    $ devlink region dump DEV/REGION [ snapshot SNAPSHOT_ID ]

    $ devlink region read DEV/REGION [ snapshot SNAPSHOT_ID ] address ADDRESS length length

    $ devlink region read DEV/REGION [ snapshot SNAPSHOT_ID ] address ADDRESS length LENGTH



    # Show all of the exposed regions with region sizes:

    $ devlink region show

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -6239,9 +6239,8 @@ S: Maintained 
F:	drivers/usb/dwc3/









DESIGNWARE XDATA IP DRIVER









M:	Gustavo Pimentel <gustavo.pimentel@synopsys.com>









L:	linux-pci@vger.kernel.org









S:	Maintained









S:	Orphan









F:	Documentation/misc-devices/dw-xdata-pcie.rst









F:	drivers/misc/dw-xdata-pcie.c
















@@ -14475,7 +14474,7 @@ MEMORY MAPPING







M:	Andrew Morton <akpm@linux-foundation.org>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Lorenzo Stoakes <lstoakes@gmail.com>









R:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









L:	linux-mm@kvack.org









S:	Maintained









W:	http://www.linux-mm.org