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

Date:	Mon, 27 Sep 2010 20:56:13 +0530
From:	"Savoy, Pavan" <pavan_savoy@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <gregkh@...e.de>
CC:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: drivers:staging:ti-st: merge issues.

Stephen, Greg,



> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@...b.auug.org.au]
> Sent: Friday, September 24, 2010 8:38 PM
> To: Greg KH
> Cc: Savoy, Pavan; linux-kernel@...r.kernel.org
> Subject: Re: drivers:staging:ti-st: merge issues.
> 
> Hi Greg,
> 
> On Fri, 24 Sep 2010 12:30:27 -0700 Greg KH <gregkh@...e.de> wrote:
> >
> > On Fri, Sep 24, 2010 at 02:11:50PM -0500, Pavan Savoy wrote:
> > >
> > > 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
> >
> > I have no idea what this all means, sorry.
> 
> I was with you, here (until I looked hard :-().
> 
> > Are these linux-next merges?
> 
> bbf96b3cb54a237f1a66883390637e30bb4407ba is the merge of the staging-next
> tree into linux-next. 759b9f0fe0c5be0d9fa1b92e14e093961312f6ac is the
> patch "Staging: ti-st: remove st_get_plat_device" that is in
> staging.current (and also in staging-next as commmit
> dbd3a8709560365ff9b1e5eca263f608877a8a89).
> 83ef41f0858b48cce4f8ca23f674ec55d50bf47d is the commit "staging: ti-st:
> mv headers to ti_wilink_st" that is in the staging-next tree.
> 
> > If I need to apply a patch to the staging-next, or Linus's tree, please
> > let me know.
> >
> > confused,
> 
> I was as well.  All I could guess was that my merge resolution when merging
> the staging-next tree was not correct?  The resolution I did was to remove
> drivers/staging/ti-st/st.h and drivers/staging/ti-st/st_core.h (since
> that had been done in commit 83ef41f0 ("staging: ti-st: mv headers to
> ti_wilink_st") in staging-next) and ...
> 
> (I see it now) I used the wrong version of
> drivers/staging/ti-st/st_kim.c ... Sorry about that.  I will correct that
> merge in the next release of linux-next.

Looks like its all sorted out, Thanks!!

> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> http://www.canb.auug.org.au/~sfr/
--
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/