linux-kernel - Re: linux-next: manual merge of the staging tree with the 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20151202220750.GA23818@kroah.com>
Date:	Wed, 2 Dec 2015 14:07:50 -0800
From:	Greg KH <greg@...ah.com>
To:	Mark Brown <broonie@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the staging tree with the  tree

On Wed, Dec 02, 2015 at 08:17:43PM +0000, Mark Brown wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8188eu/include/phy.h between Linus' tree and commit
> "staging: rtl8188eu: using unique names is good" from the staging tree.
> 
> It looks like the patch is already applied so I skipped it.

Sounds good thanks.

Note, the "Subject" here looks a bit odd :)

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/