2022-06-21 13:05:22

by Jiang Jian

Subject: [PATCH] cxl: drop unexpected word "the" in the comments

there is an unexpected word "the" in the comments that need to be dropped

file: drivers/misc/cxl/cxl.h
line: 1107
+/* check if the given pci_dev is on the the cxl vphb bus */
changed to
+/* check if the given pci_dev is on the cxl vphb bus */

Signed-off-by: Jiang Jian <[email protected]>
---
drivers/misc/cxl/cxl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index 7a6dd91987fd..0562071cdd4a 100644
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -1104,7 +1104,7 @@ extern const struct cxl_backend_ops cxl_native_ops;
extern const struct cxl_backend_ops cxl_guest_ops;
extern const struct cxl_backend_ops *cxl_ops;

-/* check if the given pci_dev is on the the cxl vphb bus */
+/* check if the given pci_dev is on the cxl vphb bus */
bool cxl_pci_is_vphb_device(struct pci_dev *dev);

/* decode AFU error bits in the PSL register PSL_SERR_An */
--
2.17.1

2022-06-21 16:39:24

by Andrew Donnellan

Subject: Re: [PATCH] cxl: drop unexpected word "the" in the comments

On Tue, 2022-06-21 at 20:53 +0800, Jiang Jian wrote:
> there is an unexpected word "the" in the comments that need to be
> dropped
>
> file: drivers/misc/cxl/cxl.h
> line: 1107
> +/* check if the given pci_dev is on the the cxl vphb bus */
> changed to
> +/* check if the given pci_dev is on the cxl vphb bus */
>
> Signed-off-by: Jiang Jian <[email protected]>

Thanks!

Acked-by: Andrew Donnellan <[email protected]>

> ---
>  drivers/misc/cxl/cxl.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
> index 7a6dd91987fd..0562071cdd4a 100644
> --- a/drivers/misc/cxl/cxl.h
> +++ b/drivers/misc/cxl/cxl.h
> @@ -1104,7 +1104,7 @@ extern const struct cxl_backend_ops
> cxl_native_ops;
>  extern const struct cxl_backend_ops cxl_guest_ops;
>  extern const struct cxl_backend_ops *cxl_ops;
>  
> -/* check if the given pci_dev is on the the cxl vphb bus */
> +/* check if the given pci_dev is on the cxl vphb bus */
>  bool cxl_pci_is_vphb_device(struct pci_dev *dev);
>  
>  /* decode AFU error bits in the PSL register PSL_SERR_An */

2022-06-29 12:46:15

by Michael Ellerman

Subject: Re: [PATCH] cxl: drop unexpected word "the" in the comments

On Tue, 21 Jun 2022 20:53:21 +0800, Jiang Jian wrote:
> there is an unexpected word "the" in the comments that need to be dropped
>
> file: drivers/misc/cxl/cxl.h
> line: 1107
> +/* check if the given pci_dev is on the the cxl vphb bus */
> changed to
> +/* check if the given pci_dev is on the cxl vphb bus */
>
> [...]

Applied to powerpc/next.

[1/1] cxl: drop unexpected word "the" in the comments
https://git.kernel.org/powerpc/c/882c835b71e22ca82361dab3b60b85b557abd72f

cheers

2022-06-30 01:35:23

by Andrew Donnellan

Subject: Re: [PATCH] cxl: drop unexpected word "the" in the comments

On Wed, 2022-06-29 at 22:15 +1000, Michael Ellerman wrote:
> On Tue, 21 Jun 2022 20:53:21 +0800, Jiang Jian wrote:
> > there is an unexpected word "the" in the comments that need to be
> > dropped
> >
> > file: drivers/misc/cxl/cxl.h
> > line: 1107
> > +/* check if the given pci_dev is on the the cxl vphb bus */
> > changed to
> > +/* check if the given pci_dev is on the cxl vphb bus */
> >
> > [...]
>
> Applied to powerpc/next.
>
> [1/1] cxl: drop unexpected word "the" in the comments
>      
> https://git.kernel.org/powerpc/c/882c835b71e22ca82361dab3b60b85b557abd72f

I believe Greg's already merged this in char-misc...


Andrew

2022-07-01 08:30:01

by Greg Kroah-Hartman

Subject: Re: [PATCH] cxl: drop unexpected word "the" in the comments

On Thu, Jun 30, 2022 at 11:10:13AM +1000, Andrew Donnellan wrote:
> On Wed, 2022-06-29 at 22:15 +1000, Michael Ellerman wrote:
> > On Tue, 21 Jun 2022 20:53:21 +0800, Jiang Jian wrote:
> > > there is an unexpected word "the" in the comments that need to be
> > > dropped
> > >
> > > file: drivers/misc/cxl/cxl.h
> > > line: 1107
> > > +/* check if the given pci_dev is on the the cxl vphb bus */
> > > changed to
> > > +/* check if the given pci_dev is on the cxl vphb bus */
> > >
> > > [...]
> >
> > Applied to powerpc/next.
> >
> > [1/1] cxl: drop unexpected word "the" in the comments
> > ?????
> > https://git.kernel.org/powerpc/c/882c835b71e22ca82361dab3b60b85b557abd72f
>
> I believe Greg's already merged this in char-misc...

git can handle merges like this without any problems :)