public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnd Bergmann <arnd@arndb•de>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Shraddha Barke <shraddha.6596@gmail•com>,
	Christoffer Dall <christoffer.dall@linaro•org>,
	Jason Hu <jia-cheng.hu@intel•com>
Subject: Re: linux-next: manual merge of the char-misc tree with the staging tree
Date: Mon, 22 Feb 2016 17:36:25 -0800	[thread overview]
Message-ID: <20160223013625.GA761@kroah.com> (raw)
In-Reply-To: <20160216135548.6da63be6@canb.auug.org.au>

On Tue, Feb 16, 2016 at 01:55:48PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/platform/goldfish/goldfish_pipe.c
> 
> between commit:
> 
>   1d427da1d7f9 ("Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version")
> 
> from the staging tree and commits:
> 
>   2f3be88237a3 ("goldfish_pipe: Pin pages to memory while copying and other cleanups")
>   d62f324b0ac8 ("goldfish: Enable ACPI-based enumeration for android pipe")
> 
> from the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for letting me know. I've now pulled in the char-misc tree into
staging due to the confusion that was happening with this driver, people
were modifying it in both repos, so now everything should be synced up.

thanks,

greg k-h

next prev parent reply	other threads:[~2016-02-23  1:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-16  2:55 linux-next: manual merge of the char-misc tree with the staging tree Stephen Rothwell
2016-02-23  1:36 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-02-16  3:00 Stephen Rothwell
2014-11-10  5:53 Stephen Rothwell
2014-11-10  5:58 ` 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=20160223013625.GA761@kroah.com \
    --to=greg@kroah$(echo .)com \
    --cc=arnd@arndb$(echo .)de \
    --cc=christoffer.dall@linaro$(echo .)org \
    --cc=jia-cheng.hu@intel$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=shraddha.6596@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox