linux-next: manual merge of the keys tree with the crypto tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the keys tree with the crypto tree
Date	2016-04-13 04:10 +0200
Message-ID	<rnipH-19b-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi David,

Today's linux-next merge of the keys tree got a conflict in:

  crypto/asymmetric_keys/pkcs7_parser.c

between commit:

  06af9b0f4949 ("PKCS#7: fix missing break on OID_sha224 case")

from the crypto tree and commit:

  566a117a8b24 ("PKCS#7: Make the signature a pointer rather than embedding it")

from the keys tree.

I fixed it up (the latter added the same "break" statement) 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.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the keys tree with the crypto tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-04-13 04:10 +0200

csiph-web