linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Duc Dang <dhdang@apm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
	netdev <netdev@vger.kernel.org>, Olof Johansson <olof@lixom.net>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-arm <linux-arm-kernel@lists.infradead.org>,
	linux-next@vger.kernel.org,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Iyappan Subramanian <isubramanian@apm.com>
Subject: Re: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Wed, 27 Jul 2016 13:41:41 -0700	[thread overview]
Message-ID: <CADaLNDn_eqKtUhYUQPOBOxt__8FukZmcnKWZk4QxWJQF4N4s2A@mail.gmail.com> (raw)
In-Reply-To: <20160727125342.1902ece1@canb.auug.org.au>

On Tue, Jul 26, 2016 at 7:53 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
>   arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
>
> between commit:
>
>   cafc4cd0c8b8 ("arm64: dts: apm: Use lowercase consistently for hex constants")
>
> from the arm-soc tree and commit:
>
>   8e694cd2762c ("dtb: xgene: Add MDIO node")
>
> 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.

Thanks for taking care of this, Stephen. The fix looks fine.

>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> index 21028b145d91,2e1e5daa1dc7..000000000000
> --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> @@@ -628,9 -636,9 +636,9 @@@
>                 sgenet0: ethernet@1f610000 {
>                         compatible = "apm,xgene2-sgenet";
>                         status = "disabled";
> -                       reg = <0x0 0x1f610000 0x0 0x10000>,
> +                       reg = <0x0 0x1f610000 0x0 0xd100>,
>  -                            <0x0 0x1f600000 0x0 0Xd100>,
>  -                            <0x0 0x20000000 0x0 0X20000>;
>  +                            <0x0 0x1f600000 0x0 0xd100>,
>  +                            <0x0 0x20000000 0x0 0x20000>;
>                         interrupts = <0 96 4>,
>                                      <0 97 4>;
>                         dma-coherent;
Regards,
Duc Dang.

  reply	other threads:[~2016-07-27 20:42 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-27  2:53 linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell
2016-07-27 20:41 ` Duc Dang [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-07-13  2:55 Stephen Rothwell
2021-02-16  2:04 Stephen Rothwell
2021-02-16  2:20 ` nobuhiro1.iwamatsu
2021-02-16 10:11   ` Arnd Bergmann
2021-02-16 11:53 ` Yoshihiro Shimoda
2021-02-16 12:28   ` Naresh Kamboju
2021-02-16 13:47     ` nobuhiro1.iwamatsu
2021-02-16 14:21       ` nobuhiro1.iwamatsu
2021-02-16 21:17   ` Stephen Rothwell
2021-02-17  0:23     ` Yoshihiro Shimoda
2019-09-05  3:42 Stephen Rothwell
2016-12-01  1:31 Stephen Rothwell
2016-06-21  1:18 Stephen Rothwell
2016-06-21  8:56 ` Arnd Bergmann
2016-05-10  0:18 Stephen Rothwell
2015-01-27  2:04 Stephen Rothwell
2014-09-25  2:58 Stephen Rothwell
2014-09-10  4:48 Stephen Rothwell
2014-09-10  8:06 ` Arnd Bergmann
2014-03-31  2:24 Stephen Rothwell
2012-01-04  4:06 Stephen Rothwell
2012-01-04  4:46 ` Richard Zhao

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=CADaLNDn_eqKtUhYUQPOBOxt__8FukZmcnKWZk4QxWJQF4N4s2A@mail.gmail.com \
    --to=dhdang@apm.com \
    --cc=arnd@arndb.de \
    --cc=bhelgaas@google.com \
    --cc=davem@davemloft.net \
    --cc=isubramanian@apm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).