Merge pull request #16662 from omoerbeek/rec-tsan-trixie

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Wed, 7 Jan 2026 07:21:07 +0000 (08:21 +0100)

committer GitHub <noreply@github.com>

Wed, 7 Jan 2026 07:21:07 +0000 (08:21 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Wed, 7 Jan 2026 07:21:07 +0000 (08:21 +0100)
committer GitHub <noreply@github.com>
Wed, 7 Jan 2026 07:21:07 +0000 (08:21 +0100)
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/dnsdistdist/dnsdist.cc
Simple merge
diff --cc pdns/recursordist/rec-main.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Wed, 7 Jan 2026 07:21:07 +0000 (08:21 +0100)
committer	GitHub <noreply@github.com>
	Wed, 7 Jan 2026 07:21:07 +0000 (08:21 +0100)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/rec-main.cc	patch \|	diff1 \|	diff2 \|	blob \| history