Hi Stephen > How about "This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may want also want to
Only the second want is required.
> consider cooperate with the maintainer of the conflicting tree to
cooperating
Andrew
