From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Guenter Roeck <linux@roeck-us.net>,
Douglas Anderson <dianders@chromium.org>
Subject: Re: linux-next: manual merge of the mfd tree with the input tree
Date: Tue, 14 Feb 2017 08:38:40 +0000 [thread overview]
Message-ID: <20170214083840.s36lep65kvecoao3@dell> (raw)
In-Reply-To: <20170214131006.4c5ab762@canb.auug.org.au>
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
Kind regards,
Lee
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2017-02-14 8:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-14 2:10 linux-next: manual merge of the mfd tree with the input tree Stephen Rothwell
2017-02-14 8:38 ` Lee Jones [this message]
2017-02-15 19:38 ` Dmitry Torokhov
-- strict thread matches above, loose matches on Subject: below --
2025-07-03 4:01 Stephen Rothwell
2025-07-29 23:17 ` Stephen Rothwell
2009-08-05 3:31 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170214083840.s36lep65kvecoao3@dell \
--to=lee.jones@linaro.org \
--cc=dianders@chromium.org \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox