diff for duplicates of <20230417125651.25126-11-tzimmermann@suse.de> diff --git a/a/1.txt b/N1/1.txt index f3a27c9..9213a02 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -149,7 +149,7 @@ index db568f67e4dc..6ea9596a3c4b 100644 - * by giving the desired number to the sticon driver. + * by giving the desired number to the sticon driver. * NOTE: This number is machine and STI ROM dependend. - * - sti_font=<height>x<width> (e.g. sti_font=16x8) + * - sti_font=<height>x<width> (e.g. sti_font\x16x8) * <height> and <width> gives hints to the height and width of the @@ -359,12 +359,12 @@ __setup("sti_font=", sti_font_setup); #endif @@ -185,13 +185,12 @@ index db568f67e4dc..6ea9596a3c4b 100644 unsigned char offs = sti->rm_entry[i]; - + - if (offs == 0) + if (offs = 0) continue; if (offs != PCI_ROM_ADDRESS && @@ -456,18 +456,18 @@ static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address, - sti->regions_phys[i] = - REGION_OFFSET_TO_PHYS(sti->regions[i], newhpa); + sti->regions_phys[i] REGION_OFFSET_TO_PHYS(sti->regions[i], newhpa); - + len = sti->regions[i].region_desc.length * 4096; @@ -328,7 +327,7 @@ index db568f67e4dc..6ea9596a3c4b 100644 ok = 0; - + - if ((sig & 0xff) == 0x01) { + if ((sig & 0xff) = 0x01) { pr_debug(" byte mode ROM at %08lx, hpa at %08lx\n", address, hpa); @@ -941,7 +941,7 @@ static struct sti_struct *sti_try_rom_generic(unsigned long address, @@ -524,15 +523,15 @@ index ef8a4c5fc687..99996bc7e6d9 100644 reg10_value = 0x13601000; break; case S9000_ID_A1439A: -- if (fb->info.var.bits_per_pixel == 32) -+ if (fb->info.var.bits_per_pixel == 32) +- if (fb->info.var.bits_per_pixel = 32) ++ if (fb->info.var.bits_per_pixel = 32) reg10_value = 0xBBA0A000; - else + else reg10_value = 0x13601000; break; case S9000_ID_HCRX: - if (fb->info.var.bits_per_pixel == 32) + if (fb->info.var.bits_per_pixel = 32) reg10_value = 0xBBA0A000; - else + else @@ -557,10 +556,10 @@ index ef8a4c5fc687..99996bc7e6d9 100644 +FINISH_IMAGE_COLORMAP_ACCESS(struct stifb_info *fb) +{ WRITE_WORD(0x400, fb, REG_2); - if (fb->info.var.bits_per_pixel == 32) { + if (fb->info.var.bits_per_pixel = 32) { WRITE_WORD(0x83000100, fb, REG_1); } else { - if (fb->id == S9000_ID_ARTIST || fb->id == CRT_ID_VISUALIZE_EG) + if (fb->id = S9000_ID_ARTIST || fb->id = CRT_ID_VISUALIZE_EG) WRITE_WORD(0x80000100, fb, REG_26); - else + else @@ -688,7 +687,7 @@ index ef8a4c5fc687..99996bc7e6d9 100644 + switch (fb->id) { case S9000_ID_A1439A: /* CRX24 */ - if (fb->var.bits_per_pixel == 8) { + if (fb->var.bits_per_pixel = 8) { @@ -576,12 +576,12 @@ setNgleLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length) lutBltCtl.fields.lutOffset = 0 * 256; } @@ -844,7 +843,7 @@ index ef8a4c5fc687..99996bc7e6d9 100644 - + if (IS_24_DEVICE(fb)) { - hyperbowl = (fb->info.var.bits_per_pixel == 32) ? + hyperbowl = (fb->info.var.bits_per_pixel = 32) ? HYPERBOWL_MODE01_8_24_LUT0_TRANSPARENT_LUT1_OPAQUE : @@ -897,9 +897,9 @@ SETUP_HCRX(struct stifb_info *fb) /* First write to Hyperbowl must happen twice (bug) */ @@ -883,7 +882,7 @@ index ef8a4c5fc687..99996bc7e6d9 100644 - + /* - if (id == S9000_ID_HCRX) + if (id = S9000_ID_HCRX) hyperInitSprite(fb); else ngleInitSprite(fb); @@ -1025,7 +1024,7 @@ index ef8a4c5fc687..99996bc7e6d9 100644 return 1; - + - if (strncmp(options, "off", 3) == 0) { + if (strncmp(options, "off", 3) = 0) { stifb_disabled = 1; options += 3; -- diff --git a/a/content_digest b/N1/content_digest index 25da9e5..ef6ed12 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020230417125651.25126-1-tzimmermann@suse.de\0" "From\0Thomas Zimmermann <tzimmermann@suse.de>\0" "Subject\0[PATCH v3 10/19] video: Remove trailing whitespaces\0" - "Date\0Mon, 17 Apr 2023 14:56:42 +0200\0" + "Date\0Mon, 17 Apr 2023 12:56:42 +0000\0" "To\0arnd@arndb.de" daniel.vetter@ffwll.ch deller@gmx.de @@ -9,20 +9,20 @@ " gregkh@linuxfoundation.org\0" "Cc\0linux-arch@vger.kernel.org" linux-fbdev@vger.kernel.org - dri-devel@lists.freedesktop.org - linux-snps-arc@lists.infradead.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org linux-ia64@vger.kernel.org - loongarch@lists.linux.dev - linux-m68k@lists.linux-m68k.org - linux-mips@vger.kernel.org + Thomas Zimmermann <tzimmermann@suse.de> linux-parisc@vger.kernel.org - linuxppc-dev@lists.ozlabs.org linux-sh@vger.kernel.org - sparclinux@vger.kernel.org x86@kernel.org - " Thomas Zimmermann <tzimmermann@suse.de>\0" + linux-kernel@vger.kernel.org + dri-devel@lists.freedesktop.org + linux-mips@vger.kernel.org + linux-m68k@lists.linux-m68k.org + loongarch@lists.linux.dev + sparclinux@vger.kernel.org + linux-snps-arc@lists.infradead.org + linuxppc-dev@lists.ozlabs.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Fix trailing whitespaces. No functional changes.\n" @@ -176,7 +176,7 @@ "- *\t\tby giving the desired number to the sticon driver. \n" "+ *\t\tby giving the desired number to the sticon driver.\n" " *\t\tNOTE: This number is machine and STI ROM dependend.\n" - " *\t- sti_font=<height>x<width> (e.g. sti_font=16x8)\n" + " *\t- sti_font=<height>x<width> (e.g. sti_font\026x8)\n" " *\t\t<height> and <width> gives hints to the height and width of the\n" "@@ -359,12 +359,12 @@ __setup(\"sti_font=\", sti_font_setup);\n" " #endif\n" @@ -212,13 +212,12 @@ " \t\t\tunsigned char offs = sti->rm_entry[i];\n" "-\t\t\t\t\n" "+\n" - " \t\t\tif (offs == 0)\n" + " \t\t\tif (offs = 0)\n" " \t\t\t\tcontinue;\n" " \t\t\tif (offs != PCI_ROM_ADDRESS &&\n" "@@ -456,18 +456,18 @@ static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address,\n" " \n" - " \t\tsti->regions_phys[i] =\n" - " \t\t\tREGION_OFFSET_TO_PHYS(sti->regions[i], newhpa);\n" + " \t\tsti->regions_phys[i] \t\t\tREGION_OFFSET_TO_PHYS(sti->regions[i], newhpa);\n" "-\t\t\n" "+\n" " \t\tlen = sti->regions[i].region_desc.length * 4096;\n" @@ -355,7 +354,7 @@ " \tok = 0;\n" "-\t\n" "+\n" - " \tif ((sig & 0xff) == 0x01) {\n" + " \tif ((sig & 0xff) = 0x01) {\n" " \t\tpr_debug(\" byte mode ROM at %08lx, hpa at %08lx\\n\",\n" " \t\t address, hpa);\n" "@@ -941,7 +941,7 @@ static struct sti_struct *sti_try_rom_generic(unsigned long address,\n" @@ -551,15 +550,15 @@ " \t\t\treg10_value = 0x13601000;\n" " \t\t\tbreak;\n" " \t\tcase S9000_ID_A1439A:\n" - "-\t\t\tif (fb->info.var.bits_per_pixel == 32)\t\t\t\t\t\t\n" - "+\t\t\tif (fb->info.var.bits_per_pixel == 32)\n" + "-\t\t\tif (fb->info.var.bits_per_pixel = 32)\t\t\t\t\t\t\n" + "+\t\t\tif (fb->info.var.bits_per_pixel = 32)\n" " \t\t\t\treg10_value = 0xBBA0A000;\n" "-\t\t\telse \n" "+\t\t\telse\n" " \t\t\t\treg10_value = 0x13601000;\n" " \t\t\tbreak;\n" " \t\tcase S9000_ID_HCRX:\n" - " \t\t\tif (fb->info.var.bits_per_pixel == 32)\n" + " \t\t\tif (fb->info.var.bits_per_pixel = 32)\n" " \t\t\t\treg10_value = 0xBBA0A000;\n" "-\t\t\telse\t\t\t\t\t\n" "+\t\t\telse\n" @@ -584,10 +583,10 @@ "+FINISH_IMAGE_COLORMAP_ACCESS(struct stifb_info *fb)\n" "+{\n" " \tWRITE_WORD(0x400, fb, REG_2);\n" - " \tif (fb->info.var.bits_per_pixel == 32) {\n" + " \tif (fb->info.var.bits_per_pixel = 32) {\n" " \t\tWRITE_WORD(0x83000100, fb, REG_1);\n" " \t} else {\n" - " \t\tif (fb->id == S9000_ID_ARTIST || fb->id == CRT_ID_VISUALIZE_EG)\n" + " \t\tif (fb->id = S9000_ID_ARTIST || fb->id = CRT_ID_VISUALIZE_EG)\n" " \t\t\tWRITE_WORD(0x80000100, fb, REG_26);\n" "-\t\telse\t\t\t\t\t\t\t\n" "+\t\telse\n" @@ -715,7 +714,7 @@ "+\tswitch (fb->id)\n" " \t{\n" " \tcase S9000_ID_A1439A:\t\t/* CRX24 */\n" - " \t\tif (fb->var.bits_per_pixel == 8) {\n" + " \t\tif (fb->var.bits_per_pixel = 8) {\n" "@@ -576,12 +576,12 @@ setNgleLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length)\n" " \t\t\tlutBltCtl.fields.lutOffset = 0 * 256;\n" " \t\t}\n" @@ -871,7 +870,7 @@ "-\t\n" "+\n" " \tif (IS_24_DEVICE(fb)) {\n" - " \t\thyperbowl = (fb->info.var.bits_per_pixel == 32) ?\n" + " \t\thyperbowl = (fb->info.var.bits_per_pixel = 32) ?\n" " \t\t\tHYPERBOWL_MODE01_8_24_LUT0_TRANSPARENT_LUT1_OPAQUE :\n" "@@ -897,9 +897,9 @@ SETUP_HCRX(struct stifb_info *fb)\n" " \t\t/* First write to Hyperbowl must happen twice (bug) */\n" @@ -910,7 +909,7 @@ "-\t\n" "+\n" " \t/*\n" - " \tif (id == S9000_ID_HCRX)\n" + " \tif (id = S9000_ID_HCRX)\n" " \t\thyperInitSprite(fb);\n" " \telse\n" " \t\tngleInitSprite(fb);\n" @@ -1052,10 +1051,10 @@ " \t\treturn 1;\n" "-\t\n" "+\n" - " \tif (strncmp(options, \"off\", 3) == 0) {\n" + " \tif (strncmp(options, \"off\", 3) = 0) {\n" " \t\tstifb_disabled = 1;\n" " \t\toptions += 3;\n" "-- \n" 2.40.0 -56fd611fe14b1a2c593e54cc4d025540ba65979ab32e47316c60a63e38467a99 +77d77fb96b22f846737eb02bdead8b8a95b399df6c279f2941d401c472d3cbee
diff --git a/a/1.txt b/N2/1.txt index f3a27c9..2fdb6d0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1030,3 +1030,9 @@ index ef8a4c5fc687..99996bc7e6d9 100644 options += 3; -- 2.40.0 + + +_______________________________________________ +linux-snps-arc mailing list +linux-snps-arc@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-snps-arc diff --git a/a/content_digest b/N2/content_digest index 25da9e5..688a374 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1056,6 +1056,12 @@ " \t\tstifb_disabled = 1;\n" " \t\toptions += 3;\n" "-- \n" - 2.40.0 + "2.40.0\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-snps-arc mailing list\n" + "linux-snps-arc@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-snps-arc -56fd611fe14b1a2c593e54cc4d025540ba65979ab32e47316c60a63e38467a99 +654893b803a81eaa198a643eb7baf33dfb91db2c65202f69a07e2e0537df45d2
diff --git a/a/content_digest b/N3/content_digest index 25da9e5..be47b2c 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -9,20 +9,20 @@ " gregkh@linuxfoundation.org\0" "Cc\0linux-arch@vger.kernel.org" linux-fbdev@vger.kernel.org - dri-devel@lists.freedesktop.org - linux-snps-arc@lists.infradead.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org linux-ia64@vger.kernel.org - loongarch@lists.linux.dev - linux-m68k@lists.linux-m68k.org - linux-mips@vger.kernel.org + Thomas Zimmermann <tzimmermann@suse.de> linux-parisc@vger.kernel.org - linuxppc-dev@lists.ozlabs.org linux-sh@vger.kernel.org - sparclinux@vger.kernel.org x86@kernel.org - " Thomas Zimmermann <tzimmermann@suse.de>\0" + linux-kernel@vger.kernel.org + dri-devel@lists.freedesktop.org + linux-mips@vger.kernel.org + linux-m68k@lists.linux-m68k.org + loongarch@lists.linux.dev + sparclinux@vger.kernel.org + linux-snps-arc@lists.infradead.org + linuxppc-dev@lists.ozlabs.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Fix trailing whitespaces. No functional changes.\n" @@ -1058,4 +1058,4 @@ "-- \n" 2.40.0 -56fd611fe14b1a2c593e54cc4d025540ba65979ab32e47316c60a63e38467a99 +ea2418a51b33b1abe9759fc5ae2997d7a1318b76cd16218e1873c0c580887d1a
diff --git a/a/1.txt b/N4/1.txt index f3a27c9..38d5d7d 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -1030,3 +1030,9 @@ index ef8a4c5fc687..99996bc7e6d9 100644 options += 3; -- 2.40.0 + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N4/content_digest index 25da9e5..29fb858 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1056,6 +1056,12 @@ " \t\tstifb_disabled = 1;\n" " \t\toptions += 3;\n" "-- \n" - 2.40.0 + "2.40.0\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -56fd611fe14b1a2c593e54cc4d025540ba65979ab32e47316c60a63e38467a99 +0126ce08b104e2c845a1781de82369ea1499a4809ce9d724c3da22a58977f31f
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.