Messages in this thread | | | Date | Tue, 27 Sep 2011 10:54:45 -0400 | Subject | Re: linux-next: manual merge of the moduleh tree with the mfd tree | From | Paul Gortmaker <> |
| |
On Tue, Sep 27, 2011 at 2:29 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi Paul, > > Today's linux-next merge of the moduleh tree got a conflict in > drivers/mfd/ab3550-core.c between commit e085f9a2e27d ("mfd: Delete > ab3550 driver") from the mfd tree and commit afb68c4877b2 ("mfd: Add > module.h to the implicit drivers/mfd users") from the moduleh tree. > > The former removes this file, so I did that.
Thanks -- I'll simply drop the changes to that file. I'll have an alternate pull site for linux-next to you by your tomorrow morning as well.
P.
> -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > http://www.canb.auug.org.au/~sfr/ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |