diff mbox series

linux-next: manual merge of the phy-next tree with the phy tree

Message ID 20230925131022.24514a20@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the phy-next tree with the phy tree |

Commit Message

Stephen Rothwell Sept. 25, 2023, 3:10 a.m. UTC 
  Hi all,

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

  drivers/phy/qualcomm/phy-qcom-m31.c

between commits:

  5f7cd740a6b6 ("phy: qcom: phy-qcom-m31: fix wrong pointer pass to PTR_ERR()")
  426e05ce126e ("phy: qcom: phy-qcom-m31: change m31_ipq5332_regs to static")

from the phy tree and commits:

  90f7af497a78 ("phy: qcom: m31: Fix indentation issues")
  68320e35f8cb ("phy: qcom-m31: Add compatible, phy init sequence for IPQ5018")

from the phy-next 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.
diff mbox series

Patch

diff --cc drivers/phy/qualcomm/phy-qcom-m31.c
index 5cb7e79b99b3,d5af4dde6960..000000000000
--- a/drivers/phy/qualcomm/phy-qcom-m31.c