Linus Torvalds writes: (Summary) wrote:
So I pulled this after your updated fscache pull request, and I notice that these three commits are duplicate (not shared): that these three commits are duplicate (not shared): fscache: Attach the index key and aux data to the cookie fscache: Pass object size in rather than calling back for it fscache: Maintain a catalogue of allocated cookies
fscache: Maintain a catalogue of allocated cookies
and partly as a result I get some trivial conflicts. So I decided to not do the resolution, and instead just verify with you that you still want this pulled?
you that you still want this pulled?
No need to rebase, no need to do anything at all, really, except reply with "yes I want you to pull this" or "no, the fscache pull updates meant that I want you to do something else, hold off".
[...]
are:So I pulled this after your updated fscache pull request, and I notice that these three commits are duplicate (not shared): that these three commits are duplicate (not shared): fscache: Attach the index key and aux data to the cookie fscache: Pass object size in rather than calling back for it fscache: Maintain a catalogue of allocated cookies
fscache: Maintain a catalogue of allocated cookies
and partly as a result I get some trivial conflicts. So I decided to not do the resolution, and instead just verify with you that you still want this pulled?
you that you still want this pulled?
No need to rebase, no need to do anything at all, really, except reply with "yes I want you to pull this" or "no, the fscache pull updates meant that I want you to do something else, hold off".