login
Header Space

 
 

Re: ACPI vs proc_create_data() mismerge (was Re: proc_dir_entry 'info' already registered)

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Alexey Dobriyan <adobriyan@...>
Cc: Justin Mattock <justinmattock@...>, <linux-kernel@...>
Date: Wednesday, April 30, 2008 - 7:24 pm

On Thu, 1 May 2008, Alexey Dobriyan wrote:

Ahh, my bad. Sorry. It all looked fine and compiled, but yes, I didn't 
boot-test the merge - although I did ask Len to double-check it for me.

Usually these "fairly trivial" merges work without any issues, so I do the 
merge for the maintainer rather than sending an email back saying "it 
didn't merge cleanly, can you do the merge for me". I reserve the latter 
for just the things that look really complicated..


Thanks,

		Linus
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
proc_dir_entry 'info' already registered, Justin Mattock, (Wed Apr 30, 6:38 pm)
Re: ACPI vs proc_create_data() mismerge (was Re: proc_dir_en..., Linus Torvalds, (Wed Apr 30, 7:24 pm)
speck-geostationary