diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-25 11:05:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-25 11:05:32 -0800 |
| commit | 42dc45e84452c1ee72c482d477a2e71c0689b143 (patch) | |
| tree | 572f312c128587f5b28b3eae40b921d76b1611e7 /MAINTAINERS | |
| parent | 11cc92eb747aace5aa2b54b65b5cb8325a8981de (diff) | |
| parent | d8f6e5c6c83737cfdad46077e614885a3db9e809 (diff) | |
Merge branch 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux
Pull coccinelle updates from Julia Lawall.
* 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux:
scripts: coccicheck: Correct usage of make coccicheck
coccinelle: update expiring email addresses
coccinnelle: Remove ptr_ret script
kbuild: do not use scripts/ld-version.sh for checking spatch version
remove boolinit.cocci
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 32944ecc5733..154c87032bae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4355,8 +4355,8 @@ T: git git://linuxtv.org/media_tree.git F: drivers/media/pci/cobalt/ COCCINELLE/Semantic Patches (SmPL) -M: Julia Lawall <Julia.Lawall@lip6.fr> -M: Gilles Muller <Gilles.Muller@lip6.fr> +M: Julia Lawall <Julia.Lawall@inria.fr> +M: Gilles Muller <Gilles.Muller@inria.fr> M: Nicolas Palix <nicolas.palix@imag.fr> M: Michal Marek <michal.lkml@markovi.net> L: cocci@systeme.lip6.fr (moderated for non-subscribers) |