Messages in this thread | | | From | Rusty Russell <> | Subject | Re: [PULL] module and parameter patches | Date | Tue, 31 Mar 2009 12:59:26 +1030 |
| |
On Tuesday 31 March 2009 06:42:42 Jiri Kosina wrote: > On Mon, 30 Mar 2009, Rusty Russell wrote: > > > The following changes since commit 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b: > > Linus Torvalds (1): > > Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/.../x86/linux-2.6-tip > > > > are available in the git repository at: > > > > ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param.git master > > > > Arjan van de Ven (3): > > module: create a request_module_nowait() > > use the new request_module_nowait() in the hid driver > [ ... ] > > commit 743b7e3627cbcd5b04b2d1878b1c6b39e357173e > > Author: Arjan van de Ven <arjan@linux.intel.com> > > Date: Sun Feb 8 10:42:40 2009 -0800 > > > > use the new request_module_nowait() in the hid driver > > > > Now that there is a request_module_nowait(), use it in the hid driver. > > This gets rid of a kernel thread, and also greatly simplifies the code... > > > > Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> > > Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> > > > > drivers/hid/hid-core.c | 19 +------------------ > > 1 files changed, 1 insertions(+), 18 deletions(-) > > Having noticed that Linus hasn't pulled this yet ... Rusty, you can safely > drop this one. I am currently preparing pull request for HID, which will > remove the whole hid-dummy stuff altogether, so all this will be removed > anyway (this is what Stephen has his extra patch in linux-next). > > So if you drop this before Linus pulls, it will save us one conflict.
Sure! The other use-request_module_nowait patch also has clashes, so I dropped that too.
Should be easy for Arjan to respin and re-send once request_module_nowait is in.
Thanks! Rusty.
| |