From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christian Gromm <christian.gromm@microchip.com>,
Steve Wise <swise@opengridcomputing.com>,
Dennis Dalessandro <dennis.dalessandro@intel.com>
Subject: Re: linux-next: manual merge of the staging tree with the rdma tree
Date: Mon, 17 Aug 2015 09:03:02 -0700 [thread overview]
Message-ID: <20150817160302.GA6311@kroah.com> (raw)
In-Reply-To: <20150817181312.4be1a554@canb.auug.org.au>
On Mon, Aug 17, 2015 at 06:13:12PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/staging/Kconfig
> drivers/staging/Makefile
>
> between commit:
>
> c2347d1b409d ("RDMA/amso1100: deprecate the amso1100 provider")
> 17465e48756f ("IB/ipath: Move ipath driver to staging.")
> 97748be1d6d0 ("Move hfi1 to staging")
>
> from the rdma tree and commit:
>
> 57562a72414c ("Staging: most: add MOST driver's core module")
>
> from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2015-08-17 16:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 8:13 linux-next: manual merge of the staging tree with the rdma tree Stephen Rothwell
2015-08-17 16:03 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-11-01 13:48 Stephen Rothwell
2015-06-15 8:12 Michael Ellerman
2015-06-16 4:48 ` Greg KH
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=20150817160302.GA6311@kroah.com \
--to=greg@kroah.com \
--cc=christian.gromm@microchip.com \
--cc=dennis.dalessandro@intel.com \
--cc=dledford@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=swise@opengridcomputing.com \
/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.