linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Woodhouse <dwmw2@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Arnd Bergmann <arnd@arndb.de>,
	Maxim Levitsky <maximlevitsky@gmail.com>,
	Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Subject: linux-next: manual merge of the mtd tree with Linus' tree
Date: Tue, 26 Oct 2010 11:32:13 +1100	[thread overview]
Message-ID: <20101026113213.1faaf8a1.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/mtd_blkdevs.c between commit
2a48fc0ab24241755dc93bfd4f01d68efab47f5a ("block: autoconvert trivial BKL
users to private mutex") from the  tree and commit
480792b7bf188c29b8d4b10fee65c3a06ec5dbf7 ("mtd: blktrans: kill BKL") from
the mtd tree.

I fixed it up (by removing all the bits of the former commit) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

             reply	other threads:[~2010-10-26  0:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-26  0:32 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-08-17  4:49 linux-next: manual merge of the mtd tree with Linus' tree Stephen Rothwell
2021-08-17  8:15 ` Sean Young
2021-08-17  8:41   ` Miquel Raynal
2019-01-29  0:17 Stephen Rothwell
2019-01-29 14:12 ` Boris Brezillon
2011-05-27  4:00 Stephen Rothwell
2011-05-27  7:47 ` Artem Bityutskiy
2011-05-27  4:00 Stephen Rothwell
2011-05-27  7:43 ` Artem Bityutskiy
2010-08-07  3:37 Stephen Rothwell
2010-04-29  2:58 Stephen Rothwell
2009-06-01  4:00 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=20101026113213.1faaf8a1.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Artem.Bityutskiy@nokia.com \
    --cc=arnd@arndb.de \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=maximlevitsky@gmail.com \
    /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;
as well as URLs for NNTP newsgroup(s).