All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Michael Hernandez <michael.hernandez@cavium.com>,
	Himanshu Madhani <himanshu.madhani@cavium.com>,
	Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the tip tree with the pci tree
Date: Thu, 29 Jun 2017 02:14:39 +0200	[thread overview]
Message-ID: <20170629001439.GB21758@lst.de> (raw)
In-Reply-To: <20170628131534.1d549e19@canb.auug.org.au>

On Wed, Jun 28, 2017 at 01:15:34PM +1000, Stephen Rothwell wrote:
> I fixed it up (see below) 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.

The merge looks fine to me.

  reply	other threads:[~2017-06-29  0:14 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-28  3:15 linux-next: manual merge of the tip tree with the pci tree Stephen Rothwell
2017-06-29  0:14 ` Christoph Hellwig [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-09  2:47 Stephen Rothwell
2023-10-31 23:15 ` Stephen Rothwell
2022-11-21  4:11 Stephen Rothwell
2020-11-30  4:03 Stephen Rothwell
2020-11-30 10:21 ` Borislav Petkov
2020-11-30 17:40   ` Bjorn Helgaas
2020-10-01  6:38 Stephen Rothwell
2020-10-01 16:06 ` Bjorn Helgaas
2020-09-25  5:35 Stephen Rothwell
2020-10-13  3:34 ` Stephen Rothwell
2020-09-25  5:21 Stephen Rothwell
2020-10-13  3:31 ` Stephen Rothwell
2016-12-09  2:38 Stephen Rothwell
2016-12-12 16:09 ` Bjorn Helgaas
2014-11-24  5:18 Stephen Rothwell
2014-11-24 10:51 ` Thomas Gleixner
2014-03-12 22:18 Mark Brown
2014-03-03  6:07 Stephen Rothwell
2014-03-03  6:03 Stephen Rothwell
2014-03-03  9:26 ` Liviu Dudau
2013-10-29  6:33 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=20170629001439.GB21758@lst.de \
    --to=hch@lst.de \
    --cc=bhelgaas@google.com \
    --cc=himanshu.madhani@cavium.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=michael.hernandez@cavium.com \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.