lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 1 Nov 2017 15:28:59 +0100 (CET) From: Jiri Kosina <jikos@...nel.org> To: Josh Poimboeuf <jpoimboe@...hat.com> cc: Miroslav Benes <mbenes@...e.cz>, Jessica Yu <jeyu@...hat.com>, live-patching@...r.kernel.org, linux-kernel@...r.kernel.org, Joe Lawrence <joe.lawrence@...hat.com> Subject: Re: [PATCH] livepatch: fix merge bug in klp_cleanup_module_patches_limited() 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
Powered by blists - more mailing lists