From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tejun Heo <tj@kernel.org>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dave Jones <davej@redhat.com>
Subject: Re: [PATCH driver-core-next] sysfs: bail early from kernfs_file_mmap() to avoid spurious lockdep warning
Date: Wed, 11 Dec 2013 11:03:19 +1100 [thread overview]
Message-ID: <20131211110319.33065ea7642d1fd5775531be@canb.auug.org.au> (raw)
In-Reply-To: <20131210145004.GA4610@htj.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 945 bytes --]
Hi Tejun,
On Tue, 10 Dec 2013 09:50:04 -0500 Tejun Heo <tj@kernel.org> wrote:
>
> Greg, given that there will be more patches in driver-core-next, I
> think it'll be best to pull driver-core-linus into driver-core-next to
> avoid conflicts from the same commit. You can pull my commit or if
> you pull it yourself, just take all the chunks from driver-core-next
> so that the resulting fs/sysfs/file.c is unchanged compared to
> driver-core-next before pull, and then apply this patch.
>
> ------ 8< ------
> From 5cb9f29a28c87cbf62f74ff6bde3d9da2a565b1d Mon Sep 17 00:00:00 2001
> From: Tejun Heo <tj@kernel.org>
> Date: Tue, 10 Dec 2013 09:29:17 -0500
>
> This is v3.14 fix for the same issue that a8b14744429f ("sysfs: give
I have added the patch as a merge fix patch for the merge of the
driver-core tree today. I will throw it away if/when Greg applies it.
--
Cheers,
Stephen Rothwell <sfr@canb.auug.org.au>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-12-11 0:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-09 3:47 linux-next: manual merge of the driver-core tree with the driver-core.current tree Stephen Rothwell
2013-12-09 8:21 ` Greg KH
2013-12-10 14:50 ` [PATCH driver-core-next] sysfs: bail early from kernfs_file_mmap() to avoid spurious lockdep warning Tejun Heo
2013-12-11 0:03 ` Stephen Rothwell [this message]
2013-12-11 5:39 ` Greg KH
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=20131211110319.33065ea7642d1fd5775531be@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davej@redhat.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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 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).