* [Intel-gfx] linux-next: manual merge of the akpm tree with the drm-intel tree
@ 2020-10-01 10:39 ` Stephen Rothwell
0 siblings, 0 replies; 17+ messages in thread
From: Stephen Rothwell @ 2020-10-01 10:39 UTC (permalink / raw)
To: Andrew Morton, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Intel Graphics, DRI
Cc: Dave Airlie, Linux Kernel Mailing List, Linux Next Mailing List,
Christoph Hellwig, Chris Wilson
[-- Attachment #1.1: Type: text/plain, Size: 871 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/gpu/drm/i915/gem/i915_gem_pages.c
between commit:
4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32")
ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported")
from the drm-intel tree and patch:
"drm/i915: use vmap in i915_gem_object_map"
from the akpm tree.
I fixed it up (I just dropped the changes in the former commits) 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] 17+ messages in thread* linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-01 10:39 ` Stephen Rothwell 0 siblings, 0 replies; 17+ messages in thread From: Stephen Rothwell @ 2020-10-01 10:39 UTC (permalink / raw) To: Andrew Morton, Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI Cc: Dave Airlie, Linux Kernel Mailing List, Linux Next Mailing List, Christoph Hellwig, Chris Wilson [-- Attachment #1.1: Type: text/plain, Size: 871 bytes --] Hi all, Today's linux-next merge of the akpm tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_pages.c between commit: 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") from the drm-intel tree and patch: "drm/i915: use vmap in i915_gem_object_map" from the akpm tree. I fixed it up (I just dropped the changes in the former commits) 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] 17+ messages in thread
* linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-01 10:39 ` Stephen Rothwell 0 siblings, 0 replies; 17+ messages in thread From: Stephen Rothwell @ 2020-10-01 10:39 UTC (permalink / raw) To: Andrew Morton, Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI Cc: Dave Airlie, Christoph Hellwig, Chris Wilson, Linux Kernel Mailing List, Linux Next Mailing List [-- Attachment #1: Type: text/plain, Size: 871 bytes --] Hi all, Today's linux-next merge of the akpm tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_pages.c between commit: 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") from the drm-intel tree and patch: "drm/i915: use vmap in i915_gem_object_map" from the akpm tree. I fixed it up (I just dropped the changes in the former commits) 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] 17+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the akpm tree with the drm-intel tree 2020-10-01 10:39 ` Stephen Rothwell @ 2020-10-01 13:53 ` Christoph Hellwig -1 siblings, 0 replies; 17+ messages in thread From: Christoph Hellwig @ 2020-10-01 13:53 UTC (permalink / raw) To: Stephen Rothwell Cc: Dave Airlie, Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, Chris Wilson, Linux Next Mailing List, DRI, Andrew Morton, Christoph Hellwig On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm tree got a conflict in: > > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > between commit: > > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > from the drm-intel tree and patch: > > "drm/i915: use vmap in i915_gem_object_map" > > from the akpm tree. > > I fixed it up (I just dropped the changes in the former commits) and Sigh. The solution is a bit more complicated, but I just redid my patches to not depend on the above ones. I can revert back to the old version, though. Andrew, let me know what works for you. _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-01 13:53 ` Christoph Hellwig 0 siblings, 0 replies; 17+ messages in thread From: Christoph Hellwig @ 2020-10-01 13:53 UTC (permalink / raw) To: Stephen Rothwell Cc: Andrew Morton, Daniel Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI, Dave Airlie, Christoph Hellwig, Chris Wilson, Linux Kernel Mailing List, Linux Next Mailing List On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm tree got a conflict in: > > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > between commit: > > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > from the drm-intel tree and patch: > > "drm/i915: use vmap in i915_gem_object_map" > > from the akpm tree. > > I fixed it up (I just dropped the changes in the former commits) and Sigh. The solution is a bit more complicated, but I just redid my patches to not depend on the above ones. I can revert back to the old version, though. Andrew, let me know what works for you. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the akpm tree with the drm-intel tree 2020-10-01 13:53 ` Christoph Hellwig (?) @ 2020-10-01 14:13 ` Daniel Vetter -1 siblings, 0 replies; 17+ messages in thread From: Daniel Vetter @ 2020-10-01 14:13 UTC (permalink / raw) To: Christoph Hellwig Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, Linux Kernel Mailing List, Chris Wilson, Linux Next Mailing List, DRI, Andrew Morton On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: > > On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the akpm tree got a conflict in: > > > > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > > > between commit: > > > > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") Uh these patches shouldn't be in linux-next because they're for 5.11, not the 5.10 merge window that will open soon. Joonas? > > from the drm-intel tree and patch: > > > > "drm/i915: use vmap in i915_gem_object_map" > > > > from the akpm tree. > > > > I fixed it up (I just dropped the changes in the former commits) and > > Sigh. The solution is a bit more complicated, but I just redid my > patches to not depend on the above ones. I can revert back to the old > version, though. Andrew, let me know what works for you. Imo ignore, rebasing onto linux-next without those intel patches was the right thing for the 5.10 merge window. -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] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-01 14:13 ` Daniel Vetter 0 siblings, 0 replies; 17+ messages in thread From: Daniel Vetter @ 2020-10-01 14:13 UTC (permalink / raw) To: Christoph Hellwig Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, Linux Kernel Mailing List, Chris Wilson, Linux Next Mailing List, DRI, Rodrigo Vivi, Andrew Morton On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: > > On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the akpm tree got a conflict in: > > > > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > > > between commit: > > > > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") Uh these patches shouldn't be in linux-next because they're for 5.11, not the 5.10 merge window that will open soon. Joonas? > > from the drm-intel tree and patch: > > > > "drm/i915: use vmap in i915_gem_object_map" > > > > from the akpm tree. > > > > I fixed it up (I just dropped the changes in the former commits) and > > Sigh. The solution is a bit more complicated, but I just redid my > patches to not depend on the above ones. I can revert back to the old > version, though. Andrew, let me know what works for you. Imo ignore, rebasing onto linux-next without those intel patches was the right thing for the 5.10 merge window. -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] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-01 14:13 ` Daniel Vetter 0 siblings, 0 replies; 17+ messages in thread From: Daniel Vetter @ 2020-10-01 14:13 UTC (permalink / raw) To: Christoph Hellwig Cc: Stephen Rothwell, Andrew Morton, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI, Dave Airlie, Chris Wilson, Linux Kernel Mailing List, Linux Next Mailing List On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: > > On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the akpm tree got a conflict in: > > > > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > > > between commit: > > > > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") Uh these patches shouldn't be in linux-next because they're for 5.11, not the 5.10 merge window that will open soon. Joonas? > > from the drm-intel tree and patch: > > > > "drm/i915: use vmap in i915_gem_object_map" > > > > from the akpm tree. > > > > I fixed it up (I just dropped the changes in the former commits) and > > Sigh. The solution is a bit more complicated, but I just redid my > patches to not depend on the above ones. I can revert back to the old > version, though. Andrew, let me know what works for you. Imo ignore, rebasing onto linux-next without those intel patches was the right thing for the 5.10 merge window. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the akpm tree with the drm-intel tree 2020-10-01 14:13 ` Daniel Vetter (?) @ 2020-10-01 15:08 ` Jani Nikula -1 siblings, 0 replies; 17+ messages in thread From: Jani Nikula @ 2020-10-01 15:08 UTC (permalink / raw) To: Daniel Vetter, Christoph Hellwig Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, Linux Kernel Mailing List, DRI, Chris Wilson, Linux Next Mailing List, Andrew Morton On Thu, 01 Oct 2020, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: >> >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: >> > Hi all, >> > >> > Today's linux-next merge of the akpm tree got a conflict in: >> > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c >> > >> > between commit: >> > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > Uh these patches shouldn't be in linux-next because they're for 5.11, > not the 5.10 merge window that will open soon. Joonas? I don't know anything else, but both are tagged Cc: stable. BR, Jani. > >> > from the drm-intel tree and patch: >> > >> > "drm/i915: use vmap in i915_gem_object_map" >> > >> > from the akpm tree. >> > >> > I fixed it up (I just dropped the changes in the former commits) and >> >> Sigh. The solution is a bit more complicated, but I just redid my >> patches to not depend on the above ones. I can revert back to the old >> version, though. Andrew, let me know what works for you. > > Imo ignore, rebasing onto linux-next without those intel patches was > the right thing for the 5.10 merge window. > -Daniel -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-01 15:08 ` Jani Nikula 0 siblings, 0 replies; 17+ messages in thread From: Jani Nikula @ 2020-10-01 15:08 UTC (permalink / raw) To: Daniel Vetter, Christoph Hellwig Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, Linux Kernel Mailing List, DRI, Chris Wilson, Linux Next Mailing List, Rodrigo Vivi, Andrew Morton On Thu, 01 Oct 2020, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: >> >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: >> > Hi all, >> > >> > Today's linux-next merge of the akpm tree got a conflict in: >> > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c >> > >> > between commit: >> > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > Uh these patches shouldn't be in linux-next because they're for 5.11, > not the 5.10 merge window that will open soon. Joonas? I don't know anything else, but both are tagged Cc: stable. BR, Jani. > >> > from the drm-intel tree and patch: >> > >> > "drm/i915: use vmap in i915_gem_object_map" >> > >> > from the akpm tree. >> > >> > I fixed it up (I just dropped the changes in the former commits) and >> >> Sigh. The solution is a bit more complicated, but I just redid my >> patches to not depend on the above ones. I can revert back to the old >> version, though. Andrew, let me know what works for you. > > Imo ignore, rebasing onto linux-next without those intel patches was > the right thing for the 5.10 merge window. > -Daniel -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-01 15:08 ` Jani Nikula 0 siblings, 0 replies; 17+ messages in thread From: Jani Nikula @ 2020-10-01 15:08 UTC (permalink / raw) To: Daniel Vetter, Christoph Hellwig Cc: Stephen Rothwell, Andrew Morton, Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI, Dave Airlie, Chris Wilson, Linux Kernel Mailing List, Linux Next Mailing List On Thu, 01 Oct 2020, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: >> >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: >> > Hi all, >> > >> > Today's linux-next merge of the akpm tree got a conflict in: >> > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c >> > >> > between commit: >> > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > Uh these patches shouldn't be in linux-next because they're for 5.11, > not the 5.10 merge window that will open soon. Joonas? I don't know anything else, but both are tagged Cc: stable. BR, Jani. > >> > from the drm-intel tree and patch: >> > >> > "drm/i915: use vmap in i915_gem_object_map" >> > >> > from the akpm tree. >> > >> > I fixed it up (I just dropped the changes in the former commits) and >> >> Sigh. The solution is a bit more complicated, but I just redid my >> patches to not depend on the above ones. I can revert back to the old >> version, though. Andrew, let me know what works for you. > > Imo ignore, rebasing onto linux-next without those intel patches was > the right thing for the 5.10 merge window. > -Daniel -- Jani Nikula, Intel Open Source Graphics Center ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the akpm tree with the drm-intel tree 2020-10-01 15:08 ` Jani Nikula (?) @ 2020-10-01 15:13 ` Daniel Vetter -1 siblings, 0 replies; 17+ messages in thread From: Daniel Vetter @ 2020-10-01 15:13 UTC (permalink / raw) To: Jani Nikula Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, Linux Kernel Mailing List, DRI, Chris Wilson, Linux Next Mailing List, Andrew Morton, Christoph Hellwig On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula <jani.nikula@linux.intel.com> wrote: > > On Thu, 01 Oct 2020, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: > >> > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > >> > Hi all, > >> > > >> > Today's linux-next merge of the akpm tree got a conflict in: > >> > > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c > >> > > >> > between commit: > >> > > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > > > Uh these patches shouldn't be in linux-next because they're for 5.11, > > not the 5.10 merge window that will open soon. Joonas? > > I don't know anything else, but both are tagged Cc: stable. Uh right I got confused, they're on -fixes now. Well -next-fixes, which seems like the wrong one for a cc: stable, I guess this should go into 5.9 even. Apologies for my confusion. -Daniel > > BR, > Jani. > > > > >> > from the drm-intel tree and patch: > >> > > >> > "drm/i915: use vmap in i915_gem_object_map" > >> > > >> > from the akpm tree. > >> > > >> > I fixed it up (I just dropped the changes in the former commits) and > >> > >> Sigh. The solution is a bit more complicated, but I just redid my > >> patches to not depend on the above ones. I can revert back to the old > >> version, though. Andrew, let me know what works for you. > > > > Imo ignore, rebasing onto linux-next without those intel patches was > > the right thing for the 5.10 merge window. > > -Daniel > > -- > Jani Nikula, Intel Open Source Graphics Center -- 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] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-01 15:13 ` Daniel Vetter 0 siblings, 0 replies; 17+ messages in thread From: Daniel Vetter @ 2020-10-01 15:13 UTC (permalink / raw) To: Jani Nikula Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, Linux Kernel Mailing List, DRI, Chris Wilson, Linux Next Mailing List, Rodrigo Vivi, Andrew Morton, Christoph Hellwig On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula <jani.nikula@linux.intel.com> wrote: > > On Thu, 01 Oct 2020, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: > >> > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > >> > Hi all, > >> > > >> > Today's linux-next merge of the akpm tree got a conflict in: > >> > > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c > >> > > >> > between commit: > >> > > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > > > Uh these patches shouldn't be in linux-next because they're for 5.11, > > not the 5.10 merge window that will open soon. Joonas? > > I don't know anything else, but both are tagged Cc: stable. Uh right I got confused, they're on -fixes now. Well -next-fixes, which seems like the wrong one for a cc: stable, I guess this should go into 5.9 even. Apologies for my confusion. -Daniel > > BR, > Jani. > > > > >> > from the drm-intel tree and patch: > >> > > >> > "drm/i915: use vmap in i915_gem_object_map" > >> > > >> > from the akpm tree. > >> > > >> > I fixed it up (I just dropped the changes in the former commits) and > >> > >> Sigh. The solution is a bit more complicated, but I just redid my > >> patches to not depend on the above ones. I can revert back to the old > >> version, though. Andrew, let me know what works for you. > > > > Imo ignore, rebasing onto linux-next without those intel patches was > > the right thing for the 5.10 merge window. > > -Daniel > > -- > Jani Nikula, Intel Open Source Graphics Center -- 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] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-01 15:13 ` Daniel Vetter 0 siblings, 0 replies; 17+ messages in thread From: Daniel Vetter @ 2020-10-01 15:13 UTC (permalink / raw) To: Jani Nikula Cc: Christoph Hellwig, Stephen Rothwell, Andrew Morton, Joonas Lahtinen, Rodrigo Vivi, Intel Graphics, DRI, Dave Airlie, Chris Wilson, Linux Kernel Mailing List, Linux Next Mailing List On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula <jani.nikula@linux.intel.com> wrote: > > On Thu, 01 Oct 2020, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: > >> > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > >> > Hi all, > >> > > >> > Today's linux-next merge of the akpm tree got a conflict in: > >> > > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c > >> > > >> > between commit: > >> > > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > > > Uh these patches shouldn't be in linux-next because they're for 5.11, > > not the 5.10 merge window that will open soon. Joonas? > > I don't know anything else, but both are tagged Cc: stable. Uh right I got confused, they're on -fixes now. Well -next-fixes, which seems like the wrong one for a cc: stable, I guess this should go into 5.9 even. Apologies for my confusion. -Daniel > > BR, > Jani. > > > > >> > from the drm-intel tree and patch: > >> > > >> > "drm/i915: use vmap in i915_gem_object_map" > >> > > >> > from the akpm tree. > >> > > >> > I fixed it up (I just dropped the changes in the former commits) and > >> > >> Sigh. The solution is a bit more complicated, but I just redid my > >> patches to not depend on the above ones. I can revert back to the old > >> version, though. Andrew, let me know what works for you. > > > > Imo ignore, rebasing onto linux-next without those intel patches was > > the right thing for the 5.10 merge window. > > -Daniel > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the akpm tree with the drm-intel tree 2020-10-01 15:13 ` Daniel Vetter (?) @ 2020-10-02 10:17 ` Joonas Lahtinen -1 siblings, 0 replies; 17+ messages in thread From: Joonas Lahtinen @ 2020-10-02 10:17 UTC (permalink / raw) To: Daniel Vetter, Jani Nikula Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, Linux Kernel Mailing List, DRI, Chris Wilson, Linux Next Mailing List, Andrew Morton, Christoph Hellwig Quoting Daniel Vetter (2020-10-01 18:13:26) > On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula <jani.nikula@linux.intel.com> wrote: > > > > On Thu, 01 Oct 2020, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: > > >> > > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > >> > Hi all, > > >> > > > >> > Today's linux-next merge of the akpm tree got a conflict in: > > >> > > > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > >> > > > >> > between commit: > > >> > > > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > > >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > > > > > Uh these patches shouldn't be in linux-next because they're for 5.11, > > > not the 5.10 merge window that will open soon. Joonas? > > > > I don't know anything else, but both are tagged Cc: stable. > > Uh right I got confused, they're on -fixes now. Well -next-fixes, > which seems like the wrong one for a cc: stable, I guess this should > go into 5.9 even. Apologies for my confusion. Yep, they happen to be Fixes: (Cc: stable even) so I asked Rodrigo to pull them to drm-intel-next-fixes. If they weren't Fixes: then indeed they would only have been queued for 5.11. With regards to 5.9, due to the hiccup of doing the split PR, all the -fixes for GT area were in limbo until -rc7. We didn't feel comfortable including all the new commits this late in the cycle, so we agreed stable porting those will be more appropriate. Regards, Joonas > -Daniel > > > > > BR, > > Jani. > > > > > > > >> > from the drm-intel tree and patch: > > >> > > > >> > "drm/i915: use vmap in i915_gem_object_map" > > >> > > > >> > from the akpm tree. > > >> > > > >> > I fixed it up (I just dropped the changes in the former commits) and > > >> > > >> Sigh. The solution is a bit more complicated, but I just redid my > > >> patches to not depend on the above ones. I can revert back to the old > > >> version, though. Andrew, let me know what works for you. > > > > > > Imo ignore, rebasing onto linux-next without those intel patches was > > > the right thing for the 5.10 merge window. > > > -Daniel > > > > -- > > Jani Nikula, Intel Open Source Graphics Center > > > > -- > 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] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-02 10:17 ` Joonas Lahtinen 0 siblings, 0 replies; 17+ messages in thread From: Joonas Lahtinen @ 2020-10-02 10:17 UTC (permalink / raw) To: Daniel Vetter, Jani Nikula Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, Linux Kernel Mailing List, DRI, Chris Wilson, Linux Next Mailing List, Rodrigo Vivi, Andrew Morton, Christoph Hellwig Quoting Daniel Vetter (2020-10-01 18:13:26) > On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula <jani.nikula@linux.intel.com> wrote: > > > > On Thu, 01 Oct 2020, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: > > >> > > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > >> > Hi all, > > >> > > > >> > Today's linux-next merge of the akpm tree got a conflict in: > > >> > > > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > >> > > > >> > between commit: > > >> > > > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > > >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > > > > > Uh these patches shouldn't be in linux-next because they're for 5.11, > > > not the 5.10 merge window that will open soon. Joonas? > > > > I don't know anything else, but both are tagged Cc: stable. > > Uh right I got confused, they're on -fixes now. Well -next-fixes, > which seems like the wrong one for a cc: stable, I guess this should > go into 5.9 even. Apologies for my confusion. Yep, they happen to be Fixes: (Cc: stable even) so I asked Rodrigo to pull them to drm-intel-next-fixes. If they weren't Fixes: then indeed they would only have been queued for 5.11. With regards to 5.9, due to the hiccup of doing the split PR, all the -fixes for GT area were in limbo until -rc7. We didn't feel comfortable including all the new commits this late in the cycle, so we agreed stable porting those will be more appropriate. Regards, Joonas > -Daniel > > > > > BR, > > Jani. > > > > > > > >> > from the drm-intel tree and patch: > > >> > > > >> > "drm/i915: use vmap in i915_gem_object_map" > > >> > > > >> > from the akpm tree. > > >> > > > >> > I fixed it up (I just dropped the changes in the former commits) and > > >> > > >> Sigh. The solution is a bit more complicated, but I just redid my > > >> patches to not depend on the above ones. I can revert back to the old > > >> version, though. Andrew, let me know what works for you. > > > > > > Imo ignore, rebasing onto linux-next without those intel patches was > > > the right thing for the 5.10 merge window. > > > -Daniel > > > > -- > > Jani Nikula, Intel Open Source Graphics Center > > > > -- > 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] 17+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the drm-intel tree @ 2020-10-02 10:17 ` Joonas Lahtinen 0 siblings, 0 replies; 17+ messages in thread From: Joonas Lahtinen @ 2020-10-02 10:17 UTC (permalink / raw) To: Daniel Vetter, Jani Nikula Cc: Christoph Hellwig, Stephen Rothwell, Andrew Morton, Rodrigo Vivi, Intel Graphics, DRI, Dave Airlie, Chris Wilson, Linux Kernel Mailing List, Linux Next Mailing List Quoting Daniel Vetter (2020-10-01 18:13:26) > On Thu, Oct 1, 2020 at 5:08 PM Jani Nikula <jani.nikula@linux.intel.com> wrote: > > > > On Thu, 01 Oct 2020, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > > On Thu, Oct 1, 2020 at 3:53 PM Christoph Hellwig <hch@lst.de> wrote: > > >> > > >> On Thu, Oct 01, 2020 at 08:39:17PM +1000, Stephen Rothwell wrote: > > >> > Hi all, > > >> > > > >> > Today's linux-next merge of the akpm tree got a conflict in: > > >> > > > >> > drivers/gpu/drm/i915/gem/i915_gem_pages.c > > >> > > > >> > between commit: > > >> > > > >> > 4caf017ee937 ("drm/i915/gem: Avoid implicit vmap for highmem on x86-32") > > >> > ba2ebf605d5f ("drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported") > > > > > > Uh these patches shouldn't be in linux-next because they're for 5.11, > > > not the 5.10 merge window that will open soon. Joonas? > > > > I don't know anything else, but both are tagged Cc: stable. > > Uh right I got confused, they're on -fixes now. Well -next-fixes, > which seems like the wrong one for a cc: stable, I guess this should > go into 5.9 even. Apologies for my confusion. Yep, they happen to be Fixes: (Cc: stable even) so I asked Rodrigo to pull them to drm-intel-next-fixes. If they weren't Fixes: then indeed they would only have been queued for 5.11. With regards to 5.9, due to the hiccup of doing the split PR, all the -fixes for GT area were in limbo until -rc7. We didn't feel comfortable including all the new commits this late in the cycle, so we agreed stable porting those will be more appropriate. Regards, Joonas > -Daniel > > > > > BR, > > Jani. > > > > > > > >> > from the drm-intel tree and patch: > > >> > > > >> > "drm/i915: use vmap in i915_gem_object_map" > > >> > > > >> > from the akpm tree. > > >> > > > >> > I fixed it up (I just dropped the changes in the former commits) and > > >> > > >> Sigh. The solution is a bit more complicated, but I just redid my > > >> patches to not depend on the above ones. I can revert back to the old > > >> version, though. Andrew, let me know what works for you. > > > > > > Imo ignore, rebasing onto linux-next without those intel patches was > > > the right thing for the 5.10 merge window. > > > -Daniel > > > > -- > > Jani Nikula, Intel Open Source Graphics Center > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2020-10-02 10:18 UTC | newest] Thread overview: 17+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-10-01 10:39 [Intel-gfx] linux-next: manual merge of the akpm tree with the drm-intel tree Stephen Rothwell 2020-10-01 10:39 ` Stephen Rothwell 2020-10-01 10:39 ` Stephen Rothwell 2020-10-01 13:53 ` [Intel-gfx] " Christoph Hellwig 2020-10-01 13:53 ` Christoph Hellwig 2020-10-01 14:13 ` [Intel-gfx] " Daniel Vetter 2020-10-01 14:13 ` Daniel Vetter 2020-10-01 14:13 ` Daniel Vetter 2020-10-01 15:08 ` [Intel-gfx] " Jani Nikula 2020-10-01 15:08 ` Jani Nikula 2020-10-01 15:08 ` Jani Nikula 2020-10-01 15:13 ` [Intel-gfx] " Daniel Vetter 2020-10-01 15:13 ` Daniel Vetter 2020-10-01 15:13 ` Daniel Vetter 2020-10-02 10:17 ` [Intel-gfx] " Joonas Lahtinen 2020-10-02 10:17 ` Joonas Lahtinen 2020-10-02 10:17 ` Joonas Lahtinen
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.