From: Coly Li <colyli@suse.de>
To: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
Cc: Lukasz Florczak <lukasz.florczak@linux.intel.com>,
jes@trained-monkey.org, linux-raid@vger.kernel.org
Subject: Re: [PATCH 2/2] mdadm: Update config man regarding default files and multi-keyword behavior.
Date: Wed, 16 Mar 2022 00:43:57 +0800 [thread overview]
Message-ID: <8ee252df-3ee2-36b0-7c4e-ef1f9c8e6f49@suse.de> (raw)
In-Reply-To: <20220315170006.00005871@linux.intel.com>
On 3/16/22 12:00 AM, Mariusz Tkaczyk wrote:
> On Tue, 15 Mar 2022 17:57:09 +0800
> Coly Li <colyli@suse.de> wrote:
>
>> On 3/15/22 4:55 PM, Lukasz Florczak wrote:
>>> Simplify default and alternative config file and directory location
>>> references from mdadm(8) as references to mdadm.conf(5). Add FILE
>>> section in config man and explain order and conditions in which
>>> default and alternative config files and directories are used.
>>>
>>> Update config man behavior regarding parsing order when multiple
>>> keywords/config files are involved.
>>>
>>> Additionally add missing HOMECLUSTER keyword description.
>>>
>>> Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
>>
>> Hi Lukasz,
>>
>>
>> This patch doesn't apply on branch 20220315-testing of the mdadm-CI
>> tree, could you please rebase this series on
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/colyli/mdadm.git
>> 20220315-testing
>>
>> Then I will continue to test them.
>>
> Hi Coly,
> This is great to see that something is happening in upstream :)
>
> I can see that you created branch where some patches were merged and
> now you are reporting conflicts now. Our patches are based on last
> mdadm commit (which is mdadm-4.2 ).
> IMO you should try to apply them first on latest master and later
> cherry-pick/ rebase them on top of your testing branch. This should
> automatically resolve most of conflicts. Could you try that?
The testing branch is updated to latest mdadm upstream. Indeed the
conflict is about blank line as I see, e.g. it removes some \t from
empty line, but such issue was removed in latest upstream.
Ineed I can fix the conflict, but I don't know how to make you update
the change from my side. Does it work if I sand you a diff of the patch?
Thanks.
Coly Li
next prev parent reply other threads:[~2022-03-15 16:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 8:55 [PATCH 0/2] Manual improvements Lukasz Florczak
2022-03-15 8:55 ` [PATCH 1/2] mdadm: Respect config file location in man Lukasz Florczak
2022-03-15 12:39 ` Paul Menzel
2022-03-16 12:03 ` Lukasz Florczak
2022-03-16 12:09 ` Paul Menzel
2022-03-15 8:55 ` [PATCH 2/2] mdadm: Update config man regarding default files and multi-keyword behavior Lukasz Florczak
2022-03-15 9:57 ` Coly Li
2022-03-15 16:00 ` Mariusz Tkaczyk
2022-03-15 16:43 ` Coly Li [this message]
2022-03-16 8:52 ` Mariusz Tkaczyk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8ee252df-3ee2-36b0-7c4e-ef1f9c8e6f49@suse.de \
--to=colyli@suse.de \
--cc=jes@trained-monkey.org \
--cc=linux-raid@vger.kernel.org \
--cc=lukasz.florczak@linux.intel.com \
--cc=mariusz.tkaczyk@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).