linux-kernel - linux-next: manual merge of the akpm-current tree with the arm64 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190807163942.4f2018b2@canb.auug.org.au>
Date:   Wed, 7 Aug 2019 16:39:42 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Mark Rutland <mark.rutland@....com>,
        Alexandre Ghiti <alex@...ti.fr>
Subject: linux-next: manual merge of the akpm-current tree with the arm64
 tree

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/arm64/include/asm/processor.h

between commit:

  b907b80d7ae7 ("arm64: remove pointless __KERNEL__ guards")

from the arm64 tree and commit:

  cd6ee3f76f64 ("arm64, mm: move generic mmap layout functions to mm")

from the akpm-current 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/include/asm/processor.h
index ec70762519df,65e2de00913f..000000000000
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@@ -280,8 -281,8 +280,6 @@@ static inline void spin_lock_prefetch(c
  		     "nop") : : "p" (ptr));
  }
  
- #define HAVE_ARCH_PICK_MMAP_LAYOUT
 -#endif
--
  extern unsigned long __ro_after_init signal_minsigstksz; /* sigframe size */
  extern void __init minsigstksz_setup(void);
  

Content of type "application/pgp-signature" skipped