From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vinod Koul <vinod.koul@intel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Xuelin Shi <xuelin.shi@freescale.com>
Subject: Re: linux-next: manual merge of the tty tree with the slave-dma tree
Date: Tue, 7 Apr 2015 11:52:36 +0200 [thread overview]
Message-ID: <20150407095236.GA7071@kroah.com> (raw)
In-Reply-To: <20150407192808.375a5d91@canb.auug.org.au>
On Tue, Apr 07, 2015 at 07:28:08PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/dma/Kconfig between commit ad80da658bbc ("dmaengine: Driver
> support for FSL RaidEngine device") from the slave-dma tree and commit
> 2b49e0c56741 ("dmaengine: append hsu DMA driver") from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2015-04-07 9:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-07 9:28 linux-next: manual merge of the tty tree with the slave-dma tree Stephen Rothwell
2015-04-07 9:52 ` Greg KH [this message]
2015-04-07 12:27 ` Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2016-09-05 6:43 Stephen Rothwell
2016-09-05 11:28 ` Vinod Koul
2016-09-05 11:33 ` Greg KH
2016-09-05 12:43 ` Vinod Koul
2016-09-05 13:55 ` Greg KH
2016-09-05 15:53 ` Vinod Koul
2016-09-09 11:53 ` Vinod Koul
2016-09-09 12:20 ` Greg KH
2014-09-30 7:26 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=20150407095236.GA7071@kroah.com \
--to=greg@kroah.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vinod.koul@intel.com \
--cc=xuelin.shi@freescale.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.