On 2020/6/14 10:28, Xiao Ni wrote:
Hi Yufen It looks like there is something wrong. I try to apply these patches based on latest upstream, but it fails. [xni@xiao md]$ git am big-page/\[PATCH\ v4\ 01_15\]\ md_raid456\:\ covert\ macro\ define\ of\ STRIPE_\*\ as\ members\ of\ struct\ r5conf\ -\ Yufen\ Yu\ \<yuyufen@xxxxxxxxxx\>\ -\ 2020-06-12\ 1942.eml Applying: md/raid456: covert macro define of STRIPE_* as members of struct r5conf error: patch failed: drivers/md/raid5.c:2267 error: drivers/md/raid5.c: patch does not apply Patch failed at 0001 md/raid456: covert macro define of STRIPE_* as members of struct r5conf The copy of the patch that failed is found in: .git/rebase-apply/patch [xni@xiao md]$ cat .git/config snip.. [remote "origin"] url = https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git [xni@xiao md]$ git branch master * md-next
Sorry for this. I have forgotten to rebase my own development branch with latest upstream. I will solve it in next version. Thanks, Yufen
