Another small series of patches following up on the two recent series. The first patch is the corrections for patch 6 of the original series, after omitting patches 2 and 4 and fixing conflicts and some other renaming. This brings the conflicted sections into line with the rest of the docs. There are also a few lines unrelated to the conflicts that differ between my tree and yours. Not sure if you have issues with them and dropped them, or something else happened along the way. I don't see anything terribly contraversial so I've kept them in here. And there is an unrelated indentation fix as well. The second is using num_values more consistently. These may actually be more corrections for doc tweaks, that slipped through because they didn't conflict, and could be squashed into patch 1, but kept them separate just in case. And there is a corresponding code rename as well, so it isn't purely documentation. The final one is completing the renaming of "buf" variables to a name more clearly indicating that they refer to uAPI types. And renaming the conversion functions to match. I think that is everything for the core for now. Hopefully. Cheers, Kent. Kent Gibson (3): doc: API documentation tweaks corrections core: use num_values rather than num_lines when dealing with subsets of values core: rename uAPI related variables and functions to uapi. include/gpiod.h | 51 +++++++++++++++++++++++--------------------- lib/chip-info.c | 2 +- lib/chip.c | 24 ++++++++++----------- lib/info-event.c | 18 ++++++++-------- lib/internal.h | 20 ++++++++--------- lib/line-config.c | 24 ++++++++++----------- lib/line-info.c | 2 +- lib/line-request.c | 50 +++++++++++++++++++++---------------------- lib/request-config.c | 12 +++++------ 9 files changed, 103 insertions(+), 100 deletions(-) base-commit: 9d5112d0448fb2436e926a36842ff5ca365303c3 -- 2.35.1