linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Douglas Anderson <dianders@chromium.org>,
	Evan Green <evgreen@chromium.org>
Subject: Re: linux-next: manual merge of the phy-next tree with Linus' tree
Date: Wed, 12 Dec 2018 10:58:38 +0530	[thread overview]
Message-ID: <470d74f1-2778-db77-641e-97310335ac42@ti.com> (raw)
In-Reply-To: <20181212161217.6858c3d9@canb.auug.org.au>

Hi,

On 12/12/18 10:42 AM, Stephen Rothwell wrote:
> Hi Kishon,
> 
> On Wed, 12 Dec 2018 10:37:37 +0530 Kishon Vijay Abraham I <kishon@ti.com> wrote:
>>
>> I've rebased by 'next' branch on top of my 'fixes' branch to avoid this conflict.
> 
> Why didn't you just merge them?

Merging will create a new merge commit which I can avoid by rebasing. Also the
patches in next branch will be above the patches in fixes branch.

Thanks
Kishon
> 

      reply	other threads:[~2018-12-12  5:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-12  4:16 linux-next: manual merge of the phy-next tree with Linus' tree Stephen Rothwell
2018-12-12  5:07 ` Kishon Vijay Abraham I
2018-12-12  5:12   ` Stephen Rothwell
2018-12-12  5:28     ` Kishon Vijay Abraham I [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=470d74f1-2778-db77-641e-97310335ac42@ti.com \
    --to=kishon@ti.com \
    --cc=dianders@chromium.org \
    --cc=evgreen@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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).