Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1281429 > unrolled thread

Re: [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes

Started byDavid Miller <davem@davemloft.net>
First post2015-12-02 04:10 +0100
Last post2015-12-03 14:50 +0100
Articles 5 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  Re: [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes David Miller <davem@davemloft.net> - 2015-12-02 04:10 +0100
    Re: [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes Marcin Wojtas <mw@semihalf.com> - 2015-12-02 07:10 +0100
    Re: [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes Gregory CLEMENT <gregory.clement@free-electrons.com> - 2015-12-02 09:20 +0100
      Re: [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes David Miller <davem@davemloft.net> - 2015-12-02 21:40 +0100
        Re: [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes Gregory CLEMENT <gregory.clement@free-electrons.com> - 2015-12-03 14:50 +0100

#1281429 — Re: [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes

FromDavid Miller <davem@davemloft.net>
Date2015-12-02 04:10 +0100
SubjectRe: [PATCH v4 net 0/6] Marvell Armada XP/370/38X Neta fixes
Message-ID<qB5XQ-1w8-11@gated-at.bofh.it>
From: Marcin Wojtas <mw@semihalf.com>
Date: Mon, 30 Nov 2015 13:27:40 +0100

> I'm sending v4 with corrected commit log of the last patch, in order
> to avoid possible conflicts between the branches as suggested by
> Gregory Clement.

Series applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1281465

FromMarcin Wojtas <mw@semihalf.com>
Date2015-12-02 07:10 +0100
Message-ID<qB8M1-3nY-3@gated-at.bofh.it>
In reply to#1281429
2015-12-02 4:03 GMT+01:00 David Miller <davem@davemloft.net>:
> From: Marcin Wojtas <mw@semihalf.com>
> Date: Mon, 30 Nov 2015 13:27:40 +0100
>
>> I'm sending v4 with corrected commit log of the last patch, in order
>> to avoid possible conflicts between the branches as suggested by
>> Gregory Clement.
>
> Series applied, thanks.

Thanks, a lot,
Marcin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1281514

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2015-12-02 09:20 +0100
Message-ID<qBaNQ-4B0-13@gated-at.bofh.it>
In reply to#1281429
Hi David,
 
 On mer., déc. 02 2015, David Miller <davem@davemloft.net> wrote:

> From: Marcin Wojtas <mw@semihalf.com>
> Date: Mon, 30 Nov 2015 13:27:40 +0100
>
>> I'm sending v4 with corrected commit log of the last patch, in order
>> to avoid possible conflicts between the branches as suggested by
>> Gregory Clement.
>
> Series applied, thanks.

Could you confirm that you don't apply the last patch?

I would prefer applying it on my tree to avoid merge conflict during the
merge windows.

Thanks,

Gregory


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1282354

FromDavid Miller <davem@davemloft.net>
Date2015-12-02 21:40 +0100
Message-ID<qBmlY-3G3-7@gated-at.bofh.it>
In reply to#1281514
From: Gregory CLEMENT <gregory.clement@free-electrons.com>
Date: Wed, 02 Dec 2015 09:16:06 +0100

> Hi David,
>  
>  On mer., déc. 02 2015, David Miller <davem@davemloft.net> wrote:
> 
>> From: Marcin Wojtas <mw@semihalf.com>
>> Date: Mon, 30 Nov 2015 13:27:40 +0100
>>
>>> I'm sending v4 with corrected commit log of the last patch, in order
>>> to avoid possible conflicts between the branches as suggested by
>>> Gregory Clement.
>>
>> Series applied, thanks.
> 
> Could you confirm that you don't apply the last patch?

If I say it's applied then it's applied, and if you don't like it then
you'll have to submit a revert patch against my tree or similar.

You know you could just check my tree instead of asking.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1283056

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2015-12-03 14:50 +0100
Message-ID<qBCqL-5Om-7@gated-at.bofh.it>
In reply to#1282354
Hi David,
 
 On mer., déc. 02 2015, David Miller <davem@davemloft.net> wrote:

> From: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Date: Wed, 02 Dec 2015 09:16:06 +0100
>
>> Hi David,
>>  
>>  On mer., déc. 02 2015, David Miller <davem@davemloft.net> wrote:
>> 
>>> From: Marcin Wojtas <mw@semihalf.com>
>>> Date: Mon, 30 Nov 2015 13:27:40 +0100
>>>
>>>> I'm sending v4 with corrected commit log of the last patch, in order
>>>> to avoid possible conflicts between the branches as suggested by
>>>> Gregory Clement.
>>>
>>> Series applied, thanks.
>> 
>> Could you confirm that you don't apply the last patch?
>
> If I say it's applied then it's applied, and if you don't like it then
> you'll have to submit a revert patch against my tree or similar.
>
> You know you could just check my tree instead of asking.

Well I was very surprised that you applied a patch in a subsystem that
you do not maintain. As written on the lines just below yours, the
purpose of this v4 was to make clear that the last patch is not for the
net subsystem but for the arm/mvebu one.

As this series will be part of the next rc, then I hope we won't have
conflicts during next merge.

Gregory


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web