All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Jani Nikula <jani.nikula@linux.intel.com>,
	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>,
	DRI <dri-devel@lists.freedesktop.org>,
	Dave Airlie <airlied@linux.ie>, Christoph Hellwig <hch@lst.de>,
	Chris Wilson <chris@chris-wilson.co.uk>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm tree with the drm-intel tree
Date: Thu, 1 Oct 2020 15:53:50 +0200	[thread overview]
Message-ID: <20201001135350.GA14869@lst.de> (raw)
In-Reply-To: <20201001203917.43d46a3d@canb.auug.org.au>

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.

WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dave Airlie <airlied@linux.ie>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Chris Wilson <chris@chris-wilson.co.uk>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	DRI <dri-devel@lists.freedesktop.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Christoph Hellwig <hch@lst.de>
Subject: Re: [Intel-gfx] linux-next: manual merge of the akpm tree with the drm-intel tree
Date: Thu, 1 Oct 2020 15:53:50 +0200	[thread overview]
Message-ID: <20201001135350.GA14869@lst.de> (raw)
In-Reply-To: <20201001203917.43d46a3d@canb.auug.org.au>

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

  reply	other threads:[~2020-10-01 13:53 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-01 10:39 linux-next: manual merge of the akpm tree with the drm-intel tree Stephen Rothwell
2020-10-01 10:39 ` [Intel-gfx] " Stephen Rothwell
2020-10-01 10:39 ` Stephen Rothwell
2020-10-01 13:53 ` Christoph Hellwig [this message]
2020-10-01 13:53   ` [Intel-gfx] " Christoph Hellwig
2020-10-01 14:13   ` Daniel Vetter
2020-10-01 14:13     ` [Intel-gfx] " Daniel Vetter
2020-10-01 14:13     ` Daniel Vetter
2020-10-01 15:08     ` Jani Nikula
2020-10-01 15:08       ` [Intel-gfx] " Jani Nikula
2020-10-01 15:08       ` Jani Nikula
2020-10-01 15:13       ` Daniel Vetter
2020-10-01 15:13         ` [Intel-gfx] " Daniel Vetter
2020-10-01 15:13         ` Daniel Vetter
2020-10-02 10:17         ` Joonas Lahtinen
2020-10-02 10:17           ` [Intel-gfx] " Joonas Lahtinen
2020-10-02 10:17           ` Joonas Lahtinen
  -- strict thread matches above, loose matches on Subject: below --
2013-08-06  5:45 Stephen Rothwell
2013-08-06  5:45 ` Stephen Rothwell
2013-07-18  4:59 Stephen Rothwell
2013-07-18  4:59 ` Stephen Rothwell
2013-07-08  4:31 Stephen Rothwell
2013-07-08  4:31 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201001135350.GA14869@lst.de \
    --to=hch@lst.de \
    --cc=airlied@linux.ie \
    --cc=akpm@linux-foundation.org \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rodrigo.vivi@intel.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.