From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Cong Wang <amwang@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Evgeniy Polyakov <zbr@ioremap.net>
Subject: linux-next: manual merge of the kmap_atomic tree with Linus' tree
Date: Fri, 10 Feb 2012 16:17:14 +1100 [thread overview]
Message-ID: <20120210161714.a769968c1569bcd30ec79956@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 450 bytes --]
Hi Cong,
Today's linux-next merge of the kmap_atomic tree got a conflict in
drivers/staging/pohmelfs/inode.c between commit 67435319866f ("staging:
pohmelfs: remove drivers/staging/pohmelfs") from Linus' tree and commit
709bc0d6b5c6 ("pohmelfs: remove the second argument of k[un]map_atomic
()") from the kmap_atomic tree.
The former removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-02-10 5:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 5:17 Stephen Rothwell [this message]
2012-02-10 5:26 ` linux-next: manual merge of the kmap_atomic tree with Linus' tree Cong Wang
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=20120210161714.a769968c1569bcd30ec79956@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=amwang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=zbr@ioremap.net \
/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).