Fix patch conflicts; discard md5p8.diff.

[rsync-patches.git] / xxh3-safety-check.diff

diff --git a/xxh3-safety-check.diff b/xxh3-safety-check.diff
index c86d5c3ec4d85c18dc07e3624699466889de45cd..d999bd342a9ec4f5a0029d497466c87ea5089495 100644 (file)
--- a/xxh3-safety-check.diff
+++ b/xxh3-safety-check.diff
@@ -6,7 +6,7 @@ To use this patch, run these commands for a successful build:
     patch -p1 <patches/xxh3-safety-check.diff
     make
 
-based-on: cc832943160fb2cbaeaf45942b724828399edd37
+based-on: 55b2a06812e39f15f52e92b979600cb82be210cb
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c
@@ -76,7 +76,7 @@ diff --git a/compat.c b/compat.c
 diff --git a/usage.c b/usage.c
 --- a/usage.c
 +++ b/usage.c
-@@ -190,6 +190,8 @@ void print_rsync_version(enum logcode f)
+@@ -195,6 +195,8 @@ void print_rsync_version(enum logcode f)
  
        print_info_flags(f);