linux-kernel - drivers:staging:ti-st: merge issues.

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

Message-ID: <AANLkTinbEH0Z61z69ThcM9-GoHW4s5nRZig8b6v8uC8r@mail.gmail.com>
Date:	Fri, 24 Sep 2010 14:11:50 -0500
From:	Pavan Savoy <pavan_savoy@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <gregkh@...e.de>,
	linux-kernel@...r.kernel.org
Subject: drivers:staging:ti-st: merge issues.

Stephen,

The merges bbf96b3cb54a237f1a66883390637e30bb4407ba and the merge on
759b9f0fe0c5be0d9fa1b92e14e093961312f6ac has caused the
drivers/staging/ti-st to get corrupted, I had submitted few patches
and it was all merged.

basically the merge for bbf96b3cb54a237f1a66883390637e30bb4407ba for
drivers/staging/ti-st/ shouldn't have happened.
The head for the drivers/staging/ti-st/ should have been @
83ef41f0858b48cce4f8ca23f674ec55d50bf47d

This is causing build failure.
--
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/