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

On 13/09/12 01:15, richard -rw- weinberger wrote:

On Thu, Sep 13, 2012 at 12:50 AM, Tracey Dent[off-list ref]  wrote:

quoted

Makefile.rej should not be there. That was introduced
in commit 3fa68afc3d774bab1e91cbb3a3cdd1e36068ee95 .

Linus' tree does not contain such a commit id.

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.

Thanks,
John

On 9/13/12, John Crispin [off-list ref] wrote:

On 13/09/12 01:15, richard -rw- weinberger wrote:

quoted

On Thu, Sep 13, 2012 at 12:50 AM, Tracey Dent[off-list ref]
wrote:

quoted

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