Messages in this thread | | | Date | Mon, 13 Oct 2014 15:06:34 +1100 (AEDT) | From | James Morris <> | Subject | Re: [GIT] Security subsystem upate for 3.18 |
| |
On Sun, 12 Oct 2014, Linus Torvalds wrote:
> on some previous development, so it's often a good time to simply > create a new feature branch. I don't know how James feels about > merging multiple separate feature branches, but I know that *I* tend > to appreciate it when I get multiple well-defined pull requests rather > than one big one that does many different things.
It's fine with me.
This is the first time I saw (or noticed) that Paul had back merged ahead of me, but it seemed to merge into my tree ok so I didn't query it at the time.
Paul: it's likey best if you consider my -next branch as your upstream. I'll sync to Linus on point releases as previously discussed.
Linus: sorry about all of this, and I'll ensure there's always a summary of the changes and a correct subject for you.
-- James Morris <jmorris@namei.org>
| |