linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Walleij <linus.walleij@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips.org>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Huacai Chen <chenhc@lemote.com>
Subject: Re: linux-next: manual merge of the gpio tree with the mips tree
Date: Thu, 12 May 2016 15:35:28 +0200	[thread overview]
Message-ID: <CACRpkdY6F_weQNsUARO2MMPC07vpezeKpwBCmeTQpSvpKh=tOg@mail.gmail.com> (raw)
In-Reply-To: <20160512141746.11db6bd3@canb.auug.org.au>

On Thu, May 12, 2016 at 6:17 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Yeah this is trivial and ACKed by the MIPS mainatainer so should be
safe, thanks!

Yours,
Linus Walleij

  reply	other threads:[~2016-05-12 13:35 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-12  4:17 linux-next: manual merge of the gpio tree with the mips tree Stephen Rothwell
2016-05-12 13:35 ` Linus Walleij [this message]
2020-01-10  4:51 Stephen Rothwell
2020-01-13  9:12 ` Paul Kocialkowski
2020-01-13 11:45   ` Stephen Rothwell
2020-01-29 22:37 ` 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='CACRpkdY6F_weQNsUARO2MMPC07vpezeKpwBCmeTQpSvpKh=tOg@mail.gmail.com' \
    --to=linus.walleij@linaro.org \
    --cc=chenhc@lemote.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ralf@linux-mips.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).