On Mon, 15 Jul 2024 19:12:42 +0200 Greg KH gregkh@linuxfoundation.org wrote:
On Mon, Jul 15, 2024 at 10:02:09AM -0700, SeongJae Park wrote:
Hi Greg,
On Mon, 15 Jul 2024 13:34:47 +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 310d6c15e9104c99d5d9d0ff8e5383a79da7d5e6
Similar to the failure of this patch for 6.1.y, I cannot reproduce the conflict on my setup. Attaching the patch for successfully cherry-picked one on my machine for any possible case.
Same issue as 6.1, it breaks the build :(
Thank you for letting me know this. I confirmed the issue can be reproduced on my setup, and made a local fix. In addition to the build failure, however, this causes a build warning. The warning occurs on 6.1, too, so we're discussing it on another thread[1]. I will send a fixed version once the discussion for the warning on the thread is completed.
[1] https://lore.kernel.org/20240715195946.1043767-1-sj@kernel.org
Thanks, SJ