linux-kernel - Re: linux-next: manual merge of the moduleh tree with the mfd tree

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: <CAP=VYLqybADeb=nMgbyK-J0NWAF7jtrTnS212qDez5WcpQADoQ@mail.gmail.com>
Date:	Tue, 27 Sep 2011 10:54:45 -0400
From:	Paul Gortmaker <paul.gortmaker@...driver.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Linus Walleij <linus.walleij@...aro.org>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: Re: linux-next: manual merge of the moduleh tree with the mfd tree

On Tue, Sep 27, 2011 at 2:29 AM, Stephen Rothwell <sfr@...b.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@...b.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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/