linux-next: manual merge of the char-misc tree with the staging tree

linux-next: manual merge of the char-misc tree with the staging tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 855 bytes --]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/Makefile between commit 777783e0abae ("staging: android:
binder: move to the "real" part of the kernel") from the staging tree and
commit a06ae8609b3d ("coresight: add CoreSight core layer framework")
from the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/Makefile
index 60d19820a4d4,628b512b625b..000000000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -161,4 -161,4 +161,5 @@@ obj-$(CONFIG_POWERCAP)		+= powercap
  obj-$(CONFIG_MCB)		+= mcb/
  obj-$(CONFIG_RAS)		+= ras/
  obj-$(CONFIG_THUNDERBOLT)	+= thunderbolt/
 +obj-$(CONFIG_ANDROID)		+= android/
+ obj-$(CONFIG_CORESIGHT)		+= coresight/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the char-misc tree with the staging tree

[Greg KH]

On Mon, Nov 10, 2014 at 04:53:16PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/Makefile between commit 777783e0abae ("staging: android:
> binder: move to the "real" part of the kernel") from the staging tree and
> commit a06ae8609b3d ("coresight: add CoreSight core layer framework")
> from the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/Makefile
> index 60d19820a4d4,628b512b625b..000000000000
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@@ -161,4 -161,4 +161,5 @@@ obj-$(CONFIG_POWERCAP)		+= powercap
>   obj-$(CONFIG_MCB)		+= mcb/
>   obj-$(CONFIG_RAS)		+= ras/
>   obj-$(CONFIG_THUNDERBOLT)	+= thunderbolt/
>  +obj-$(CONFIG_ANDROID)		+= android/
> + obj-$(CONFIG_CORESIGHT)		+= coresight/


Looks good, thanks.

greg k-h

linux-next: manual merge of the char-misc tree with the staging tree

[Stephen Rothwell]

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).

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/platform/goldfish/goldfish_pipe.c
index 9f6734ce1873,839df4aace76..000000000000
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@@ -57,7 -58,8 +58,9 @@@
  #include <linux/slab.h>
  #include <linux/io.h>
  #include <linux/goldfish.h>
 +#include <linux/dma-mapping.h>
+ #include <linux/mm.h>
+ #include <linux/acpi.h>
  
  /*
   * IMPORTANT: The following constants must match the ones used and defined

linux-next: manual merge of the char-misc tree with the staging tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/staging/goldfish/goldfish_nand.c

between commit:

  814625b539d3 ("staging: goldfish: goldfish_nand: Return correct error code")

from the staging tree and commit:

  3e2fbc7feec4 ("Staging: goldfish: goldfish_nand: Add DMA Support using dmam_alloc_coherent")

from the char-misc tree.

I fixed it up (the latter incorporated the former) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell

Re: linux-next: manual merge of the char-misc tree with the staging tree

[Greg KH]

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