From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Tejun Heo <tj@kernel.org>
Cc: linux-kernel@vger.kernel.org, Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: [PATCH driver-core-next] kernfs: fix hash calculation in kernfs_rename_ns()
Date: Tue, 11 Feb 2014 08:56:28 -0800 [thread overview]
Message-ID: <20140211165628.GA29405@kroah.com> (raw)
In-Reply-To: <20140211003956.GN25350@mtj.dyndns.org>
On Mon, Feb 10, 2014 at 07:39:56PM -0500, Tejun Heo wrote:
> Hello, Greg.
>
> On Mon, Feb 10, 2014 at 04:01:41PM -0800, Greg Kroah-Hartman wrote:
> > Also, can you look into the merge of 3.14-rc2 into the driver-core-next
> > branch? There are some conflicts in the kernfs code due to the lockdep
> > changes that I couldn't easily verify I got right, so I didn't do the
> > merge. Could you give me a diff of the merge for me to work off of?
>
> Sure thing. It can be resolved by simply ignoring the
> driver-core-linus side. kernfs_drain() updates in driver-core-next
> already has all the necessary lockdep flag checks through
> kernfs_lockdep().
>
> The following git branch contains a test merge between
> driver-core-next and rc2.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git driver-core-next-test-merge-rc2
Thanks, I took this merge and pulled it into my tree.
greg k-h
prev parent reply other threads:[~2014-02-11 16:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-10 22:57 [PATCH driver-core-next] kernfs: fix hash calculation in kernfs_rename_ns() Tejun Heo
2014-02-11 0:01 ` Greg Kroah-Hartman
2014-02-11 0:39 ` Tejun Heo
2014-02-11 16:56 ` Greg Kroah-Hartman [this message]
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=20140211165628.GA29405@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=dan.carpenter@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.