linux-kernel - Re: linux-next: manual merge of the staging tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20110920125328.GA9736@kroah.com>
Date:	Tue, 20 Sep 2011 05:53:28 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Randy Dunlap <rdunlap@...otime.net>
Subject: Re: linux-next: manual merge of the staging tree with Linus' tree

On Tue, Sep 20, 2011 at 04:46:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/ni_labpc.c between commit c19cc78efe92
> ("staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is
> not enabled") from Linus' tree and commit d6aa8366dde1 ("staging: fix
> comedi build errors") from the staging tree.
> 
> I have used the version from Linus' tree.

Thank you, that should be correct.  I'll merge the two together when
kernel.org comes back.

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/