On Wed, Aug 22, 2012 at 10:33:55PM +0530, Shubhrajyoti Datta wrote: > Actually there was a patch in your tree that I sent which is not yet > in linus tree so I rebased > it to linux-next to avoid any merge conflicts. > Henceforth I will rebase it to your tree. That's also a good option, though for simple conflcits it's OK if the person applying the patch has to resolve them especially if you give some warning.
Attachment:
signature.asc
Description: Digital signature
