Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1451010 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-07-27 05:00 +0200 |
| Last post | 2016-07-27 22:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-27 05:00 +0200
Re: linux-next: manual merge of the net-next tree with the arm-soc tree Duc Dang <dhdang@apm.com> - 2016-07-27 22:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-07-27 05:00 +0200 |
| Subject | linux-next: manual merge of the net-next tree with the arm-soc tree |
| Message-ID | <rZneF-22x-1@gated-at.bofh.it> |
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.
--
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;
[toc] | [next] | [standalone]
| From | Duc Dang <dhdang@apm.com> |
|---|---|
| Date | 2016-07-27 22:50 +0200 |
| Message-ID | <rZDWa-4k0-27@gated-at.bofh.it> |
| In reply to | #1451010 |
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.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web