linux-kernel - Re: pull-request: wireless-drivers-next 2016-07-22

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: <20160725.111001.2062566223923183810.davem@davemloft.net>
Date:	Mon, 25 Jul 2016 11:10:01 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	kvalo@...eaurora.org
Cc:	linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org, computersforpeace@...il.com
Subject: Re: pull-request: wireless-drivers-next 2016-07-22

From: Kalle Valo <kvalo@...eaurora.org>
Date: Fri, 22 Jul 2016 17:28:44 +0300

> I'm sick so I have to keep this short, but here's the last pull request
> to net-next. This time there's a trivial conflict with mtd tree:
> 
> http://lkml.kernel.org/g/20160720123133.44dab209@canb.auug.org.au
> 
> We concluded with Brian (CCed) that it's best that we ask Linus to fix
> this. The patches have been in linux-next for a couple of days. This
> time I haven't done any merge tests so I don't know if there are any
> other conflicts etc.
> 
> Please let me know if there are any problems.

Ok, pulled, thanks Kalle.

Feel better soon.