From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Fri, 16 Dec 2011 11:21:30 +0100 Subject: [GIT PULL] at91: drivers for 3.3 In-Reply-To: References: <4EEA0DF6.3050408@atmel.com> Message-ID: <4EEB1BAA.9050705@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 12/16/2011 06:53 AM, Olof Johansson : > Hi, > > On Thu, Dec 15, 2011 at 7:10 AM, Nicolas Ferre wrote: >> Arnd, Olof, >> >> This is a first "drivers" part of our material for 3.3 merge window. It collects >> Ethernet drivers changes. >> One thing to note is that the macb.c driver is modified to support >> device tree. We agreed with David to drag those modifications into >> arm-soc git tree because they go on top of Jamie's work on macb-gem driver >> already in your drivers/macb-gem branch. >> >> This pull request goes on top of Linus' 3.2-rc5 commit but with additional >> dependencies with two of your branches: >> 1/ fixes (which seems already included in 3.2-rc5) >> 2/ drivers/macb-gem >> >> I had to resolve a conflict while merging the macb-gem branche with current 3.2-rc5. The >> resolution is commited into this branch. >> Tell me if you need more precision. > > The history of this branch due to the double dependencies gets a bit > awkward. Also, it seems like you in one of your merges kept the > 'default y' in NET_CADENCE that should have been removed. Well, no, this line has been added into "eccab1ec" and is in mainline since 3.2-rc3. This line have to be kept and the merge conflict is triggered during the merge of macb-gem on top of Linus' tree. BTW, this merge is already performed properly in linux-next. > Would you mind trying this instead? > > * Base this new branch on the previous macb-gem branch > * Cherry-pick the fixes from 'fixes' into the new branch if truly > needed -- I tested here and all of the patches applied cleanly. > * Then apply these patches > * For build testing before sending, merge into for-next to aggregate > with the rest of the 'fixes' changes -- it's OK that we have to do a > fixup here. > > That should give a clean branch with neat history for just these > changes. About 'fixes': Since they are in for-next, and will be in > 3.2, that dependency will be taken care of that way. > > Then send a fresh pull request for that new branch, please. Ok, I will base my "drivers" branch on top of macb-gem one and send you another pull request. Thanks, bye, -- Nicolas Ferre