Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wdctl: read firmware_version from sysfs #1927

Merged
merged 2 commits into from Mar 2, 2023

Conversation

t-8ch
Copy link
Member

@t-8ch t-8ch commented Nov 25, 2022

@t-8ch t-8ch force-pushed the wdctl/sysfs-firmware_version branch from 728658d to 65d6f20 Compare November 26, 2022 03:28
@karelzak karelzak added the KERNEL-FIRST Postponed until the kernel portion got merged into Linus' tree. label Nov 28, 2022
@karelzak
Copy link
Collaborator

Good idea.

@t-8ch t-8ch force-pushed the wdctl/sysfs-firmware_version branch from 65d6f20 to dfe3a75 Compare December 19, 2022 21:30
t-8ch added a commit to t-8ch/linux that referenced this pull request Dec 21, 2022
This synchronizes the information reported by ioctl and sysfs.
The mismatch is confusing because "wdctl" from util-linux uses the ioctl
when used with root privileges and sysfs without.

Userspace implementation: util-linux/util-linux#1927

To: Wim Van Sebroeck <wim@linux-watchdog.org>
To: Guenter Roeck <linux@roeck-us.net>
Cc: linux-kernel@vger.kernel.org
Cc: linux-watchdog@vger.kernel.org
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
Changes in v3:
- EDITME: describe what is new in this series revision.
- EDITME: use bulletpoints and terse descriptions.
- Link to v2: https://lore.kernel.org/r/20221216-watchdog-sysfs-v2-0-6189311103a9@weissschuh.net


Changes in v2:
- Report options in addition to firmware_version
- Add documentation
- Rename firmware_version to fw_version to avoid conflicts
- Link to v1: https://lore.kernel.org/r/20221214-nsfs-ioctl-compat-v1-0-b169796000b2@weissschuh.net

--- b4-submit-tracking ---
# This section is used internally by b4 prep for tracking purposes.
{
  "series": {
    "revision": 3,
    "change-id": "20221216-watchdog-sysfs-b2ce9f8f449b",
    "base-branch": null,
    "history": {
      "v2": [
        "20221216-watchdog-sysfs-v2-0-6189311103a9@weissschuh.net"
      ]
    }
  }
}
@karelzak
Copy link
Collaborator

karelzak commented Jan 5, 2023

What is the current status of the kernel code?

@t-8ch
Copy link
Member Author

t-8ch commented Jan 5, 2023

No progress either way yet on kernel side.

@t-8ch
Copy link
Member Author

t-8ch commented Mar 2, 2023

This has been merged into the watchdog tree.

The watchdog PR for the 6.3 mergewindow has not been submitted, but I suspect it should make it into 6.3.

@karelzak karelzak removed the KERNEL-FIRST Postponed until the kernel portion got merged into Linus' tree. label Mar 2, 2023
@karelzak karelzak merged commit e4e00b0 into util-linux:master Mar 2, 2023
@t-8ch
Copy link
Member Author

t-8ch commented Mar 2, 2023

The kernel part has now been merged into Linus' tree

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants