From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>,
Herbert Xu <herbert@gondor•apana.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Colin Ian King <colin.king@canonical•com>
Subject: linux-next: manual merge of the keys tree with the crypto tree
Date: Wed, 13 Apr 2016 12:03:21 +1000 [thread overview]
Message-ID: <20160413120321.396226c2@canb.auug.org.au> (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
reply other threads:[~2016-04-13 2:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160413120321.396226c2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=colin.king@canonical$(echo .)com \
--cc=dhowells@redhat$(echo .)com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox