public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Gunthorpe <jgg@mellanox•com>
Cc: Andrew Morton <akpm@linux-foundation•org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Christoph Hellwig <hch@lst•de>,
	Dan Williams <dan.j.williams@intel•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the hmm tree
Date: Fri, 5 Jul 2019 07:08:10 +1000	[thread overview]
Message-ID: <20190705070810.1e01ea9d@canb.auug.org.au> (raw)
In-Reply-To: <20190704132836.GM3401@mellanox.com>

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

Hi Jason,

On Thu, 4 Jul 2019 13:28:41 +0000 Jason Gunthorpe <jgg@mellanox•com> wrote:
>
> BTW, do you use a script to get these conflicting patch commit ID
> automatically? It is so helpful to have them.

No, I just use gitk and a bit of searching.  Though often there are not
many possible commits to search.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2019-07-04 21:08 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-04 10:55 linux-next: manual merge of the akpm-current tree with the hmm tree Stephen Rothwell
2019-07-04 12:55 ` Jason Gunthorpe
2019-07-04 13:01   ` Stephen Rothwell
2019-07-04 13:28     ` Jason Gunthorpe
2019-07-04 21:08       ` Stephen Rothwell [this message]
2019-07-04 23:29         ` Dan Williams
2019-07-05 12:08           ` Jason Gunthorpe
2019-07-07  5:04             ` Andrew Morton
2019-07-16  4:25               ` Dan Williams
  -- strict thread matches above, loose matches on Subject: below --
2020-05-08 10:22 Stephen Rothwell
2019-08-22  8:14 Stephen Rothwell
2019-07-04 10:44 Stephen Rothwell
2019-07-04 10:36 Stephen Rothwell
2019-07-04 10:09 Stephen Rothwell
2019-07-04 12:44 ` Jason Gunthorpe
2019-07-04 10:01 Stephen Rothwell
2019-07-04 12:42 ` Jason Gunthorpe

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=20190705070810.1e01ea9d@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=dan.j.williams@intel$(echo .)com \
    --cc=hch@lst$(echo .)de \
    --cc=jgg@mellanox$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /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