diff for duplicates of <8a6ec70f8054979db20fc7f62d12d4e4f5747324.camel@collabora.com> diff --git a/a/1.txt b/N1/1.txt index d3f43a4..57cb942 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,6 +29,6 @@ Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> _______________________________________________ -Linux-rockchip mailing list -Linux-rockchip@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-rockchip +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/N1/content_digest index a0080c7..05abb8f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -46,8 +46,8 @@ "\n" "\n" "_______________________________________________\n" - "Linux-rockchip mailing list\n" - "Linux-rockchip@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-rockchip + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -62427a2ed2af228f1efef4b03903010de656d740fe225e1ed2e01f72a1523a0a +447b0b3463d102f97005ab3c7e828cc9469db043a9de1341a8dc0e969e0dc17d
diff --git a/a/1.txt b/N2/1.txt index d3f43a4..dea1b75 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -26,9 +26,3 @@ Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> > unsigned int height = ALIGN(ctrls->frame->frame_height_minus_1 + 1, 64); > unsigned int height_in_sb = height / 64; > unsigned int stripe_num = ((height + 8) + 63) / 64; - - -_______________________________________________ -Linux-rockchip mailing list -Linux-rockchip@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-rockchip diff --git a/a/content_digest b/N2/content_digest index a0080c7..1fc224f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -42,12 +42,6 @@ "> +\tunsigned int num_tile_cols = tile_info->tile_cols;\n" "> \tunsigned int height = ALIGN(ctrls->frame->frame_height_minus_1 + 1, 64);\n" "> \tunsigned int height_in_sb = height / 64;\n" - "> \tunsigned int stripe_num = ((height + 8) + 63) / 64;\n" - "\n" - "\n" - "_______________________________________________\n" - "Linux-rockchip mailing list\n" - "Linux-rockchip@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-rockchip + "> \tunsigned int stripe_num = ((height + 8) + 63) / 64;" -62427a2ed2af228f1efef4b03903010de656d740fe225e1ed2e01f72a1523a0a +4c44a5d656b435c2ef65ce09658fb148cff6de9ee8ccce211329d84155392640
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.