LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mateusz Guzik <mguzik@redhat.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
	linux-fsdevel@vger.kernel.org,
	Alexander Viro <viro@zeniv.linux.org.uk>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
	"Theodore Ts'o" <tytso@mit.edu>,
	Miklos Szeredi <mszeredi@redhat.com>
Subject: Re: linux-next: Tree for May 2   [WARNING: at fs/dcache.c]
Date: Mon, 2 May 2016 22:35:29 +1000	[thread overview]
Message-ID: <20160502223529.5d1ffb78@canb.auug.org.au> (raw)
In-Reply-To: <20160502220745.44c4bd91@canb.auug.org.au>

Hi all,

On Mon, 2 May 2016 22:07:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> This comes from a bad automatic merge resolution between commit
> 
>   d101a125954e ("fs: add file_dentry()")
> 
> from Linus' tree (introduced before v4.5-rc3) and commit
                                      ^^^^^^^^
Clearly I typoed v4.6-rc3

-- 
Cheers,
Stephen Rothwell

  reply	other threads:[~2016-05-02 12:35 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-02  8:40 linux-next: Tree for May 2 Stephen Rothwell
2016-05-02 10:15 ` linux-next: Tree for May 2 [WARNING: at fs/dcache.c] Sergey Senozhatsky
2016-05-02 10:33   ` Mateusz Guzik
2016-05-02 12:07     ` Stephen Rothwell
2016-05-02 12:35       ` Stephen Rothwell [this message]
2016-05-02 13:15       ` Sergey Senozhatsky

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=20160502223529.5d1ffb78@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mguzik@redhat.com \
    --cc=mszeredi@redhat.com \
    --cc=sergey.senozhatsky.work@gmail.com \
    --cc=sergey.senozhatsky@gmail.com \
    --cc=tytso@mit.edu \
    --cc=viro@zeniv.linux.org.uk \
    --subject='Re: linux-next: Tree for May 2   [WARNING: at fs/dcache.c]' \
    /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

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).