Merge branch 'master' into issue48741

.dockerignore

@@ -6,5 +6,4 @@ bazel-testlogs/
 bin/
 tidb-server/tidb-server
 *.test.bin
-cmd/
 Dockerfile

br/pkg/lightning/backend/external/BUILD.bazel

@@ -57,7 +57,6 @@ go_test(
         "engine_test.go",
         "file_test.go",
         "iter_test.go",
-        "merge_test.go",
         "onefile_writer_test.go",
         "split_test.go",
         "util_test.go",
@@ -85,7 +84,6 @@ go_test(
         "@com_github_johannesboyne_gofakes3//:gofakes3",
         "@com_github_johannesboyne_gofakes3//backend/s3mem",
         "@com_github_pingcap_errors//:errors",
-        "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_pingcap_kvproto//pkg/brpb",
         "@com_github_stretchr_testify//require",
         "@org_golang_x_exp//rand",