linux-next: manual merge of the reset tree with the arm-soc tree
diff mbox series

Message ID 20210125082837.49db69eb@canb.auug.org.au
State New, archived
Headers show
Series
  • linux-next: manual merge of the reset tree with the arm-soc tree
Related show

Commit Message

Stephen Rothwell Jan. 24, 2021, 9:28 p.m. UTC
Hi all,

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

  drivers/reset/Kconfig

between commit:

  89d4f98ae90d ("ARM: remove zte zx platform")

from the arm-soc tree and commit:

  def26913b66f ("reset: simple: add BCM4908 MISC PCIe reset controller support")

from the reset 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.

Patch
diff mbox series

diff --cc drivers/reset/Kconfig
index 8dd99ca2192c,752bef7e564f..000000000000
--- a/drivers/reset/Kconfig