Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 10 Jul 2019 16:00:51 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Winkler, Tomas" <tomas.winkler@intel.com>
Cc:     Greg KH <greg@kroah.com>, "Arnd Bergmann" <arnd@arndb.de>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "Lubart, Vitaly" <vitaly.lubart@intel.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 driver-core tree
Message-ID: <20190710160051.5b192606@canb.auug.org.au>
In-Reply-To: <5B8DA87D05A7694D9FA63FD143655C1B9DC6C94D@hasmsx108.ger.corp.intel.com>
References: <20190620153552.1392079c@canb.auug.org.au>
        <20190709095109.3b75679b@canb.auug.org.au>
        <5B8DA87D05A7694D9FA63FD143655C1B9DC6C94D@hasmsx108.ger.corp.intel.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/1JauvoM9pHm9Os9uhPJxkTc"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/1JauvoM9pHm9Os9uhPJxkTc
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Tomas,

On Tue, 9 Jul 2019 07:12:34 +0000 "Winkler, Tomas" <tomas.winkler@intel.com=
> wrote:
>
> Actually I've asked Greg this git expertise question: how the
> **exact** conflict resolution is carried between git trees (before it
> is finally resolved in upstream for all.). For next time If anyone
> has the answer, please let me know.

When I see a conflict, I fix it up and report it, then "git rerere"
will remember the resolution for me so that the next day it is fixed up
automatically.  When Linus merges the same trees he will do the same
(or a similar) merge resolution.  I depend on the maintainers to inform
Linus if the conflict is any anyway difficult to resolve.

--=20
Cheers,
Stephen Rothwell

--Sig_/1JauvoM9pHm9Os9uhPJxkTc
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0lfxMACgkQAVBC80lX
0GylYAgAiDaCEKvhJeM7K6qo7sJNDK/yUzqM9NC8FBwsIRVAwUjZH1XarjFi8334
EVJbXZ1WxPW1I04QgqejLjwMG8P/i6qDtrLjBaIYrU0bIFk2GgBlmTdkRHt2szsp
BrUn7ByJuGOvK0/l0HQhOO+RH876fj64WmP15bcpVrDmJ9FKBONt2sulA7NI8KmO
lkUrtOb4oqIsuDE7RbOSUMODnc0BOPPyByBMbaDU4mexXb46cKT3Wxr0pjE8QE3R
tajIAZF0z3boxBgmy95HEjglMUh5sWP822pWfV6Tor6+yzEh4z3JXyDIV4G+s0AR
8a21p3I6LsuSo1m7ExM7BjpKEGm/UQ==
=QlJ5
-----END PGP SIGNATURE-----

--Sig_/1JauvoM9pHm9Os9uhPJxkTc--