From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomi Valkeinen Subject: Re: [GIT PULL] omapdrm changes for v4.5 Date: Thu, 31 Dec 2015 11:47:47 +0200 Message-ID: <5684F9C3.6080406@ti.com> References: <5673CEF8.6000100@ti.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0143085891==" Return-path: Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3030189B3C for ; Thu, 31 Dec 2015 01:47:56 -0800 (PST) In-Reply-To: <5673CEF8.6000100@ti.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie Cc: Laurent Pinchart , DRI Development List-Id: dri-devel@lists.freedesktop.org --===============0143085891== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Xd4MPeM7vLHc2mx0cbRgjNOg2IFifH8jW" --Xd4MPeM7vLHc2mx0cbRgjNOg2IFifH8jW Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Dave, On 18/12/15 11:16, Tomi Valkeinen wrote: > Hi Dave, >=20 > Please pull omapdrm changes for v4.5. >=20 > Tomi >=20 > The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e2786435= 3c89: >=20 > Linux 4.4-rc5 (2015-12-13 17:42:58 -0800) >=20 > are available in the git repository at: >=20 > git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/om= apdrm-4.5 >=20 > for you to fetch changes up to 49d274e110d185dbbacabc601b55fd7b9b0e91d6= : >=20 > drm/omap: remove obsolete manager assignment (2015-12-18 11:08:20 +02= 00) 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 --Xd4MPeM7vLHc2mx0cbRgjNOg2IFifH8jW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWhPnDAAoJEPo9qoy8lh71e5wP/2XTeqBXjLWOcJzGvY8u/sGQ k4Qhh7udPIfq6MepVLYXDJzukrRydE2+VLTt2/OizJFhfDHQlN9nJwzs38vYhBCZ KvyHfVURLDRqSJvhtBESRrynPMYzbP4hN8irIyhcbmk/sO/eK2RNnbJ/vZQ/pQnT hUAaKH/XACIWt7Al14MeP1J4EYu21WdfNPo16EN3Z7chzjlN5A3iqiJZSJNb/I+n TT2yNKx+XjiyVm4Urtt0x/Ljia8VUBvT5n6fkdVCEP3SHn4xGJQNLM/wtQzIzrFY Oe4cOjHAyrKDe51LhAzku/P7Bxr8Y8q31RkdLx95A4q2W2N5YTIRAkBJZs2HoeQi zyqwlMIAEGQK0bYCoUwoM4i2HM+NArDYpcH7bRRUHqlIxYCAnpZS3chE4KGue3Mc fu5rqUTAeH+i0eckyhCIHNYjClYSgPGk6Tz3tAKEhYQbHbgTnXa8BQVGAZDUEPPm YSXJYwsiZRdOcQZQqRkcIOr9NQyPqArWCKyen71rNA/HI7yFfzxP4vofsiwai1jh d/XTXryPYOBazyQA8KpBOeGUtk1d+a0I872Qf4JXd7Ad4mOJpnB5HIttSlio80n4 1UPwn8OZlxvJ0IWWnzf2AJ/XStK7A9v+td1FFe+QI501GCiSmjiObyIlEHa3ilSO +igtxJd0QKO+d68ofUEm =3Nfm -----END PGP SIGNATURE----- --Xd4MPeM7vLHc2mx0cbRgjNOg2IFifH8jW-- --===============0143085891== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK --===============0143085891==--