linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: ebiederm@xmission.com (Eric W. Biederman)
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: Re: [GIT PULL] exec fixes for v5.11-rc1
Date: Wed, 16 Dec 2020 08:35:34 -0600	[thread overview]
Message-ID: <87wnxh7r9l.fsf@x220.int.ebiederm.org> (raw)
In-Reply-To: <CAHk-=wijn40PoFccpQZExuyWnz2i+wmBx+9gw5nKJPVQVmzb5g@mail.gmail.com> (Linus Torvalds's message of "Tue, 15 Dec 2020 19:32:37 -0800")

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


  reply	other threads:[~2020-12-16 14:37 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-15 22:59 [GIT PULL] exec fixes for v5.11-rc1 Eric W. Biederman
2020-12-16  3:32 ` Linus Torvalds
2020-12-16 14:35   ` Eric W. Biederman [this message]
2020-12-16  3:44 ` pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wnxh7r9l.fsf@x220.int.ebiederm.org \
    --to=ebiederm@xmission.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).