[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87wnxh7r9l.fsf@x220.int.ebiederm.org>
Date: Wed, 16 Dec 2020 08:35:34 -0600
From: ebiederm@...ssion.com (Eric W. Biederman)
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
linux-fsdevel <linux-fsdevel@...r.kernel.org>
Subject: Re: [GIT PULL] exec fixes for v5.11-rc1
Linus Torvalds <torvalds@...ux-foundation.org> writes:
> On Tue, Dec 15, 2020 at 3:00 PM Eric W. Biederman <ebiederm@...ssion.com> wrote:
>>
>> There is a minor conflict with parallel changes to the bpf task_iter
>> code. The changes don't fundamentally conflict but both are removing
>> code from same areas of the same function.
>
> Ok, that was somewhat confusing.
>
> I think I got it right, but I'd appreciate you giving my resolution a
> second look. Just to be safe.
I have read through the merge commit and everything looks correct.
Eric
Powered by blists - more mailing lists