| Message ID | 20240418113403.06e5ceed@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the stm32 tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc drivers/of/property.c index dfdda94834d5,cc064151853e..000000000000 --- a/drivers/of/property.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/of/property.c between commit: 6a15368c1c6d ("of: property: fw_devlink: Add support for "access-controller"") from the stm32 tree and commit: 93c0d8c0ac30 ("of: property: Add fw_devlink support for pse parent") from the net-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.