diff for duplicates of <20200330191619.GF7594@ravnborg.org> diff --git a/a/1.txt b/N1/1.txt index 1f8b66d..e211709 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,7 +40,7 @@ On Sun, Mar 29, 2020 at 04:56:47PM +0800, Qiujun Huang wrote: > if (!con_is_bound(&fb_con)) > fbcon_exit(); > -> + if (vc->vc_num = logo_shown) +> + if (vc->vc_num == logo_shown) > + logo_shown = FBCON_LOGO_CANSHOW; > + > return; @@ -52,3 +52,7 @@ Acked-by: Sam Ravnborg <sam@ravnborg.org> I expect Bartlomiej to review/apply. Sam +_______________________________________________ +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 90c7e95..7190b42 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,11 @@ "ref\020200329085647.25133-1-hqjagain@gmail.com\0" "From\0Sam Ravnborg <sam@ravnborg.org>\0" "Subject\0Re: [PATCH v2] fbcon: fix null-ptr-deref in fbcon_switch\0" - "Date\0Mon, 30 Mar 2020 19:16:19 +0000\0" + "Date\0Mon, 30 Mar 2020 21:16:19 +0200\0" "To\0Qiujun Huang <hqjagain@gmail.com>" " Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>\0" "Cc\0daniel.thompson@linaro.org" + b.zolnierkie@samsung.com daniel.vetter@ffwll.ch linux-fbdev@vger.kernel.org dri-devel@lists.freedesktop.org @@ -54,7 +55,7 @@ "> \tif (!con_is_bound(&fb_con))\n" "> \t\tfbcon_exit();\n" "> \n" - "> +\tif (vc->vc_num = logo_shown)\n" + "> +\tif (vc->vc_num == logo_shown)\n" "> +\t\tlogo_shown = FBCON_LOGO_CANSHOW;\n" "> +\n" "> \treturn;\n" @@ -65,6 +66,10 @@ "\n" "I expect Bartlomiej to review/apply.\n" "\n" - "\tSam" + "\tSam\n" + "_______________________________________________\n" + "dri-devel mailing list\n" + "dri-devel@lists.freedesktop.org\n" + https://lists.freedesktop.org/mailman/listinfo/dri-devel -a8ee6970b3f0c68801c7fb0c697f67f1e35e914d871bb6905d621be1df9ed4fa +7fcc1be0fa173ea1126f80fb946505dfd69cc0ba0b21058895cbc0ddd3dae8f1
diff --git a/a/1.txt b/N2/1.txt index 1f8b66d..3c5bce3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -40,7 +40,7 @@ On Sun, Mar 29, 2020 at 04:56:47PM +0800, Qiujun Huang wrote: > if (!con_is_bound(&fb_con)) > fbcon_exit(); > -> + if (vc->vc_num = logo_shown) +> + if (vc->vc_num == logo_shown) > + logo_shown = FBCON_LOGO_CANSHOW; > + > return; diff --git a/a/content_digest b/N2/content_digest index 90c7e95..60775c0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,15 +1,17 @@ "ref\020200329085647.25133-1-hqjagain@gmail.com\0" "From\0Sam Ravnborg <sam@ravnborg.org>\0" "Subject\0Re: [PATCH v2] fbcon: fix null-ptr-deref in fbcon_switch\0" - "Date\0Mon, 30 Mar 2020 19:16:19 +0000\0" + "Date\0Mon, 30 Mar 2020 21:16:19 +0200\0" "To\0Qiujun Huang <hqjagain@gmail.com>" " Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>\0" - "Cc\0daniel.thompson@linaro.org" + "Cc\0b.zolnierkie@samsung.com" daniel.vetter@ffwll.ch - linux-fbdev@vger.kernel.org + maarten.lankhorst@linux.intel.com + daniel.thompson@linaro.org + ghalat@redhat.com dri-devel@lists.freedesktop.org - linux-kernel@vger.kernel.org - " ghalat@redhat.com\0" + linux-fbdev@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Hi Qiujun\n" @@ -54,7 +56,7 @@ "> \tif (!con_is_bound(&fb_con))\n" "> \t\tfbcon_exit();\n" "> \n" - "> +\tif (vc->vc_num = logo_shown)\n" + "> +\tif (vc->vc_num == logo_shown)\n" "> +\t\tlogo_shown = FBCON_LOGO_CANSHOW;\n" "> +\n" "> \treturn;\n" @@ -67,4 +69,4 @@ "\n" "\tSam" -a8ee6970b3f0c68801c7fb0c697f67f1e35e914d871bb6905d621be1df9ed4fa +c3ebb196eebedfe8cc5935e981c77a36689660d2976e2cca4783d45f761ec648
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.