AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:<20070925102211.796a1c5f@ripper.onstor.net>
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:onstor-exch02.onstor.net
NSV:
SSH:
R:<maxim.kozlovsky@onstor.com>
MAID:1
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/andys@onstor.net@onstor-exch02.onstor.net/INBOX	0	BB375AF679D4A34E9CA8DFA650E2B04E05B4677C@onstor-exch02.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Tue, 25 Sep 2007 10:22:54 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: "Maxim Kozlovsky" <maxim.kozlovsky@onstor.com>
Subject: Re: neteee and mgmt-bus mods for cougar kernel
Message-ID: <20070925102254.5cbbadba@ripper.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E05B4677C@onstor-exch02.onstor.net>
References: <20070924190633.184a9155@ripper.onstor.net>
	<BB375AF679D4A34E9CA8DFA650E2B04E05B4677C@onstor-exch02.onstor.net>
Organization: Onstor
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

that's not what happens when i do it.

$ git-checkout arch/mips/onstor/bobcat/setup.c
re-run other git-checkout command


On Tue, 25 Sep 2007 10:18:12 -0700 "Maxim Kozlovsky"
<maxim.kozlovsky@onstor.com> wrote:

> maximk@ripper:~/d/linux/kernel/linux-mips-2.6$ git-checkout
> onstor-cg-2.6.22-dev
> fatal: Entry 'arch/mips/onstor/bobcat/setup.c' not uptodate. Cannot
> merge.
> 
> >-----Original Message-----
> >From: Andy Sharp
> >Sent: Monday, September 24, 2007 7:07 PM
> >To: Maxim Kozlovsky
> >Subject: neteee and mgmt-bus mods for cougar kernel
> >
> >Hi Max,
> >
> >The changes to netee and mgmt-bus that I've been attempting are now
> >in perforce, but will require that you use a little bit of git to
> >look at them ~:^)
> >
> >There is a git repository checked into the perforce repository.  It
> >confuses even me sometimes.  But if you have an unmodified checkout
> >from perforce of the kernel directory, you should have a git
> >repository with the branch onstor-2.6.20-stuper-hack checked out.
> >The name is an unfortunate carry over from my early development days
> >in January, and I forgot to change it before I checked it into
> >perforce, so I'm stuck with it for a while.
> >
> >Note: you should do this in a kernel directory that has been sync'd
> >from perforce and does not have any files open for edit.
> >
> >If you log into ripper, which has git installed on it, or if you have
> >at least version 1.4.4 of git installed on your workstation, you can
> >list the branches in the git repository:
> >
> >ripper:kernel$ cd linux-mips-2.6
> >ripper:linux-mips-2.6$ git-branch
> >  linux-2.6.16-stable
> >  linux-2.6.17-stable
> >  linux-2.6.18-stable
> >  linux-2.6.19-stable
> >  linux-2.6.20-stable
> >  local-master
> >  master
> >  onstor-2.6.19-pmc9k
> >  onstor-2.6.20
> >  onstor-2.6.20-bobcat
> >  onstor-2.6.20-sb1
> >* onstor-2.6.20-stuper-hack
> >  onstor-cg-2.6.22
> >  onstor-cg-2.6.22-dev
> >  origin
> >  queue
> >ripper:linux-mips-2.6$
> >
> >This shows you that the current checked out branch is
> >onstor-2.6.20-stuper-hack.  You can only have one branch checked out
> >at a time -- that's called your working tree.  You want to checkout
> >the branch onstor-cg-2.6.22-dev but before you can actually do this,
> >first you have to fix up a little chicanery I've perpetrated -- the
> >perfarce and git repositories don't quite agree.  To fix it, type
> >
> >ripper:linux-mips-2.6$ git-checkout drivers/pcmcia/pd6729.c
> >drivers/pcmcia/rsrc_nonstatic.c drivers/serial/mpsc.c
> >
> >Now you can checkout the onstor-cg-2.6.22-dev branch using the
> >command:
> >
> >ripper:linux-mips-2.6$ git-checkout onstor-cg-2.6.22-dev
> >
> >Go ahead and do that and take a look at the neteee and mgmt-bus
> >driver code and the matching code in udp and route and such.  I
> >tried to guess what the right replacement for skb->data was, but I
> >don't know if I'm right, and the kernel couldn't run this driver
> >last time I tried it. I haven't tried to do any 64 bit work, and
> >you're basically right, until we know some addresses, that can
> >probably wait.
> >
> >Let me know if you need to use a cougar for testing.
> >
> >You should be able to put your directory back to the way it was using
> >p4 sync -f as long as you didn't have anything open for edit that git
> >has now changed.
> >
> >Thanks,
> >
> >a
> 
