From 4c05af335173adb56dfc121fcf7bc5acd8ba81bb Mon Sep 17 00:00:00 2001
From: Steve Yegge <steve.yegge@gmail.com>
Date: Fri, 19 Dec 2025 18:27:27 -0800
Subject: [PATCH] bd sync: merge consolidation