From: Len Brown <lenb@kernel.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: Sam Ravnborg <sam@ravnborg.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Len Brown <len.brown@intel.com>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Randy Dunlap <randy.dunlap@oracle.com>,
x86@kernel.org, linux-acpi@vger.kernel.org
Subject: Re: [RFC PATCH v2] create drivers/platform/x86/ from drivers/misc/
Date: Mon, 01 Dec 2008 14:12:40 -0500 (EST) [thread overview]
Message-ID: <alpine.LFD.2.00.0812011405070.3197@localhost.localdomain> (raw)
In-Reply-To: <20081201074842.GC27768@elte.hu>
> > 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
next prev parent reply other threads:[~2008-12-01 19:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-28 10:36 linux-next: Tree for November 28 Stephen Rothwell
2008-11-28 15:17 ` next-2008-11-28: bfin vs cpumask fixlet Alexey Dobriyan
2008-12-01 4:47 ` Rusty Russell
2008-11-28 17:55 ` linux-next: Tree for November 28 (misc/tc1100) Randy Dunlap
2008-11-28 21:35 ` drivers/x86 (Was: Re: linux-next: Tree for November 28 (misc/tc1100)) Stephen Rothwell
2008-11-28 21:50 ` Len Brown
[not found] ` <alpine.LFD.2.00.0811281702570.24773@localhost.localdomain>
2008-11-28 22:09 ` [RFC PATCH] x86: create drivers/x86/ from drivers/misc/ Len Brown
2008-11-28 22:35 ` Sam Ravnborg
2008-11-28 23:16 ` Len Brown
2008-11-29 0:16 ` Henrique de Moraes Holschuh
2008-12-01 4:35 ` Len Brown
2008-11-29 1:00 ` Randy Dunlap
2008-11-29 7:23 ` Sam Ravnborg
2008-11-29 7:38 ` Sam Ravnborg
2008-12-01 5:00 ` Len Brown
2008-12-01 5:54 ` Sam Ravnborg
2008-12-01 6:02 ` [RFC PATCH v2] create drivers/platform/x86/ " Len Brown
2008-12-01 6:03 ` [PATCH 1/2] drivers/misc/Makefile, Kconfig: cleanup Len Brown
2008-12-01 7:41 ` Sam Ravnborg
2008-12-01 19:23 ` Len Brown
2008-12-01 6:05 ` [PATCH 2/2] create drivers/platform/x86/ from drivers/misc/ Len Brown
2008-12-01 7:48 ` [RFC PATCH v2] " Ingo Molnar
2008-12-01 19:12 ` Len Brown [this message]
2008-11-28 23:20 ` [RFC PATCH] x86: create drivers/x86/ " Len Brown
2008-12-01 4:49 ` Randy Dunlap
2008-11-29 9:34 ` drivers/x86 (Was: Re: linux-next: Tree for November 28 (misc/tc1100)) Ingo Molnar
2008-12-01 4:29 ` Len Brown
2008-11-30 23:44 ` next-2008-11-28 : can't mount UDF DVD Laurent Riffard
2008-12-01 0:18 ` Marcin Slusarz
2008-12-01 19:28 ` Laurent Riffard
2008-12-01 23:22 ` [PATCH] udf: fix default mode and dmode options handling Marcin Slusarz
2008-12-02 13:38 ` Jan Kara
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=alpine.LFD.2.00.0812011405070.3197@localhost.localdomain \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=randy.dunlap@oracle.com \
--cc=sam@ravnborg.org \
--cc=sfr@canb.auug.org.au \
--cc=x86@kernel.org \
/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