fix conflicts

patches/0002-Add-crypto-backend-foundation.patch

@@ -28,7 +28,7 @@ Subject: [PATCH] Add crypto backend foundation
  .../internal/backend/fips140/isrequirefips.go |   9 +
  .../internal/backend/fips140/norequirefips.go |   9 +
  .../internal/backend/fips140/nosystemfips.go  |   9 +
- src/crypto/internal/backend/nobackend.go      | 200 ++++++++++++++++++
+ src/crypto/internal/backend/nobackend.go      | 192 ++++++++++++++++++
  src/crypto/internal/cryptotest/allocations.go |   2 +-
  .../internal/cryptotest/implementations.go    |   2 +-
  src/crypto/md5/md5.go                         |   7 +
@@ -63,7 +63,7 @@ Subject: [PATCH] Add crypto backend foundation
  src/hash/notboring_test.go                    |   5 +
  src/net/smtp/smtp_test.go                     |  72 ++++---
  src/runtime/runtime_boring.go                 |   5 +
- 58 files changed, 841 insertions(+), 73 deletions(-)
+ 59 files changed, 832 insertions(+), 73 deletions(-)
  create mode 100644 src/crypto/ed25519/boring.go
  create mode 100644 src/crypto/ed25519/notboring.go
  create mode 100644 src/crypto/internal/backend/backend_test.go
@@ -162,7 +162,7 @@ index 21303b384cf757..0d3c4f810cfd8f 100644
  	c := new(tripleDESCipher)
  	c.cipher1.generateSubkeys(key[:8])
 diff --git a/src/crypto/dsa/dsa.go b/src/crypto/dsa/dsa.go
-index 4524bd492feba0..3937865aee7ef8 100644
+index 000becc82dfb79..f1cbcccbddf4bd 100644
 --- a/src/crypto/dsa/dsa.go
 +++ b/src/crypto/dsa/dsa.go
 @@ -18,6 +18,8 @@ import (
@@ -171,10 +171,10 @@ index 4524bd492feba0..3937865aee7ef8 100644
 
 +	boring "crypto/internal/backend"
 +	"crypto/internal/backend/bbig"
+ 	"crypto/internal/fips140only"
  	"crypto/internal/randutil"
  )
-
-@@ -86,6 +88,17 @@ func GenerateParameters(params *Parameters, rand io.Reader, sizes ParameterSizes
+@@ -91,6 +93,17 @@ func GenerateParameters(params *Parameters, rand io.Reader, sizes ParameterSizes
  		return errors.New("crypto/dsa: invalid ParameterSizes")
  	}