All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Dave Airlie <airlied@gmail.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [GIT PULL] omapdrm changes for v4.5
Date: Thu, 31 Dec 2015 11:47:47 +0200	[thread overview]
Message-ID: <5684F9C3.6080406@ti.com> (raw)
In-Reply-To: <5673CEF8.6000100@ti.com>


[-- Attachment #1.1: Type: text/plain, Size: 1221 bytes --]

Hi Dave,

On 18/12/15 11:16, Tomi Valkeinen wrote:
> Hi Dave,
> 
> Please pull omapdrm changes for v4.5.
> 
>  Tomi
> 
> The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e27864353c89:
> 
>   Linux 4.4-rc5 (2015-12-13 17:42:58 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/omapdrm-4.5
> 
> for you to fetch changes up to 49d274e110d185dbbacabc601b55fd7b9b0e91d6:
> 
>   drm/omap: remove obsolete manager assignment (2015-12-18 11:08:20 +0200)

I see there's a conflict with my tag and drm-next.

Commit 07a6dc19a36912a1bea7ce1d5856c5616c30839a ("drm/omap: use kzalloc
in sita_init()") in drm-next makes a change to tcm-sita.c, which was
pretty much re-written in my branch. I hadn't noticed that patch on the
list.

The conflict looks a bit messy, but can be resolved easily by just
taking tcm-sita.c from my tag, as the change in 07a6dc19a36912a is no
longer needed.

So you can just do:

git merge -s recursive -X theirs omapdrm-4.5

Or you can merge a new tag I made 'omapdrm-4.5-resolved' which has the
same patches, rebased (with -s recursive -X theirs) on top of drm-next.

 Tomi


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

      reply	other threads:[~2015-12-31  9:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-18  9:16 [GIT PULL] omapdrm changes for v4.5 Tomi Valkeinen
2015-12-31  9:47 ` Tomi Valkeinen [this message]

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=5684F9C3.6080406@ti.com \
    --to=tomi.valkeinen@ti.com \
    --cc=airlied@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=laurent.pinchart@ideasonboard.com \
    /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.