lkml.org 
[lkml]   [2020]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the arm64 tree with the asm-generic tree
On Mon, Oct 12, 2020 at 12:52 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/include/asm/mmu_context.h
>
> between commit:
>
> f911c2a7c096 ("arm64: use asm-generic/mmu_context.h for no-op implementations")
>
> from the asm-generic tree and commit:
>
> 48118151d8cc ("arm64: mm: Pin down ASIDs for sharing mm with devices")
>
> from the arm64 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>

Sorry about that, I had pushed my asm-generic branch to the correct
location on Friday after I noticed it was missing. Removed it again now
until the end up the merge window.

Arnd

\
 
 \ /
  Last update: 2020-10-12 10:03    [W:0.058 / U:0.088 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site