| Message ID | 20200613094959.05d121d5@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | linux-next: manual merge of the crypto-current tree with Linus' tree | expand |
diff --cc drivers/crypto/ccp/sev-dev.c index a2426334be61,aa576529283b..000000000000 --- a/drivers/crypto/ccp/sev-dev.c
Hi all, Today's linux-next merge of the crypto-current tree got a conflict in: drivers/crypto/ccp/sev-dev.c between commit: 835ae3bb530a ("drivers/crypto/ccp/sev-dev.c: get rid of pointless access_ok()") from Linus' tree and commit: 832910f2e6b5 ("crypto: ccp - Fix sparse warnings in sev-dev") from the crypto-current tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.