On Mon, Nov 18, 2024 at 11:34:35AM +0000, Matthew Auld wrote:
On 17/11/2024 20:36, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
The patch below does not apply to the 6.11-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@xxxxxxxxxxxxxxx>.
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-6.11.y
git checkout FETCH_HEAD
git cherry-pick -x 46f1f4b0f3c2a2dff9887de7c66ccc7ef482bd83
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024111758-jumbo-neon-1b3c@gregkh' --subject-prefix 'PATCH 6.11.y' HEAD^..
Possible dependencies:
There is a dependency with:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=dd886a63d6e2ce5c16e662c07547c067ad7d91f5
I guess we need to get that patch into linux-6.11.y branch also? I
think we also need both patches for "drm/xe: handle flat ccs during
hibernation on igpu" to work, even if it applies without.
there are more dependencies... in 6.11 for example we can't simply "use
what we have for dgfx" like we did here, because those patches are not
there. I have a few extra patches to stable that includes it and will
submit soon.
thanks
Lucas De Marchi
