linux-next: manual merge of the char-misc tree with the ia64 tree

linux-next: manual merge of the char-misc tree with the ia64 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]

Hi all,

Today's linux-next merge of the char-misc tree got conflicts in
drivers/Kconfig and drivers/Makefile between commit 76ac8275f296
("trace, RAS: Add basic RAS trace event") from the ia64 tree and commit
16603153666d ("thunderbolt: Add initial cactus ridge NHI support") from
the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/Kconfig
index 4e6e66c3c8d6,9b2dcc2ea663..000000000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -176,6 -176,6 +176,8 @@@ source "drivers/powercap/Kconfig
  
  source "drivers/mcb/Kconfig"
  
 +source "drivers/ras/Kconfig"
 +
+ source "drivers/thunderbolt/Kconfig"
+ 
  endmenu
diff --cc drivers/Makefile
index 8a72e1cc2afa,37b9ed4cd2d6..000000000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -159,4 -158,4 +159,5 @@@ obj-$(CONFIG_NTB)		+= ntb
  obj-$(CONFIG_FMC)		+= fmc/
  obj-$(CONFIG_POWERCAP)		+= powercap/
  obj-$(CONFIG_MCB)		+= mcb/
 +obj-$(CONFIG_RAS)		+= ras/
+ obj-$(CONFIG_THUNDERBOLT)	+= thunderbolt/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the char-misc tree with the ia64 tree

[Greg KH]

On Tue, Jul 15, 2014 at 04:43:49PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got conflicts in
> drivers/Kconfig and drivers/Makefile between commit 76ac8275f296
> ("trace, RAS: Add basic RAS trace event") from the ia64 tree and commit
> 16603153666d ("thunderbolt: Add initial cactus ridge NHI support") from
> the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h

Re: linux-next: manual merge of the char-misc tree with the ia64 tree

[Greg KH]

On Tue, Jul 15, 2014 at 06:44:58AM -0700, Greg KH wrote:
> On Tue, Jul 15, 2014 at 04:43:49PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the char-misc tree got conflicts in
> > drivers/Kconfig and drivers/Makefile between commit 76ac8275f296
> > ("trace, RAS: Add basic RAS trace event") from the ia64 tree and commit
> > 16603153666d ("thunderbolt: Add initial cactus ridge NHI support") from
> > the char-misc tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> Looks good, thanks.

Wait, do we really need a drivers/ras directory for one single driver?
Why not put it in drivers/misc/ instead?  A whole subdir at the top of
drivers seems overkill and odd.

As it's a memory driver, what about drivers/firmware/ or drivers/edac/
or drivers/platform?

thanks,

greg k-h

RE: linux-next: manual merge of the char-misc tree with the ia64 tree

[Luck, Tony]

> Wait, do we really need a drivers/ras directory for one single driver?
> Why not put it in drivers/misc/ instead?  A whole subdir at the top of
> drivers seems overkill and odd.
>
> As it's a memory driver, what about drivers/firmware/ or drivers/edac/
> or drivers/platform?

It isn't really a firmware driver, and definitely not an EDAC driver.

drivers/platform/x86 seems at least plausible.

Adding Boris as drivers/ras was his idea. I think he has plans
for more stuff to go here.

-Tony

Re: linux-next: manual merge of the char-misc tree with the ia64 tree

[Borislav Petkov]

On Tue, Jul 15, 2014 at 03:22:31PM +0000, Luck, Tony wrote:
> > Wait, do we really need a drivers/ras directory for one single driver?
> > Why not put it in drivers/misc/ instead?  A whole subdir at the top of
> > drivers seems overkill and odd.
> >
> > As it's a memory driver, what about drivers/firmware/ or drivers/edac/
> > or drivers/platform?
> 
> It isn't really a firmware driver, and definitely not an EDAC driver.
> 
> drivers/platform/x86 seems at least plausible.
> 
> Adding Boris as drivers/ras was his idea. I think he has plans
> for more stuff to go here.

Actually what I'd really like is to have a separate RAS subsystem where
we pull in all things RAS. Possibly arch-independent as I'm assuming
other arches would need RAS functionality at some point too.

Currently, all the stuff we're doing is x86-only so arch/x86/ras/ might
be a good place too, if other arches wanna do their own thing or if x86
RAS facilities turn out to be PITA to make arch-independent.

-- 
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

RE: linux-next: manual merge of the char-misc tree with the ia64 tree

[Luck, Tony]

> Currently, all the stuff we're doing is x86-only so arch/x86/ras/ might
> be a good place too, if other arches wanna do their own thing or if x86
> RAS facilities turn out to be PITA to make arch-independent.

Oops - not quite.  We moved creation of the EDAC trace point into drivers/ras/ras.c
and edac is not x86 specific.

We also create the PCIe AER tracepoint there too - PCIe is not x86 specific.

-Tony

Re: linux-next: manual merge of the char-misc tree with the ia64 tree

[Borislav Petkov]

On Tue, Jul 15, 2014 at 03:57:42PM +0000, Luck, Tony wrote:
> Oops - not quite. We moved creation of the EDAC trace point into
> drivers/ras/ras.c and edac is not x86 specific.
>
> We also create the PCIe AER tracepoint there too - PCIe is not x86
> specific.

Right, but AFAIK, only x86 uses those. And frankly, we don't know
whether other arches would have interest in those or would like to grow
their own.

So, I don't have an idea whether we want to make the whole RAS stuff
arch-specific or we have to talk about it or we have to leave us that
option open and so on...

It is hard to say.

One example to mud the situation even more :-):

The APEI stuff is apparently being used by arm now too, but without the
NMI which is x86-specific. Carving that whole thing out took a bit of
work but it got done.

-- 
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--