diff for duplicates of <2103506.7Srdik8cGn@grover> diff --git a/a/1.txt b/N1/1.txt index 4565c4b..4f96a6e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -101,19 +101,19 @@ On Monday 30 June 2014 07:59:55 Chris Wilson wrote: > > console_lock(); > - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); -> - if (ret = 0) { +> - if (ret == 0) { > - ret = do_unregister_con_driver(&vga_con); > - > - /* Ignore "already unregistered". */ -> - if (ret = -ENODEV) +> - if (ret == -ENODEV) > - ret = 0; > + if (con_is_bound(&vga_con)) { > + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); -> + if (ret = 0) { +> + if (ret == 0) { > + ret = do_unregister_con_driver(&vga_con); > + > + /* Ignore "already unregistered". */ -> + if (ret = -ENODEV) +> + if (ret == -ENODEV) > + ret = 0; > + } > } diff --git a/a/content_digest b/N1/content_digest index 49e51c7..065e6e5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020140630065955.GD7687@nuc-i3427.alporthouse.com\0" "From\0Ed Tomlinson <edt@aei.ca>\0" "Subject\0Re: [PATCH 5/5] drm/i915: Kick out vga console\0" - "Date\0Tue, 01 Jul 2014 13:51:42 +0000\0" + "Date\0Tue, 01 Jul 2014 09:51:42 -0400\0" "To\0Chris Wilson <chris@chris-wilson.co.uk>\0" "Cc\0linux-fbdev@vger.kernel.org" Dave Airlie <airlied@linux.ie> @@ -119,19 +119,19 @@ "> \n" "> console_lock();\n" "> - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);\n" - "> - if (ret = 0) {\n" + "> - if (ret == 0) {\n" "> - ret = do_unregister_con_driver(&vga_con);\n" "> -\n" "> - /* Ignore \"already unregistered\". */\n" - "> - if (ret = -ENODEV)\n" + "> - if (ret == -ENODEV)\n" "> - ret = 0;\n" "> + if (con_is_bound(&vga_con)) {\n" "> + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);\n" - "> + if (ret = 0) {\n" + "> + if (ret == 0) {\n" "> + ret = do_unregister_con_driver(&vga_con);\n" "> +\n" "> + /* Ignore \"already unregistered\". */\n" - "> + if (ret = -ENODEV)\n" + "> + if (ret == -ENODEV)\n" "> + ret = 0;\n" "> + }\n" "> }\n" @@ -141,4 +141,4 @@ "> \n" > -a672dcedb13b62ccfadbb47f890ee98b7a2e8e012fc380c84bdd487b63f3253a +1fe4f992146b2b9455609aea32fb5ad456dadb6b8f01ce744a4c0f87bff538b1
diff --git a/a/1.txt b/N2/1.txt index 4565c4b..4f96a6e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -101,19 +101,19 @@ On Monday 30 June 2014 07:59:55 Chris Wilson wrote: > > console_lock(); > - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); -> - if (ret = 0) { +> - if (ret == 0) { > - ret = do_unregister_con_driver(&vga_con); > - > - /* Ignore "already unregistered". */ -> - if (ret = -ENODEV) +> - if (ret == -ENODEV) > - ret = 0; > + if (con_is_bound(&vga_con)) { > + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); -> + if (ret = 0) { +> + if (ret == 0) { > + ret = do_unregister_con_driver(&vga_con); > + > + /* Ignore "already unregistered". */ -> + if (ret = -ENODEV) +> + if (ret == -ENODEV) > + ret = 0; > + } > } diff --git a/a/content_digest b/N2/content_digest index 49e51c7..2d9a30c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,17 +3,18 @@ "ref\020140630065955.GD7687@nuc-i3427.alporthouse.com\0" "From\0Ed Tomlinson <edt@aei.ca>\0" "Subject\0Re: [PATCH 5/5] drm/i915: Kick out vga console\0" - "Date\0Tue, 01 Jul 2014 13:51:42 +0000\0" + "Date\0Tue, 01 Jul 2014 09:51:42 -0400\0" "To\0Chris Wilson <chris@chris-wilson.co.uk>\0" - "Cc\0linux-fbdev@vger.kernel.org" - Dave Airlie <airlied@linux.ie> - Daniel Vetter <daniel.vetter@ffwll.ch> + "Cc\0Daniel Vetter <daniel.vetter@ffwll.ch>" Intel Graphics Development <intel-gfx@lists.freedesktop.org> - LKML <linux-kernel@vger.kernel.org> DRI Development <dri-devel@lists.freedesktop.org> - Tomi Valkeinen <tomi.valkeinen@ti.com> + LKML <linux-kernel@vger.kernel.org> David Herrmann <dh.herrmann@gmail.com> - " Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>\0" + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + Tomi Valkeinen <tomi.valkeinen@ti.com> + linux-fbdev@vger.kernel.org + Jani Nikula <jani.nikula@linux.intel.com> + " Dave Airlie <airlied@linux.ie>\0" "\00:1\0" "b\0" "Hi Chris,\n" @@ -119,19 +120,19 @@ "> \n" "> console_lock();\n" "> - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);\n" - "> - if (ret = 0) {\n" + "> - if (ret == 0) {\n" "> - ret = do_unregister_con_driver(&vga_con);\n" "> -\n" "> - /* Ignore \"already unregistered\". */\n" - "> - if (ret = -ENODEV)\n" + "> - if (ret == -ENODEV)\n" "> - ret = 0;\n" "> + if (con_is_bound(&vga_con)) {\n" "> + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);\n" - "> + if (ret = 0) {\n" + "> + if (ret == 0) {\n" "> + ret = do_unregister_con_driver(&vga_con);\n" "> +\n" "> + /* Ignore \"already unregistered\". */\n" - "> + if (ret = -ENODEV)\n" + "> + if (ret == -ENODEV)\n" "> + ret = 0;\n" "> + }\n" "> }\n" @@ -141,4 +142,4 @@ "> \n" > -a672dcedb13b62ccfadbb47f890ee98b7a2e8e012fc380c84bdd487b63f3253a +4aa51b443dc94d0daee740cc81b90eded37cd3a27ec63cbbf1fa312e8cad419b
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.