Messages in this thread | | | Date | Fri, 21 Nov 2014 09:55:38 -0800 | From | Greg Kroah-Hartman <> | Subject | Re: kdbus: add node and filesystem implementation |
| |
On Fri, Nov 21, 2014 at 12:03:51PM -0500, Sasha Levin wrote: > On 11/21/2014 11:56 AM, Greg Kroah-Hartman wrote: > >>> Maybe it's worth basing your git tree on top of Al's rather than a random > >>> > > -rc, since it's now a filesystem? > >> > > >> > Sure, sounds good. > > No, I'll keep it as is, we can handle the merge issues later when it > > hits Linus's tree, this makes it easier for me and others to test it > > out properly. > > It should be hitting -next, not Linus's tree. This is why we have an > integration tree, no?
Yes, it will hit -next, and the merge issue can be resolved there.
| |