mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Justin Mattock <justinmattock@gmail.com>, linux-kernel@vger.kernel.org
Subject: Re: ACPI vs proc_create_data() mismerge (was Re: proc_dir_entry 'info' already registered)
Date: Wed, 30 Apr 2008 16:24:37 -0700 (PDT)	[thread overview]
Message-ID: <alpine.LFD.1.10.0804301622120.2980@woody.linux-foundation.org> (raw)
In-Reply-To: <20080501001002.GA4820@martell.zuzino.mipt.ru>



On Thu, 1 May 2008, Alexey Dobriyan wrote:
>
> ACPI vs proc_create_data() mismerge.

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..

> acpi_device_dir() is NULL until all files are createst, so everyting is
> created in straight in /proc/ and creation code warns.

Thanks,

		Linus

  reply	other threads:[~2008-04-30 23:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-30 22:38 proc_dir_entry 'info' already registered Justin Mattock
2008-05-01  0:10 ` ACPI vs proc_create_data() mismerge (was Re: proc_dir_entry 'info' already registered) Alexey Dobriyan
2008-04-30 23:24   ` Linus Torvalds [this message]
2008-05-01  0:07   ` Linus Torvalds
2008-05-01  0:24     ` Justin Mattock

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.1.10.0804301622120.2980@woody.linux-foundation.org \
    --to=torvalds@linux-foundation.org \
    --cc=adobriyan@gmail.com \
    --cc=justinmattock@gmail.com \
    --cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®