Commit 224b744a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

include/linux/bpf.h
  1f6e04a1 ("bpf: Fix offset calculation error in __copy_map_value and zero_map_value")
  aa3496ac ("bpf: Refactor kptr_off_tab into btf_record")
  f71b2f64 ("bpf: Refactor map->off_arr handling")
https://lore.kernel.org/all/20221114095000.67a73239@canb.auug.org.au/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b4b221bd 847ccab8

Documentation/dev-tools/kmsan.rst

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ uninitialized in the local variable, as well as the stack where the value was 
copied to another memory location before use.



A use of uninitialized value ``v`` is reported by KMSAN in the following cases:



 - in a condition, e.g. ``if (v) { ... }``;

 - in an indexing or pointer dereferencing, e.g. ``array[v]`` or ``*v``;

 - when it is copied to userspace or hardware, e.g. ``copy_to_user(..., &v, ...)``;

Documentation/virt/kvm/devices/vm.rst

+3 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ KVM_S390_VM_TOD_EXT). 
:Parameters: address of a buffer in user space to store the data (u8) to

:Returns:   -EFAULT if the given address is not accessible from kernel space;

	    -EINVAL if setting the TOD clock extension to != 0 is not supported

	    -EOPNOTSUPP for a PV guest (TOD managed by the ultravisor)



3.2. ATTRIBUTE: KVM_S390_VM_TOD_LOW

-----------------------------------
@@ -224,6 +225,7 @@ the POP (u64). 


:Parameters: address of a buffer in user space to store the data (u64) to

:Returns:    -EFAULT if the given address is not accessible from kernel space

	     -EOPNOTSUPP for a PV guest (TOD managed by the ultravisor)



3.3. ATTRIBUTE: KVM_S390_VM_TOD_EXT

-----------------------------------
@@ -237,6 +239,7 @@ it, it is stored as 0 and not allowed to be set to a value != 0. 
	     (kvm_s390_vm_tod_clock) to

:Returns:   -EFAULT if the given address is not accessible from kernel space;

	    -EINVAL if setting the TOD clock extension to != 0 is not supported

	    -EOPNOTSUPP for a PV guest (TOD managed by the ultravisor)



4. GROUP: KVM_S390_VM_CRYPTO

============================

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -9343,7 +9343,7 @@ S: Maintained 
F:	drivers/crypto/hisilicon/trng/trng.c









HISILICON V3XX SPI NOR FLASH Controller Driver









M:	John Garry <john.garry@huawei.com>









M:	Jay Fang <f.fangjian@huawei.com>









S:	Maintained









W:	http://www.hisilicon.com









F:	drivers/spi/spi-hisi-sfc-v3xx.c








@@ -9510,7 +9510,6 @@ F:	drivers/media/i2c/hi847.c







Hyper-V/Azure CORE AND DRIVERS









M:	"K. Y. Srinivasan" <kys@microsoft.com>









M:	Haiyang Zhang <haiyangz@microsoft.com>









M:	Stephen Hemminger <sthemmin@microsoft.com>









M:	Wei Liu <wei.liu@kernel.org>









M:	Dexuan Cui <decui@microsoft.com>









L:	linux-hyperv@vger.kernel.org
































Makefile



+1
−1






























Original line number
Diff line number
Diff line







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







VERSION = 6









PATCHLEVEL = 1









SUBLEVEL = 0









EXTRAVERSION = -rc4









EXTRAVERSION = -rc5









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*
































arch/arm64/include/asm/cputype.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -41,7 +41,7 @@







	(((midr) & MIDR_IMPLEMENTOR_MASK) >> MIDR_IMPLEMENTOR_SHIFT)



















#define MIDR_CPU_MODEL(imp, partnum) \









	(((imp)			<< MIDR_IMPLEMENTOR_SHIFT) | \









	((_AT(u32, imp)		<< MIDR_IMPLEMENTOR_SHIFT) | \









	(0xf			<< MIDR_ARCHITECTURE_SHIFT) | \









	((partnum)		<< MIDR_PARTNUM_SHIFT))