Skip to content
Commit 82f18d6a authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Bruce Ashfield
Browse files

arm: merge fixup for duplicate TIF_NOTIFY_SIGNAL and other TIF_*

This linux-stable backport:

  commit 855edc4e
  Author: Jens Axboe <axboe@kernel.dk>
  Date:   Wed Jan 4 07:48:37 2023 -0700

    ARM: renumber bits related to _TIF_WORK_MASK

    commit 191f8453 upstream.

conflicts with the preempt-lazy patches from the -rt folks, resulting
in some post merge duplicates and compile failures like:

  arch/arm/include/asm/thread_info.h:141: error: "TIF_NOTIFY_SIGNAL" redefined [-Werror]

Ideally I would have copied the thread_info directly from the v5.15-rt
branch of linux-stable-rt[1] so that we'd stay exactly aligned with -rt
upstream for when/if we integrate future updates from the preempt-rt
people, but they haven't yet integrated the v5.15.87 with the offending
change yet.

[1] git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git



Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarBruce Ashfield <bruce.ashfield@gmail.com>
parent 24b6f990
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment