mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-02 20:10:27 -05:00
Resolve conflict betweend2912cb15b("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer andfe03d47456("Update my email address") which updates Jozsef Kadlecsik's email. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>