diff for duplicates of <20150225131748.GE19745@mwanda> diff --git a/a/1.txt b/N1/1.txt index b00bb94..1c493bb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ index 26e9c7b..a76b2ed 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -139,10 +139,11 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) - obj->madv = I915_MADV_DONTNEED ? " purgeable" : ""); + obj->madv == I915_MADV_DONTNEED ? " purgeable" : ""); if (obj->base.name) seq_printf(m, " (name: %d)", obj->base.name); - list_for_each_entry(vma, &obj->vma_list, vma_link) @@ -27,3 +27,7 @@ index 26e9c7b..a76b2ed 100644 if (obj->pin_display) seq_printf(m, " (display)"); if (obj->fence_reg != I915_FENCE_REG_NONE) +_______________________________________________ +dri-devel mailing list +dri-devel@lists.freedesktop.org +http://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/a/content_digest b/N1/content_digest index ce258a2..e25179f 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: cleanup some indenting\0" - "Date\0Wed, 25 Feb 2015 13:17:48 +0000\0" + "Date\0Wed, 25 Feb 2015 16:17:48 +0300\0" "To\0Daniel Vetter <daniel.vetter@intel.com>\0" "Cc\0intel-gfx@lists.freedesktop.org" kernel-janitors@vger.kernel.org @@ -23,7 +23,7 @@ "--- a/drivers/gpu/drm/i915/i915_debugfs.c\n" "+++ b/drivers/gpu/drm/i915/i915_debugfs.c\n" "@@ -139,10 +139,11 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)\n" - " \t\t obj->madv = I915_MADV_DONTNEED ? \" purgeable\" : \"\");\n" + " \t\t obj->madv == I915_MADV_DONTNEED ? \" purgeable\" : \"\");\n" " \tif (obj->base.name)\n" " \t\tseq_printf(m, \" (name: %d)\", obj->base.name);\n" "-\tlist_for_each_entry(vma, &obj->vma_list, vma_link)\n" @@ -35,6 +35,10 @@ "+\tseq_printf(m, \" (pinned x %d)\", pin_count);\n" " \tif (obj->pin_display)\n" " \t\tseq_printf(m, \" (display)\");\n" - " \tif (obj->fence_reg != I915_FENCE_REG_NONE)" + " \tif (obj->fence_reg != I915_FENCE_REG_NONE)\n" + "_______________________________________________\n" + "dri-devel mailing list\n" + "dri-devel@lists.freedesktop.org\n" + http://lists.freedesktop.org/mailman/listinfo/dri-devel -a5dadeb0e9845314f6f1fd324a5905b741613d03b2114c6ac15f1b68f0d1e283 +03fc9c083ffa6dcc10842dbab01054c93a384a5fa2fcec022b676ee0f33d400a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.