linux-kernel - linux-next: manual merge of the akpm-current tree with the kbuild 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: <20200511182305.6001b046@canb.auug.org.au>
Date:   Mon, 11 May 2020 18:23:05 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Masahiro Yamada <masahiroy@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        xujialu <xujialu@...ux.org>
Subject: linux-next: manual merge of the akpm-current tree with the kbuild
 tree

Hi all,

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

  Makefile

between commit:

  0e92fd54b7c1 ("kbuild: remove {CLEAN,MRPROPER,DISTCLEAN}_DIRS")

from the kbuild tree and commit:

  51b26a64f220 ("scripts/tags.sh: add a intermediate file for 'make gtags'")

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 Makefile
index 4334bcffa886,995020716343..000000000000
--- a/Makefile
+++ b/Makefile
@@@ -1413,7 -1397,8 +1413,7 @@@ MRPROPER_FILES += include/config includ
  		  *.spec
  
  # Directories & files removed with 'make distclean'
- DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
 -DISTCLEAN_DIRS  +=
+ DISTCLEAN_FILES += tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS gtags.files
  
  # clean - Delete most, but leave enough to build external modules
  #

Content of type "application/pgp-signature" skipped