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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Aug 08, 2023 at 06:33:07AM +0200, Greg KH wrote:
> On Mon, Aug 07, 2023 at 05:42:26PM -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 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)
> 
> I think the confusion here is that my tree does NOT look like your tree
> at all right now.  If I try to apply this patch, I get:
> 
> 	checking file drivers/staging/vme_user/vme.c
> 	Hunk #1 FAILED at 563.
> 	Hunk #2 FAILED at 614.
> 	Hunk #3 FAILED at 1045.
> 	Hunk #4 FAILED at 1841.
> 	4 out of 4 hunks FAILED
> 
> So please, rebase your tree against my staging.git on git.kernel.org
> tree, the staging-next branch, and then resend the patches from that.
> 

Hmm, ACK. I always rebase before commit a new patch, but doing like
this:

$ git fetch origin
$ git rebase -i origin/staging-testing

I'll do it as you instructed.

> thanks,
> 
> greg k-h

Thank you.

Alexon Oliveira




[Index of Archives]     [Linux Driver Development]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux