From: Kirill A. Korinsky Subject: Re: sys/videoio.h: sync V4L2 with Linux-6.13-rc6 To: Marcus Glocker Cc: tech@openbsd.org Date: Sat, 18 Jan 2025 20:16:00 +0100 On Wed, 15 Jan 2025 21:13:59 +0100, Marcus Glocker wrote: > > On Wed, Jan 15, 2025 at 03:03:30PM GMT, Kirill A. Korinsky wrote: > > > On Wed, 15 Jan 2025 14:54:34 +0100, > > Marcus Glocker wrote: > > > > > > > I had put some thought and would like to move on without this chunk, better > > > > to keep it inside commit log and just keep it synced. > > > > > > Can you please re-share the entire diff when you do changes? And then > > > just explain what you have changed. > > > > > > > Sure, here the diff which had removed only one chunk with comment: > > > > /* Based on Linux-v6.13-rc7 */ > > Looks good to me. Tested again quickly, and couldn't spot an issue. > > ok mglocker@ > ... and I had discovered that I commited version of diff with this line. Here a diff to remove it. Ok? Index: sys/sys/videoio.h =================================================================== RCS file: /home/cvs/src/sys/sys/videoio.h,v diff -u -p -r1.20 videoio.h --- sys/sys/videoio.h 15 Jan 2025 20:34:50 -0000 1.20 +++ sys/sys/videoio.h 18 Jan 2025 19:11:52 -0000 @@ -1,7 +1,5 @@ /* $OpenBSD: videoio.h,v 1.20 2025/01/15 20:34:50 kirill Exp $ */ -/* Based on Linux-v6.13-rc7 */ - /* * Video for Linux Two header file * -- wbr, Kirill