On Tue, Feb 14, 2017 at 08:38:40AM +0000, Lee Jones wrote:
> On Tue, 14 Feb 2017, Stephen Rothwell wrote:
>
> > Hi Lee,
> >
> > Today's linux-next merge of the mfd tree got a conflict in:
> >
> > drivers/input/keyboard/cros_ec_keyb.c
> >
> > between commits:
> >
> > 2057e15945a8 ("Input: cros_ec_keyb - drop unnecessary call to
> > dev_set_drvdata and other changes")
> > aef01aad89e4 ("Input: matrix-keypad - switch to using generic device
> > properties")
> >
> > from the input tree and commit:
> >
> > cdd7950e7aa4 ("input: cros_ec_keyb: Add non-matrix buttons and switches")
> >
> > from the mfd tree.
> >
> > It looks like the latter introduces a call to dev_get_drvdata(), so I
> > left the dev_set_drvdata() call in.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
>
> Morning Stephen,
>
> It looks like Dmitry is yet to pull from:
>
> http://tinyurl.com/ztg68nj
Just pulled and resolved conflicts. Thanks!
--
Dmitry
