mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: Pavan Savoy <pavan_savoy@ti.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-kernel@vger.kernel.org
Subject: Re: drivers:staging:ti-st: merge issues.
Date: Fri, 24 Sep 2010 12:30:27 -0700	[thread overview]
Message-ID: <20100924193027.GA17728@suse.de> (raw)
In-Reply-To: <AANLkTinbEH0Z61z69ThcM9-GoHW4s5nRZig8b6v8uC8r@mail.gmail.com>

On Fri, Sep 24, 2010 at 02:11:50PM -0500, Pavan Savoy 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

I have no idea what this all means, sorry.

Are these linux-next merges?

If I need to apply a patch to the staging-next, or Linus's tree, please
let me know.

confused,

greg k-h

  parent reply	other threads:[~2010-09-24 19:57 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-24 19:11 Pavan Savoy
2010-09-24 19:19 ` Pavan Savoy
2010-09-24 19:30 ` Greg KH [this message]
2010-09-25  1:37   ` Stephen Rothwell
2010-09-27 15:26     ` Savoy, Pavan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100924193027.GA17728@suse.de \
    --to=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pavan_savoy@ti.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome