diff options
author | Jakub Kicinski | 2022-11-17 16:19:14 -0800 |
---|---|---|
committer | Jakub Kicinski | 2022-11-17 18:30:39 -0800 |
commit | 224b744abf9f0663ca6762a79c7298b663fa4f04 (patch) | |
tree | 4f6a817547e7d0584d96cd539a3d63be75059cf1 /MAINTAINERS | |
parent | b4b221bd79a1c698d9653e3ae2c3cb61cdc9aee7 (diff) | |
parent | 847ccab8fdcf4a0cd85a278480fab1ccdc9f6136 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/linux/bpf.h
1f6e04a1c7b8 ("bpf: Fix offset calculation error in __copy_map_value and zero_map_value")
aa3496accc41 ("bpf: Refactor kptr_off_tab into btf_record")
f71b2f64177a ("bpf: Refactor map->off_arr handling")
https://lore.kernel.org/all/20221114095000.67a73239@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 14ee1c72d01a..48bacf763e91 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 |