You are correct. I forgot to rebase before I checked. I rebased, and will resend the merge request. On Thu, Dec 8, 2011 at 3:20 PM, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > On Thu, Dec 8, 2011 at 11:36 AM, Steve French <smfrench@xxxxxxxxx> wrote: >> >> Jeff Layton (2): >> cifs: attempt to freeze while looping on a receive attempt >> cifs: check for NULL last_entry before calling cifs_save_resume_key >> >> fs/cifs/connect.c | 2 ++ >> fs/cifs/readdir.c | 10 ++++++++-- >> 2 files changed, 10 insertions(+), 2 deletions(-) > > This is not at all what I get. I get those two, but I also get > > Pavel Shilovsky (1): > CIFS: Add descriptions to the brlock cache functions > > Steve French (1): > cifs: Fix sparse warning when calling cifs_strtoUCS > > Not pulled, I don't pull from branches that don't match the description. > > Linus -- Thanks, Steve -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
