From: Greg KH <greg@kroah.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, devel@linuxdriverproject.org
Subject: Re: [GIT PATCH] big staging merge for 3.3
Date: Mon, 9 Jan 2012 12:59:53 -0800 [thread overview]
Message-ID: <20120109205953.GA9000@kroah.com> (raw)
In-Reply-To: <CA+55aFxjj0Bji2ivUPc7g5E0bz7Gft7a9uNbeDP4aQABhgTwng@mail.gmail.com>
On Mon, Jan 09, 2012 at 12:17:15PM -0800, Linus Torvalds wrote:
> On Mon, Jan 9, 2012 at 11:08 AM, Greg KH <greg@kroah.com> wrote:
> >
> > Note, you will get a merge conflict in the
> > drivers/staging/iio/adc/ad799x_core.c file, but it's pretty simple to
> > resolve (just delete the module_init/exit calls, and keep the
> > MODULE_ALIAS line).
>
> Are you sure about keeping the MODULE_ALIAS line?
>
> It was removed by commit 55e4390cb04e ("staging:iio: Add missing
> MODULE_DEVICE_TABLE and MODULE_ALIAS") which added the
> MODULE_DEVICE_TABLE() line for that driver instead.
>
> The natural merge would seem to be to remove that line too.
Ugh, yes, you are right, that should be the correct thing to do.
greg k-h
prev parent reply other threads:[~2012-01-09 21:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-09 19:08 [GIT PATCH] big staging merge for 3.3 Greg KH
2012-01-09 20:17 ` Linus Torvalds
2012-01-09 20:59 ` Greg KH [this message]
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=20120109205953.GA9000@kroah.com \
--to=greg@kroah.com \
--cc=akpm@linux-foundation.org \
--cc=devel@linuxdriverproject.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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