Messages in this thread | | | Date | Thu, 29 May 2008 14:58:54 -0400 | From | Dmitry Torokhov <> | Subject | Re: [PATCH 15/15] rfkill: document rw rfkill switches and clarify input subsystem interactions (v2) |
| |
On Thu, May 29, 2008 at 02:46:21PM -0300, Henrique de Moraes Holschuh wrote: > On Thu, 29 May 2008, Ivo van Doorn wrote: > > On Thursday 29 May 2008, Henrique de Moraes Holschuh wrote: > > > On Thu, 29 May 2008, Ivo van Doorn wrote: > > > > On Thursday 29 May 2008, Henrique de Moraes Holschuh wrote: > > > > > On Thu, 29 May 2008, Ivo van Doorn wrote: > > > > > > > This version better documents *_RFKILL_ALL. Is it good enough for an > > > > > > > ACK for patch 14 of 15? > > > > > > > > > > > > Yes, you can put my ack on patch 14. > > > > > > Thanks for the documentation update. :) > > > > > > > > > > Then, this entire batch is ready for merging. Now, if only Len would > > > > > come back from wherever he disappeared to, in order to merge the two > > > > > thinkpad-acpi patches, I could send it to netdev for merge. > > > > > > > > Actually, I believe the correct merge order would through wireless-dev, > > > > which means the patches should go to John Linville and linux-wireless in the CC. > > > > > > Noted. At merge time (which will be as soon as the thinkpad-acpi > > > changes hit mainline), I will send them to you, John, and > > > linux-wireless. > > > > > > Unless you want me to send them all right now to linux-wireless to see > > > if there are any comments? > > > > Well why wait with merging it into wireless-dev until thinkpad-acpi is merged? > > I don't think there are real dependencies other then the SW_RFKILL_ALL define. > > Perhaps you could send the rfkill patches with SW_RADIO instead of SW_RFKILL_ALL > > and make the rename after the thinkpad and rfkill series have both been merged. > > That would probably be the fastest route for this patch series. > > Yeah, but it would be bad for the documentation, and SW_RADIO was > renamed because it was an error-inducer, so I *really* don't want to > attract any more eyes to rfkill WITHOUT getting that error-inducing > define renamed first. > > OTOH, I don't want the clashes thinkpad-acpi init changes to cause a > mess for whomever is going to merge rfkill, as even if I submit them > now, the rfkill changes are next- material, while the thinkpad-acpi > changes are merge-them-ASAP material. > > I will talk to Andrew Morton and see if he accepts to push the two > thinkpad-acpi changes to Linus ASAP. Or maybe we will luck out and Len > will show up in 72h, I think he is bound to come back really soon now. >
I wonder why thinkpad_acpi has to go through Len, it seems to live in drivers/misc... Does it depend on some other ACPI changes that are not in mainline/-mm yet? If it not I'd probably bombard Andrew with it.
Alternatively SW_RFKILL_ALL can be brought in through wireless three or I can add it to my "for_linus" branch that I want Linus to pull soon.
-- Dmitry
| |