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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130320152007.56de4a48eaf2760ccc07f02b@canb.auug.org.au>
Date:	Wed, 20 Mar 2013 15:20:07 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Haiyang Zhang <haiyangz@...rosoft.com>,
	"K. Y. Srinivasan" <kys@...rosoft.com>, Greg KH <greg@...ah.com>,
	Arnd Bergmann <arnd@...db.de>
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).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.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
   */

Content of type "application/pgp-signature" skipped