From: Linus Torvalds <torvalds@linux-foundation.org>
To: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
LKML <linux-kernel@vger.kernel.org>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>
Subject: Re: [GIT PULL] platform-drivers-x86 for 4.17-1
Date: Wed, 11 Apr 2018 11:50:25 -0700 [thread overview]
Message-ID: <CA+55aFxODGv7-AvnqFmxrXBcS2w0XzHuZ7UuRi3EMQz4-oeLJA@mail.gmail.com> (raw)
In-Reply-To: <CAHp75VcH0N2BZHaVko3EGWJGk8g_GriCCS_izyjXFSXG81q4rg@mail.gmail.com>
On Tue, Apr 10, 2018 at 1:35 PM, Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
>
> That's good news.
> I'm using whatever is in Debian Unstable (old for less than month) and
> what I tried was
>
> % git checkout -b test origin/master
> % git merge for-next # our branch for you
>
> It complained to me that file was renamed / deleted and it didn't
> resolve conflicts automatically.
Hmm. I don't know what the difference might be. debian-unstable is
usually not *so* ancient that I'd expect big git version differences
(even if I personally tend to run very recent git trees, because it's
the one thing in addition to the kernel that I build myself).
Sometimes things like the git rename limits hit people. Your side
didn't have a lot of file creation/deletion (which is when the default
git rename limits can bite you), but my side did.
Did you perhaps also get a message like "inexact rename detection was
skipped due to too many files"? If you have lots of memory, it can be
a good idea to just disable the rename limits:
git config diff.renameLimit 0
git config merge.renameLimit 0
but it's also possible that some tweak to the diff algorithm triggered
this, or just the fact that we tried merging at slightly different
points.
Not a big deal.
Linus
prev parent reply other threads:[~2018-04-11 20:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-10 17:12 [GIT PULL] platform-drivers-x86 for 4.17-1 Andy Shevchenko
2018-04-10 19:22 ` Linus Torvalds
2018-04-10 20:35 ` Andy Shevchenko
2018-04-11 18:50 ` Linus Torvalds [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=CA+55aFxODGv7-AvnqFmxrXBcS2w0XzHuZ7UuRi3EMQz4-oeLJA@mail.gmail.com \
--to=torvalds@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.kernel.org \
/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).