Merge pull request #14436 from rgacogne/ddist19-xsk-backend-race

author Remi Gacogne <remi.gacogne@powerdns.com>

Fri, 12 Jul 2024 11:28:15 +0000 (13:28 +0200)

committer GitHub <noreply@github.com>

Fri, 12 Jul 2024 11:28:15 +0000 (13:28 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Fri, 12 Jul 2024 11:28:15 +0000 (13:28 +0200)
committer GitHub <noreply@github.com>
Fri, 12 Jul 2024 11:28:15 +0000 (13:28 +0200)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Fri, 12 Jul 2024 11:28:15 +0000 (13:28 +0200)
committer	GitHub <noreply@github.com>
	Fri, 12 Jul 2024 11:28:15 +0000 (13:28 +0200)
		1	2
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history