* linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-04 4:58 ` Stephen Rothwell 0 siblings, 0 replies; 20+ messages in thread From: Stephen Rothwell @ 2021-02-04 4:58 UTC (permalink / raw) To: Hans de Goede, Mark Gross, Daniel Vetter, Intel Graphics, DRI Cc: Andy Shevchenko, Linux Kernel Mailing List, Linux Next Mailing List, Patrik Jakobsson, Thomas Zimmermann [-- Attachment #1: Type: text/plain, Size: 1118 bytes --] Hi all, Today's linux-next merge of the drivers-x86 tree got a conflict in: drivers/gpu/drm/gma500/Kconfig drivers/gpu/drm/gma500/mdfld_device.c drivers/gpu/drm/gma500/mdfld_dsi_output.c drivers/gpu/drm/gma500/mdfld_output.c drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c between commits: b51035c200bd ("drm/gma500: Remove Medfield support") 837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option") from the drm-misc tree and commit: bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks") from the drivers-x86 tree. I fixed it up (the former removed the text that was updated by the latter and removed the last 4 files) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-04 4:58 ` Stephen Rothwell 0 siblings, 0 replies; 20+ messages in thread From: Stephen Rothwell @ 2021-02-04 4:58 UTC (permalink / raw) To: Hans de Goede, Mark Gross, Daniel Vetter, Intel Graphics, DRI Cc: Linux Next Mailing List, Andy Shevchenko, Linux Kernel Mailing List, Thomas Zimmermann [-- Attachment #1.1: Type: text/plain, Size: 1118 bytes --] Hi all, Today's linux-next merge of the drivers-x86 tree got a conflict in: drivers/gpu/drm/gma500/Kconfig drivers/gpu/drm/gma500/mdfld_device.c drivers/gpu/drm/gma500/mdfld_dsi_output.c drivers/gpu/drm/gma500/mdfld_output.c drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c between commits: b51035c200bd ("drm/gma500: Remove Medfield support") 837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option") from the drm-misc tree and commit: bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks") from the drivers-x86 tree. I fixed it up (the former removed the text that was updated by the latter and removed the last 4 files) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 20+ messages in thread
* linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-04 4:58 ` Stephen Rothwell 0 siblings, 0 replies; 20+ messages in thread From: Stephen Rothwell @ 2021-02-04 4:58 UTC (permalink / raw) To: Hans de Goede, Mark Gross, Daniel Vetter, Intel Graphics, DRI Cc: Linux Next Mailing List, Andy Shevchenko, Linux Kernel Mailing List, Thomas Zimmermann [-- Attachment #1.1: Type: text/plain, Size: 1118 bytes --] Hi all, Today's linux-next merge of the drivers-x86 tree got a conflict in: drivers/gpu/drm/gma500/Kconfig drivers/gpu/drm/gma500/mdfld_device.c drivers/gpu/drm/gma500/mdfld_dsi_output.c drivers/gpu/drm/gma500/mdfld_output.c drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c between commits: b51035c200bd ("drm/gma500: Remove Medfield support") 837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option") from the drm-misc tree and commit: bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks") from the drivers-x86 tree. I fixed it up (the former removed the text that was updated by the latter and removed the last 4 files) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree 2021-02-04 4:58 ` Stephen Rothwell @ 2021-02-04 9:04 ` Andy Shevchenko -1 siblings, 0 replies; 20+ messages in thread From: Andy Shevchenko @ 2021-02-04 9:04 UTC (permalink / raw) To: Stephen Rothwell Cc: Mark Gross, Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI, Hans de Goede, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko [-- Attachment #1.1: Type: text/plain, Size: 1526 bytes --] On Thursday, February 4, 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > Thanks. I already asked Patrick yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > drivers/gpu/drm/gma500/Kconfig > drivers/gpu/drm/gma500/mdfld_device.c > drivers/gpu/drm/gma500/mdfld_dsi_output.c > drivers/gpu/drm/gma500/mdfld_output.c > drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c > > between commits: > > b51035c200bd ("drm/gma500: Remove Medfield support") > 837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option") > > from the drm-misc tree and commit: > > bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") > 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks") > > from the drivers-x86 tree. > > I fixed it up (the former removed the text that was updated by the > latter and removed the last 4 files) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. > > -- > Cheers, > Stephen Rothwell > -- With Best Regards, Andy Shevchenko [-- Attachment #1.2: Type: text/html, Size: 2068 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-04 9:04 ` Andy Shevchenko 0 siblings, 0 replies; 20+ messages in thread From: Andy Shevchenko @ 2021-02-04 9:04 UTC (permalink / raw) To: Stephen Rothwell Cc: Mark Gross, Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko [-- Attachment #1.1: Type: text/plain, Size: 1526 bytes --] On Thursday, February 4, 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > Thanks. I already asked Patrick yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > drivers/gpu/drm/gma500/Kconfig > drivers/gpu/drm/gma500/mdfld_device.c > drivers/gpu/drm/gma500/mdfld_dsi_output.c > drivers/gpu/drm/gma500/mdfld_output.c > drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c > > between commits: > > b51035c200bd ("drm/gma500: Remove Medfield support") > 837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option") > > from the drm-misc tree and commit: > > bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") > 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks") > > from the drivers-x86 tree. > > I fixed it up (the former removed the text that was updated by the > latter and removed the last 4 files) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. > > -- > Cheers, > Stephen Rothwell > -- With Best Regards, Andy Shevchenko [-- Attachment #1.2: Type: text/html, Size: 2068 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree 2021-02-04 9:04 ` [Intel-gfx] " Andy Shevchenko (?) @ 2021-02-05 11:06 ` Andy Shevchenko -1 siblings, 0 replies; 20+ messages in thread From: Andy Shevchenko @ 2021-02-05 11:06 UTC (permalink / raw) To: Stephen Rothwell Cc: Hans de Goede, Mark Gross, Daniel Vetter, Intel Graphics, DRI, Andy Shevchenko, Linux Kernel Mailing List, Linux Next Mailing List, Patrik Jakobsson, Thomas Zimmermann On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, Patrik, I have sent a PR again, so you may consider pulling it, thanks! -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-05 11:06 ` Andy Shevchenko 0 siblings, 0 replies; 20+ messages in thread From: Andy Shevchenko @ 2021-02-05 11:06 UTC (permalink / raw) To: Stephen Rothwell Cc: Mark Gross, Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, Patrik, I have sent a PR again, so you may consider pulling it, thanks! -- With Best Regards, Andy Shevchenko _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-05 11:06 ` Andy Shevchenko 0 siblings, 0 replies; 20+ messages in thread From: Andy Shevchenko @ 2021-02-05 11:06 UTC (permalink / raw) To: Stephen Rothwell Cc: Mark Gross, Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI, Hans de Goede, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, Patrik, I have sent a PR again, so you may consider pulling it, thanks! -- With Best Regards, Andy Shevchenko _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree 2021-02-05 11:06 ` Andy Shevchenko (?) @ 2021-02-05 11:14 ` Patrik Jakobsson -1 siblings, 0 replies; 20+ messages in thread From: Patrik Jakobsson @ 2021-02-05 11:14 UTC (permalink / raw) To: Andy Shevchenko Cc: Stephen Rothwell, Hans de Goede, Mark Gross, Daniel Vetter, Intel Graphics, DRI, Andy Shevchenko, Linux Kernel Mailing List, Linux Next Mailing List, Thomas Zimmermann On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! Daniel, is this something you can pull into drm or ask one of the drm-misc maintainers to do? ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-05 11:14 ` Patrik Jakobsson 0 siblings, 0 replies; 20+ messages in thread From: Patrik Jakobsson @ 2021-02-05 11:14 UTC (permalink / raw) To: Andy Shevchenko Cc: Stephen Rothwell, Mark Gross, Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! Daniel, is this something you can pull into drm or ask one of the drm-misc maintainers to do? _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-05 11:14 ` Patrik Jakobsson 0 siblings, 0 replies; 20+ messages in thread From: Patrik Jakobsson @ 2021-02-05 11:14 UTC (permalink / raw) To: Andy Shevchenko Cc: Stephen Rothwell, Mark Gross, Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI, Hans de Goede, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! Daniel, is this something you can pull into drm or ask one of the drm-misc maintainers to do? _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree 2021-02-05 11:14 ` Patrik Jakobsson (?) @ 2021-02-05 13:05 ` Daniel Vetter -1 siblings, 0 replies; 20+ messages in thread From: Daniel Vetter @ 2021-02-05 13:05 UTC (permalink / raw) To: Patrik Jakobsson Cc: Andy Shevchenko, Stephen Rothwell, Hans de Goede, Mark Gross, Intel Graphics, DRI, Andy Shevchenko, Linux Kernel Mailing List, Linux Next Mailing List, Thomas Zimmermann On Fri, Feb 5, 2021 at 12:14 PM Patrik Jakobsson <patrik.r.jakobsson@gmail.com> wrote: > > On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > > > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > > > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! > > Daniel, is this something you can pull into drm or ask one of the > drm-misc maintainers to do? We've already created the conflict, and my understanding is that Linus wants to have visibility into conflict-y stuff and doesn't mind at all resolving conflicts. Hence for 5.12 I think we're fine as-is. Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-05 13:05 ` Daniel Vetter 0 siblings, 0 replies; 20+ messages in thread From: Daniel Vetter @ 2021-02-05 13:05 UTC (permalink / raw) To: Patrik Jakobsson Cc: Stephen Rothwell, Mark Gross, Intel Graphics, Linux Kernel Mailing List, DRI, Andy Shevchenko, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko On Fri, Feb 5, 2021 at 12:14 PM Patrik Jakobsson <patrik.r.jakobsson@gmail.com> wrote: > > On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > > > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > > > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! > > Daniel, is this something you can pull into drm or ask one of the > drm-misc maintainers to do? We've already created the conflict, and my understanding is that Linus wants to have visibility into conflict-y stuff and doesn't mind at all resolving conflicts. Hence for 5.12 I think we're fine as-is. Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-05 13:05 ` Daniel Vetter 0 siblings, 0 replies; 20+ messages in thread From: Daniel Vetter @ 2021-02-05 13:05 UTC (permalink / raw) To: Patrik Jakobsson Cc: Stephen Rothwell, Mark Gross, Intel Graphics, Linux Kernel Mailing List, DRI, Hans de Goede, Andy Shevchenko, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko On Fri, Feb 5, 2021 at 12:14 PM Patrik Jakobsson <patrik.r.jakobsson@gmail.com> wrote: > > On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > > > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > > > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! > > Daniel, is this something you can pull into drm or ask one of the > drm-misc maintainers to do? We've already created the conflict, and my understanding is that Linus wants to have visibility into conflict-y stuff and doesn't mind at all resolving conflicts. Hence for 5.12 I think we're fine as-is. Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree 2021-02-05 13:05 ` Daniel Vetter (?) @ 2021-02-05 14:01 ` Andy Shevchenko -1 siblings, 0 replies; 20+ messages in thread From: Andy Shevchenko @ 2021-02-05 14:01 UTC (permalink / raw) To: Daniel Vetter Cc: Patrik Jakobsson, Stephen Rothwell, Hans de Goede, Mark Gross, Intel Graphics, DRI, Andy Shevchenko, Linux Kernel Mailing List, Linux Next Mailing List, Thomas Zimmermann On Fri, Feb 5, 2021 at 3:05 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > On Fri, Feb 5, 2021 at 12:14 PM Patrik Jakobsson > <patrik.r.jakobsson@gmail.com> wrote: > > > > On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > > > > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > > > <andy.shevchenko@gmail.com> wrote: > > > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > > > > > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! > > > > Daniel, is this something you can pull into drm or ask one of the > > drm-misc maintainers to do? > > We've already created the conflict, and my understanding is that Linus > wants to have visibility into conflict-y stuff and doesn't mind at all > resolving conflicts. Hence for 5.12 I think we're fine as-is. Fine with me! -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-05 14:01 ` Andy Shevchenko 0 siblings, 0 replies; 20+ messages in thread From: Andy Shevchenko @ 2021-02-05 14:01 UTC (permalink / raw) To: Daniel Vetter Cc: Stephen Rothwell, Mark Gross, Intel Graphics, Linux Kernel Mailing List, DRI, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko On Fri, Feb 5, 2021 at 3:05 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > On Fri, Feb 5, 2021 at 12:14 PM Patrik Jakobsson > <patrik.r.jakobsson@gmail.com> wrote: > > > > On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > > > > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > > > <andy.shevchenko@gmail.com> wrote: > > > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > > > > > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! > > > > Daniel, is this something you can pull into drm or ask one of the > > drm-misc maintainers to do? > > We've already created the conflict, and my understanding is that Linus > wants to have visibility into conflict-y stuff and doesn't mind at all > resolving conflicts. Hence for 5.12 I think we're fine as-is. Fine with me! -- With Best Regards, Andy Shevchenko _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-05 14:01 ` Andy Shevchenko 0 siblings, 0 replies; 20+ messages in thread From: Andy Shevchenko @ 2021-02-05 14:01 UTC (permalink / raw) To: Daniel Vetter Cc: Stephen Rothwell, Mark Gross, Intel Graphics, Linux Kernel Mailing List, DRI, Hans de Goede, Linux Next Mailing List, Thomas Zimmermann, Andy Shevchenko On Fri, Feb 5, 2021 at 3:05 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > On Fri, Feb 5, 2021 at 12:14 PM Patrik Jakobsson > <patrik.r.jakobsson@gmail.com> wrote: > > > > On Fri, Feb 5, 2021 at 12:07 PM Andy Shevchenko > > <andy.shevchenko@gmail.com> wrote: > > > > > > On Thu, Feb 4, 2021 at 11:04 AM Andy Shevchenko > > > <andy.shevchenko@gmail.com> wrote: > > > >> Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > > > > > Thanks. I already asked Patrik yesterday day if DRM missed to pull an immutable tag I provided. I think they can pull and resolve conflicts themselves. Alternatively it would be easy to resolve by Linus by removing Kconfig lines along with mentioned files, > > > > > > Patrik, I have sent a PR again, so you may consider pulling it, thanks! > > > > Daniel, is this something you can pull into drm or ask one of the > > drm-misc maintainers to do? > > We've already created the conflict, and my understanding is that Linus > wants to have visibility into conflict-y stuff and doesn't mind at all > resolving conflicts. Hence for 5.12 I think we're fine as-is. Fine with me! -- With Best Regards, Andy Shevchenko _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree 2021-02-04 4:58 ` Stephen Rothwell (?) @ 2021-02-14 22:39 ` Stephen Rothwell -1 siblings, 0 replies; 20+ messages in thread From: Stephen Rothwell @ 2021-02-14 22:39 UTC (permalink / raw) To: Hans de Goede, Mark Gross, Daniel Vetter, Intel Graphics, DRI, Rafael J. Wysocki Cc: Andy Shevchenko, Linux Kernel Mailing List, Linux Next Mailing List, Patrik Jakobsson, Thomas Zimmermann [-- Attachment #1: Type: text/plain, Size: 1566 bytes --] Hi all, On Thu, 4 Feb 2021 15:58:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > drivers/gpu/drm/gma500/Kconfig > drivers/gpu/drm/gma500/mdfld_device.c > drivers/gpu/drm/gma500/mdfld_dsi_output.c > drivers/gpu/drm/gma500/mdfld_output.c > drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c > > between commits: > > b51035c200bd ("drm/gma500: Remove Medfield support") Now e1da811218d2 ("drm/gma500: Remove Medfield support") > 837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option") Now 26499e0518a7 ("drm/gma500: Drop DRM_GMA3600 config option") > > from the drm-misc tree and commit: > > bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") > 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks") > > from the drivers-x86 tree. > > I fixed it up (the former removed the text that was updated by the > latter and removed the last 4 files) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. With the merge window about to open, this is a reminder that this conflict still exists. The two drivers-x86 tree commits have also been merged into the pm tree. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-14 22:39 ` Stephen Rothwell 0 siblings, 0 replies; 20+ messages in thread From: Stephen Rothwell @ 2021-02-14 22:39 UTC (permalink / raw) To: Hans de Goede, Mark Gross, Daniel Vetter, Intel Graphics, DRI, Rafael J. Wysocki Cc: Linux Next Mailing List, Andy Shevchenko, Linux Kernel Mailing List, Thomas Zimmermann [-- Attachment #1.1: Type: text/plain, Size: 1566 bytes --] Hi all, On Thu, 4 Feb 2021 15:58:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > drivers/gpu/drm/gma500/Kconfig > drivers/gpu/drm/gma500/mdfld_device.c > drivers/gpu/drm/gma500/mdfld_dsi_output.c > drivers/gpu/drm/gma500/mdfld_output.c > drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c > > between commits: > > b51035c200bd ("drm/gma500: Remove Medfield support") Now e1da811218d2 ("drm/gma500: Remove Medfield support") > 837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option") Now 26499e0518a7 ("drm/gma500: Drop DRM_GMA3600 config option") > > from the drm-misc tree and commit: > > bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") > 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks") > > from the drivers-x86 tree. > > I fixed it up (the former removed the text that was updated by the > latter and removed the last 4 files) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. With the merge window about to open, this is a reminder that this conflict still exists. The two drivers-x86 tree commits have also been merged into the pm tree. -- Cheers, Stephen Rothwell [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree @ 2021-02-14 22:39 ` Stephen Rothwell 0 siblings, 0 replies; 20+ messages in thread From: Stephen Rothwell @ 2021-02-14 22:39 UTC (permalink / raw) To: Hans de Goede, Mark Gross, Daniel Vetter, Intel Graphics, DRI, Rafael J. Wysocki Cc: Linux Next Mailing List, Andy Shevchenko, Linux Kernel Mailing List, Thomas Zimmermann [-- Attachment #1.1: Type: text/plain, Size: 1566 bytes --] Hi all, On Thu, 4 Feb 2021 15:58:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > drivers/gpu/drm/gma500/Kconfig > drivers/gpu/drm/gma500/mdfld_device.c > drivers/gpu/drm/gma500/mdfld_dsi_output.c > drivers/gpu/drm/gma500/mdfld_output.c > drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c > > between commits: > > b51035c200bd ("drm/gma500: Remove Medfield support") Now e1da811218d2 ("drm/gma500: Remove Medfield support") > 837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option") Now 26499e0518a7 ("drm/gma500: Drop DRM_GMA3600 config option") > > from the drm-misc tree and commit: > > bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") > 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks") > > from the drivers-x86 tree. > > I fixed it up (the former removed the text that was updated by the > latter and removed the last 4 files) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. With the merge window about to open, this is a reminder that this conflict still exists. The two drivers-x86 tree commits have also been merged into the pm tree. -- Cheers, Stephen Rothwell [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2021-02-14 22:40 UTC | newest] Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-02-04 4:58 linux-next: manual merge of the drivers-x86 tree with the drm-misc tree Stephen Rothwell 2021-02-04 4:58 ` [Intel-gfx] " Stephen Rothwell 2021-02-04 4:58 ` Stephen Rothwell 2021-02-04 9:04 ` Andy Shevchenko 2021-02-04 9:04 ` [Intel-gfx] " Andy Shevchenko 2021-02-05 11:06 ` Andy Shevchenko 2021-02-05 11:06 ` [Intel-gfx] " Andy Shevchenko 2021-02-05 11:06 ` Andy Shevchenko 2021-02-05 11:14 ` Patrik Jakobsson 2021-02-05 11:14 ` [Intel-gfx] " Patrik Jakobsson 2021-02-05 11:14 ` Patrik Jakobsson 2021-02-05 13:05 ` Daniel Vetter 2021-02-05 13:05 ` [Intel-gfx] " Daniel Vetter 2021-02-05 13:05 ` Daniel Vetter 2021-02-05 14:01 ` Andy Shevchenko 2021-02-05 14:01 ` [Intel-gfx] " Andy Shevchenko 2021-02-05 14:01 ` Andy Shevchenko 2021-02-14 22:39 ` Stephen Rothwell 2021-02-14 22:39 ` [Intel-gfx] " Stephen Rothwell 2021-02-14 22:39 ` Stephen Rothwell
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.