From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the bkl-trivial tree with the hfsplus tree
Date: Mon, 4 Oct 2010 10:47:40 +1100 [thread overview]
Message-ID: <20101004104740.822b987d.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
Hi Arnd,
Today's linux-next merge of the bkl-trivial tree got a conflict in
fs/hfsplus/ioctl.c between commits
94744567fef9602c3d8218a1d8f58c04cce354f6 ("hfsplus: split hfsplus_ioctl")
and 6333816ade7e04a96ec0a34a8378c455e4f7c4dd ("hfsplus: protect setflags
using i_mutex") from the hfsplus tree and commit
65c7297b0322453d238b2d23918a3a8b3a223c3b ("drivers: autoconvert trivial
BKL users to private mutex") from the bkl-trivial tree.
The second of the hfsplus tree commits seems to supercede the bkl-trivial
one, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-10-03 23:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-03 23:47 Stephen Rothwell [this message]
2010-10-04 3:34 ` linux-next: manual merge of the bkl-trivial tree with the hfsplus tree Christoph Hellwig
2010-10-04 8:23 ` Arnd Bergmann
2010-10-04 8:29 ` Christoph Hellwig
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=20101004104740.822b987d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=hch@lst$(echo .)de \
--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