Re: [PATCH] livepatch: fix merge bug in klp_cleanup_module_patches_limited()

From: Jiri Kosina
Date: Wed Nov 01 2017 - 10:29:05 EST


On Tue, 31 Oct 2017, Josh Poimboeuf wrote:

> > Now, the only branch I could actually technically apply this patch to
> > would be for-next, but that'd be useless, as that is only an
> > integration/testing branch, that doesn't get merged anywhere else than
> > linux-next.
>
> Makes sense, I didn't know the rebase policy for that branch.

for-next is the only branch which I ocasionaly rebase; the most prominent
example is due to dropping a particular topic branch.

The topic branches themselves, I never actually rebase, as they are
usually used as basis for actual development, while for-next really should
not; that's just an integration branch.

> > Would you be okay with me just redoing the merge into for-next with this
> > fixup attributed to you in the merge message (and my git-rerere picking it
> > up for upstream)?
>
> Sure, no problem.

Thanks a lot again; I've just pushed out a fixed merge.

--
Jiri Kosina
SUSE Labs