Commit 2525e16a 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 (net-6.14-rc6).

Conflicts:

net/ethtool/cabletest.c
  2bcf4772 ("net: ethtool: try to protect all callback with netdev instance lock")
  637399bf ("net: ethtool: netlink: Allow NULL nlattrs when getting a phy_device")

No Adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f1078ab1 f315296c

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ Antonio Quartulli <antonio@mandelbit.com> <antonio@open-mesh.com> 
Antonio Quartulli <antonio@mandelbit.com> <antonio.quartulli@open-mesh.com>

Antonio Quartulli <antonio@mandelbit.com> <ordex@autistici.org>

Antonio Quartulli <antonio@mandelbit.com> <ordex@ritirata.org>

Antonio Quartulli <antonio@mandelbit.com> <antonio@openvpn.net>

Antonio Quartulli <antonio@mandelbit.com> <a@unstable.cc>

Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>

Archit Taneja <archit@ti.com>
@@ -522,6 +521,7 @@ Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il> 
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>

Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>

Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>

Natalie Vock <natalie.vock@gmx.de> <friedrich.vock@gmx.de>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.ibm.com>

Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.vnet.ibm.com>
@@ -613,6 +613,8 @@ Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net> 
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>

Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>

Rodrigo Siqueira <siqueira@igalia.com> <Rodrigo.Siqueira@amd.com>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>

Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>

Documentation/filesystems/idmappings.rst

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ what id ``k11000`` corresponds to in the second or third idmapping. The 
straightforward algorithm to use is to apply the inverse of the first idmapping,

mapping ``k11000`` up to ``u1000``. Afterwards, we can map ``u1000`` down using

either the second idmapping mapping or third idmapping mapping. The second

idmapping would map ``u1000`` down to ``21000``. The third idmapping would map

``u1000`` down to ``u31000``.

idmapping would map ``u1000`` down to ``k21000``. The third idmapping would map

``u1000`` down to ``k31000``.



If we were given the same task for the following three idmappings::

MAINTAINERS

+16 −3
Original line number Diff line number Diff line
@@ -1046,14 +1046,14 @@ F: drivers/crypto/ccp/hsti.* 
AMD DISPLAY CORE

M:	Harry Wentland <harry.wentland@amd.com>

M:	Leo Li <sunpeng.li@amd.com>

M:	Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>

R:	Rodrigo Siqueira <siqueira@igalia.com>

L:	amd-gfx@lists.freedesktop.org

S:	Supported

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

F:	drivers/gpu/drm/amd/display/









AMD DISPLAY CORE - DML









M:	Chaitanya Dhere <chaitanya.dhere@amd.com>









M:	Austin Zheng <austin.zheng@amd.com>









M:	Jun Lei <jun.lei@amd.com>









S:	Supported









F:	drivers/gpu/drm/amd/display/dc/dml/








@@ -5775,6 +5775,7 @@ X:	drivers/clk/clkdev.c















COMMON INTERNET FILE SYSTEM CLIENT (CIFS and SMB3)









M:	Steve French <sfrench@samba.org>









M:	Steve French <smfrench@gmail.com>









R:	Paulo Alcantara <pc@manguebit.com> (DFS, global name space)









R:	Ronnie Sahlberg <ronniesahlberg@gmail.com> (directory leases, sparse files)









R:	Shyam Prasad N <sprasad@microsoft.com> (multichannel)








@@ -5926,6 +5927,17 @@ F:	tools/testing/selftests/cgroup/test_cpuset.c







F:	tools/testing/selftests/cgroup/test_cpuset_prs.sh









F:	tools/testing/selftests/cgroup/test_cpuset_v1_base.sh

















CONTROL GROUP - DEVICE MEMORY CONTROLLER (DMEM)









M:	Maarten Lankhorst <dev@lankhorst.se>









M:	Maxime Ripard <mripard@kernel.org>









M:	Natalie Vock <natalie.vock@gmx.de>









L:	cgroups@vger.kernel.org









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git









F:	include/linux/cgroup_dmem.h









F:	kernel/cgroup/dmem.c

















CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)









M:	Johannes Weiner <hannes@cmpxchg.org>









M:	Michal Hocko <mhocko@kernel.org>








@@ -12645,7 +12657,9 @@ F:	tools/testing/selftests/















KERNEL SMB3 SERVER (KSMBD)









M:	Namjae Jeon <linkinjeon@kernel.org>









M:	Namjae Jeon <linkinjeon@samba.org>









M:	Steve French <sfrench@samba.org>









M:	Steve French <smfrench@gmail.com>









R:	Sergey Senozhatsky <senozhatsky@chromium.org>









R:	Tom Talpey <tom@talpey.com>









L:	linux-cifs@vger.kernel.org








@@ -19657,7 +19671,6 @@ F:	drivers/net/wireless/quantenna







RADEON and AMDGPU DRM DRIVERS









M:	Alex Deucher <alexander.deucher@amd.com>









M:	Christian König <christian.koenig@amd.com>









M:	Xinhui Pan <Xinhui.Pan@amd.com>









L:	amd-gfx@lists.freedesktop.org









S:	Supported









B:	https://gitlab.freedesktop.org/drm/amd/-/issues

























Makefile



+1
−1






























Original line number
Diff line number
Diff line







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







VERSION = 6









PATCHLEVEL = 14









SUBLEVEL = 0









EXTRAVERSION = -rc4









EXTRAVERSION = -rc5









NAME = Baby Opossum Posse



















# *DOCUMENTATION*
































arch/arm64/include/asm/hugetlb.h



+18
−8






























Original line number
Diff line number
Diff line







@@ -42,8 +42,8 @@ extern int huge_ptep_set_access_flags(struct vm_area_struct *vma,







				      unsigned long addr, pte_t *ptep,









				      pte_t pte, int dirty);









#define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR









extern pte_t huge_ptep_get_and_clear(struct mm_struct *mm,









				     unsigned long addr, pte_t *ptep);









extern pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,









				     pte_t *ptep, unsigned long sz);









#define __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT









extern void huge_ptep_set_wrprotect(struct mm_struct *mm,









				    unsigned long addr, pte_t *ptep);








@@ -76,12 +76,22 @@ static inline void flush_hugetlb_tlb_range(struct vm_area_struct *vma,







{









	unsigned long stride = huge_page_size(hstate_vma(vma));



















	if (stride == PMD_SIZE)









		__flush_tlb_range(vma, start, end, stride, false, 2);









	else if (stride == PUD_SIZE)









		__flush_tlb_range(vma, start, end, stride, false, 1);









	else









		__flush_tlb_range(vma, start, end, PAGE_SIZE, false, 0);









	switch (stride) {









#ifndef __PAGETABLE_PMD_FOLDED









	case PUD_SIZE:









		__flush_tlb_range(vma, start, end, PUD_SIZE, false, 1);









		break;









#endif









	case CONT_PMD_SIZE:









	case PMD_SIZE:









		__flush_tlb_range(vma, start, end, PMD_SIZE, false, 2);









		break;









	case CONT_PTE_SIZE:









		__flush_tlb_range(vma, start, end, PAGE_SIZE, false, 3);









		break;









	default:









		__flush_tlb_range(vma, start, end, PAGE_SIZE, false, TLBI_TTL_UNKNOWN);









	}









}



















#endif /* __ASM_HUGETLB_H */