| Message ID | 20231012101434.1e5e7340@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the imx-mxs tree with the net tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Thu, Oct 12, 2023 at 10:14:34AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the imx-mxs tree got a conflict in: > > arch/arm64/boot/dts/freescale/imx93.dtsi > > between commit: > > 23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR") Marc, Is there any particular reason why this dts change needs to go via net tree? Otherwise, could you drop it from net and let it go via i.MX tree? Shawn > > from the net tree and commit: > > d34d2aa594d0 ("arm64: dts: imx93: add edma1 and edma2") > > from the imx-mxs 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.
On 12.10.2023 08:43:56, Shawn Guo wrote: > On Thu, Oct 12, 2023 at 10:14:34AM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the imx-mxs tree got a conflict in: > > > > arch/arm64/boot/dts/freescale/imx93.dtsi > > > > between commit: > > > > 23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR") > > Marc, > > Is there any particular reason why this dts change needs to go via net > tree? Otherwise, could you drop it from net and let it go via i.MX tree? As far as I understand the problem, the imx93 A0 silicon was supposed to have a functional auto-stop mode for the flexcan peripheral. But wakeup stress tests show that it doesn't work reliable. So this and the following patch switched the imx93 back to the "old" stop-mode via GPR, which needs a DT update. | 23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR") | 63ead535570f ("can: flexcan: remove the auto stop mode for IMX93") See the description of 63ead535570f for more details. Marc
diff --cc arch/arm64/boot/dts/freescale/imx93.dtsi index dcf6e4846ac9,4a0d604fd0db..000000000000 --- a/arch/arm64/boot/dts/freescale/imx93.dtsi
Hi all, Today's linux-next merge of the imx-mxs tree got a conflict in: arch/arm64/boot/dts/freescale/imx93.dtsi between commit: 23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR") from the net tree and commit: d34d2aa594d0 ("arm64: dts: imx93: add edma1 and edma2") from the imx-mxs 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.