Strange duplicated code after merge

[psgreco]

After commit a21b986 there is a strange duplicated atomic_inc/atomic_dec in drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c which looks more like a bad merge than actual code.

Even more, git blame seems to point to 2 different versions of the same patch.

a21b986#diff-7aba1a24b36b535c3c8817c7dda105c6

[6by9]

Thanks for the report. Yes, it's a bad merge from upstream. They picked up a load of my patches and backported them to 4.19, and it looks like the merge has gone wrong.
I'll sort out a PR.

[JamesH65]

@6by9 Did this get done? Closeable?

[6by9]

Yes, see the linked commits.