All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
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: Tue, 10 Apr 2018 23:35:43 +0300	[thread overview]
Message-ID: <CAHp75VcH0N2BZHaVko3EGWJGk8g_GriCCS_izyjXFSXG81q4rg@mail.gmail.com> (raw)
In-Reply-To: <CA+55aFxzkm0ELM4Xa_rkJpsv4hqeFa7yh2Tvkrh_xnhQqZs=Kg@mail.gmail.com>

On Tue, Apr 10, 2018 at 10:22 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, Apr 10, 2018 at 10:12 AM, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
>>
>> This is first batch of Platform Drivers x86 for v4.17 cycle. Due to few
>> duplication the merge will have conflicts which would be resolved by
>> using `git merge -X no-renames ...` followed by choose of our version of
>> two failed one-liner hunks situated in one file.
>
> I'm not sure what git version or flags you are using, but git merges
> it cleanly for me using the standard recursive merge policy.

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.

-- 
With Best Regards,
Andy Shevchenko

  reply	other threads:[~2018-04-10 20:35 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 [this message]
2018-04-11 18:50     ` Linus Torvalds

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=CAHp75VcH0N2BZHaVko3EGWJGk8g_GriCCS_izyjXFSXG81q4rg@mail.gmail.com \
    --to=andy.shevchenko@gmail.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=andy@infradead.org \
    --cc=dvhart@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.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 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.