Messages in this thread | | | Date | Wed, 16 Dec 2020 22:14:10 +0000 | From | Catalin Marinas <> | Subject | Re: [PATCH] arm64: make _TIF_WORK_MASK bits contiguous (was: Re: [GIT PULL] TIF_NOTIFY_SIGNAL for all archs) |
| |
On Wed, Dec 16, 2020 at 02:06:46PM -0800, Linus Torvalds wrote: > On Wed, Dec 16, 2020 at 2:04 PM Mark Rutland <mark.rutland@arm.com> wrote: > > Unfortunately the merge resolution broke the build for arm64 -- could > > you please apply the fixup below? IIUC that matches what we did in > > linux-next, and builds fine locally. > > Oops. That was a bit too subtle. I didn't realize that the bits really > wanted to be contiguous, and it wasn't obvious at the point of > conflict. > > Will apply your fix asap.
Thanks Linus for applying it and thanks Mark for the quick fix. I noticed it in -next before and gave Stephen my conflict resolution.
-- Catalin
| |