[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20101209184940.GB23781@core.coreip.homeip.net>
Date: Thu, 9 Dec 2010 10:49:41 -0800
From: Dmitry Torokhov <dmitry.torokhov@...il.com>
To: Henrik Rydberg <rydberg@...omail.se>
Cc: Jiri Kosina <jkosina@...e.cz>,
linux-input <linux-input@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] input: mt updates for 2.6.38
On Thu, Dec 09, 2010 at 07:23:31PM +0100, Henrik Rydberg wrote:
> On 12/09/2010 09:58 AM, Dmitry Torokhov wrote:
>
> > On Wed, Dec 08, 2010 at 10:02:52AM +0100, Henrik Rydberg wrote:
> >> Dmitry,
> >>
> >> Please pull from
> >>
> >> git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git next
> >>
> >> to receive input-mt updates for 2.6.38.
> >>
> >> The tree contains core changes as well as dependent changes to hid drivers. You
> >> also find the new hid-egalax driver in there, signed off by Jiri.
> >
> > Pulled, thank you Henrik.
> >
> > I wonder if we should move input-mt.h into input/mt.h (and if someone
> > would bother to input-polldev.h there that would be great too).
>
>
> Sure, I have been wondering about that too. Right away, or later?
Better sooner than later as you'll have less places to patch ;)
>
> > Also I try to sync with mainline once per release, at -rc1, unless I
> > know that my changes will conflict with some other work. I'd recommend
> > you do the same so that when I pull from you I am getting just your
> > changes and not the rest of stuff from mainline.
>
>
> No problem - I will see what sync point you end up using, and I will rebase to
> the same point.
No, not rebase, pull please. Public branches should not be rebased, at
least not when they have been pulled from.
>
> > BTW, we need to document dev->trkid to avoid complaints from 'make
> > htmldocs' and friends. I wonder if the patch below will do.
>
>
> Looks good, thanks.
OK. I take it as an acked-by then.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists