OK. I cloned your tree a different way this time. This time I did:
$ git clone --reference ../linux-2.6 staging-2.6
Initialized empty Git repository in /home/bigguiness/src/git/z/staging-2.6/.git/
warning: You appear to have cloned an empty repository.
$ cd staging-2.6
$ git remote add staging-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
$ git fetch staging-2.6
remote: Counting objects: 1541325, done.
remote: Compressing objects: 100% (249801/249801), done.
remote: Total 1541325 (delta 1283336), reused 1536966 (delta 1279192)
Receiving objects: 100% (1541325/1541325), 342.86 MiB | 330 KiB/s, done.
Resolving deltas: 100% (1283336/1283336), done.
From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6
* [new branch] master -> staging-2.6/master
* [new branch] staging-next -> staging-2.6/staging-next
...
$ git branch -a
remotes/staging-2.6/master
remotes/staging-2.6/staging-next
$ git checkout remotes/staging-2.6/staging-next
Checking out files: 100% (32340/32340), done.
Note: checking out 'remotes/staging-2.6/staging-next'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at e595eea... Staging: comedi: __user markup on comedi_fops.c
Now it's different. Your staging-next tree appears to be missing these patches:
Staging: dt3155: fix 50Hz configuration
staging: fix dt3155 build
Both of which change dt3155_drv.c and both of which are in Linus' tree
and the next tree.
I think this explains why you had issues with trying to merge my patch
with the dt3155_drv.c file. But it still doesn't explain the problem
with dt3155_io.c. All the files except dt3155_drv.c seem to match
between next-20100503 and your staging-next tree.
Argh! git drives me nuts sometimes....
Regards,
Hartley
--
