Ed W:
> OK, so the process I am seeking is actually something more like a full
> set of commits from upstream kernel, but mixed in are my patches and
> merges where needed.
>
> The closest I found so far is to fork my branch, apply my patches, then
> rebase the kernel tree *onto* my tree (and fix any merge conflicts where
> necessary). This gives something which looks like the original kernel
> tree, but with my patches mixed in... Slight fiddle to do though...
>
> Ideas on a better solution?
I think this (below) is a git-freindly way.
- Categorize the patches by topic (or its origin) and create branch for
each topic.
For example, if I want to merge grsecurity patch and aufs patch into
2.6.37, then I will create 2 topic-braches.
$ git clone /mainline/linus/git .
$ git checkout -b grsec-XXX-37 v2.6.37
$ git apply --index /grsec/patch
$ git commit -m "apply /grsec/patch"
$ git checkout -b aufs-XXX-37 v2.6.37
$ git apply --index /aufs/patch
$ git commit -m "apply /aufs/patch"
or
$ git checkout -b aufs-XXX-37 v2.6.37
$ git pull /aufs/git aufs2.1-37
- Create a brach for merging.
$ git checkout -b my-37 v2.6.37
$ git pull . grsec-XXX-37
$ git pull . aufs-XXX-37
By splitting by topics, it will be easier to follow the upstream changes
and testing/debugging more narrow region. If you meet a problem in my-37
and need to know where the bug came from, then you can test the same
scenario in each topic-branch. (Of cource, the problem may be a conflict
at pulling, or the scenario is available only for my-37 tough)
If you have more topics (or patches), then create a branch for each
topic and merge it into the final my-37 by git-pull.
> I have one of these in my current laptop and it absolutely screams:
> http://www.ebuyer.com/product/225806
What is "scream"? I don't think SDD is noisy. Does it mean super silent
and fast? Or SDD is so cold as "icecream"? (because I wrote about the heat)
> If you can help me find the same or similar drive locally to you for
> around the same price I would consider donating one to you?
Whao! Great!!
In my country, the price is much expensive. A simple googling tells me
that 250GB SSD costs twice as yours...
If I can find a good hardware in good price, I may write and ask
you. But not now.
Anyway I appriciate you for considering donation.
J. R. Okajima
------------------------------------------------------------------------------
Index, Search & Analyze Logs and other IT data in Real-Time with Splunk
Collect, index and harness all the fast moving IT data generated by your
applications, servers and devices whether physical, virtual or in the cloud.
Deliver compliance at lower cost and gain new business insights.
Free Software Download: http://p.sf.net/sfu/splunk-dev2dev
