On Wed, 16 Mar 2022 00:43:57 +0800 Coly Li <colyli@xxxxxxx> wrote: > On 3/16/22 12:00 AM, Mariusz Tkaczyk wrote: > > On Tue, 15 Mar 2022 17:57:09 +0800 > > Coly Li <colyli@xxxxxxx> 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@xxxxxxxxxxxxxxx> > >> > >> 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? > Hi Coly, Resolving conflicts is a normal maintenance work. Just add you sign-off and modify whatever is necessary, ofc. if are sure that it is correct. If not, then ask owner to do that. IMO you should send a note that you resolved something, we can verify it ourselves in commit later. Thanks, Mariusz
