[PATCH RFC 01/17 v2] staging: dgap: Merge dgap_fep5.c into dgap_driver.c

Dan Carpenter dan.carpenter at oracle.com
Tue Feb 18 13:50:49 UTC 2014

On Tue, Feb 18, 2014 at 08:27:17AM -0500, Mark Hounschell wrote:
> On 02/18/2014 08:14 AM, Dan Carpenter wrote:
> > On Tue, Feb 18, 2014 at 08:00:57AM -0500, Mark Hounschell wrote:
> >> That's odd. I just installed vanilla 3.14-rc3 yesterday from kernel.org.
> >> It boots up fine but does not appear to have the same dgap driver as
> >> staging-next. Clearly staging-next is more up to date. I assume that
> >> means I just have the wrong 3.14-rc3? No matter, I can work with vanilla
> >> 3.14-rc3 with dgap from staging-next copied over into it? I can also git
> >> from where ever you did your merge. Sorry for my inexperience, but I
> >> don't know where that would be from though? linux-next?
> > 
> > Here is the command to find which changes have been applied since
> > v3.14-rc3:
> > 
> > 	git log -p v3.14-rc3.. drivers/staging/dgap/
> > 
> > There have been no noteworthy changes.  Just spelling fixes and removing
> > dead code.
> > 
> Sorry again for my ignorance.  If I re "git clone" staging-next will I
> get something that is based on 3.14-rc3 (so I can boot)? Or do I have to
> re "git clone" from somewhere else? I'm still in pretty big git learning
> curve?

Your question is confusing.  What does "based on" mean?  The driver in
staging-next is very similar to the driver in v3.14-rc3 but with some
additional patches applied.

Once you have one git tree then you don't need to clone again.  You just
to a "git fetch" and a "git checkout".  The "git fetch" command will
download a smaller chunk of data than cloning the whole repository every

Anyway, if you want v3.14-rc3 then just do:
git fetch --tags git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
git checkout v3.14-rc3

Don't forget to add the "v" in "v3.14-rc3".

Type "git tag -l" to see which tags you can checkout.

dan carpenter

More information about the devel mailing list