linux-next: manual merge of the security tree with Linus' tree
Hi all,
Today's linux-next merge of the security tree got a conflict in:
security/commoncap.c
between commit:
8cf0a1bc1287 ("capabilities: fix potential memleak on error path from vfs_getxattr_alloc()")
from Linus' tree and commit:
f6fbd8cbf3ed ("lsm,fs: fix vfs_getxattr_alloc() return type and caller error paths")
from the security tree.
I fixed it up (I just used the latter) 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.
Signature · 2 lines
Cheers, Stephen Rothwell
Quoted 11 lines · Stephen Rothwell
Hi all,
Today's linux-next merge of the security tree got a conflict in:
security/commoncap.cbetween commit:
8cf0a1bc1287("capabilities: fix potential memleak on error path fromvfs_getxattr_alloc()")
Quoted 8 lines
from Linus' tree and commit:
f6fbd8cbf3ed("lsm,fs: fixvfs_getxattr_alloc()return type and caller error paths")from the security tree.
I fixed it up (I just used the latter) and can carry the fix as necessary.
That's more or less what I've done with my builds, thanks Stephen.
I asked this on a previous conflict but never received an answer so I'll ask it one more time: is there a recommended way to notify linux-next of an upcoming conflict? I generally notice the merge conflict within a few minutes of merging the patches into a -next branch, and fix it shortly afterwards. I'm happy to provide a heads-up, and a merge example, but I'm not sure what the process is for that, if any. Or, would you simply prefer to notice it yourself? I'm not bothered either way, I just thought you might appreciate the heads-up.
Signature · 1 line
paul-moore.com
Hi Paul,
Quoted 10 lines · On Mon, 21 Nov 2022 13:47:18 -0500 Paul Moore <[email protected]> wrote:
I asked this on a previous conflict but never received an answer so I'll ask it one more time: is there a recommended way to notify linux-next of an upcoming conflict? I generally notice the merge conflict within a few minutes of merging the patches into a -next branch, and fix it shortly afterwards. I'm happy to provide a heads-up, and a merge example, but I'm not sure what the process is for that, if any. Or, would you simply prefer to notice it yourself? I'm not bothered either way, I just thought you might appreciate the heads-up.
Sorry about that. Some maintainers will just send a "heads up" email with a suggested resolution patch (but I don't get very many). That can be very helpful for complicated (or non obvious) conflicts. I still generally look at how to fix them myself (and report them), but it can save me considerable time in particularly obscure cases.
Signature · 2 lines
Cheers, Stephen Rothwell
Quoted 15 lines · Stephen Rothwell
Hi Paul,
Quoted 10 lines · On Mon, 21 Nov 2022 13:47:18 -0500 Paul Moore <[email protected]> wrote:
I asked this on a previous conflict but never received an answer so I'll ask it one more time: is there a recommended way to notify linux-next of an upcoming conflict? I generally notice the merge conflict within a few minutes of merging the patches into a -next branch, and fix it shortly afterwards. I'm happy to provide a heads-up, and a merge example, but I'm not sure what the process is for that, if any. Or, would you simply prefer to notice it yourself? I'm not bothered either way, I just thought you might appreciate the heads-up.
Quoted 5 lines
Sorry about that. Some maintainers will just send a "heads up" email with a suggested resolution patch (but I don't get very many). That can be very helpful for complicated (or non obvious) conflicts. I still generally look at how to fix them myself (and report them), but it can save me considerable time in particularly obscure cases.
Okay, I'll make a mental note to send a FYI to the linux-next list next time I notice a merge conflict. The real trick will be to see if I actually manage to remember the next time I see one ;)
Signature · 1 line
paul-moore.com