From: Artem Bityutskiy <dedekind1@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the staging tree with the l2-mtd tree
Date: Wed, 28 Dec 2011 10:54:02 +0200 [thread overview]
Message-ID: <1325062442.1165.95.camel@sauron.fi.intel.com> (raw)
In-Reply-To: <20111228175440.fa8c027e41dbeaccddb0e6ea@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
On Wed, 2011-12-28 at 17:54 +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/spectra/lld_mtd.c between a series of commits from the
> l2-mtd tree and commit be7f39c5ecf5 ("Staging: delete spectra driver")
> from the staging tree.
>
> I just removed the file.
Oh, it is in staging, I somehow missed that and pushed a small clean-up
to the MTD tree (because the driver is an MTD driver). I'll kill that
commit now.
Apologies for the hassle.
--
Best Regards,
Artem Bityutskiy
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2011-12-28 8:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-28 6:54 linux-next: manual merge of the staging tree with the l2-mtd tree Stephen Rothwell
2011-12-28 8:54 ` Artem Bityutskiy [this message]
2011-12-28 9:04 ` Artem Bityutskiy
-- strict thread matches above, loose matches on Subject: below --
2015-11-01 13:35 Stephen Rothwell
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=1325062442.1165.95.camel@sauron.fi.intel.com \
--to=dedekind1@gmail.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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