Re: linux-next: manual merge of the block tree with the arm64 tree

2020-12-14 Thread Stephen Rothwell
Hi all, On Thu, 3 Dec 2020 14:25:30 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the block tree got a conflict in: > > arch/arm64/include/asm/thread_info.h > > between commit: > > b5a5a01d8e9a ("arm64: uaccess: remove addr_limit_user_check()") > > from the arm64 tree and

Re: linux-next: manual merge of the block tree with the arm64 tree

2020-12-03 Thread Jens Axboe
On 12/3/20 8:05 AM, Catalin Marinas wrote: > On Thu, Dec 03, 2020 at 07:36:10AM -0700, Jens Axboe wrote: >> On 12/3/20 4:01 AM, Catalin Marinas wrote: >>> On Thu, Dec 03, 2020 at 02:25:30PM +1100, Stephen Rothwell wrote: diff --cc arch/arm64/include/asm/thread_info.h index 015beafe58f5,cd

Re: linux-next: manual merge of the block tree with the arm64 tree

2020-12-03 Thread Catalin Marinas
On Thu, Dec 03, 2020 at 07:36:10AM -0700, Jens Axboe wrote: > On 12/3/20 4:01 AM, Catalin Marinas wrote: > > On Thu, Dec 03, 2020 at 02:25:30PM +1100, Stephen Rothwell wrote: > >> diff --cc arch/arm64/include/asm/thread_info.h > >> index 015beafe58f5,cdcf307764aa.. > >> --- a/arch/arm64

Re: linux-next: manual merge of the block tree with the arm64 tree

2020-12-03 Thread Jens Axboe
On 12/3/20 4:01 AM, Catalin Marinas wrote: > On Thu, Dec 03, 2020 at 02:25:30PM +1100, Stephen Rothwell wrote: >> diff --cc arch/arm64/include/asm/thread_info.h >> index 015beafe58f5,cdcf307764aa.. >> --- a/arch/arm64/include/asm/thread_info.h >> +++ b/arch/arm64/include/asm/thread_info

Re: linux-next: manual merge of the block tree with the arm64 tree

2020-12-03 Thread Catalin Marinas
On Thu, Dec 03, 2020 at 02:25:30PM +1100, Stephen Rothwell wrote: > diff --cc arch/arm64/include/asm/thread_info.h > index 015beafe58f5,cdcf307764aa.. > --- a/arch/arm64/include/asm/thread_info.h > +++ b/arch/arm64/include/asm/thread_info.h > @@@ -63,7 -66,9 +63,8 @@@ void arch_release_

linux-next: manual merge of the block tree with the arm64 tree

2020-12-02 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the block tree got a conflict in: arch/arm64/include/asm/thread_info.h between commit: b5a5a01d8e9a ("arm64: uaccess: remove addr_limit_user_check()") from the arm64 tree and commit: 192caabd4dd9 ("arm64: add support for TIF_NOTIFY_SIGNAL") from the