From: Lee Jones <lee.jones@linaro.org>
To: Alexander Shiyan <shc_work@mail.ru>, cooloney@gmail.com
Cc: linux-kernel@vger.kernel.org, Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: [PATCH] mfd: mc13xxx: Move definitions out of structures
Date: Tue, 18 Mar 2014 09:27:35 +0000 [thread overview]
Message-ID: <20140318092735.GK25478@lee--X1> (raw)
In-Reply-To: <1395134091.369687348@f500.i.mail.ru>
> > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> > > ---
> > > include/linux/mfd/mc13xxx.h | 22 ++++++++++++----------
> > > 1 file changed, 12 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
> > > index a326c85..d63b1d3 100644
> > > --- a/include/linux/mfd/mc13xxx.h
> > > +++ b/include/linux/mfd/mc13xxx.h
> > > @@ -117,10 +117,6 @@ struct mc13xxx_led_platform_data {
> > >
> > > #define MAX_LED_CONTROL_REGS 6
> > >
> > > -struct mc13xxx_leds_platform_data {
> > > - struct mc13xxx_led_platform_data *led;
> > > - int num_leds;
> > > -
> > > /* MC13783 LED Control 0 */
> > > #define MC13783_LED_C0_ENABLE (1 << 0)
> > > #define MC13783_LED_C0_TRIODE_MD (1 << 7)
> > > @@ -169,10 +165,13 @@ struct mc13xxx_leds_platform_data {
> > > /* MC34708 LED Control 0 */
> >
> > I don't see the line above in the MFD tree?
> >
> > Which commit/branch/repo is this patch based on?
>
> Dependency:
> linux-next, a59ce6584d (leds: leds-mc13783: Add MC34708 LED support)
>
> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/include/linux/mfd/mc13xxx.h?id=a59ce6584d566847980f9dcad5343cd9856145c8
Ah, you can't do that, as it will cause conflicts and Linus will
likely get upset.
Bryan you naughty boy! Why are you applying patches to files in MFD?
--
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:[~2014-03-18 9:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-15 7:08 [PATCH] mfd: mc13xxx: Move definitions out of structures Alexander Shiyan
2014-03-18 8:46 ` Lee Jones
2014-03-18 9:02 ` Lee Jones
2014-03-18 9:14 ` Alexander Shiyan
2014-03-18 9:27 ` Lee Jones [this message]
2014-03-18 9:33 ` Alexander Shiyan
2014-03-18 9:40 ` Lee Jones
2014-03-18 22:31 ` Bryan Wu
2014-03-19 8:51 ` Lee Jones
2014-03-19 9:05 ` Alexander Shiyan
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=20140318092735.GK25478@lee--X1 \
--to=lee.jones@linaro.org \
--cc=cooloney@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=shc_work@mail.ru \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.