[S] Change in flashrom[master]: stlinkv3_spi: Bug fix, Initialize uninitialized pointers

[Felix Singer (Code Review)]

Attention is currently required from: Thomas Heijligen, Angel Pons, Shreeyash .

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66225 )

Change subject: stlinkv3_spi: Bug fix, Initialize uninitialized pointers
......................................................................

Patch Set 2:

(1 comment)

File stlinkv3_spi.c:

https://review.coreboot.org/c/flashrom/+/66225/comment/27e6ade1_d73bf395 
PS1, Line 501: 		stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx,
> So, "fixing conflicts" is essentially making my changes? What's the "conflict" here?

We don't know yet. `git status` can tell us. So please provide the info which was asked by Angel 3 times now. Most likely the conflict is somewhere in a file.

Also, have a look at `git diff`. This shows you the specific changes, and in this case also the conflict.