Re: [GIT PULL] exec fixes for v5.11-rc1

Eric W. Biederman
2020-12-16T14:37:19Z

Linus Torvalds <torvalds@linux-foundation.org> writes:

> On Tue, Dec 15, 2020 at 3:00 PM Eric W. Biederman <ebiederm@xmission.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