From: Stephen Rothwell <sfr@canb.auug.org.au> To: Bartosz Golaszewski <brgl@bgdev.pl>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>, ARM <linux-arm-kernel@lists.infradead.org> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> Subject: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree Date: Thu, 28 Jan 2021 17:03:31 +1100 [thread overview] Message-ID: <20210128170331.4f2ac87b@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1193 bytes --] 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"; + }; [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Bartosz Golaszewski <brgl@bgdev.pl>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>, ARM <linux-arm-kernel@lists.infradead.org> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>, Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree Date: Thu, 28 Jan 2021 17:03:31 +1100 [thread overview] Message-ID: <20210128170331.4f2ac87b@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 1193 bytes --] 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"; + }; [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2021-01-28 6:04 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-28 6:03 Stephen Rothwell [this message] 2021-01-28 6:03 ` linux-next: manual merge of the gpio-brgl tree with the arm-soc tree Stephen Rothwell 2021-02-09 10:01 ` Geert Uytterhoeven 2021-02-09 10:01 ` Geert Uytterhoeven 2021-02-09 11:35 ` Arnd Bergmann 2021-02-09 11:35 ` Arnd Bergmann 2021-02-10 5:33 ` nobuhiro1.iwamatsu 2021-02-10 5:33 ` nobuhiro1.iwamatsu 2023-05-30 4:19 Stephen Rothwell 2023-05-30 4:19 ` Stephen Rothwell 2023-05-30 9:28 ` Arnd Bergmann 2023-05-30 9:28 ` Arnd Bergmann 2023-05-30 9:35 ` Bartosz Golaszewski 2023-05-30 9:35 ` Bartosz Golaszewski 2023-05-30 9:49 ` Linus Walleij 2023-05-30 9:49 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210128170331.4f2ac87b@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=arnd@arndb.de \ --cc=bgolaszewski@baylibre.com \ --cc=brgl@bgdev.pl \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=nobuhiro1.iwamatsu@toshiba.co.jp \ --cc=olof@lixom.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.