Messages in this thread | | | Date | Fri, 24 Mar 2017 09:49:42 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the gpio tree with the input tree |
| |
Hi Dmitry,
On Thu, 23 Mar 2017 09:30:49 -0700 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > > I think the fix is trivial and if it does not both Stephen to carry it > on we'll let the other Linus resolve it in his tree when merging. I > think he prefers to have cross-tree merges only happen when it is > needed for development, not simply to resolve conflicts.
I have no problem carrying the merge fix.
-- Cheers, Stephen Rothwell
| |