[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <alpine.LFD.2.00.0812011405070.3197@localhost.localdomain>
Date: Mon, 01 Dec 2008 14:12:40 -0500 (EST)
From: Len Brown <lenb@...nel.org>
To: Ingo Molnar <mingo@...e.hu>
Cc: Sam Ravnborg <sam@...nborg.org>,
Stephen Rothwell <sfr@...b.auug.org.au>,
Len Brown <len.brown@...el.com>, linux-next@...r.kernel.org,
LKML <linux-kernel@...r.kernel.org>,
Randy Dunlap <randy.dunlap@...cle.com>, x86@...nel.org,
linux-acpi@...r.kernel.org
Subject: Re: [RFC PATCH v2] create drivers/platform/x86/ from drivers/misc/
> > this version does not touch arch/x86/
>
> the problem isnt the bits that touch arch/x86/, but that we carry these
> commits:
>
> fbc2a06: Merge branch 'linus' into x86/uv
> a3d732f: x86, UV: fix redundant creation of sgi_uv
> 7d9d1f2: sgi-xp: support getting the address of a partition's reserved page
> 31de5ec: sgi-xp: define xp_partition_id and xp_region_size
> 2525789: sgi-xp: create activate and notify gru message queues
> 6c1c325: sgi-xp: define xp_expand_memprotect() and xp_restrict_memprotect()
>
> their drivers/misc impact is significant:
>
> drivers/misc/sgi-gru/grufault.c | 4 +-
> drivers/misc/sgi-gru/gruprocfs.c | 1 -
> drivers/misc/sgi-xp/xp.h | 7 +-
> drivers/misc/sgi-xp/xp_main.c | 7 +
> drivers/misc/sgi-xp/xp_sn2.c | 34 +++++
> drivers/misc/sgi-xp/xp_uv.c | 70 +++++++++-
> drivers/misc/sgi-xp/xpc.h | 12 ++
> drivers/misc/sgi-xp/xpc_sn2.c | 15 +--
> drivers/misc/sgi-xp/xpc_uv.c | 290 ++++++++++++++++++++++++++++++--------
> 10 files changed, 368 insertions(+), 74 deletions(-)
>
> And we'll likely get new commits in that space.
>
> So if this is causing conflicts in linux-next then i'd suggest for you to
> please do this "git mv drivers/misc/ drivers/x86/" rename (with which i
> fully agree!) right after v2.6.29-rc1 - or near the end of the -rc1 merge
> window.
I only moved only the laptop drivers, didn't touch misc/sgi*/,
so I don't see any conflicts here.
> In any case, please keep it in a separate branch in the ACPI tree so that
> we can reconsider the ordering of this change in the future as well -
> should it cause problems.
sure.
Since we have no problems in linux-next now, I don't expect any at merge
time, but we'll have eyes open for issues then.
thanks,
-Len
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists