From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Artem Bityutskiy <dedekind1@gmail•com>
Subject: linux-next: manual merge of the staging tree with the l2-mtd tree
Date: Wed, 28 Dec 2011 17:54:40 +1100 [thread overview]
Message-ID: <20111228175440.fa8c027e41dbeaccddb0e6ea@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-12-28 6:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-28 6:54 Stephen Rothwell [this message]
2011-12-28 8:54 ` linux-next: manual merge of the staging tree with the l2-mtd tree Artem Bityutskiy
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=20111228175440.fa8c027e41dbeaccddb0e6ea@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dedekind1@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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