Subject: linux-next: manual merge of the kbuild tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 27 Apr 2021 09:02:45 +1000

Hi all,

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

  certs/.gitignore

between commit:

  81f202315856 ("certs: add 'x509_revocation_list' to gitignore")

from Linus' tree and commit:

  8573271e6946 (".gitignore: prefix local generated files with a slash")

from the kbuild 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 certs/.gitignore
index 6cbd1f1a5837,5759643f638b..000000000000
--- a/certs/.gitignore
+++ b/certs/.gitignore
@@@ -1,3 -1,2 +1,3 @@@
  # SPDX-License-Identifier: GPL-2.0-only
- x509_certificate_list
- x509_revocation_list
+ /x509_certificate_list
++/x509_revocation_list