[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <AANLkTi=j3CAhHExdEPuV6WGkgegizBE7Eyu7BSYQrgE+@mail.gmail.com>
Date: Thu, 28 Oct 2010 15:46:47 -0400
From: Mike Frysinger <vapier.adi@...il.com>
To: Michal Marek <mmarek@...e.cz>
Cc: Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>,
Michael Holzheu <holzheu@...ux.vnet.ibm.com>,
tabbott@...lice.com, vda.linux@...glemail.com, hpa@...ux.intel.com,
akpm@...ux-foundation.org, linux-kernel@...r.kernel.org,
heiko.carstens@...ibm.com, schwidefsky@...ibm.com,
Sam Ravnborg <sam@...nborg.org>
Subject: Re: [PATCH] initramfs: Fix build break on symbol-prefixed archs
On Thu, Oct 28, 2010 at 08:08, Michal Marek wrote:
> On 28.10.2010 01:58, Mike Frysinger wrote:
>> On Wed, Oct 27, 2010 at 19:33, Michal Marek wrote:
>>> On 28.10.2010 01:10, Mike Frysinger wrote:
>>>> On Wed, Oct 27, 2010 at 18:46, Michal Marek wrote:
>>>>> Sorry I missed this thread. So your last patch
>>>>> (http://lkml.org/lkml/2010/10/19/488) did fix the Blackfin build
>>>>> failure? Can you submit it with a proper Signed-off-by and changelog?
>>>>
>>>> it shouldnt be a sep change. it should be squashed into the broken
>>>> one so that the result works.
>>>
>>> The breakage already happened and I don't want to rewind the branch now.
>>
>> if it isnt going to be merged until 2.6.38 merge window, i dont see
>> what the problem is with squashing a change into it.
>
> kbuild-2.6.git#kbuild has stuff meant for 2.6.37, In fact I'll be
> sending a pull request to Linus today. It would be great to sort the
> Blackfin & h8300 build failure first, though.
so you sent a pull request to Linus knowing full well that the
contents of your merge will completely break two architectures ?
>> The previous commit works and
>>> the next will do as well if you submit the patch.
>>
>> if my change is going in after your bad commit, then you can squash it
>> with a simple `git commit --amend`.
>
> I know how to rewrite the branch, I just don't want to do it needlessly
> so that 'git pull' still works for people tracking the branch.
keeping git bisect sane is not what i would classify as "needlessly"
at any rate, i'm leaving now for vacation and wont be back for like
two weeks. feel free to take any of the changes i posted earlier
under whatever authorship/sob you want.
-mike
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists