From: Tejun Heo <tj@kernel•org>
To: Paul Gortmaker <paul.gortmaker@windriver•com>
Cc: "linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>
Subject: Re: Bogus dir.c file introduced at top level.
Date: Wed, 19 Feb 2014 13:25:24 -0500 [thread overview]
Message-ID: <20140219182524.GO10134@htj.dyndns.org> (raw)
In-Reply-To: <5304F1A8.1030503@windriver.com>
(cc'ing Greg)
On Wed, Feb 19, 2014 at 01:02:16PM -0500, Paul Gortmaker wrote:
> Hi Tiejun,
>
> This merge:
>
> commit a8fa94e0f2ab665f9aa665195618178b61ed8304
> Merge: 9561a89 b28a960
> Author: Tejun Heo <tj@kernel•org>
> Date: Mon Feb 10 19:34:30 2014 -0500
>
> Merge branch 'master' into driver-core-next-test-merge-rc2
>
> introduces a bogus copy of fs/kernfs/dir.c at the top level of
> the tree. Seen in the Feb19th linux-next tree.
Gees, sorry about that. Wrong git-add, I guess. Unfortunately, the
commit seems to be buried under other commits already. I'll send a
patch to remove the file soon.
Thanks.
--
tejun
next prev parent reply other threads:[~2014-02-19 18:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-19 18:02 Bogus dir.c file introduced at top level Paul Gortmaker
2014-02-19 18:25 ` Tejun Heo [this message]
2014-02-19 18:29 ` [PATCH driver-core-next] kernfs: remove duplicate dir.c at the top dir Tejun Heo
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=20140219182524.GO10134@htj.dyndns.org \
--to=tj@kernel$(echo .)org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul.gortmaker@windriver$(echo .)com \
/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