[PATCH] drivers: gpu: drm: xen_drm_front_drm_info is declared twice

Wan Jiabing posted 1 patch 2 weeks, 6 days ago
Failed in applying to current master (apply log)
drivers/gpu/drm/xen/xen_drm_front_conn.h | 1 -
1 file changed, 1 deletion(-)

[PATCH] drivers: gpu: drm: xen_drm_front_drm_info is declared twice

Posted by Wan Jiabing 2 weeks, 6 days ago
struct xen_drm_front_drm_info has been declared. 
Remove the duplicate.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 drivers/gpu/drm/xen/xen_drm_front_conn.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/xen/xen_drm_front_conn.h b/drivers/gpu/drm/xen/xen_drm_front_conn.h
index 3adacba9a23b..e5f4314899ee 100644
--- a/drivers/gpu/drm/xen/xen_drm_front_conn.h
+++ b/drivers/gpu/drm/xen/xen_drm_front_conn.h
@@ -16,7 +16,6 @@
 struct drm_connector;
 struct xen_drm_front_drm_info;
 
-struct xen_drm_front_drm_info;
 
 int xen_drm_front_conn_init(struct xen_drm_front_drm_info *drm_info,
 			    struct drm_connector *connector);
-- 
2.25.1


Re: [PATCH] drivers: gpu: drm: xen_drm_front_drm_info is declared twice

Posted by Oleksandr Andrushchenko 2 weeks, 6 days ago
Hi,

On 3/25/21 8:19 AM, Wan Jiabing wrote:
> struct xen_drm_front_drm_info has been declared.
> Remove the duplicate.
>
> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>

Thank you for the patch,

Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>

Will apply to drm-misc-next-fixes

Thank you,

Oleksandr

> ---
>   drivers/gpu/drm/xen/xen_drm_front_conn.h | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/xen/xen_drm_front_conn.h b/drivers/gpu/drm/xen/xen_drm_front_conn.h
> index 3adacba9a23b..e5f4314899ee 100644
> --- a/drivers/gpu/drm/xen/xen_drm_front_conn.h
> +++ b/drivers/gpu/drm/xen/xen_drm_front_conn.h
> @@ -16,7 +16,6 @@
>   struct drm_connector;
>   struct xen_drm_front_drm_info;
>   
> -struct xen_drm_front_drm_info;
>   
>   int xen_drm_front_conn_init(struct xen_drm_front_drm_info *drm_info,
>   			    struct drm_connector *connector);

Re: [PATCH] drivers: gpu: drm: xen_drm_front_drm_info is declared twice

Posted by Daniel Vetter 2 weeks, 6 days ago
On Thu, Mar 25, 2021 at 7:53 AM Oleksandr Andrushchenko
<Oleksandr_Andrushchenko@epam.com> wrote:
>
> Hi,
>
> On 3/25/21 8:19 AM, Wan Jiabing wrote:
> > struct xen_drm_front_drm_info has been declared.
> > Remove the duplicate.
> >
> > Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
>
> Thank you for the patch,
>
> Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>
> Will apply to drm-misc-next-fixes

drm-misc-next-fixes is the wrong tree, bugfixes outside of the merge
window belong into drm-misc-fixes. Please consult

https://drm.pages.freedesktop.org/maintainer-tools/committer-drm-misc.html#where-do-i-apply-my-patch

We need to hard-reset drm-misc-next-fixes back, please re-apply the
patches (both of them) to drm-misc-fixes. Also adding drm-misc
maintainers.
-Daniel

>
> Thank you,
>
> Oleksandr
>
> > ---
> >   drivers/gpu/drm/xen/xen_drm_front_conn.h | 1 -
> >   1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/xen/xen_drm_front_conn.h b/drivers/gpu/drm/xen/xen_drm_front_conn.h
> > index 3adacba9a23b..e5f4314899ee 100644
> > --- a/drivers/gpu/drm/xen/xen_drm_front_conn.h
> > +++ b/drivers/gpu/drm/xen/xen_drm_front_conn.h
> > @@ -16,7 +16,6 @@
> >   struct drm_connector;
> >   struct xen_drm_front_drm_info;
> >
> > -struct xen_drm_front_drm_info;
> >
> >   int xen_drm_front_conn_init(struct xen_drm_front_drm_info *drm_info,
> >                           struct drm_connector *connector);



-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Re: [PATCH] drivers: gpu: drm: xen_drm_front_drm_info is declared twice

Posted by Oleksandr Andrushchenko 2 weeks, 6 days ago
Hi, Daniel!

On 3/25/21 11:16 AM, Daniel Vetter wrote:
> On Thu, Mar 25, 2021 at 7:53 AM Oleksandr Andrushchenko
> <Oleksandr_Andrushchenko@epam.com> wrote:
>> Hi,
>>
>> On 3/25/21 8:19 AM, Wan Jiabing wrote:
>>> struct xen_drm_front_drm_info has been declared.
>>> Remove the duplicate.
>>>
>>> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
>> Thank you for the patch,
>>
>> Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
>>
>> Will apply to drm-misc-next-fixes
> drm-misc-next-fixes is the wrong tree, bugfixes outside of the merge
> window belong into drm-misc-fixes. Please consult
>
> https://urldefense.com/v3/__https://drm.pages.freedesktop.org/maintainer-tools/committer-drm-misc.html*where-do-i-apply-my-patch__;Iw!!GF_29dbcQIUBPA!nfKNXrB-yHqaxeH6nC3mEw28HFFI1p5fc5CZKEFeoQPWXEhZCpvMqvW8EtFfTqtHPiNgpY4S-g$ [drm[.]pages[.]freedesktop[.]org]
>
> We need to hard-reset drm-misc-next-fixes back, please re-apply the
> patches (both of them) to drm-misc-fixes. Also adding drm-misc
> maintainers.
Sorry for screwing things up, will re-apply both patches to drm-misc-fixes
> -Daniel
>
>> Thank you,
>>
>> Oleksandr
>>
>>> ---
>>>    drivers/gpu/drm/xen/xen_drm_front_conn.h | 1 -
>>>    1 file changed, 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/xen/xen_drm_front_conn.h b/drivers/gpu/drm/xen/xen_drm_front_conn.h
>>> index 3adacba9a23b..e5f4314899ee 100644
>>> --- a/drivers/gpu/drm/xen/xen_drm_front_conn.h
>>> +++ b/drivers/gpu/drm/xen/xen_drm_front_conn.h
>>> @@ -16,7 +16,6 @@
>>>    struct drm_connector;
>>>    struct xen_drm_front_drm_info;
>>>
>>> -struct xen_drm_front_drm_info;
>>>
>>>    int xen_drm_front_conn_init(struct xen_drm_front_drm_info *drm_info,
>>>                            struct drm_connector *connector);
>
>

Re: [PATCH] drivers: gpu: drm: xen_drm_front_drm_info is declared twice

Posted by Daniel Vetter 2 weeks, 6 days ago
On Thu, Mar 25, 2021 at 10:16 AM Daniel Vetter <daniel@ffwll.ch> wrote:
>
> On Thu, Mar 25, 2021 at 7:53 AM Oleksandr Andrushchenko
> <Oleksandr_Andrushchenko@epam.com> wrote:
> >
> > Hi,
> >
> > On 3/25/21 8:19 AM, Wan Jiabing wrote:
> > > struct xen_drm_front_drm_info has been declared.
> > > Remove the duplicate.
> > >
> > > Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
> >
> > Thank you for the patch,
> >
> > Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
> >
> > Will apply to drm-misc-next-fixes
>
> drm-misc-next-fixes is the wrong tree, bugfixes outside of the merge
> window belong into drm-misc-fixes. Please consult
>
> https://drm.pages.freedesktop.org/maintainer-tools/committer-drm-misc.html#where-do-i-apply-my-patch
>
> We need to hard-reset drm-misc-next-fixes back, please re-apply the
> patches (both of them) to drm-misc-fixes. Also adding drm-misc
> maintainers.

Also simple cleanup like this should be pushed to drm-misc-next, not
any of the -fixes branches.
-Daniel

> -Daniel
>
> >
> > Thank you,
> >
> > Oleksandr
> >
> > > ---
> > >   drivers/gpu/drm/xen/xen_drm_front_conn.h | 1 -
> > >   1 file changed, 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/xen/xen_drm_front_conn.h b/drivers/gpu/drm/xen/xen_drm_front_conn.h
> > > index 3adacba9a23b..e5f4314899ee 100644
> > > --- a/drivers/gpu/drm/xen/xen_drm_front_conn.h
> > > +++ b/drivers/gpu/drm/xen/xen_drm_front_conn.h
> > > @@ -16,7 +16,6 @@
> > >   struct drm_connector;
> > >   struct xen_drm_front_drm_info;
> > >
> > > -struct xen_drm_front_drm_info;
> > >
> > >   int xen_drm_front_conn_init(struct xen_drm_front_drm_info *drm_info,
> > >                           struct drm_connector *connector);
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch



-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch