Messages in this thread | | | Date | Thu, 28 Jan 2021 17:03:31 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the gpio-brgl tree with the arm-soc tree |
| |
Hi all,
Today's linux-next merge of the gpio-brgl tree got a conflict in:
arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
between commit:
4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC")
from the arm-soc tree and commit:
08bc3941b6a4 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver")
from the gpio-brgl 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.
-- Cheers, Stephen Rothwell
diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts index 37da418393e0,950010a290f0..000000000000 --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts @@@ -42,7 -42,6 +42,11 @@@ clock-names = "apb_pclk"; }; +&wdt { + status = "okay"; + clocks = <&wdt_clk>; +}; ++ + &gpio { + status = "okay"; + }; [unhandled content-type:application/pgp-signature] | |