[lkml]   [2022]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the pci tree with the arm-soc tree
Hi all,

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


between commit:

5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")

from the arm-soc tree and commit:

4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")

from the pci tree.

I didn't know how to fix this up, so I just used the latter (and so lost
the addition of "ecam").

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2022-12-04 23:58    [W:0.396 / U:0.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site