From: Michael Ellerman <mpe@ellerman•id.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Al Viro <viro@zeniv•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Fabian Frederick <fabf@skynet•be>
Subject: linux-next: manual merge of the akpm-current tree with the vfs tree
Date: Wed, 17 Jun 2015 13:24:13 +1000 [thread overview]
Message-ID: <1434511453.24642.8.camel@ellerman.id.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/ufs/namei.c
between commit:
a50e4a02ad69 "ufs: don't bother with lock_ufs()/unlock_ufs() for directory access"
from the vfs tree and commit:
2ce1efe3965b "fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge"
from the akpm-current tree.
I fixed it up by taking the vfs version and can carry the fix as necessary (no
action is required).
cheers
next reply other threads:[~2015-06-17 3:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 3:24 Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-19 6:36 linux-next: manual merge of the akpm-current tree with the vfs tree Stephen Rothwell
2018-05-29 9:37 Stephen Rothwell
2017-07-10 4:41 Stephen Rothwell
2016-01-11 7:48 Stephen Rothwell
2016-01-11 13:26 ` Vlastimil Babka
2015-12-03 0:18 Mark Brown
2015-04-13 11:10 Stephen Rothwell
2015-04-13 11:00 Stephen Rothwell
2015-04-13 10:57 Stephen Rothwell
2015-03-13 5:31 Stephen Rothwell
2015-03-13 5:27 Stephen Rothwell
2013-11-08 7:38 Stephen Rothwell
2013-11-08 18:58 ` Josh Triplett
2013-11-08 7:35 Stephen Rothwell
2013-11-08 7:30 Stephen Rothwell
2013-11-08 12:59 ` Oleg Nesterov
2013-11-08 13:48 ` Oleg Nesterov
2013-02-27 2: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=1434511453.24642.8.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=fabf@skynet$(echo .)be \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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