linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <AANLkTin0UA_=yNbnTSHovZxByBaJUESH0a=8-=5b5HkS@mail.gmail.com>
Date:	Fri, 24 Sep 2010 14:19:18 -0500
From:	Pavan Savoy <pavan_savoy@...y.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <gregkh@...e.de>,
	linux-kernel@...r.kernel.org, anca.emanuel@...il.com
Cc:	pavan_savoy@...y.com
Subject: Re: drivers:staging:ti-st: merge issues.

+ emanuel,

On Fri, Sep 24, 2010 at 2:11 PM, Pavan Savoy <pavan_savoy@...com> wrote:
> 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

Upon emanuel's request the patch was brought in again to staging-next,
whose merge into linux-next has caused all the problems.
Now what needs to be done?

> 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/