Prev: [PATCH v2.1 3/4] IPVS: make FTP work with full NAT support
Next: Staging: dream: pmem: code style fixes
From: Joe Perches on 3 May 2010 20:10
On Mon, 2010-05-03 at 16:41 -0700, Greg KH wrote:
> No, wait, I see these in my staging-next tree here. Some of them I
> wrote :)

There not there.

git push?


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: H Hartley Sweeten on 3 May 2010 21:00
On Monday, May 03, 2010 4:41 PM, Greg KH wrote:
> On Mon, May 03, 2010 at 06:33:08PM -0500, H Hartley Sweeten wrote:
>> It appears these are the patches missing in your staging-next tree that do
>> exist in the linux-next tree:
>>
>> Staging: dt3155: remove "inline" usage
>> Staging: dt3155: rename dt3155_fbuffer_s
>> Staging: dt3155: rename dt3155_config_s
>> Staging: dt3155: rename dt3155_read_t
>> Staging: dt3155: rename dt3155_status_t
>> Staging: dt3155: remove frame_info_t
>> Staging: dt3155: remove TRUE/FALSE
>> Staging: dt3155: remove #ifdef
>> Staging: dt3155: allocator.c: sparse cleanups
>> Staging: dt3155: fix parentheses and bracket spacing style issues
>> Staging: dt3155: fix coding style issue in dt3155_isr.c
>> Staging: dt3155: fix wait_ibsyclr function
>> Staging: remove unused #include <linux/version.h>
>
> No, wait, I see these in my staging-next tree here. Some of them I
> wrote :)
>
> Are you sure you are cloning my tree properly?

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 3 May 2010 23:00
On Mon, May 03, 2010 at 04:59:58PM -0700, Joe Perches wrote:
> On Mon, 2010-05-03 at 16:41 -0700, Greg KH wrote:
> > No, wait, I see these in my staging-next tree here. Some of them I
> > wrote :)
>
> There not there.
>
> git push?

I have, and they look to be there to me:
http://git.kernel.org/?p=linux/kernel/git/gregkh/staging-next-2.6.git;a=commit;h=4f923d004396ef272600d381a365cac9d832486d

So something must be odd on your side.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Joe Perches on 4 May 2010 15:10
On Mon, 2010-05-03 at 19:54 -0700, Greg KH wrote:
> > git push?
> I have, and they look to be there to me:
> http://git.kernel.org/?p=linux/kernel/git/gregkh/staging-next-2.6.git;a=commit;h=4f923d004396ef272600d381a365cac9d832486d
> So something must be odd on your side.

Yup, sorry, my mistake.

staging-next is the name of your repository as well as
a branch within your repository and git after git clone
doesn't by default show all remote branches.

$ git clone --reference=linux-2.6 \
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git

$ git branch -r
origin/HEAD -> origin/master
origin/master
origin/staging-next

I needed to add a git checkout origin/staging-next


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: H Hartley Sweeten on 4 May 2010 16:10
On Tuesday, May 04, 2010 12:07 PM, Joe Perches wrote:
> On Mon, 2010-05-03 at 19:54 -0700, Greg KH wrote:
>>> git push?
>> I have, and they look to be there to me:
>> http://git.kernel.org/?p=linux/kernel/git/gregkh/staging-next-2.6.git;a=commit;h=4f923d004396ef272600d381a365cac9d832486d
>> So something must be odd on your side.
>
> Yup, sorry, my mistake.
>
> staging-next is the name of your repository as well as
> a branch within your repository and git after git clone
> doesn't by default show all remote branches.
>
> $ git clone --reference=linux-2.6 \
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
>
> $ git branch -r
> origin/HEAD -> origin/master
> origin/master
> origin/staging-next
>
> I needed to add a git checkout origin/staging-next

That tree is still missing a couple commits that are in Linus' tree:

commit 6536560cabab170ed2969b005bf69a496e9c45bf
Staging: dt3155: fix 50Hz configuration

commit 74a920139a0f1119c5a604cef0ce5d6f591dc782
staging: fix dt3155 build


Which would probably explain the conflict that occurs in linux-next for
dt3155_drv.c.


commit 9e1bd9a6f8c6ad8b461294a365c49b19212178d9
Merge: 5382319 e595eea
Author: Stephen Rothwell <sfr(a)canb.auug.org.au>
Date: Tue May 4 15:42:20 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

Regards,
Hartley
First  |  Prev  |  Next  |  Last
Pages: 1 2 3 4 5
Prev: [PATCH v2.1 3/4] IPVS: make FTP work with full NAT support
Next: Staging: dream: pmem: code style fixes