summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-11-29 22:04:52 +0100
committerJakub Kicinski <kuba@kernel.org>2022-11-29 22:04:52 +0100
commitf2bb566f5c977ff010baaa9e5e14d9a75b06e5f2 (patch)
tree6359cc9169bd06bfb8b757a534c82886df605b71 /CREDITS
parentudp_tunnel: Add checks for nla_nest_start() in __udp_tunnel_nic_dump_write() (diff)
parentMerge tag 'net-6.1-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ne... (diff)
downloadlinux-f2bb566f5c977ff010baaa9e5e14d9a75b06e5f2.tar.xz
linux-f2bb566f5c977ff010baaa9e5e14d9a75b06e5f2.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
tools/lib/bpf/ringbuf.c 927cbb478adf ("libbpf: Handle size overflow for ringbuf mmap") b486d19a0ab0 ("libbpf: checkpatch: Fixed code alignments in ringbuf.c") https://lore.kernel.org/all/20221121122707.44d1446a@canb.auug.org.au/ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS4
1 files changed, 4 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 54672cbcd719..198f675c419e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2452,6 +2452,10 @@ S: 482 Shadowgraph Dr.
S: San Jose, CA 95110
S: USA
+N: Michal Marek
+E: michal.lkml@markovi.net
+D: Kbuild Maintainer 2009-2017
+
N: Martin Mares
E: mj@ucw.cz
W: http://www.ucw.cz/~mj/