| Message ID | 20220815023855.GF1089@zhen-hp.sh.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PULL] gvt-fixes | expand |
On Mon, Aug 15, 2022 at 10:38:55AM +0800, Zhenyu Wang wrote: > > Hi, > > Here's one gvt-fixes pull for 6.0-rc. Major one is Cometlake regression > fix for mmio table rework, and others are left kernel doc fixes not pushed yet. > > Thanks > -- > The following changes since commit a7a47a5dfa9a9692a41764ee9ab4054f12924a42: > > drm/i915/reset: Add additional steps for Wa_22011802037 for execlist backend (2022-07-25 15:57:54 +0100) > > are available in the Git repository at: > > https://github.com/intel/gvt-linux.git tags/gvt-fixes-2022-08-15 > > for you to fetch changes up to 394f0560a76298842defd1d95bd64b203a5fdcc4: > > drm/i915/gvt: Fix Comet Lake (2022-08-15 10:54:03 +0800) > > ---------------------------------------------------------------- > gvt-fixes-2022-08-15 > > - CometLake regression fix in mmio table rework (Alex) > - misc kernel doc and typo fixes > > ---------------------------------------------------------------- > Alex Williamson (1): > drm/i915/gvt: Fix Comet Lake > > Colin Ian King (1): > drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported" dim: d6632370536d ("drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported""): committer Signed-off-by missing. is it possible to fix this in your tree? Thanks, Rodrigo. > > Jiapeng Chong (3): > drm/i915/gvt: Fix kernel-doc > drm/i915/gvt: Fix kernel-doc > drm/i915/gvt: Fix kernel-doc > > Julia Lawall (1): > drm/i915/gvt: fix typo in comment > > drivers/gpu/drm/i915/gvt/aperture_gm.c | 4 ++-- > drivers/gpu/drm/i915/gvt/gtt.c | 2 +- > drivers/gpu/drm/i915/gvt/handlers.c | 4 ++-- > drivers/gpu/drm/i915/gvt/mmio_context.c | 2 +- > drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 3 ++- > 5 files changed, 8 insertions(+), 7 deletions(-)
On 2022.08.15 19:32:45 -0400, Rodrigo Vivi wrote: > On Mon, Aug 15, 2022 at 10:38:55AM +0800, Zhenyu Wang wrote: > > > > Hi, > > > > Here's one gvt-fixes pull for 6.0-rc. Major one is Cometlake regression > > fix for mmio table rework, and others are left kernel doc fixes not pushed yet. > > > > Thanks > > -- > > The following changes since commit a7a47a5dfa9a9692a41764ee9ab4054f12924a42: > > > > drm/i915/reset: Add additional steps for Wa_22011802037 for execlist backend (2022-07-25 15:57:54 +0100) > > > > are available in the Git repository at: > > > > https://github.com/intel/gvt-linux.git tags/gvt-fixes-2022-08-15 > > > > for you to fetch changes up to 394f0560a76298842defd1d95bd64b203a5fdcc4: > > > > drm/i915/gvt: Fix Comet Lake (2022-08-15 10:54:03 +0800) > > > > ---------------------------------------------------------------- > > gvt-fixes-2022-08-15 > > > > - CometLake regression fix in mmio table rework (Alex) > > - misc kernel doc and typo fixes > > > > ---------------------------------------------------------------- > > Alex Williamson (1): > > drm/i915/gvt: Fix Comet Lake > > > > Colin Ian King (1): > > drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported" > > dim: d6632370536d ("drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported""): committer Signed-off-by missing. > > is it possible to fix this in your tree? Sorry about that. Let me re-generate.
On 2022.08.16 12:05:08 +0800, Zhenyu Wang wrote: > On 2022.08.15 19:32:45 -0400, Rodrigo Vivi wrote: > > On Mon, Aug 15, 2022 at 10:38:55AM +0800, Zhenyu Wang wrote: > > > > > > Hi, > > > > > > Here's one gvt-fixes pull for 6.0-rc. Major one is Cometlake regression > > > fix for mmio table rework, and others are left kernel doc fixes not pushed yet. > > > > > > Thanks > > > -- > > > The following changes since commit a7a47a5dfa9a9692a41764ee9ab4054f12924a42: > > > > > > drm/i915/reset: Add additional steps for Wa_22011802037 for execlist backend (2022-07-25 15:57:54 +0100) > > > > > > are available in the Git repository at: > > > > > > https://github.com/intel/gvt-linux.git tags/gvt-fixes-2022-08-15 > > > > > > for you to fetch changes up to 394f0560a76298842defd1d95bd64b203a5fdcc4: > > > > > > drm/i915/gvt: Fix Comet Lake (2022-08-15 10:54:03 +0800) > > > > > > ---------------------------------------------------------------- > > > gvt-fixes-2022-08-15 > > > > > > - CometLake regression fix in mmio table rework (Alex) > > > - misc kernel doc and typo fixes > > > > > > ---------------------------------------------------------------- > > > Alex Williamson (1): > > > drm/i915/gvt: Fix Comet Lake > > > > > > Colin Ian King (1): > > > drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported" > > > > dim: d6632370536d ("drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported""): committer Signed-off-by missing. > > > > is it possible to fix this in your tree? > > Sorry about that. Let me re-generate. oh, surprise! I just found Colin's email is actually defined in .mailmap, so all his commits in kernel are changed for @intel.com address as in mailmap... So maybe I can't change that?
On Tue, 2022-08-16 at 12:43 +0800, Zhenyu Wang wrote: > On 2022.08.16 12:05:08 +0800, Zhenyu Wang wrote: > > On 2022.08.15 19:32:45 -0400, Rodrigo Vivi wrote: > > > On Mon, Aug 15, 2022 at 10:38:55AM +0800, Zhenyu Wang wrote: > > > > > > > > Hi, > > > > > > > > Here's one gvt-fixes pull for 6.0-rc. Major one is Cometlake > > > > regression > > > > fix for mmio table rework, and others are left kernel doc fixes > > > > not pushed yet. > > > > > > > > Thanks > > > > -- > > > > The following changes since commit > > > > a7a47a5dfa9a9692a41764ee9ab4054f12924a42: > > > > > > > > drm/i915/reset: Add additional steps for Wa_22011802037 for > > > > execlist backend (2022-07-25 15:57:54 +0100) > > > > > > > > are available in the Git repository at: > > > > > > > > https://github.com/intel/gvt-linux.git tags/gvt-fixes-2022- > > > > 08-15 > > > > > > > > for you to fetch changes up to > > > > 394f0560a76298842defd1d95bd64b203a5fdcc4: > > > > > > > > drm/i915/gvt: Fix Comet Lake (2022-08-15 10:54:03 +0800) > > > > > > > > --------------------------------------------------------------- > > > > - > > > > gvt-fixes-2022-08-15 > > > > > > > > - CometLake regression fix in mmio table rework (Alex) > > > > - misc kernel doc and typo fixes > > > > > > > > --------------------------------------------------------------- > > > > - > > > > Alex Williamson (1): > > > > drm/i915/gvt: Fix Comet Lake > > > > > > > > Colin Ian King (1): > > > > drm/i915/reg: Fix spelling mistake "Unsupport" -> > > > > "Unsupported" > > > > > > dim: d6632370536d ("drm/i915/reg: Fix spelling mistake > > > "Unsupport" -> "Unsupported""): committer Signed-off-by missing. > > > > > > is it possible to fix this in your tree? > > > > Sorry about that. Let me re-generate. > > oh, surprise! I just found Colin's email is actually defined in > .mailmap, > so all his commits in kernel are changed for @intel.com address as in > mailmap... Colin, would you mind to get the Sign-off-by in the patches the same as your authorship so the tools don't get confused? (starting with modifying in tree this already merged patch) Thanks, Rodrigo. > > So maybe I can't change that? > >
On 17/08/2022 21:07, Vivi, Rodrigo wrote: > On Tue, 2022-08-16 at 12:43 +0800, Zhenyu Wang wrote: >> On 2022.08.16 12:05:08 +0800, Zhenyu Wang wrote: >>> On 2022.08.15 19:32:45 -0400, Rodrigo Vivi wrote: >>>> On Mon, Aug 15, 2022 at 10:38:55AM +0800, Zhenyu Wang wrote: >>>>> >>>>> Hi, >>>>> >>>>> Here's one gvt-fixes pull for 6.0-rc. Major one is Cometlake >>>>> regression >>>>> fix for mmio table rework, and others are left kernel doc fixes >>>>> not pushed yet. >>>>> >>>>> Thanks >>>>> -- >>>>> The following changes since commit >>>>> a7a47a5dfa9a9692a41764ee9ab4054f12924a42: >>>>> >>>>> drm/i915/reset: Add additional steps for Wa_22011802037 for >>>>> execlist backend (2022-07-25 15:57:54 +0100) >>>>> >>>>> are available in the Git repository at: >>>>> >>>>> https://github.com/intel/gvt-linux.git tags/gvt-fixes-2022- >>>>> 08-15 >>>>> >>>>> for you to fetch changes up to >>>>> 394f0560a76298842defd1d95bd64b203a5fdcc4: >>>>> >>>>> drm/i915/gvt: Fix Comet Lake (2022-08-15 10:54:03 +0800) >>>>> >>>>> --------------------------------------------------------------- >>>>> - >>>>> gvt-fixes-2022-08-15 >>>>> >>>>> - CometLake regression fix in mmio table rework (Alex) >>>>> - misc kernel doc and typo fixes >>>>> >>>>> --------------------------------------------------------------- >>>>> - >>>>> Alex Williamson (1): >>>>> drm/i915/gvt: Fix Comet Lake >>>>> >>>>> Colin Ian King (1): >>>>> drm/i915/reg: Fix spelling mistake "Unsupport" -> >>>>> "Unsupported" >>>> >>>> dim: d6632370536d ("drm/i915/reg: Fix spelling mistake >>>> "Unsupport" -> "Unsupported""): committer Signed-off-by missing. >>>> >>>> is it possible to fix this in your tree? >>> >>> Sorry about that. Let me re-generate. >> >> oh, surprise! I just found Colin's email is actually defined in >> .mailmap, >> so all his commits in kernel are changed for @intel.com address as in >> mailmap... > > Colin, would you mind to get the Sign-off-by in the patches the same > as your authorship so the tools don't get confused? > (starting with modifying in tree this already merged patch) Since my patches are generally trivial janitorial fixed done in my spare time I'm going to get the .mailmap changed to use my gmail email address rather than my Intel one (since I don't do kernel work in my current role). This should clean up the confusion. Apologies. Colin > > Thanks, > Rodrigo. > >> >> So maybe I can't change that? >> >> >
On Wed, 17 Aug 2022, "Colin King (gmail)" <colin.i.king@gmail.com> wrote: > On 17/08/2022 21:07, Vivi, Rodrigo wrote: >> On Tue, 2022-08-16 at 12:43 +0800, Zhenyu Wang wrote: >>> On 2022.08.16 12:05:08 +0800, Zhenyu Wang wrote: >>>> On 2022.08.15 19:32:45 -0400, Rodrigo Vivi wrote: >>>>> On Mon, Aug 15, 2022 at 10:38:55AM +0800, Zhenyu Wang wrote: >>> oh, surprise! I just found Colin's email is actually defined in >>> .mailmap, >>> so all his commits in kernel are changed for @intel.com address as in >>> mailmap... >> >> Colin, would you mind to get the Sign-off-by in the patches the same >> as your authorship so the tools don't get confused? >> (starting with modifying in tree this already merged patch) > > Since my patches are generally trivial janitorial fixed done in my spare > time I'm going to get the .mailmap changed to use my gmail email address > rather than my Intel one (since I don't do kernel work in my current role). > > This should clean up the confusion. Apologies. Everyone hold your horses. I think our tooling should handle the mailmap stuff. The commit *is* fine, it's just that the when we check it, we let mailmap alter it. We should check the commit without mailmap modifications. BR, Jani.
On Thu, 18 Aug 2022, Jani Nikula <jani.nikula@intel.com> wrote: > On Wed, 17 Aug 2022, "Colin King (gmail)" <colin.i.king@gmail.com> wrote: >> On 17/08/2022 21:07, Vivi, Rodrigo wrote: >>> On Tue, 2022-08-16 at 12:43 +0800, Zhenyu Wang wrote: >>>> On 2022.08.16 12:05:08 +0800, Zhenyu Wang wrote: >>>>> On 2022.08.15 19:32:45 -0400, Rodrigo Vivi wrote: >>>>>> On Mon, Aug 15, 2022 at 10:38:55AM +0800, Zhenyu Wang wrote: >>>> oh, surprise! I just found Colin's email is actually defined in >>>> .mailmap, >>>> so all his commits in kernel are changed for @intel.com address as in >>>> mailmap... >>> >>> Colin, would you mind to get the Sign-off-by in the patches the same >>> as your authorship so the tools don't get confused? >>> (starting with modifying in tree this already merged patch) >> >> Since my patches are generally trivial janitorial fixed done in my spare >> time I'm going to get the .mailmap changed to use my gmail email address >> rather than my Intel one (since I don't do kernel work in my current role). >> >> This should clean up the confusion. Apologies. > > Everyone hold your horses. > > I think our tooling should handle the mailmap stuff. The commit *is* > fine, it's just that the when we check it, we let mailmap alter it. We > should check the commit without mailmap modifications. In this case, it's actually not about Colin's Signed-off-by or mailmap at all! Like the error message from dim says, "committer Signed-off-by missing". Committer, not author! $ git show -s tags/gvt-fixes-2022-08-15^ --pretty=fuller commit d6632370536d0b80be3bfc90dd67e1f693335a75 Author: Colin Ian King <colin.king@intel.com> AuthorDate: Tue Mar 15 20:24:49 2022 +0000 Commit: Zhenyu Wang <zhenyuw@linux.intel.com> CommitDate: Mon Aug 15 10:51:15 2022 +0800 drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported" There is a spelling mistake in a gvt_vgpu_err error message. Fix it. Fixes: 695fbc08d80f ("drm/i915/gvt: replace the gvt_err with gvt_vgpu_err") Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Signed-off-by: Zhi Wang <zhi.a.wang@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20220315202449.2952845-1-colin.i.king@gmail.com Reviewed-by: Zhi Wang <zhi.a.wang@intel.com> Committed by Zhenyu, Signed-off-by Zhi. Maybe caused by rebase by Zhenyu after being committed by Zhi? BR, Jani.
On Thu, 2022-08-18 at 17:27 +0300, Jani Nikula wrote:
On Thu, 18 Aug 2022, Jani Nikula <jani.nikula@intel.com<mailto:jani.nikula@intel.com>> wrote:
On Wed, 17 Aug 2022, "Colin King (gmail)" <colin.i.king@gmail.com<mailto:colin.i.king@gmail.com>> wrote:
On 17/08/2022 21:07, Vivi, Rodrigo wrote:
On Tue, 2022-08-16 at 12:43 +0800, Zhenyu Wang wrote:
On 2022.08.16 12:05:08 +0800, Zhenyu Wang wrote:
On 2022.08.15 19:32:45 -0400, Rodrigo Vivi wrote:
On Mon, Aug 15, 2022 at 10:38:55AM +0800, Zhenyu Wang wrote:
oh, surprise! I just found Colin's email is actually defined in
.mailmap,
so all his commits in kernel are changed for @intel.com address as in
mailmap...
Colin, would you mind to get the Sign-off-by in the patches the same
as your authorship so the tools don't get confused?
(starting with modifying in tree this already merged patch)
Since my patches are generally trivial janitorial fixed done in my spare
time I'm going to get the .mailmap changed to use my gmail email address
rather than my Intel one (since I don't do kernel work in my current role).
This should clean up the confusion. Apologies.
Everyone hold your horses.
I think our tooling should handle the mailmap stuff. The commit *is*
fine, it's just that the when we check it, we let mailmap alter it. We
should check the commit without mailmap modifications.
In this case, it's actually not about Colin's Signed-off-by or mailmap
at all! Like the error message from dim says, "committer Signed-off-by
missing". Committer, not author!
$ git show -s tags/gvt-fixes-2022-08-15^ --pretty=fuller
commit d6632370536d0b80be3bfc90dd67e1f693335a75
Author: Colin Ian King <colin.king@intel.com<mailto:colin.king@intel.com>>
AuthorDate: Tue Mar 15 20:24:49 2022 +0000
Commit: Zhenyu Wang <zhenyuw@linux.intel.com<mailto:zhenyuw@linux.intel.com>>
CommitDate: Mon Aug 15 10:51:15 2022 +0800
drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported"
There is a spelling mistake in a gvt_vgpu_err error message. Fix it.
Fixes: 695fbc08d80f ("drm/i915/gvt: replace the gvt_err with gvt_vgpu_err")
Signed-off-by: Colin Ian King <colin.i.king@gmail.com<mailto:colin.i.king@gmail.com>>
Signed-off-by: Zhi Wang <zhi.a.wang@intel.com<mailto:zhi.a.wang@intel.com>>
Link: http://patchwork.freedesktop.org/patch/msgid/20220315202449.2952845-1-colin.i.king@gmail.com
Reviewed-by: Zhi Wang <zhi.a.wang@intel.com<mailto:zhi.a.wang@intel.com>>
Committed by Zhenyu, Signed-off-by Zhi. Maybe caused by rebase by Zhenyu
after being committed by Zhi?
Probably easier if you could rebase it again signing it then?
I could bypass dim here, but this will likely affect someone else later in the upstream chain as well..
BR,
Jani.
On 2022.08.18 15:43:32 +0000, Vivi, Rodrigo wrote: > On Thu, 2022-08-18 at 17:27 +0300, Jani Nikula wrote: > > On Thu, 18 Aug 2022, Jani Nikula <jani.nikula@intel.com> wrote: > > On Wed, 17 Aug 2022, "Colin King (gmail)" <colin.i.king@gmail.com> > wrote: > > On 17/08/2022 21:07, Vivi, Rodrigo wrote: > > On Tue, 2022-08-16 at 12:43 +0800, Zhenyu Wang wrote: > > On 2022.08.16 12:05:08 +0800, Zhenyu Wang wrote: > > On 2022.08.15 19:32:45 -0400, Rodrigo Vivi wrote: > > On Mon, Aug 15, 2022 at 10:38:55AM +0800, Zhenyu > Wang wrote: > > oh, surprise! I just found Colin's email is actually > defined in > .mailmap, > so all his commits in kernel are changed for @intel.com > address as in > mailmap... > > > Colin, would you mind to get the Sign-off-by in the patches the > same > as your authorship so the tools don't get confused? > (starting with modifying in tree this already merged patch) > > > Since my patches are generally trivial janitorial fixed done in my > spare > time I'm going to get the .mailmap changed to use my gmail email > address > rather than my Intel one (since I don't do kernel work in my > current role). > > This should clean up the confusion. Apologies. > > > Everyone hold your horses. > > I think our tooling should handle the mailmap stuff. The commit *is* > fine, it's just that the when we check it, we let mailmap alter it. We > should check the commit without mailmap modifications. > > > In this case, it's actually not about Colin's Signed-off-by or mailmap > at all! Like the error message from dim says, "committer Signed-off-by > missing". Committer, not author! > > $ git show -s tags/gvt-fixes-2022-08-15^ --pretty=fuller > commit d6632370536d0b80be3bfc90dd67e1f693335a75 > Author: Colin Ian King <colin.king@intel.com> > AuthorDate: Tue Mar 15 20:24:49 2022 +0000 > Commit: Zhenyu Wang <zhenyuw@linux.intel.com> > CommitDate: Mon Aug 15 10:51:15 2022 +0800 > > drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported" > > There is a spelling mistake in a gvt_vgpu_err error message. Fix it. > > Fixes: 695fbc08d80f ("drm/i915/gvt: replace the gvt_err with > gvt_vgpu_err") > Signed-off-by: Colin Ian King <colin.i.king@gmail.com> > Signed-off-by: Zhi Wang <zhi.a.wang@intel.com> > Link: http://patchwork.freedesktop.org/patch/msgid/ > 20220315202449.2952845-1-colin.i.king@gmail.com > Reviewed-by: Zhi Wang <zhi.a.wang@intel.com> > > Committed by Zhenyu, Signed-off-by Zhi. Maybe caused by rebase by Zhenyu > after being committed by Zhi? > > > Probably easier if you could rebase it again signing it then? > Oops, sorry about that, will re-send.
Hi, Here's one gvt-fixes pull for 6.0-rc. Major one is Cometlake regression fix for mmio table rework, and others are left kernel doc fixes not pushed yet. Thanks -- The following changes since commit a7a47a5dfa9a9692a41764ee9ab4054f12924a42: drm/i915/reset: Add additional steps for Wa_22011802037 for execlist backend (2022-07-25 15:57:54 +0100) are available in the Git repository at: https://github.com/intel/gvt-linux.git tags/gvt-fixes-2022-08-15 for you to fetch changes up to 394f0560a76298842defd1d95bd64b203a5fdcc4: drm/i915/gvt: Fix Comet Lake (2022-08-15 10:54:03 +0800) ---------------------------------------------------------------- gvt-fixes-2022-08-15 - CometLake regression fix in mmio table rework (Alex) - misc kernel doc and typo fixes ---------------------------------------------------------------- Alex Williamson (1): drm/i915/gvt: Fix Comet Lake Colin Ian King (1): drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported" Jiapeng Chong (3): drm/i915/gvt: Fix kernel-doc drm/i915/gvt: Fix kernel-doc drm/i915/gvt: Fix kernel-doc Julia Lawall (1): drm/i915/gvt: fix typo in comment drivers/gpu/drm/i915/gvt/aperture_gm.c | 4 ++-- drivers/gpu/drm/i915/gvt/gtt.c | 2 +- drivers/gpu/drm/i915/gvt/handlers.c | 4 ++-- drivers/gpu/drm/i915/gvt/mmio_context.c | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-)