LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>,
	Julia Lawall <Julia.Lawall@lip6.fr>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the akpm-current tree with the vfs tree
Date: Thu, 3 Dec 2015 00:18:32 +0000	[thread overview]
Message-ID: <20151203001832.ef38abf329032ddb8eae22ef@kernel.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in fs/adfs/adfs.h 
since it appears that "adfs: constify adfs_dir_ops structures" has been applied
by Al Viro. There was no conflict to resolve but git still flagged it as a conflict
for some reason.

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

             reply	other threads:[~2015-12-03  0:18 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-03  0:18 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-06-19  6:36 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-06-17  3:24 Michael Ellerman
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=20151203001832.ef38abf329032ddb8eae22ef@kernel.org \
    --to=broonie@kernel.org \
    --cc=Julia.Lawall@lip6.fr \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --subject='Re: linux-next: manual merge of the akpm-current tree with the vfs tree' \
    /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).