On Mon, Jul 26, 2010 at 12:01 PM, Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> wrote: > On Mon, 26 Jul 2010, Belisko Marek wrote: > >> Hi, >> >> On Mon, Jul 26, 2010 at 11:51 AM, Robert P. J. Day >> <rpjday@xxxxxxxxxxxxxx> wrote: >> > On Mon, 26 Jul 2010, Belisko Marek wrote: >> > >> >> Hi, >> >> >> >> I'm using 2.6.33.6 stable kernel for development. I would like to >> >> switch to 2.6.34 stable kernel. I'm using git. Is there some easy >> >> way how to do that? >> >> >> >> I try to merge 2.6.34/master to my 2.6.33 with git but merge failed >> >> and changes are so huge. Or should I create patch for my 2.6.33 >> >> clone 2.6.34 and apply patch to 2.6.34 kernel? >> > >> > just use git to check out the 2.6.34 tag before building. or is >> > there something more complicated happening here? > >> I'm not using mainline kernel but stable kernels which has different >> git repos for every stable kernel. In mainline there is only rc >> series not stable. > > that's not true -- my git repo clearly shows a tag of "v2.6.34". > why wouldn't that be what you want? git describe in mainline show: v2.6.34 git describe in stable kernel repo shows for e.g .2.6.33 kernel: v2.6.33.6 Last digit is incremented with new update of stable tree which is done by greg k-h. > > rday > > -- > > ======================================================================== > Robert P. J. Day Waterloo, Ontario, CANADA > > Top-notch, inexpensive online Linux/OSS/kernel courses > http://crashcourse.ca > > Twitter: http://twitter.com/rpjday > LinkedIn: http://ca.linkedin.com/in/rpjday > ======================================================================== Marek -- as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite icq: 290551086 web: http://open-nandra.com -- To unsubscribe from this list: send an email with "unsubscribe kernelnewbies" to ecartis@xxxxxxxxxxxx Please read the FAQ at http://kernelnewbies.org/FAQ
