linux-next: manual merge of the kspp tree with the kbuild tree

Stephen Rothwell
2021-08-26T06:48:19Z

[-- Attachment #1: Type: text/plain, Size: 820 bytes --]

Hi all,

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

Makefile

between commit:

389640bf8d17 ("Makefile: remove stale cc-option checks")

from the kbuild tree and commits:

2d931b634b81 ("Makefile: Enable -Warray-bounds")
7d8aac16a0a8 ("Makefile: Enable -Wzero-length-bounds")

from the kspp tree.

I fixed it up (the latter removed the line modified by the former,
so I just used the latter) 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.