From: lijiang <lijiang@redhat•com>
To: Jason Gunthorpe <jgg@mellanox•com>,
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>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Borislav Petkov <bp@suse•de>, Christoph Hellwig <hch@lst•de>
Subject: Re: linux-next: manual merge of the hmm tree with the tip tree
Date: Thu, 4 Jul 2019 22:26:07 +0800 [thread overview]
Message-ID: <e10ac232-d21e-c231-e47f-f31bb770a922@redhat.com> (raw)
In-Reply-To: <20190704124212.GH3401@mellanox.com>
> On Thu, Jul 04, 2019 at 07:03:52PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the hmm tree got a conflict in:
>>
>> include/linux/ioport.h
>>
>> between commit:
>>
>> ae9e13d621d6 ("x86/e820, ioport: Add a new I/O resource descriptor IORES_DESC_RESERVED")
>> 5da04cc86d12 ("x86/mm: Rework ioremap resource mapping determination")
>>
>> from the tip tree and commit:
>>
>> 25b2995a35b6 ("mm: remove MEMORY_DEVICE_PUBLIC support")
>>
>> from the hmm 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.
>>
>> --
>> Cheers,
>> Stephen Rothwell
>>
>> diff --cc include/linux/ioport.h
>> index 5db386cfc2d4,a02b290ca08a..000000000000
>> --- a/include/linux/ioport.h
>> +++ b/include/linux/ioport.h
>> @@@ -133,16 -132,6 +133,15 @@@ enum
>> IORES_DESC_PERSISTENT_MEMORY = 4,
>> IORES_DESC_PERSISTENT_MEMORY_LEGACY = 5,
>> IORES_DESC_DEVICE_PRIVATE_MEMORY = 6,
>> - IORES_DESC_DEVICE_PUBLIC_MEMORY = 7,
>> - IORES_DESC_RESERVED = 8,
>> ++ IORES_DESC_RESERVED = 7,
>> +};
This change should be OK. Thanks.
Lianbo
>> +
>> +/*
>> + * Flags controlling ioremap() behavior.
>> + */
>> +enum {
>> + IORES_MAP_SYSTEM_RAM = BIT(0),
>> + IORES_MAP_ENCRYPTED = BIT(1),
>> };
>>
>> /* helpers to define resources */
>
> Looks OK to me, thanks
>
> Jason
>
prev parent reply other threads:[~2019-07-04 14:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 9:03 linux-next: manual merge of the hmm tree with the tip tree Stephen Rothwell
2019-07-04 12:42 ` Jason Gunthorpe
2019-07-04 14:26 ` lijiang [this message]
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=e10ac232-d21e-c231-e47f-f31bb770a922@redhat.com \
--to=lijiang@redhat$(echo .)com \
--cc=bp@suse$(echo .)de \
--cc=hch@lst$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=jgg@mellanox$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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