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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 8 Sep 2020 19:17:57 +1000

Hi all,

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

  .clang-format

between commit:

  4e4bb894467c ("clang-format: Update with the latest for_each macro list")

from Linus' tree and commits:

  7008a2f408a3 ("memblock: implement for_each_reserved_mem_region() using __next_mem_region()")
  203287621da3 ("memblock: use separate iterators for memory and reserved regions")

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 .clang-format
index badfc1ba440a,a118fdde25c1..000000000000
--- a/.clang-format
+++ b/.clang-format
@@@ -269,8 -267,7 +271,9 @@@ ForEachMacros
    - 'for_each_process_thread'
    - 'for_each_property_of_node'
    - 'for_each_registered_fb'
 +  - 'for_each_requested_gpio'
 +  - 'for_each_requested_gpio_in_range'
+   - 'for_each_reserved_mem_range'
    - 'for_each_reserved_mem_region'
    - 'for_each_rtd_codec_dais'
    - 'for_each_rtd_codec_dais_rollback'