linux-kernel - Re: [GIT PATCH] big staging merge for 3.3

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20120109205953.GA9000@kroah.com>
Date:	Mon, 9 Jan 2012 12:59:53 -0800
From:	Greg KH <greg@...ah.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-kernel@...r.kernel.org, devel@...uxdriverproject.org
Subject: Re: [GIT PATCH] big staging merge for 3.3

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@...ah.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/