>       Yongjun[1] into the original patch. If Wei's patch is applied on top
>       of whats already in i2c/for-next then this patch can be ignored.

I applied Wei's patch instead. It was easier.