Hi, > -----Original Message----- > From: Inaky Perez-Gonzalez [mailto:[email protected]] > Sent: Thursday, September 10, 2009 3:31 AM > To: Yakovenko Oleg > Cc: [email protected] > Subject: Re: op_nap_scan patch, questions > > Hi Oleg > > Ouch .. that's weird -- yes, it is a merge issue. Why I wonder is where > did I mess up that the compiler didn't catch it. Haven't been able to > build the NAP branch for a while -- that could be it. > > The patch itself is ok, but yes, you broke the process :) I have posted > a long list of tips and stuff I have collected over the years; I hope > it'll be useful: > > http://linuxwimax.org/Developer/Tips
Thanks you. The list you have posted is indeed a good place to start. > > Please submit patches inline vs attached -- use 'git send-email' to > send > the patches. This way they can be commented upon and tools import them > directly from email gathering information such as date they were sent, > etc and adding that to the repo. Here is the corrected patch as per your suggestions: >From dc82a3bd18d197774083c640342a825d4e910cfd Mon Sep 17 00:00:00 2001 From: Oleg Yakovenko <[email protected]> Date: Wed, 9 Sep 2009 20:15:37 +0400 Subject: [PATCH] wimax/i2400m: Remove a double definition of i2400m_power_save_disabled Module parameter i2400m_power_save_disabled was defined twice. It is being removed by this patch. Signed-off-by: Oleg Yakovenko <[email protected]> --- drivers/net/wimax/i2400m/driver.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index 1dbef36..5beb3ef 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c @@ -98,14 +98,6 @@ MODULE_PARM_DESC(power_save_disabled, "False by default (so the device is told to do power " "saving)."); -int i2400m_power_save_disabled; /* 0 (power saving enabled) by default */ -module_param_named(power_save_disabled, i2400m_power_save_disabled, int, 0644); -MODULE_PARM_DESC(power_save_disabled, - "If true, the driver will not tell the device to enter " - "power saving mode when it reports it is ready for it. " - "False by default (so the device is told to do power " - "saving)."); - /** * i2400m_queue_work - schedule work on a i2400m's queue * -- 1.6.0.4 > If you inline manually, watchout for tab-to-space conversion and line > wrap around. > > I've inlined for commenting > > > From dc82a3bd18d197774083c640342a825d4e910cfd Mon Sep 17 00:00:00 > 2001 > > From: Oleg Yakovenko <[email protected]> > > Date: Wed, 9 Sep 2009 20:15:37 +0400 > > Subject: [PATCH] Remove a double definition of > i2400m_power_save_disabled > > Missing subsystem header. Add a "wimax/i2400m:" header, so in the > kernel > commit logs, the single line description can tell what the patch > applies > to (wimax subsystem, i2400m driver). Obviosuly for other driver, it'd > be > something like 'scsi/aha912x:'. > > Missing longer description: even if this is a one liner, explain why > the > commit: > > "Module paraemter i2400m_power_save_disabled was defined twice; seems > it > wasn't caught by the empty headed maintainer...yadah yadah...". > > Missing "Signed-off-by": this tracks authorship of patches and the fact > that you own the code: > > Signed-off-by: Your Name <your.n...@email> > > Use the pointers in the Linux kernel Documentation/ Submit* documents, > they are quite useful. Also the check-patch script in scripts/ helps a > lot. > > Is my understanding correct that Inaky maintains the whole wimax > > source (both drivers and the stack) and sometimes it gets merged to > > the mainline kernel? > > Yes. whenever the merge window open, I submit feature enhancements and > minor bug fixes. Major bug fixes I send as they pop up. What about the different branches? I see there are these branches in your repository: -- master -- op_nap_scan -- linux-2.6.31.y -- linux-2.6.30.y -- linux-2.6.29.y Is it correct to say that linux-2.6* branches are used for creating patches against a corresponding linux- version, the master branch is used for main development and the op_nap_scan branch will be merged to master branch when the work is done there? Thanks, O. _______________________________________________ wimax mailing list [email protected] http://lists.linuxwimax.org/listinfo/wimax
