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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Sat, 15 Sep 2012 23:34:03 -0400
From:	Tracey Dent <tdent48227@...il.com>
To:	John Crispin <blogic@...nwrt.org>
Cc:	akpm@...ux-foundation.org,
	richard -rw- weinberger <richard.weinberger@...il.com>,
	linux-kernel@...r.kernel.org, Ralf Baechle <ralf@...ux-mips.org>,
	"linux-mips@...ux-mips.org" <linux-mips@...ux-mips.org>
Subject: Re: [PATCH 1/1] Arch: mips: Delete Makefile.rej

On 9/13/12, John Crispin <blogic@...nwrt.org> wrote:
> On 13/09/12 01:15, richard -rw- weinberger wrote:
>> On Thu, Sep 13, 2012 at 12:50 AM, Tracey Dent<tdent48227@...il.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
>
--
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/