netdev - [GIT] net --> net-next merge

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>] [day] [month] [year] [list]

Message-Id: <20120628.175255.722583271813954010.davem@davemloft.net>
Date:	Thu, 28 Jun 2012 17:52:55 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	netdev@...r.kernel.org
CC:	sjur.brandeland@...ricsson.com
Subject: [GIT] net --> net-next merge

I just did said merge, but there was a really difficult conflict to
resolve in the caif-hsi driver.

Sjur please send me any necessary fixups and please be more mindful in
the future of the incredible merge pain you put me through when you
have such fundamentally overlapping changes like that and don't
provide me with a sample merge resolution like other people do.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html