Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>,
	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: Tue, 18 Jul 2023 08:35:46 +0100	[thread overview]
Message-ID: <7b948154-8b32-bb0a-0268-46194b8129ae@linux.intel.com> (raw)
In-Reply-To: <87sf9mib8k.wl-ashutosh.dixit@intel.com>


On 17/07/2023 20:33, Dixit, Ashutosh wrote:
> 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.

Ah thank you, didn't realize it was broken, I thought it was only warnings.

Regards,

Tvrtko

      reply	other threads:[~2023-07-18  7:36 UTC|newest]

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

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=7b948154-8b32-bb0a-0268-46194b8129ae@linux.intel.com \
    --to=tvrtko.ursulin@linux.intel.com \
    --cc=Intel-gfx@lists.freedesktop.org \
    --cc=ashutosh.dixit@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=rodrigo.vivi@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox