History should be clean now - I reset back to the previous rc, merged
with your current tree and then applied the one trivial cifs patch.
The following changes since commit 7ee94d97aafacf5a019b3578e0eae6daa2e2bcd5:
Linus Torvalds (1):
Merge tag 'fixes-for-linus' of git://git.kernel.org/.../arm/arm-soc
are available in the git repository at:
git://git.samba.org/sfrench/cifs-2.6.git master
Dan Carpenter (1):
cifs: fix revalidation test in cifs_llseek()
fs/cifs/cifsfs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
On Wed, May 9, 2012 at 1:19 PM, Linus Torvalds
<[email protected]> wrote:
> On Wed, May 9, 2012 at 6:12 AM, Steve French <[email protected]> wrote:
>> The following changes since commit 5c503f8c0f7550ffe76e388172f898d8d11a336e:
>> Steve French (1):
>> Merge branch 'master' of git://git.kernel.org/.../torvalds/linux-2.6
>>
>> are available in the git repository at:
>>
>> git://git.samba.org/sfrench/cifs-2.6.git master
>>
>> Dan Carpenter (1):
>> cifs: fix revalidation test in cifs_llseek()
>>
>> fs/cifs/cifsfs.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> This is not at all what I get. I get four commits, three of which are
> rebased versions of the ones I already pulled last week. And two
> pointless back-to-back merges.
>
> Not pulled.
>
> Linus
--
Thanks,
Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html