Re: [PATCH v3] staging: vme_user: fix alignment of open parenthesis and deleted trailing spaces

[Nam Cao <namcaov@gmail.com>]

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@gmail.com>
> ---
> 
> Changes in v3:
> - Rebased against staging.git and staging-next branch, noted by Greg KH
> 
> Changes in v2:
> - Fixed changelog, noted by Greg KH
> 
>  drivers/staging/vme_user/vme.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/vme_user/vme.c b/drivers/staging/vme_user/vme.c
> index 977c81e2f3c7..741593d75a63 100644
> --- a/drivers/staging/vme_user/vme.c
> +++ b/drivers/staging/vme_user/vme.c
> @@ -563,7 +563,7 @@ EXPORT_SYMBOL(vme_master_request);
>   *         returned.
>   */
>  int vme_master_set(struct vme_resource *resource, int enabled,
> -		   unsigned long long vme_base, unsigned long long size, 
> +		   unsigned long long vme_base, unsigned long long size,
>  		   u32 aspace, u32 cycle, u32 dwidth)

As Greg said, it doesn't look like this in staging tree, so your patch doesn't apply.

However I look it up and the last change to this line was 12 years ago, so I doubt
that it is because you didn't rebase to Greg's tree. I think the more likely
possibility is that you have a commit to this line yourself (by mistake perhaps?),
and this patch is on top of that.

Make sure you don't have any accident commit that modifies this line in your tree.

Best regards,
Nam