pkg/bindings/generator/generator.go | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 system-goimports

===================================================================

pkg/api/handlers/compat/containers.go | 7 2 + 5 - 0 !
pkg/api/handlers/compat/containers_stats_linux.go | 24 12 + 12 - 0 !
pkg/api/handlers/compat/images_prune.go | 3 2 + 1 - 0 !
pkg/api/handlers/compat/networks.go | 21 10 + 11 - 0 !
pkg/api/handlers/compat/system.go | 3 1 + 2 - 0 !
pkg/api/handlers/compat/types.go | 25 13 + 12 - 0 !
pkg/api/handlers/compat/volumes.go | 19 10 + 9 - 0 !
pkg/api/handlers/swagger/models.go | 8 4 + 4 - 0 !
pkg/api/handlers/swagger/responses.go | 13 6 + 7 - 0 !
9 files changed, 60 insertions(+), 63 deletions(-)

 revert "update to docker 27"

This reverts commit e24367aa14b7669d116a2a27ba12c69cbf51612b.

pkg/machine/provider/platform_test.go | 8 6 + 2 - 0 !
1 file changed, 6 insertions(+), 2 deletions(-)

 testproviders: skip test if unable to list providers

this is to fix autopkgtest in Debian when running in qemu

cmd/podman/machine/init.go | 2 1 + 1 - 0 !
cmd/podman/machine/server9p.go | 2 1 + 1 - 0 !
pkg/machine/e2e/init_test.go | 2 1 + 1 - 0 !
pkg/machine/gvproxy_unix.go | 2 1 + 1 - 0 !
4 files changed, 4 insertions(+), 4 deletions(-)

 do not hardcode gopsutil v4

cmd/quadlet/main_test.go | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 testunitdirs: skip when clone_newuser fails

test/system/030-run.bats | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 test/system: skip some system tests that fail in debian

test/e2e/run_test.go | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 e2e-test: skip tests that don't currently work

These failures need to be investigated more closely

libpod/container_copy_common.go | 7 2 + 5 - 0 !
libpod/container_internal_common.go | 4 4 + 0 - 0 !
test/e2e/cp_test.go | 22 9 + 13 - 0 !
3 files changed, 15 insertions(+), 18 deletions(-)

 fix a potential deadlock during `podman cp`

Have one function without a `defer lock.unlock()` as one of the
commands in it calls a function that also takes the same lock,
so the unlock has to happen prior to function completion.
Unfortunately, this is prone to errors, like the one here: I
missed a case, and we could return without unlocking, causing a
deadlock later in the cleanup code as we tried to take the same
lock again.

Refactor the command to use `defer unlock()` to simplify and
avoid any further errors of this type.

Introduced by e66b788a514fb8df2c8b8d3c000e0d543bbd60df - this
should be included in any backports of that commit.

Fixes #25585

Signed-off-by: Matt Heon <mheon@redhat.com>