public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: David Hildenbrand <david@redhat•com>
To: Mike Rapoport <rppt@linux•vnet.ibm.com>,
	Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
	Jonathan Corbet <corbet@lwn•net>,
	Linux-Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the akpm tree with the jc_docs tree
Date: Mon, 8 Oct 2018 10:38:29 +0200	[thread overview]
Message-ID: <6ab76538-b836-3b22-cb29-102c613091cf@redhat.com> (raw)
In-Reply-To: <20181008081315.GB6772@rapoport-lnx>

On 08/10/2018 10:13, Mike Rapoport wrote:
> On Mon, Oct 08, 2018 at 06:38:40PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the akpm tree got conflicts in:
>>
>>   Documentation/memory-hotplug.txt
>>   Documentation/admin-guide/mm/memory-hotplug.rst
>>
>> between commits:
>>
>>   6bf53999a3a2 ("docs: move memory hotplug description into admin-guide/mm")
>>   98cee6742c80 ("docs/vm: split memory hotplug notifier description to Documentation/core-api")
>>
>> from the jc_docs tree and patch:
>>
>>   "memory-hotplug.txt: add some details about locking internals"
>>
>> from the akpm tree.
>>
>> 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.
> 
> Somehow I've managed to miss the patches from David :(
> 
> I should have called the new
> Documentation/core-api/memory-hotplug-notifier.rst memory-hotplug.rst and
> then the details about locking would fit there just fine.
> 

Yes, my changes certainly don't belong into the admin guide, so having
internal memory-hotplug.rst sounds good to me.

> I can do the renaming and add the patch
> 
>   "memory-hotplug.txt: add some details about locking internals"
> 
> on top of the jc_docs tree.
> 
> Does it sound Ok?
> 

Fine with me.

Thanks!

-- 

Thanks,

David / dhildenb

next prev parent reply	other threads:[~2018-10-08  8:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-08  7:38 linux-next: manual merge of the akpm tree with the jc_docs tree Stephen Rothwell
2018-10-08  8:13 ` Mike Rapoport
2018-10-08  8:38   ` David Hildenbrand [this message]
2018-10-08 14:32     ` Jonathan Corbet
2018-10-11  0:21       ` Andrew Morton
  -- strict thread matches above, loose matches on Subject: below --
2020-12-01  9:18 Stephen Rothwell
2016-11-09  4:19 Stephen Rothwell
2016-11-09 19:16 ` Mimi Zohar

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=6ab76538-b836-3b22-cb29-102c613091cf@redhat.com \
    --to=david@redhat$(echo .)com \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=corbet@lwn$(echo .)net \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=rppt@linux$(echo .)vnet.ibm.com \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox