Re: [PATCH 1/1] Arch: mips: Delete Makefile.rej

From: Tracey Dent
Date: Sat Sep 15 2012 - 23:33:59 EST


On 9/13/12, John Crispin <blogic@xxxxxxxxxxx> wrote:
> On 13/09/12 01:15, richard -rw- weinberger wrote:
>> On Thu, Sep 13, 2012 at 12:50 AM, Tracey Dent<tdent48227@xxxxxxxxx>
>> wrote:
>>> Makefile.rej should not be there. That was introduced
>>> in commit 3fa68afc3d774bab1e91cbb3a3cdd1e36068ee95 .
>> Linus' tree does not contain such a commit id.
>>

Your right but its in linux-next

>
> Hi,
>
> my bad .. its in linux-next (3fa68afc3d774bab1e91cbb3a3cdd1e36068ee95)
> and comes from the upstream-sfr tree on linux-mips.org
>
> i will talk to Ralf and fix it inside the lmo tree.

Okay

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