Re: [GIT PATCH] big staging merge for 3.3

[Linus Torvalds]

On Mon, Jan 9, 2012 at 11:08 AM, Greg KH <greg@xxxxxxxxx> 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.

                        Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/