From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bin Meng <bmeng.cn@gmail.com>
Date: Wed, 13 Jan 2016 17:14:44 +0800
Subject: [U-Boot] [PATCH 1/8] fdt: Fix up stdout correctly in
	fdt_fixup_stdout()
In-Reply-To: <CAPnjgZ1WpOvP-qscgQboXTVtxEwG-Vj-k61GAE9HJQO0QNrS_g@mail.gmail.com>
References: <1451551990-32165-1-git-send-email-bmeng.cn@gmail.com>
 <1451551990-32165-2-git-send-email-bmeng.cn@gmail.com>
 <CAPnjgZ0sH7ZoZAiDNX+5GBgRKat8zXg0-ST1PrTi0wd2abVNzg@mail.gmail.com>
 <CAEUhbmXFG_pVH4bwM+Jk3J8knLraHQfdYbniGzomVAmsu9EGRw@mail.gmail.com>
 <CAPnjgZ1WpOvP-qscgQboXTVtxEwG-Vj-k61GAE9HJQO0QNrS_g@mail.gmail.com>
Message-ID: <CAEUhbmVzN=hTPNvNoxsLYyfHyEXpQx0JMcXjKEzP=AXv-Z9yyg@mail.gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Simon,

On Tue, Jan 12, 2016 at 12:58 AM, Simon Glass <sjg@chromium.org> wrote:
> Hi Bin,
>
> On 10 January 2016 at 20:02, Bin Meng <bmeng.cn@gmail.com> wrote:
>> Hi Simon,
>>
>> On Fri, Jan 8, 2016 at 11:34 AM, Simon Glass <sjg@chromium.org> wrote:
>>> Hi Bin,
>>>
>>> On 31 December 2015 at 01:53, Bin Meng <bmeng.cn@gmail.com> wrote:
>>>> When CONFIG_OF_STDOUT_VIA_ALIAS is on, always fix up kernel's stdout
>>>> string with hardcoded CONFIG_CONS_INDEX.
>>>>
>>>> This actually reverts commit 3e303f748cf57fb23e8ec95ab7eac0074be50e2b
>>>> "fdt_support: Add multi-serial support for stdout fixup", as the fix
>>>
>>> In that case, could this be a revert, created with 'git revert'?
>>
>> I've never used 'git revert' command. Did you mean this commit/patch
>> should be recreated using 'git revert'? Does this matter?
>
> Well it creates a commit with a particular subject and format, which
> people are used to seeing for reverts. So if it is actually a revert,
> then yes I think you should use 'git revert'. You can edit the commit
> message to provide more detail.
>

When running 'git revert 3e303f748cf57fb23e8ec95ab7eac0074be50e2b', I got:

error: could not revert 3e303f7... fdt_support: Add multi-serial
support for stdout fixup
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

Looks it cannot be reverted cleanly using 'git revert' command. What's
the best practice here?

Regards,
Bin