On Wed, Aug 09, 2023 at 02:24:25PM +0200, Greg KH wrote:
> On Tue, Aug 08, 2023 at 10:59:40AM -0300, Alexon Oliveira wrote:
> > Fixed all CHECK: Alignment should match open parenthesis
> > and deleted the trailing whitespaces as reported by
> > checkpatch to adhere to the Linux kernel coding-style
> > guidelines.
> >
> > Signed-off-by: Alexon Oliveira <alexondunkan@xxxxxxxxx>
> > ---
> >
> > Changes in v3:
> > - Rebased against staging.git and staging-next branch, noted by Greg KH
>
> I don't think you did this as it still fails to apply for me :(
>
> Can you go through the exact steps and try again?
>
I'm pretty positive I did as you instructed me, but I think the problem
seems to be another thing:
$ git fetch origin
remote: Enumerating objects: 46, done.
remote: Counting objects: 100% (46/46), done.
remote: Compressing objects: 100% (46/46), done.
remote: Total 46 (delta 35), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (46/46), 33.97 KiB | 135.00 KiB/s, done.
>From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
1422b526fba9..c3bdcb94967d staging-testing -> origin/staging-testing
$ git rebase -i origin/staging-testing
warning: skipped previously applied commit 7d5ce25fb4c3
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
^[[AERROR: trailing whitespace
#158: FILE: drivers/staging/vme_user/vme.c:566:
+^I^I unsigned long long vme_base, unsigned long long size, $
ERROR: trailing whitespace
#180: FILE: drivers/staging/vme_user/vme.c:617:
+^I^I unsigned long long *vme_base, unsigned long long *size, $
ERROR: trailing whitespace
#244: FILE: drivers/staging/vme_user/vme.c:1048:
+^I^I^I^I^I u32 aspace, u32 cycle, $
ERROR: trailing whitespace
#311: FILE: drivers/staging/vme_user/vme.c:1844:
+^I^I^I^I struct vme_bridge *bridge, $
total: 4 errors, 0 warnings, 0 checks, 277 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
NOTE: Whitespace errors detected.
You may wish to use scripts/cleanpatch or scripts/cleanfile
"[PATCH] staging: vme_user: fix alignment of open parenthesis and" has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
total: 0 errors, 0 warnings, 0 checks, 32 lines checked
"[PATCH] staging: vme_user: fix alignment of open parenthesis and" has no obvious style problems and is ready for submission.
Successfully rebased and updated refs/heads/first-patch.
$ git rebase -i origin/staging-testing
Stopped at d13431f7a7ba... staging: vme_user: fix alignment of open parenthesis and deleted trailing spaces
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
$ git commit --amend -s -v
ERROR: trailing whitespace
#158: FILE: drivers/staging/vme_user/vme.c:566:
+^I^I unsigned long long vme_base, unsigned long long size, $
ERROR: trailing whitespace
#180: FILE: drivers/staging/vme_user/vme.c:617:
+^I^I unsigned long long *vme_base, unsigned long long *size, $
ERROR: trailing whitespace
#244: FILE: drivers/staging/vme_user/vme.c:1048:
+^I^I^I^I^I u32 aspace, u32 cycle, $
ERROR: trailing whitespace
#311: FILE: drivers/staging/vme_user/vme.c:1844:
+^I^I^I^I struct vme_bridge *bridge, $
total: 4 errors, 0 warnings, 0 checks, 277 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
NOTE: Whitespace errors detected.
You may wish to use scripts/cleanpatch or scripts/cleanfile
"[PATCH] staging: vme_user: fix alignment of open parenthesis and" has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
[detached HEAD 527a5480c032] staging: vme_user: fix alignment of open parenthesis and deleted trailing spaces
Date: Fri Aug 4 18:01:54 2023 -0300
1 file changed, 43 insertions(+), 42 deletions(-)
$ git rebase --continue
total: 0 errors, 0 warnings, 0 checks, 32 lines checked
"[PATCH] staging: vme_user: fix alignment of open parenthesis and" has no obvious style problems and is ready for submission.
Successfully rebased and updated refs/heads/first-patch.
$ git rebase -i origin/staging-testing
Successfully rebased and updated refs/heads/first-patch.
$ git rebase -i origin/staging-next
Successfully rebased and updated refs/heads/first-patch.
> thanks,
>
> greg k-h
Thank you.
Alexon Oliveira
