All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
To: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org,
	Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Subject: Re: [igt-dev] [PATCH i-g-t v2] tests/i915_pm_rps: Fix test after silent conflict
Date: Mon, 17 Jul 2023 12:33:47 -0700	[thread overview]
Message-ID: <87sf9mib8k.wl-ashutosh.dixit@intel.com> (raw)
In-Reply-To: <ZLWOJ+EDk1jyBk37@intel.com>

On Mon, 17 Jul 2023 11:53:27 -0700, Rodrigo Vivi wrote:
>
> On Mon, Jul 17, 2023 at 06:12:19PM +0100, Tvrtko Ursulin wrote:
> > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >
> > A silent conflict sneaked in as I was merging
> > d86ca7e17b58 ("tests/i915_pm_rps: Exercise sysfs thresholds") in a way
> > that igt_sysfs_set_u32 has became a function returning void.
> >
> > Assert is now built-in so drop it from the test.
> >
> > v2:
> >  * Fix invalid value test.
> >  * Assert new values after write while at it.
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Merged to fix the IGT build.

WARNING: multiple messages have this Message-ID (diff)
From: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
To: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [igt-dev] [PATCH i-g-t v2] tests/i915_pm_rps: Fix test after silent conflict
Date: Mon, 17 Jul 2023 12:33:47 -0700	[thread overview]
Message-ID: <87sf9mib8k.wl-ashutosh.dixit@intel.com> (raw)
In-Reply-To: <ZLWOJ+EDk1jyBk37@intel.com>

On Mon, 17 Jul 2023 11:53:27 -0700, Rodrigo Vivi wrote:
>
> On Mon, Jul 17, 2023 at 06:12:19PM +0100, Tvrtko Ursulin wrote:
> > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >
> > A silent conflict sneaked in as I was merging
> > d86ca7e17b58 ("tests/i915_pm_rps: Exercise sysfs thresholds") in a way
> > that igt_sysfs_set_u32 has became a function returning void.
> >
> > Assert is now built-in so drop it from the test.
> >
> > v2:
> >  * Fix invalid value test.
> >  * Assert new values after write while at it.
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Merged to fix the IGT build.

  reply	other threads:[~2023-07-17 19:33 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-17 16:53 [igt-dev] [PATCH i-g-t] tests/i915_pm_rps: Fix test after silent conflict Tvrtko Ursulin
2023-07-17 16:53 ` [Intel-gfx] " Tvrtko Ursulin
2023-07-17 17:05 ` [igt-dev] ✗ Fi.CI.BUILD: failure for " Patchwork
2023-07-17 17:12 ` [igt-dev] [PATCH i-g-t v2] " Tvrtko Ursulin
2023-07-17 17:12   ` [Intel-gfx] " Tvrtko Ursulin
2023-07-17 18:53   ` [igt-dev] " Rodrigo Vivi
2023-07-17 18:53     ` [Intel-gfx] " Rodrigo Vivi
2023-07-17 19:33     ` Dixit, Ashutosh [this message]
2023-07-17 19:33       ` [Intel-gfx] [igt-dev] " Dixit, Ashutosh
2023-07-18  7:35       ` Tvrtko Ursulin
2023-07-18  7:35         ` [Intel-gfx] " Tvrtko Ursulin
2023-07-17 17:37 ` [igt-dev] ✗ Fi.CI.BUILD: failure for tests/i915_pm_rps: Fix test after silent conflict (rev2) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87sf9mib8k.wl-ashutosh.dixit@intel.com \
    --to=ashutosh.dixit@intel.com \
    --cc=Intel-gfx@lists.freedesktop.org \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=rodrigo.vivi@intel.com \
    --cc=tvrtko.ursulin@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.