]> git.ipfire.org Git - thirdparty/systemd.git/commit
Resolve conflicts between #23616 and the recent NFT additions
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 9 Jun 2022 08:06:11 +0000 (10:06 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 9 Jun 2022 08:06:30 +0000 (10:06 +0200)
commit2299b1cae32c1fb8911da0ce26efced68032f4f8
tree35911e787094ea88d98054cc867dcc8b02be3013
parent377157e6bd743af8de1e89b6109282de4fc5a066
Resolve conflicts between #23616 and the recent NFT additions
src/network/networkd-address.c
src/network/networkd-netlabel.c
src/shared/firewall-util-nft.c