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

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

[Stephen Rothwell]

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
include/linux/hyperv.h between commit 96dd86fa5881 ("Drivers: hv: Add a
new driver to support host initiated backup") from the char-misc  tree
and commit "drivers/video: add Hyper-V Synthetic Video Frame Buffer
Driver" from the akpm 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 include/linux/hyperv.h
index 95d0850,a460ee4..0000000
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@@ -1310,13 -1253,16 +1310,25 @@@ void vmbus_driver_unregister(struct hv_
  		}
  
  /*
 + * VSS (Backup/Restore) GUID
 + */
 +#define HV_VSS_GUID \
 +	.guid = { \
 +			0x29, 0x2e, 0xfa, 0x35, 0x23, 0xea, 0x36, 0x42, \
 +			0x96, 0xae, 0x3a, 0x6e, 0xba, 0xcb, 0xa4,  0x40 \
 +		}
++
++/*
+  * Synthetic Video GUID
+  * {DA0A7802-E377-4aac-8E77-0558EB1073F8}
+  */
+ #define HV_SYNTHVID_GUID \
+ 	.guid = { \
+ 			0x02, 0x78, 0x0a, 0xda, 0x77, 0xe3, 0xac, 0x4a, \
+ 			0x8e, 0x77, 0x05, 0x58, 0xeb, 0x10, 0x73, 0xf8 \
+ 		}
+ 
+ 
  /*
   * Common header for Hyper-V ICs
   */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[KY Srinivasan]

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Wednesday, March 20, 2013 12:20 AM
> To: Andrew Morton
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Haiyang Zhang; KY
> Srinivasan; Greg KH; Arnd Bergmann
> Subject: linux-next: manual merge of the akpm tree with the char-misc tree
> 
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> include/linux/hyperv.h between commit 96dd86fa5881 ("Drivers: hv: Add a
> new driver to support host initiated backup") from the char-misc  tree
> and commit "drivers/video: add Hyper-V Synthetic Video Frame Buffer
> Driver" from the akpm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen,


K. Y
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc include/linux/hyperv.h
> index 95d0850,a460ee4..0000000
> --- a/include/linux/hyperv.h
> +++ b/include/linux/hyperv.h
> @@@ -1310,13 -1253,16 +1310,25 @@@ void vmbus_driver_unregister(struct
> hv_
>   		}
> 
>   /*
>  + * VSS (Backup/Restore) GUID
>  + */
>  +#define HV_VSS_GUID \
>  +	.guid = { \
>  +			0x29, 0x2e, 0xfa, 0x35, 0x23, 0xea, 0x36, 0x42, \
>  +			0x96, 0xae, 0x3a, 0x6e, 0xba, 0xcb, 0xa4,  0x40 \
>  +		}
> ++
> ++/*
> +  * Synthetic Video GUID
> +  * {DA0A7802-E377-4aac-8E77-0558EB1073F8}
> +  */
> + #define HV_SYNTHVID_GUID \
> + 	.guid = { \
> + 			0x02, 0x78, 0x0a, 0xda, 0x77, 0xe3, 0xac, 0x4a, \
> + 			0x8e, 0x77, 0x05, 0x58, 0xeb, 0x10, 0x73, 0xf8 \
> + 		}
> +
> +
>   /*
>    * Common header for Hyper-V ICs
>    */

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

[Haiyang Zhang]

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Wednesday, March 20, 2013 12:20 AM
> To: Andrew Morton
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Haiyang
> Zhang; KY Srinivasan; Greg KH; Arnd Bergmann
> Subject: linux-next: manual merge of the akpm tree with the char-misc
> tree
> 
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> include/linux/hyperv.h between commit 96dd86fa5881 ("Drivers: hv: Add a
> new driver to support host initiated backup") from the char-misc  tree
> and commit "drivers/video: add Hyper-V Synthetic Video Frame Buffer
> Driver" from the akpm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thank you for fixing it!

- Haiyang

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

[Stephen Rothwell]

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/w1/w1_int.c between commit fdc9167a7853 ("w1: use pr_* instead
of printk") from the char-misc tree and commit "drivers/w1/w1_int.c:
call put_device if device_register fails" from the akpm 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/w1/w1_int.c
index 47249a30eae3,ec3fc9335f0d..000000000000
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@@ -90,10 -91,9 +90,9 @@@ static struct w1_master *w1_alloc_dev(u
  
  	err = device_register(&dev->dev);
  	if (err) {
 -		printk(KERN_ERR "Failed to register master device. err=%d\n", err);
 +		pr_err("Failed to register master device. err=%d\n", err);
- 		memset(dev, 0, sizeof(struct w1_master));
- 		kfree(dev);
- 		dev = NULL;
+ 		put_device(&dev->dev);
+ 		return NULL;
  	}
  
  	return dev;

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