Re: linux-next: manual merge of the pidfd tree with the csky tree

Hi all, On Mon, 6 Jul 2020 15:06:13 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the pidfd tree got a conflict in: > > arch/csky/kernel/process.c > > between commit: > > 29adb883aa77 ("csky: remove unusued thread_saved_pc and *_segments > functions/macros") > > from the

Re: linux-next: manual merge of the pidfd tree with the csky tree

Hi all, On Mon, 3 Aug 2020 18:25:50 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the pidfd tree got a conflict in: > > arch/csky/Kconfig > > between commits: > > e95a4f8cb985 ("csky: Add SECCOMP_FILTER supported") > 953131e5b5a5 ("csky: Use top-down mmap layout") > bd

linux-next: manual merge of the pidfd tree with the csky tree

Hi all, Today's linux-next merge of the pidfd tree got a conflict in: arch/csky/Kconfig between commits: e95a4f8cb985 ("csky: Add SECCOMP_FILTER supported") 953131e5b5a5 ("csky: Use top-down mmap layout") bdcd93ef9afb ("csky: Add context tracking support") from the csky tree and commit

linux-next: manual merge of the pidfd tree with the csky tree

Hi all, Today's linux-next merge of the pidfd tree got a conflict in: arch/csky/kernel/process.c between commit: 29adb883aa77 ("csky: remove unusued thread_saved_pc and *_segments functions/macros") from the csky tree and commit: 714acdbd1c94 ("arch: rename copy_thread_tls() back to co

linux-next: manual merge of the pidfd tree with the csky tree

Hi all, Today's linux-next merge of the pidfd tree got a conflict in: arch/csky/Kconfig between commit: f4dd2edafba0 ("csky: add support for SECCOMP and SECCOMP_FILTER") from the csky tree and commit: 140c8180eb7c ("arch: remove HAVE_COPY_THREAD_TLS") from the pidfd tree. I fixed it u