From: Linus Walleij <linus.walleij@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Roman Sommer <roman.sommer@fau.de>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: Re: linux-next: manual merge of the gpio tree with the staging tree
Date: Mon, 30 Jan 2017 18:28:16 +0100 [thread overview]
Message-ID: <CACRpkdYtux7ZqJ1VLbpa0Qgk3Nf+SczGdhOT6AK1GsNQ0b_NxQ@mail.gmail.com> (raw)
In-Reply-To: <20170130152855.7e8cb6c2@canb.auug.org.au>
On Mon, Jan 30, 2017 at 5:28 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.
OK I'll mention it to Linus (the big penguin). Thanks!
Linus Walleij
prev parent reply other threads:[~2017-01-30 17:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 4:28 linux-next: manual merge of the gpio tree with the staging tree Stephen Rothwell
2017-01-30 17:02 ` Greg KH
2017-01-30 17:28 ` Linus Walleij [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=CACRpkdYtux7ZqJ1VLbpa0Qgk3Nf+SczGdhOT6AK1GsNQ0b_NxQ@mail.gmail.com \
--to=linus.walleij@linaro.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=roman.sommer@fau.de \
--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).