Re: linux-next: manual merge of the liveupdate tree with the liveupdate-fixes tree

[Mark Brown]

On Tue, May 26, 2026 at 04:30:12PM +0200, Pratyush Yadav wrote:

> I suppose one option is to wait for "liveupdate: validate session type
> before performing operation" to land into v7.1-rc6 and then rebase the
> liveupdate/next branch on top of it and fix the conflict ourselves. This
> gives around 2 weeks for the rebased branch to soak into linux-next
> until we send the PR. But I am not sure if this is enough time or if we
> should just let Linus deal with this...

You could also do a merge instead of a rebase, the end result is the
same but the older commits are preserved.

> > + 	IOCTL_OP(LIVEUPDATE_SESSION_GET_NAME, luo_session_get_name,
> >  -		 struct liveupdate_session_get_name, name),
> > ++		 struct liveupdate_session_get_name, name, LUO_IOCTL_OUTGOING),

> FWIW, this resolution is wrong. It should be LUO_IOCTL_ALL here.

OK, I'll fix up tomorrow.

Attachment: signature.asc
Description: PGP signature