> Hello again Lorenzo, > > On Wed, Feb 08, 2023 at 05:34:23PM +0100, Lorenzo Bianconi wrote: > > > Date: Wed, 8 Feb 2023 17:34:23 +0100 > > From: Lorenzo Bianconi <lorenzo@xxxxxxxxxx> > > To: Philippe De Muyter <phdm@xxxxxxx> > > Cc: jic23@xxxxxxxxxx, linux-iio@xxxxxxxxxxxxxxx, > > lorenzo.bianconi@xxxxxxxxxx > > Subject: Re: [PATCH] iio: imu: st_lsm6dsx: discard samples during filters > > settling time > > > > > Hello Lorenzo, > > > > > > thank you for your patch. > > > > > > I had successfully applied the previous one, but not yet had time > > > to test it, but this one I cannot apply. > > > > > > On which branch/tag does it apply ? > > > > I am using testing branch from linux-iio tree: > > > > git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git > > > > Regards, > > Lorenzo > > I have fetched it with : > > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git +testing > > git am complains with : > $ git am ~/st_lsm6dsx-real.patch > Applying: iio: imu: st_lsm6dsx: discard samples during filters settling time > error: patch failed: drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h:137 > error: drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h: patch does not apply > error: patch failed: drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c:457 > error: drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c: patch does not apply > error: patch failed: drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c:634 > error: drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c: patch does not apply > Patch failed at 0001 iio: imu: st_lsm6dsx: discard samples during filters settling time > hint: Use 'git am --show-current-patch=diff' to see the failed patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > and patch -p1 with : > $ patch -p1 < ~/st_lsm6dsx-real.patch > patching file drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > Hunk #1 succeeded at 144 with fuzz 2 (offset 7 lines). > Hunk #2 FAILED at 298. > Hunk #3 FAILED at 330. > Hunk #4 FAILED at 360. > Hunk #5 FAILED at 374. > 4 out of 5 hunks FAILED -- saving rejects to file drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h.rej > patching file drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > Hunk #1 FAILED at 457. > Hunk #2 FAILED at 541. > Hunk #3 succeeded at 673 with fuzz 1 (offset 19 lines). > Hunk #4 FAILED at 692. > 3 out of 4 hunks FAILED -- saving rejects to file drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c.rej > patching file drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > Hunk #1 FAILED at 634. > 1 out of 1 hunk FAILED -- saving rejects to file drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c.rej > > > Could it be something caused by your or my mail-transfer-agent ? > > Best regards > > Philippe Can you please try the following branch? https://github.com/LorenzoBianconi/linux-iio/tree/st_lsm6dsx_discard_sample Regards, Lorenzo
Attachment:
signature.asc
Description: PGP signature
