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

2020-12-16 Thread Eric W. Biederman
Linus Torvalds writes: > On Tue, Dec 15, 2020 at 3:00 PM Eric W. Biederman > 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

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

2020-12-15 Thread pr-tracker-bot
The pull request you sent on Tue, 15 Dec 2020 16:59:55 -0600: > git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git > exec-for-v5.11 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/faf145d6f3f3d6f2c066f65602ba9d0a03106915 Thank you! -- Deet-doo

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

2020-12-15 Thread Linus Torvalds
On Tue, Dec 15, 2020 at 3:00 PM Eric W. Biederman 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

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

2020-12-15 Thread Eric W. Biederman
Please pull the exec-for-v5.11 branch from the git tree: git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git exec-for-v5.11 HEAD: 9ee1206dcfb9d56503c0de9f8320f7b29c795867 exec: Move io_uring_task_cancel after the point of no return This set of changes ultimately f