Subject: linux-next: manual merge of the bkl-llseek tree with the infiniband tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 13 Oct 2010 14:32:29 +1100

Hi Arnd,

Today's linux-next merge of the bkl-llseek tree got a conflict in
drivers/infiniband/hw/cxgb4/device.c between commit
8bbac892fb75d20fa274ca026e24faf00afbf9dd ("RDMA/cxgb4: Add default_llseek
to debugfs files") from the infiniband tree and commit
9711569d06e7df5f02a943fc4138fb152526e719 ("llseek: automatically
add .llseek fop") from the bkl-llseek tree.

Not really a conflict.  The infiniband tree patch is a superset of the
part of the bkl-llseek commit that affects this file.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/