* git fetch and git merge stable kernel @ 2014-04-01 19:56 Anand Moon 2014-04-01 21:34 ` Greg KH 0 siblings, 1 reply; 7+ messages in thread From: Anand Moon @ 2014-04-01 19:56 UTC (permalink / raw) To: kernelnewbies Hi All, Bellow git kernel point to different stable tags git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git My guess the current stable branch point to tag v3.13.8. I would like to fetch and merge the kernel from Linux-stable tags (v3.2.xx) to my kernel. Please suggest me a method to such a operation. -Anand Moon ^ permalink raw reply [flat|nested] 7+ messages in thread
* git fetch and git merge stable kernel 2014-04-01 19:56 git fetch and git merge stable kernel Anand Moon @ 2014-04-01 21:34 ` Greg KH 2014-04-02 3:25 ` Anand Moon 0 siblings, 1 reply; 7+ messages in thread From: Greg KH @ 2014-04-01 21:34 UTC (permalink / raw) To: kernelnewbies On Tue, Apr 01, 2014 at 12:56:58PM -0700, Anand Moon wrote: > > > Hi All, > > Bellow git kernel point to different stable tags > > > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git > > My guess the current stable branch point to tag v3.13.8. > > I would like to fetch and merge the kernel from Linux-stable tags (v3.2.xx) to my kernel. What exactly do you want to do here? That didn't parse very well, sorry. greg k-h ^ permalink raw reply [flat|nested] 7+ messages in thread
* git fetch and git merge stable kernel 2014-04-01 21:34 ` Greg KH @ 2014-04-02 3:25 ` Anand Moon 2014-04-02 3:35 ` Greg KH 0 siblings, 1 reply; 7+ messages in thread From: Anand Moon @ 2014-04-02 3:25 UTC (permalink / raw) To: kernelnewbies Hi Greg, I have kernel version 3.05 for particular ARM board. I want to fetch and merger from 3.05 --> 3.2.xx (i.e. 3.2.55) and see if how this new kernel works on the ARM board. Can some body guide me with some steps the do such a operations. Hope this clear my questions. -Anand Moon On Wednesday, April 2, 2014 3:23 AM, Greg KH <greg@kroah.com> wrote: On Tue, Apr 01, 2014 at 12:56:58PM -0700, Anand Moon wrote: > > > Hi All, > > Bellow git kernel point to different stable tags > > > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git > > My guess the current stable branch point to tag v3.13.8. > > I would like to fetch and merge the kernel from Linux-stable tags (v3.2.xx) to my kernel. What exactly do you want to do here?? That didn't parse very well, sorry. greg k-h _______________________________________________ Kernelnewbies mailing list Kernelnewbies at kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies ^ permalink raw reply [flat|nested] 7+ messages in thread
* git fetch and git merge stable kernel 2014-04-02 3:25 ` Anand Moon @ 2014-04-02 3:35 ` Greg KH 2014-04-02 10:02 ` Anand Moon 0 siblings, 1 reply; 7+ messages in thread From: Greg KH @ 2014-04-02 3:35 UTC (permalink / raw) To: kernelnewbies On Tue, Apr 01, 2014 at 08:25:25PM -0700, Anand Moon wrote: > Hi Greg, > > I have kernel version 3.05 for particular ARM board. There is no "3.05" kernel, specifics matter here. There is a 3.5 kernel, is that what you are using? Or is it "3.0.5"? Big difference... > I want to fetch and merger from 3.05 --> 3.2.xx (i.e. 3.2.55) and see if how this new kernel works on the ARM board. > > Can some body guide me with some steps the do such a operations. git merge v3.2.55 when in your 3.0.5 branch should do what you want, have you tried that? But note, that's going to try to merge a lot of patches, be prepared for a mess if you were not really using a "clean" 3.0.5 kernel release... Hope this helps, greg k-h ^ permalink raw reply [flat|nested] 7+ messages in thread
* git fetch and git merge stable kernel 2014-04-02 3:35 ` Greg KH @ 2014-04-02 10:02 ` Anand Moon 2014-04-02 15:28 ` Valdis.Kletnieks at vt.edu 2014-04-02 15:53 ` Greg KH 0 siblings, 2 replies; 7+ messages in thread From: Anand Moon @ 2014-04-02 10:02 UTC (permalink / raw) To: kernelnewbies Hi Greg, I have performed following operations listed below. amoon at moon-ubuntu:imx_3.05-udoo-back$ git remote add stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git amoon at moon-ubuntu:imx_3.05-udoo-back$ git fetch stable v3.2.55 warning: no common commits remote: Counting objects: 2268469, done. remote: Compressing objects: 100% (358926/358926), done. remote: Total 2268469 (delta 1894711), reused 2251941 (delta 1888257) Receiving objects: 100% (2268469/2268469), 454.48 MiB | 54.00 KiB/s, done. Resolving deltas: 100% (1894711/1894711), done. >From git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable * tag v3.2.55 -> FETCH_HEAD amoon at moon-ubuntu:imx_3.05-udoo-back$ git branch -r origin/HEAD -> origin/master origin/master amoon at moon-ubuntu:imx_3.05-udoo-back$ git branch -a * master remotes/origin/HEAD -> origin/master ? remotes/origin/master amoon at moon-ubuntu:imx_3.05-udoo-back$ git merge FETCH_HEAD ..... ..... ..... Auto-merging Documentation/ABI/removed/o2cb CONFLICT (add/add): Merge conflict in Documentation/ABI/removed/o2cb Auto-merging Documentation/ABI/obsolete/proc-pid-oom_adj CONFLICT (add/add): Merge conflict in Documentation/ABI/obsolete/proc-pid-oom_adj Auto-merging Documentation/00-INDEX CONFLICT (add/add): Merge conflict in Documentation/00-INDEX Auto-merging CREDITS CONFLICT (add/add): Merge conflict in CREDITS Automatic merge failed; fix conflicts and then commit the result. amoon at moon-ubuntu:imx_3.05-udoo-back$ But their are too many confilits so no point in continue this way I will rather find patches?from the?old kernel and do some reverse engineering and apply them to latest stable kernel and lets see it it working. Any way?I have learned some good thing from git,?thank for your inputs. -Anand Moon? ? On Wednesday, April 2, 2014 9:18 AM, Greg KH <greg@kroah.com> wrote: On Tue, Apr 01, 2014 at 08:25:25PM -0700, Anand Moon wrote: > Hi Greg, > > I have kernel version 3.05 for particular ARM board. There is no "3.05" kernel, specifics matter here.? There is a 3.5 kernel, is that what you are using?? Or is it "3.0.5"?? Big difference... ------------------------------------------- You are right its 3.0.5 ------------------------------------------- > I want to fetch and merger from 3.05 --> 3.2.xx (i.e. 3.2.55) and see if how this new kernel works on the ARM board. > > Can some body guide me with some steps the do such a operations. git merge v3.2.55 when in your 3.0.5 branch should do what you want, have you tried that? But note, that's going to try to merge a lot of patches, be prepared for a mess if you were not really using a "clean" 3.0.5 kernel release... Hope this helps, greg k-h ^ permalink raw reply [flat|nested] 7+ messages in thread
* git fetch and git merge stable kernel 2014-04-02 10:02 ` Anand Moon @ 2014-04-02 15:28 ` Valdis.Kletnieks at vt.edu 2014-04-02 15:53 ` Greg KH 1 sibling, 0 replies; 7+ messages in thread From: Valdis.Kletnieks at vt.edu @ 2014-04-02 15:28 UTC (permalink / raw) To: kernelnewbies On Wed, 02 Apr 2014 03:02:01 -0700, Anand Moon said: > But their are too many confilits so no point in continue this way > I will > rather find patches?from the?old kernel and do some reverse engineering > and apply them to latest stable kernel and lets see it it working. Did you learn that you're probably better off getting your patches into the mainline kernel, so that henceforth anybody who changes APIs that affect your code has to also fix your code for you? Also, 3.2 was a *long* time ago - if your code isn't a driver, there's a good chance that there's new and better ways to fix your problem. And if it *is* a driver, submit it for upstream. Heck, we carried around an entire *architecture* (the old NCR Voyager SMP boxes) for one guy who had 2 systems.... -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 848 bytes Desc: not available Url : http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140402/c9914a63/attachment.bin ^ permalink raw reply [flat|nested] 7+ messages in thread
* git fetch and git merge stable kernel 2014-04-02 10:02 ` Anand Moon 2014-04-02 15:28 ` Valdis.Kletnieks at vt.edu @ 2014-04-02 15:53 ` Greg KH 1 sibling, 0 replies; 7+ messages in thread From: Greg KH @ 2014-04-02 15:53 UTC (permalink / raw) To: kernelnewbies On Wed, Apr 02, 2014 at 03:02:01AM -0700, Anand Moon wrote: > Hi Greg, > > I have performed following operations listed below. > > amoon at moon-ubuntu:imx_3.05-udoo-back$ git remote add stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git > > amoon at moon-ubuntu:imx_3.05-udoo-back$ git fetch stable v3.2.55 > warning: no common commits That's the problem right there. You aren't working on a tree that is actually based on the Linux kernel upstream tree. Merging into this tree is going to be an impossible task, as you have found out :( Please work with the company who gave you this tree to rebase it on top of the community tree in order to resolve this issue. good luck, greg k-h ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-04-02 15:53 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-04-01 19:56 git fetch and git merge stable kernel Anand Moon 2014-04-01 21:34 ` Greg KH 2014-04-02 3:25 ` Anand Moon 2014-04-02 3:35 ` Greg KH 2014-04-02 10:02 ` Anand Moon 2014-04-02 15:28 ` Valdis.Kletnieks at vt.edu 2014-04-02 15:53 ` Greg KH
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).