> -----Original Message----- > From: Stephen Rothwell [mailto:[email protected]] > Sent: Wednesday, March 20, 2013 12:20 AM > To: Andrew Morton > Cc: [email protected]; [email protected]; 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
