On Fri, Apr 18, 2025 at 10:40:08AM +0200, Mickaël Salaün wrote:
Hi Greg,
On Thu, Apr 17, 2025 at 03:39:13PM +0200, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 15383a0d63dbcd63dc7e8d9ec1bf3a0f7ebf64ac
Running this command works for me:
$ git cherry-pick -x 15383a0d63dbcd63dc7e8d9ec1bf3a0f7ebf64ac Auto-merging include/uapi/linux/landlock.h Auto-merging security/landlock/setup.c Auto-merging security/landlock/setup.h Auto-merging security/landlock/syscalls.c Auto-merging tools/testing/selftests/landlock/base_test.c [linux-5.15.y e2b5baf61146] landlock: Add the errata interface Date: Tue Mar 18 17:14:37 2025 +0100 6 files changed, 185 insertions(+), 5 deletions(-) create mode 100644 security/landlock/errata.h
$ git version # without custom .gitconfig git version 2.49.0
I previously tested and validated this approach that produces a working commit.
However, trying to apply the raw patch does not work:
$ git apply this.patch error: patch failed: security/landlock/setup.c:6 error: security/landlock/setup.c: patch does not apply error: patch failed: security/landlock/setup.h:11 error: security/landlock/setup.h: patch does not apply error: patch failed: security/landlock/syscalls.c:169 error: security/landlock/syscalls.c: patch does not apply
This is the case for these stable trees: 5.15, 6.1, and 6.6
Could you please use Git to cherry-pick this commit on these 3 trees?
Sorry, but we don't use git cherry-pick, we need them in patch form.
thanks,
greg k-h