diff for duplicates of <20170207131630.GA28207@mwanda>

diff --git a/a/1.txt b/N1/1.txt
index 29fb280..5244306 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,7 +8,8 @@ index 3f656e3a6e5a..de2a55178a37 100644
 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
 +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
 @@ -965,11 +965,8 @@ 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);
@@ -19,3 +20,7 @@ index 3f656e3a6e5a..de2a55178a37 100644
  			break;
  
  		case VFIO_PCI_BAR3_REGION_INDEX ... VFIO_PCI_BAR5_REGION_INDEX:
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index c3c6420..f692928 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "From\0Dan Carpenter <dan.carpenter@oracle.com>\0"
  "Subject\0[patch] drm/i915/gvt/kvmgt: remove some dead code\0"
- "Date\0Tue, 07 Feb 2017 13:16:31 +0000\0"
+ "Date\0Tue, 7 Feb 2017 16:16:31 +0300\0"
  "To\0Zhenyu Wang <zhenyuw@linux.intel.com>"
  " Jike Song <jike.song@intel.com>\0"
  "Cc\0intel-gfx@lists.freedesktop.org"
@@ -21,7 +21,8 @@
  "--- a/drivers/gpu/drm/i915/gvt/kvmgt.c\n"
  "+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c\n"
  "@@ -965,11 +965,8 @@ 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"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-bd59965455bb666a6cb875f1d22e1accaa56e6a0c3d69121436045ad4e08ede7
+f7103902e3827dce3c6025968253dfc5967ab4c4913ca91ff3a8c817f725b7d6
