linux-kernel - Re: [PATCH] mfd: mc13xxx: Move definitions out of structures

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1395135226.132641029@f500.i.mail.ru>
Date:	Tue, 18 Mar 2014 13:33:46 +0400
From:	Alexander Shiyan <shc_work@...l.ru>
To:	Lee Jones <lee.jones@...aro.org>
Cc:	linux-kernel@...r.kernel.org,
	Samuel Ortiz <sameo@...ux.intel.com>,
	cooloney@...il.com
Subject: Re: [PATCH] mfd: mc13xxx: Move definitions out of structures

Tue, 18 Mar 2014 09:27:35 +0000 от Lee Jones <lee.jones@...aro.org>:
> > > > Signed-off-by: Alexander Shiyan <shc_work@...l.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.

So what do we do now? What is the solution?

---