stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Petr Machata <petrm@nvidia.com>
Cc: Sasha Levin <sashal@kernel.org>,
	stable@vger.kernel.org, Wojtek Wasko <wwasko@nvidia.com>,
	Mahesh Bandewar <maheshb@google.com>,
	Shuah Khan <shuah@kernel.org>,
	Richard Cochran <richardcochran@gmail.com>,
	Yong Wang <yongwang@nvidia.com>
Subject: Re: [PATCH 6.1.y] Revert "selftest/ptp: update ptp selftest to exercise the gettimex options"
Date: Tue, 16 Jun 2026 18:59:32 +0530	[thread overview]
Message-ID: <2026061610-lying-manor-2d57@gregkh> (raw)
In-Reply-To: <2026061639-antennae-upstage-bd52@gregkh>

On Tue, Jun 16, 2026 at 06:58:53PM +0530, Greg KH wrote:
> On Fri, May 15, 2026 at 03:53:53PM +0200, Petr Machata wrote:
> > This reverts commit 06954f715deb0ed053f8bf85547370db6870225d, which is
> > commit 3d07b691ee707c00afaf365440975e81bb96cd9b upstream.
> > 
> > The cited commit allows testptp to set a configurable clock_id. That is
> > done via a PTP_SYS_OFFSET_EXTENDED ioctl call, whose argument is struct
> > ptp_sys_offset_extended, where the clock_id is set. However, this Linux
> > version does not support the ptp_sys_offset_extended.clockid field, and
> > the test case cannot be built against this tree's own UAPI headers.
> > 
> > The reverted commit was introduced to resolve a missing dependency of
> > commit c6dc458227a3 ("testptp: Add option to open PHC in readonly mode"),
> > which is 76868642e427 upstream. My suspicion is that the only conflict
> > between the two is the getopt string, and there is otherwise no direct
> > dependency between the two.
> > 
> > This patch therefore reverts the cited commit, with hand-resolving the
> > getopt string to include 'r' (as introduced by c6dc458227a3), but not
> > 'y' (introduced by 06954f715deb).
> > 
> > Reported-by: Yong Wang <yongwang@nvidia.com>
> > Signed-off-by: Petr Machata <petrm@nvidia.com>
> > ---
> > 
> > Note: the issue appears to exist in 6.6, 6.12 and 6.18 as well.
> >       Depending on your preference, I can prepare separate
> >       patches for those branches as well. Let me know.
> 
> No need, I did it now for those branches too, thanks!

Oops, nope, spoke too soon, 6.18.y still needs it, this one doesn't
apply there.  Can you send that revert?

thanks,

greg k-h

  reply	other threads:[~2026-06-16 13:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-15 13:53 [PATCH 6.1.y] Revert "selftest/ptp: update ptp selftest to exercise the gettimex options" Petr Machata
2026-06-16 13:28 ` Greg KH
2026-06-16 13:29   ` Greg KH [this message]
2026-06-17 15:22     ` Petr Machata
2026-06-17 15:40       ` Greg KH
2026-06-22  8:11         ` Petr Machata

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=2026061610-lying-manor-2d57@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=maheshb@google.com \
    --cc=petrm@nvidia.com \
    --cc=richardcochran@gmail.com \
    --cc=sashal@kernel.org \
    --cc=shuah@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=wwasko@nvidia.com \
    --cc=yongwang@nvidia.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;
as well as URLs for NNTP newsgroup(s).