Hi all,
On Mon, 1 Jul 2019 20:35:13 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> kernel/fork.c
>
> between commits:
>
> 9014143bab2f ("fork: don't check parent_tidptr with CLONE_PIDFD")
> 6fd2fe494b17 ("copy_process(): don't use ksy
Hi all,
On Thu, 6 Jun 2019 15:40:34 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> tools/testing/selftests/pidfd/pidfd_test.c
>
> between commit:
>
> 1fcd0eb356ad ("tests: fix pidfd-test compilation")
>
> from Linus' tree and commit:
>
Hi Christian,
On Wed, 22 May 2019 09:55:00 +0200 Christian Brauner
wrote:
>
> On May 22, 2019 9:48:33 AM GMT+02:00, Stephen Rothwell
> wrote:
> >Hi Greg,
> >
> >On Wed, 22 May 2019 07:52:35 +0200 Greg Kroah-Hartman
> > wrote:
> >>
> >> Sorry, you are going to get a number of these types of m
On May 22, 2019 9:48:33 AM GMT+02:00, Stephen Rothwell
wrote:
>Hi Greg,
>
>On Wed, 22 May 2019 07:52:35 +0200 Greg Kroah-Hartman
> wrote:
>>
>> Sorry, you are going to get a number of these types of minor
>conflicts
>> now. That's the problem of touching thousands of files :(
>
>Yeah, I expected
Hi Greg,
On Wed, 22 May 2019 07:52:35 +0200 Greg Kroah-Hartman
wrote:
>
> Sorry, you are going to get a number of these types of minor conflicts
> now. That's the problem of touching thousands of files :(
Yeah, I expected that one I saw the commits. At least is is just after
-rc1, hopefully m
On Wed, May 22, 2019 at 11:01:15AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> tools/testing/selftests/pidfd/Makefile
>
> between commit:
>
> ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")
>
> fro
6 matches
Mail list logo
