diff for duplicates of <20170207145307.GA28648@mwanda>

diff --git a/a/1.txt b/N1/1.txt
index 8fbad61..77bf2a2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,7 +8,8 @@ index 3f656e3a6e5a..773a45aa18f8 100644
 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
 +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
 @@ -965,11 +965,6 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
- 			sparse->areas[0].offset  					PAGE_ALIGN(vgpu_aperture_offset(vgpu));
+ 			sparse->areas[0].offset =
+ 					PAGE_ALIGN(vgpu_aperture_offset(vgpu));
  			sparse->areas[0].size = vgpu_aperture_sz(vgpu);
 -			if (!caps.buf) {
 -				kfree(caps.buf);
@@ -18,3 +19,7 @@ index 3f656e3a6e5a..773a45aa18f8 100644
  			break;
  
  		case VFIO_PCI_BAR3_REGION_INDEX ... VFIO_PCI_BAR5_REGION_INDEX:
+_______________________________________________
+Intel-gfx mailing list
+Intel-gfx@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/a/content_digest b/N1/content_digest
index 477ec21..5200840 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\01486478097.3121.120.camel@linux.intel.com\0"
  "From\0Dan Carpenter <dan.carpenter@oracle.com>\0"
  "Subject\0[patch v2] drm/i915/gvt/kvmgt: remove some dead code\0"
- "Date\0Tue, 07 Feb 2017 14:53:07 +0000\0"
+ "Date\0Tue, 7 Feb 2017 17:53:07 +0300\0"
  "To\0Zhenyu Wang <zhenyuw@linux.intel.com>"
  " Jike Song <jike.song@intel.com>\0"
  "Cc\0David Airlie <airlied@linux.ie>"
@@ -22,7 +22,8 @@
  "--- a/drivers/gpu/drm/i915/gvt/kvmgt.c\n"
  "+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c\n"
  "@@ -965,11 +965,6 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,\n"
- " \t\t\tsparse->areas[0].offset  \t\t\t\t\tPAGE_ALIGN(vgpu_aperture_offset(vgpu));\n"
+ " \t\t\tsparse->areas[0].offset =\n"
+ " \t\t\t\t\tPAGE_ALIGN(vgpu_aperture_offset(vgpu));\n"
  " \t\t\tsparse->areas[0].size = vgpu_aperture_sz(vgpu);\n"
  "-\t\t\tif (!caps.buf) {\n"
  "-\t\t\t\tkfree(caps.buf);\n"
@@ -31,6 +32,10 @@
  "-\t\t\t}\n"
  " \t\t\tbreak;\n"
  " \n"
- " \t\tcase VFIO_PCI_BAR3_REGION_INDEX ... VFIO_PCI_BAR5_REGION_INDEX:"
+ " \t\tcase VFIO_PCI_BAR3_REGION_INDEX ... VFIO_PCI_BAR5_REGION_INDEX:\n"
+ "_______________________________________________\n"
+ "Intel-gfx mailing list\n"
+ "Intel-gfx@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/intel-gfx
 
-fa764ac887270573829bbf402eeb29790da63b1e760668eba68250c249899d34
+f79d47ebb8e69d2da07b06e4caf7d64e8bc768e561664b023bf56eb836c5d332
