* linux-next: manual merge of the keys tree with the ecryptfs tree
@ 2019-06-26 4:28 Stephen Rothwell
2019-07-09 0:10 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-06-26 4:28 UTC (permalink / raw)
To: David Howells, Tyler Hicks
Cc: Linux Next Mailing List, Linux Kernel Mailing List, YueHaibing
[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]
Hi all,
Today's linux-next merge of the keys tree got a conflict in:
fs/ecryptfs/keystore.c
between commit:
29a51df0609c ("ecryptfs: remove unnessesary null check in ecryptfs_keyring_auth_tok_for_sig")
from the ecryptfs tree and commit:
79512db59dc8 ("keys: Replace uid/gid/perm permissions checking with an ACL")
from the keys 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.
--
Cheers,
Stephen Rothwell
diff --cc fs/ecryptfs/keystore.c
index 216fbe6a4837,ba382f135918..000000000000
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@@ -1611,10 -1610,10 +1611,10 @@@ int ecryptfs_keyring_auth_tok_for_sig(s
{
int rc = 0;
- (*auth_tok_key) = request_key(&key_type_user, sig, NULL);
+ (*auth_tok_key) = request_key(&key_type_user, sig, NULL, NULL);
- if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {
+ if (IS_ERR(*auth_tok_key)) {
(*auth_tok_key) = ecryptfs_get_encrypted_key(sig);
- if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {
+ if (IS_ERR(*auth_tok_key)) {
printk(KERN_ERR "Could not find key with description: [%s]\n",
sig);
rc = process_request_key_err(PTR_ERR(*auth_tok_key));
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the keys tree with the ecryptfs tree
2019-06-26 4:28 linux-next: manual merge of the keys tree with the ecryptfs tree Stephen Rothwell
@ 2019-07-09 0:10 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2019-07-09 0:10 UTC (permalink / raw)
To: David Howells, Tyler Hicks
Cc: Linux Next Mailing List, Linux Kernel Mailing List, YueHaibing
[-- Attachment #1: Type: text/plain, Size: 1861 bytes --]
Hi all,
On Wed, 26 Jun 2019 14:28:38 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the keys tree got a conflict in:
>
> fs/ecryptfs/keystore.c
>
> between commit:
>
> 29a51df0609c ("ecryptfs: remove unnessesary null check in ecryptfs_keyring_auth_tok_for_sig")
>
> from the ecryptfs tree and commit:
>
> 79512db59dc8 ("keys: Replace uid/gid/perm permissions checking with an ACL")
>
> from the keys 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/ecryptfs/keystore.c
> index 216fbe6a4837,ba382f135918..000000000000
> --- a/fs/ecryptfs/keystore.c
> +++ b/fs/ecryptfs/keystore.c
> @@@ -1611,10 -1610,10 +1611,10 @@@ int ecryptfs_keyring_auth_tok_for_sig(s
> {
> int rc = 0;
>
> - (*auth_tok_key) = request_key(&key_type_user, sig, NULL);
> + (*auth_tok_key) = request_key(&key_type_user, sig, NULL, NULL);
> - if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {
> + if (IS_ERR(*auth_tok_key)) {
> (*auth_tok_key) = ecryptfs_get_encrypted_key(sig);
> - if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {
> + if (IS_ERR(*auth_tok_key)) {
> printk(KERN_ERR "Could not find key with description: [%s]\n",
> sig);
> rc = process_request_key_err(PTR_ERR(*auth_tok_key));
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-09 0:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-26 4:28 linux-next: manual merge of the keys tree with the ecryptfs tree Stephen Rothwell
2019-07-09 0:10 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox