Hi all,
On Fri, 11 Dec 2020 18:24:53 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the userns tree got a conflict in:
>
> kernel/events/core.c
>
> between commit:
>
> 78af4dc949da ("perf: Break deadlock involving exec_update_mutex")
>
> from the tip tree and commit:
>
>
Hi all,
Today's linux-next merge of the userns tree got a conflict in:
kernel/events/core.c
between commit:
78af4dc949da ("perf: Break deadlock involving exec_update_mutex")
from the tip tree and commit:
f7cfd871ae0c ("exec: Transform exec_update_mutex into a rw_semaphore")
from the us
Stephen Rothwell writes:
> Hi all,
>
> On Mon, 15 Oct 2018 15:11:59 +1100 Stephen Rothwell
> wrote:
>>
>> Today's linux-next merge of the userns tree got a conflict in:
>>
>> arch/x86/mm/fault.c
>>
>> between commit:
>>
>> 164477c2331b ("x86/mm: Clarify hardware vs. software "error_code"
Hi all,
On Mon, 15 Oct 2018 15:11:59 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the userns tree got a conflict in:
>
> arch/x86/mm/fault.c
>
> between commit:
>
> 164477c2331b ("x86/mm: Clarify hardware vs. software "error_code"")
> (and others from that series)
>
> fr
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in:
arch/x86/mm/fault.c
between commit:
164477c2331b ("x86/mm: Clarify hardware vs. software "error_code"")
(and others from that series)
from the tip tree and commits:
768fd9c69bb5 ("signal/x86: Remove pkey parameter f
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in:
arch/x86/kernel/traps.c
between commits:
76dee4a72849 ("x86/kprobes: Inline kprobe_exceptions_notify() into
do_general_protection()")
81fd9c18444e ("x86/fault: Plumb error code and fault address through to fault
han
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in
drivers/firmware/efi/efi.c between commit 0bb549052d33 ("efi: Add esrt
support") from the tip tree and commit c2f0fd2c640e ("sysfs: Create
mountpoints with sysfs_create_mount_point") from the userns tree.
I fixed it up (see be
7 matches
Mail list logo