On 13/12/15 22:39, Laurent Pinchart wrote: >> This one moves the function, so it's pretty hard to see what actually >> was changed. > > It's unfortunately needed if we want to avoid forward declarations. I could > split the patch in two, but given the size of the function and the extent of > the change I thought it wouldn't be worth it.
Maybe not, if everything goes perfectly and the patch is never applied to any other kernel tree. But if there is a single change to the function, or to the surrounding lines, having the fix and the move in the same patch makes resolving the conflict much harder. Tomi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: OpenPGP digital signature URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20151214/8f11d16c/attachment-0001.sig>
