From: Dinh Nguyen <dinh.linux@gmail.com>
To: Arnd Bergmann <arnd@arndb.de>, dinguyen@altera.com
Cc: davem@davemloft.net, peppe.cavallaro@st.com,
srinivas.kandagatla@st.com, netdev@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, arm@kernel.org,
robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
ijc+devicetree@hellion.org.uk, galak@codeaurora.org,
devicetree@vger.kernel.org
Subject: Re: [PATCH 0/3] Fix stmmac-socfpga allmodconfig breakage in arm-soc
Date: Wed, 26 Mar 2014 19:05:13 -0500 [thread overview]
Message-ID: <53336B39.3080209@gmail.com> (raw)
In-Reply-To: <201403262254.41069.arnd@arndb.de>
On 03/26/2014 04:54 PM, Arnd Bergmann wrote:
> On Wednesday 26 March 2014, dinguyen@altera.com wrote:
>> From: Dinh Nguyen <dinguyen@altera.com>
>>
>> Hi,
>>
>> These 3 patches are based on Arnd's patch to fix the allmodconfig for the
>> dwmac-socfpga implementation. I just broke the patch out into drivers,
>> dts, and dts documentation.
>>
>> The original patch is here:
>> http://lists.infradead.org/pipermail/linux-arm-kernel/2014-March/241518.html
>>
>> Arnd mentioned that he was thinking about just removing the dwmac-socfpga
>> and send out the new verion to the netdev tree, but I haven't seen it. So
>> just in case this solution might work, here are the patches.
>>
>> These patches are based on arm-soc/for-next.
>
> Hi Dinh,
>
> Thanks for putting these patches together. The problem I see with these
> is that we have multiple conflicts between my changes and the other
> patches that went into the netdev tree.
>
> Originally, the idea was that David Miller gave his Ack to have
> the patches merged through arm-soc, but I think that was a mistake,
> and they should have been treated like the other patches for
> the same driver, i.e. put the driver and binding changes into
> netdev, and the dt changes into arm-soc.
>
> If I apply your patches on top of the next/drivers branch, we get
> conflicts for a handful of files, and get Linus to resolve them.
> I tried applying my patch on Sunday, but backed it out because
> of this.
>
> My preferred solution at this point would be to revert the driver
> addition in the arm-soc tree and have David put the new version
> in, but I don't know if he still takes patches like that for 3.15.
>
That's fine. Do you mind if I send out a fresh patch based on the netdev
tree? If there is still for 3.15, otherwise, going for 3.16 is fine.
Dinh
> Arnd
>
next prev parent reply other threads:[~2014-03-27 0:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-25 23:34 [PATCH 0/3] Fix stmmac-socfpga allmodconfig breakage in arm-soc dinguyen-EIB2kfCEclfQT0dZR+AlfA
[not found] ` <1395790482-3957-1-git-send-email-dinguyen-EIB2kfCEclfQT0dZR+AlfA@public.gmane.org>
2014-03-25 23:34 ` [PATCH 1/3] net: stmmac: improve binding and fix build dinguyen-EIB2kfCEclfQT0dZR+AlfA
2014-03-25 23:34 ` [PATCH 2/3] dts: socfpga: Fix ethernet entries for the stmmac dinguyen
2014-03-26 22:12 ` Gerhard Sittig
2014-03-27 0:05 ` Dinh Nguyen
2014-03-25 23:34 ` [PATCH 3/3] dts: documentation: Update documentation for the stmmac ethernet controller dinguyen
2014-03-26 21:54 ` [PATCH 0/3] Fix stmmac-socfpga allmodconfig breakage in arm-soc Arnd Bergmann
2014-03-27 0:05 ` Dinh Nguyen [this message]
[not found] ` <53336B39.3080209-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-03-27 0:29 ` Arnd Bergmann
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=53336B39.3080209@gmail.com \
--to=dinh.linux@gmail.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dinguyen@altera.com \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=pawel.moll@arm.com \
--cc=peppe.cavallaro@st.com \
--cc=robh+dt@kernel.org \
--cc=srinivas.kandagatla@st.com \
/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).