lkml.org 
[lkml]   [2010]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRE: Staging: dt3155: Cleanup memory mapped i/o access
On Monday, May 03, 2010 2:18 PM, Greg KH wrote:
>>> Did you rebase this on the latest linux-next tree?
>>
>> I did. And I just re-did is again against next-20100503 and it generated
>> the same patch.
>
> Wierd.
>
>> But, I just noticed this:
>>
>> $ git log drivers/staging/dt3155
>> commit 3c59b4691587b8977cc77ecf07985758a2ba0d97
>> Merge: 7f1e428 bed46a8
>> Author: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon May 3 14:17:49 2010 +1000
>>
>> Merge remote branch 'staging-next/staging-next'
>>
>> Conflicts:
>> drivers/staging/arlan/arlan-main.c
>> drivers/staging/comedi/drivers/cb_das16_cs.c
>> drivers/staging/cx25821/cx25821-alsa.c
>> drivers/staging/dt3155/dt3155_drv.c
>> drivers/staging/netwave/netwave_cs.c
>>
>> Could the next tree be out of sync with your tree?
>
> Hm, some other tree might be doing something in those files. But the
> fact that the drivers/staging/dt3155/dt3155_io.h was so wrong it thought
> it was a revert, makes me suspect that you did it against something
> else.

I just looked at the Next/merge.log file for next-20100503.

$ git merge origin/master
...
drivers/staging/dt3155/dt3155_drv.c | 4 +-
...
$ git merge staging-next/staging-next
...
Resolved 'drivers/staging/dt3155/dt3155_drv.c' using previous resolution.
...
Auto-merging drivers/staging/dt3155/dt3155_drv.c
CONFLICT (content): Merge conflict in drivers/staging/dt3155/dt3155_drv.c
...
$ git diff -M --stat --summary HEAD^..
...
drivers/staging/dt3155/allocator.c | 16 +-
drivers/staging/dt3155/allocator.h | 4 +-
drivers/staging/dt3155/dt3155.h | 44 +-
drivers/staging/dt3155/dt3155_drv.c | 380 +-
drivers/staging/dt3155/dt3155_io.c | 24 +-
drivers/staging/dt3155/dt3155_isr.c | 297 +-
drivers/staging/dt3155/dt3155_isr.h | 2 +-
...
Not sure if that helps...

>
> If you make this against my staging-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
> using the staging-next branch, does that make the patch different?
>
> Let me know if you need help doing that.

I just tried pulling that tree and got:

$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
fatal: Not a git repository (or any of the parent directories): .git

So, yes I need help doing that ;-)

Regards,
Hartley

\
 
 \ /
  Last update: 2010-05-04 00:27    [from the cache]
©2003-2011 Jasper Spaans