On 21/02/2020 16:37, Douglas Gilbert wrote: > On 2020-02-21 4:49 a.m., Johannes Thumshirn wrote: >> On 20/02/2020 21:09, Douglas Gilbert wrote: >>> +MODULE_PARM_DESC(opt_xferlen_exp, "optimal transfer length granularity exponent (def=physblk_exp)"); >>> MODULE_PARM_DESC(opts, "1->noise, 2->medium_err, 4->timeout, 8->recovered_err... (def=0)"); >>> MODULE_PARM_DESC(physblk_exp, "physical block exponent (def=0)"); >>> -MODULE_PARM_DESC(opt_xferlen_exp, "optimal transfer length granularity exponent (def=physblk_exp)"); >> >> Unrelated change, isn't it? > > Yes, it should be in the re-arrange in alphabetical order patch. Do you > know a one-liner (or two or ...) for pulling a line out of one patch > and placing it in another with git :-) From the top of my head (haven't tested it right now) I'd do git rebase -i $BASE_BRANCH <mark this patch as 'edit'> git reset --soft HEAD^ git add -p <add hunk #1> git commit git add -p <add other hunks> git commit git rebase --continue This /should/ do the trick, but someone please speak up if there's an error in there. Byte, Johannes
