* [PATCH 1/1] Arch: mips: Delete Makefile.rej
@ 2012-09-12 22:50 Tracey Dent
2012-09-12 23:15 ` richard -rw- weinberger
0 siblings, 1 reply; 4+ messages in thread
From: Tracey Dent @ 2012-09-12 22:50 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, blogic, Tracey Dent
Makefile.rej should not be there. That was introduced
in commit 3fa68afc3d774bab1e91cbb3a3cdd1e36068ee95 .
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
---
arch/mips/lantiq/xway/Makefile.rej | 5 -----
1 file changed, 5 deletions(-)
delete mode 100644 arch/mips/lantiq/xway/Makefile.rej
diff --git a/arch/mips/lantiq/xway/Makefile.rej b/arch/mips/lantiq/xway/Makefile.rej
deleted file mode 100644
index 8066520..0000000
--- a/arch/mips/lantiq/xway/Makefile.rej
+++ /dev/null
@@ -1,5 +0,0 @@
---- arch/mips/lantiq/xway/Makefile
-+++ arch/mips/lantiq/xway/Makefile
-@@ -1 +1 @@
--obj-y := prom.o sysctrl.o clk.o reset.o gpio.o dma.o
-+obj-y := prom.o sysctrl.o clk.o reset.o dma.o
--
1.7.10.rc4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] Arch: mips: Delete Makefile.rej
2012-09-12 22:50 [PATCH 1/1] Arch: mips: Delete Makefile.rej Tracey Dent
@ 2012-09-12 23:15 ` richard -rw- weinberger
2012-09-13 8:24 ` John Crispin
0 siblings, 1 reply; 4+ messages in thread
From: richard -rw- weinberger @ 2012-09-12 23:15 UTC (permalink / raw)
To: Tracey Dent; +Cc: akpm, linux-kernel, blogic
On Thu, Sep 13, 2012 at 12:50 AM, Tracey Dent <tdent48227@gmail.com> wrote:
> Makefile.rej should not be there. That was introduced
> in commit 3fa68afc3d774bab1e91cbb3a3cdd1e36068ee95 .
Linus' tree does not contain such a commit id.
--
Thanks,
//richard
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] Arch: mips: Delete Makefile.rej
2012-09-12 23:15 ` richard -rw- weinberger
@ 2012-09-13 8:24 ` John Crispin
2012-09-16 3:34 ` Tracey Dent
0 siblings, 1 reply; 4+ messages in thread
From: John Crispin @ 2012-09-13 8:24 UTC (permalink / raw)
To: akpm
Cc: richard -rw- weinberger, Tracey Dent, linux-kernel, Ralf Baechle,
linux-mips
On 13/09/12 01:15, richard -rw- weinberger wrote:
> On Thu, Sep 13, 2012 at 12:50 AM, Tracey Dent<tdent48227@gmail.com> wrote:
>> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] Arch: mips: Delete Makefile.rej
2012-09-13 8:24 ` John Crispin
@ 2012-09-16 3:34 ` Tracey Dent
0 siblings, 0 replies; 4+ messages in thread
From: Tracey Dent @ 2012-09-16 3:34 UTC (permalink / raw)
To: John Crispin
Cc: akpm, richard -rw- weinberger, linux-kernel, Ralf Baechle, linux-mips
On 9/13/12, John Crispin <blogic@openwrt.org> wrote:
> On 13/09/12 01:15, richard -rw- weinberger wrote:
>> On Thu, Sep 13, 2012 at 12:50 AM, Tracey Dent<tdent48227@gmail.com>
>> 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-16 3:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-12 22:50 [PATCH 1/1] Arch: mips: Delete Makefile.rej Tracey Dent
2012-09-12 23:15 ` richard -rw- weinberger
2012-09-13 8:24 ` John Crispin
2012-09-16 3:34 ` Tracey Dent
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).