linux-kernel - Re: [PATCH v2 0/5] Update the OF unittest and some small fix

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]

Message-ID: <CACxGe6uZAXmoztE5u2W8iqEoS2YBrdZNNjgRMsijx80xLiggvw@mail.gmail.com>
Date:	Sun, 29 Mar 2015 18:24:35 +0100
From:	Grant Likely <grant.likely@...aro.org>
To:	Rob Herring <robherring2@...il.com>,
	Wang Long <long.wanglong@...wei.com>
Cc:	Gaurav Minocha <gaurav.minocha.os@...il.com>,
	Rob Herring <robh+dt@...nel.org>,
	Pantelis Antoniou <pantelis.antoniou@...sulko.com>,
	Pawel Moll <pawel.moll@....com>,
	Mark Rutland <mark.rutland@....com>,
	Kumar Gala <galak@...eaurora.org>,
	"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	peifeiyue@...wei.com, Ian Campbell <ijc+devicetree@...lion.org.uk>
Subject: Re: [PATCH v2 0/5] Update the OF unittest and some small fix

On Sat, Mar 28, 2015 at 1:23 PM, Grant Likely <grant.likely@...aro.org> wrote:
> On Tue, 24 Mar 2015 23:43:43 -0500
> , Rob Herring <robherring2@...il.com>
>  wrote:
>> On Wed, Mar 11, 2015 at 3:36 AM, Wang Long <long.wanglong@...wei.com> wrote:
>> > This series patches do some small fixes in drivers/of/unittest.c,
>> > and update the Documenttion.
>> >
>> > At last, replace selftest with unittest in the c, dtsi
>> > and binding files.
>> >
>> > * v2 <- v1:
>> >         - According to Gaurav's advice. make the rename
>> >         file patch correctly.
>> >
>> > Wang Long (5):
>> >   of/unittest: remove the duplicate of_changeset_init
>> >   of/unittest: Fix the wrong expected value in
>> >     of_selftest_property_string
>> >   Documentation: update the of_selftest.txt
>> >   Documentation: rename of_selftest.txt to of_unittest.txt
>> >   of/unittest: replace 'selftest' with 'unittest'
>>
>> I've applied the series. Thanks.
>
> Hmmm, I neglected to update my git tree before getting on an airplane
> and merging patches. I may have pushed out conflicts to my tree. If I've
> done so, then I'll fix it up this weekend.

I think I've got it sorted out now. I've dropped the duplicates from
my tree and merged rob's tree into mine. The merge conflicts weren't
as serious as I feared they world be. It's pushed out now.

g.
--
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/