On Tue, Mar 12, 2019 at 01:12:51PM +0100, Daniel Borkmann wrote: > On 03/12/2019 01:05 PM, Greg KH wrote: > > On Tue, Mar 12, 2019 at 10:41:26AM +0100, Jakub Sitnicki wrote: > >> Hi, > >> > >> On Mon, Mar 11, 2019 at 08:17 PM CET, Sasha Levin wrote: > >>> This is a note to let you know that I've just added the patch titled > >>> > >>> sk_msg: Always cancel strp work before freeing the psock > >>> > >>> to the 4.20-stable tree which can be found at: > >>> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > >>> > >>> The filename of the patch is: > >>> sk_msg-always-cancel-strp-work-before-freeing-the-ps.patch > >>> and it can be found in the queue-4.20 subdirectory. > >>> > >>> If you, or anyone else, feels it should not be added to the stable tree, > >>> please let <stable@xxxxxxxxxxxxxxx> know about it. > >> > >> There is a follow-up fix for this change - e8e3437762ad ("bpf: Stop the > >> psock parser before canceling its work") in bpf tree: > >> > >> https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=e8e3437762ad938880dd48a3c52d702e7cf3c124 > >> > >> I think this patch should not go to into stable without the follow-up > >> fix. Otherwise kselftests for bpf will be noisy due to kernel warnings. > > > > Thanks, I've dropped this now. We can add this back when the original > > patch hits Linus's tree. > > This is already in Linus tree here, so we should be able to proceed with > queueing both of them: > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e8e3437762ad938880dd48a3c52d702e7cf3c124 Ah, thanks, didn't catch that, no morning coffee yet :) I'll go queue up this patch for 5.0 now, and for 4.20 along with the original one. thanks again, greg k-h
