Merge remote-tracking branch 'upstream/devel' into devel+classic · ETCCooperative/erigon@aa97f13

type func(i Match, j Match) bool of func(i, j Match) bool {…} does not match inferred type func(a Match, b Match) int for func(a E, b E) int

type func(i FileInfo, j FileInfo) bool of func(i, j FileInfo) bool {…} does not match inferred type func(a FileInfo, b FileInfo) int for func(a E, b E) int

Process completed with exit code 1.