linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Colin Ian King <colin.king@canonical.com>,
	"David S. Miller" <davem@davemloft.net>
Subject: linux-next: manual merge of the vfs tree with Linus' tree
Date: Mon, 4 Dec 2017 10:05:27 +1100	[thread overview]
Message-ID: <20171204100527.1366a333@canb.auug.org.au> (raw)

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

  drivers/net/ethernet/via/via-rhine.c

between commit:

  a7e4fbbfdf79 ("net: via: via-rhine: use %p to format void * address instead of %x")

from Linus' tree and commit:

  68fef306c2a5 ("via: trivial sparse annotations")

from the vfs tree.

I fixed it up (I used the version of the netdev_info line change from
Linus' tree) and can carry the fix as necessary. This is now fixed as
far as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

             reply	other threads:[~2017-12-03 23:05 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-03 23:05 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-05  0:10 linux-next: manual merge of the vfs tree with Linus' tree Stephen Rothwell
2024-01-05  0:20 ` Steven Rostedt
2024-01-01 22:36 Stephen Rothwell
2020-07-28  1:09 Stephen Rothwell
2020-07-27  1:37 Stephen Rothwell
2020-03-31 23:55 Stephen Rothwell
2019-01-02  1:32 Stephen Rothwell
2019-01-02  1:18 Stephen Rothwell
2018-10-30  1:20 Stephen Rothwell
2018-06-01  1:52 Stephen Rothwell
2018-01-01 22:54 Stephen Rothwell
2017-11-28 23:53 Stephen Rothwell
2017-11-30 23:36 ` Stephen Rothwell
2017-11-17  0:42 Stephen Rothwell
2017-03-30  0:07 Stephen Rothwell
2017-02-27  0:10 Stephen Rothwell
2017-02-27  8:28 ` David Howells
2017-01-22 23:36 Stephen Rothwell
2016-10-10  0:20 Stephen Rothwell
2016-05-19  1:17 Stephen Rothwell
2016-05-19  2:02 ` Steve French
2016-05-02  0:49 Stephen Rothwell
2016-05-02  0:43 Stephen Rothwell
2016-05-02  0:38 Stephen Rothwell
2016-03-13 23:24 Stephen Rothwell
2015-12-07  1:46 Stephen Rothwell
2015-02-22  0:57 Stephen Rothwell
2015-02-22  0:55 Stephen Rothwell
2015-02-22  0:51 Stephen Rothwell
2015-02-22  0:46 Stephen Rothwell
2015-01-23  1:10 Stephen Rothwell
2014-05-29  3:19 Stephen Rothwell
2014-04-22  1:17 Stephen Rothwell
2014-04-22  0:50 Stephen Rothwell
2014-04-22  0:44 Stephen Rothwell
2013-11-08  1:01 Stephen Rothwell
2013-09-05  2:59 Stephen Rothwell
2013-05-02  2:00 Stephen Rothwell
2013-05-02  1:55 Stephen Rothwell
2013-05-01  2:11 Stephen Rothwell
2013-04-29  1:38 Stephen Rothwell
2012-09-24  1:45 Stephen Rothwell
2012-07-30  0:41 Stephen Rothwell
2012-07-30  0:37 Stephen Rothwell
2012-02-14  0:54 Stephen Rothwell
2012-02-14  1:43 ` Al Viro
2012-01-09  1:11 Stephen Rothwell
2012-01-09  1:32 ` Linus Torvalds
2012-01-09  2:22   ` Stephen Rothwell
2012-01-09  2:14 ` Al Viro
2010-05-28  1:31 Stephen Rothwell
2010-05-28  1:31 Stephen Rothwell
2009-05-04  3:13 Stephen Rothwell
2009-05-04  3:55 ` Al Viro

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=20171204100527.1366a333@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=colin.king@canonical.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=viro@ZenIV.linux.org.uk \
    /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).