linux-next: build failure after merge of the phy-next tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

After merging the phy-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/phy/qualcomm/phy-qcom-qmp-pcie.c:2378:38: error: redefinition of 'qmp_pcie_offsets_v5_20'
 2378 | static const struct qmp_pcie_offsets qmp_pcie_offsets_v5_20 = {
      |                                      ^~~~~~~~~~~~~~~~~~~~~~
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c:2357:38: note: previous definition of 'qmp_pcie_offsets_v5_20' with type 'const struct qmp_pcie_offsets'
 2357 | static const struct qmp_pcie_offsets qmp_pcie_offsets_v5_20 = {
      |                                      ^~~~~~~~~~~~~~~~~~~~~~

Caused by commits

  a05b6d5135ec ("phy: qcom-qmp-pcie: add support for sa8775p")
  64adc0bf06ad ("phy: qcom-qmp-pcie: populate offsets configuration")

I have used the phy-next tree from next-20230817 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp4i3Xi3WfQ7.pgp
Description: OpenPGP digital signature