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
Date: Wed, 10 Jul 2019 16:00:51 +1000 [thread overview]
Message-ID: <20190710160051.5b192606@canb.auug.org.au> (raw)
In-Reply-To: <5B8DA87D05A7694D9FA63FD143655C1B9DC6C94D@hasmsx108.ger.corp.intel.com>
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-07-10 6:00 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-20 5:35 linux-next: manual merge of the char-misc tree with the driver-core tree Stephen Rothwell
2019-06-20 6:20 ` Greg KH
2019-07-08 23:51 ` Stephen Rothwell
2019-07-09 7:12 ` Winkler, Tomas
2019-07-10 6:00 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-07-01 9:09 Stephen Rothwell
2019-07-01 18:39 ` Nathan Chancellor
2019-07-01 21:53 ` Stephen Rothwell
2019-07-01 20:04 ` Nathan Chancellor
2019-07-01 21:58 ` Stephen Rothwell
2019-07-02 14:18 ` Jean-Philippe Brucker
2019-07-02 15:18 ` Joerg Roedel
2019-07-02 15:23 ` Michael S. Tsirkin
2019-07-02 15:58 ` Joerg Roedel
2019-07-02 17:05 ` Michael S. Tsirkin
2019-07-02 21:41 ` Stephen Rothwell
2019-07-03 8:41 ` Suzuki K Poulose
2019-07-12 0:53 ` Stephen Rothwell
2019-07-15 20:22 ` Mathieu Poirier
2019-06-13 5:53 Stephen Rothwell
2019-06-13 6:10 ` Greg KH
2019-07-08 23:20 ` Stephen Rothwell
2019-07-08 23:25 ` Nadav Amit
2019-07-09 6:15 ` Greg KH
2019-07-12 7:45 ` Greg KH
2017-02-01 4:28 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=20190710160051.5b192606@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tomas.winkler@intel.com \
--cc=vitaly.lubart@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).