Linux-parisc archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the akpm-current tree with the parisc-hd tree
@ 2019-05-09  5:33 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2019-05-09  5:33 UTC (permalink / raw)
  To: Andrew Morton, Helge Deller, Parisc List
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Christoph Hellwig

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

Hi all,

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

  arch/parisc/mm/init.c

between commit:

  98429dded340 ("parisc: Enable SPARSEMEM_VMEMMAP")

from the parisc-hd tree and commit:

  2e5adbd9e97a ("initramfs: provide a generic free_initrd_mem implementation")

from the akpm-current 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 arch/parisc/mm/init.c
index 6fa6d3b1d3f4,437d4c35c562..000000000000
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@@ -928,18 -921,3 +928,11 @@@ void flush_tlb_all(void
  	spin_unlock(&sid_lock);
  }
  #endif
 +
- #ifdef CONFIG_BLK_DEV_INITRD
- void free_initrd_mem(unsigned long start, unsigned long end)
- {
- 	free_reserved_area((void *)start, (void *)end, -1, "initrd");
- }
- #endif
- 
 +#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_SPARSEMEM_VMEMMAP)
 +int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend,
 +			       int node, struct vmem_altmap *altmap)
 +{
 +	return vmemmap_populate_basepages(vstart, vend, node);
 +}
 +#endif

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: linux-next: manual merge of the akpm-current tree with the parisc-hd tree
  2017-09-05  6:09   ` Helge Deller
@ 2017-09-05  6:58     ` Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2017-09-05  6:58 UTC (permalink / raw)
  To: Helge Deller
  Cc: Andrew Morton, Parisc List, Linux-Next Mailing List,
	Linux Kernel Mailing List, Rik van Riel

Hi Helge,

On Tue, 5 Sep 2017 08:09:01 +0200 Helge Deller <deller@gmx.de> wrote:
>
> >> diff --cc arch/parisc/include/uapi/asm/mman.h
> >> index 9a9c2fe4be50,f6eec376e5fa..000000000000
> >> --- a/arch/parisc/include/uapi/asm/mman.h
> >> +++ b/arch/parisc/include/uapi/asm/mman.h
> >> @@@ -57,9 -60,9 +57,12 @@@
> >>   					   overrides the coredump filter bits */
> >>   #define MADV_DODUMP	70		/* Clear the MADV_NODUMP flag */
> >>   
> >> + #define MADV_WIPEONFORK 71		/* Zero memory on fork, child only */
> >> + #define MADV_KEEPONFORK 72		/* Undo MADV_WIPEONFORK */
> >> + 
> >>  +#define MADV_HWPOISON     100		/* poison a page for testing */
> >>  +#define MADV_SOFT_OFFLINE 101		/* soft offline page for testing */
> >>  +
> >>   /* compatibility flags */
> >>   #define MAP_FILE	0
> >>   #define MAP_VARIABLE	0  
> > 
> > Just a reminder that the above conflict still exists.  
> 
> Thanks Stephen!
> 
> @Andrew, I can push the addition of those two MADV_ constants to 
> arch/parisc/include/uapi/asm/mman.h through the parisc git tree, 
> if you drop this part from your patchset.
> Otherwise, just let me know how you prefer to solve this merge conflict. 

These simple conflicts are not really a problem (Linus is happy to cope
with them).  I just send these messages out for consistency and
openness.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: linux-next: manual merge of the akpm-current tree with the parisc-hd tree
  2017-09-05  0:34 ` Stephen Rothwell
@ 2017-09-05  6:09   ` Helge Deller
  2017-09-05  6:58     ` Stephen Rothwell
  0 siblings, 1 reply; 7+ messages in thread
From: Helge Deller @ 2017-09-05  6:09 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Stephen Rothwell, Parisc List, Linux-Next Mailing List,
	Linux Kernel Mailing List, Rik van Riel

On 05.09.2017 02:34, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 22 Aug 2017 16:53:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the akpm-current tree got a conflict in:
>>
>>   arch/parisc/include/uapi/asm/mman.h
>>
>> between commit:
>>
>>   1c190151447d ("parisc: Add MADV_HWPOISON and MADV_SOFT_OFFLINE")
>>
>> from the parisc-hd tree and commit:
>>
>>   115d20ededaf ("mm,fork: introduce MADV_WIPEONFORK")
>>
>> from the akpm-current 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.
>>
>> diff --cc arch/parisc/include/uapi/asm/mman.h
>> index 9a9c2fe4be50,f6eec376e5fa..000000000000
>> --- a/arch/parisc/include/uapi/asm/mman.h
>> +++ b/arch/parisc/include/uapi/asm/mman.h
>> @@@ -57,9 -60,9 +57,12 @@@
>>   					   overrides the coredump filter bits */
>>   #define MADV_DODUMP	70		/* Clear the MADV_NODUMP flag */
>>   
>> + #define MADV_WIPEONFORK 71		/* Zero memory on fork, child only */
>> + #define MADV_KEEPONFORK 72		/* Undo MADV_WIPEONFORK */
>> + 
>>  +#define MADV_HWPOISON     100		/* poison a page for testing */
>>  +#define MADV_SOFT_OFFLINE 101		/* soft offline page for testing */
>>  +
>>   /* compatibility flags */
>>   #define MAP_FILE	0
>>   #define MAP_VARIABLE	0
> 
> Just a reminder that the above conflict still exists.

Thanks Stephen!

@Andrew, I can push the addition of those two MADV_ constants to 
arch/parisc/include/uapi/asm/mman.h through the parisc git tree, 
if you drop this part from your patchset.
Otherwise, just let me know how you prefer to solve this merge conflict. 

Helge

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: linux-next: manual merge of the akpm-current tree with the parisc-hd tree
  2017-08-22  6:53 Stephen Rothwell
@ 2017-09-05  0:34 ` Stephen Rothwell
  2017-09-05  6:09   ` Helge Deller
  0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2017-09-05  0:34 UTC (permalink / raw)
  To: Andrew Morton, Helge Deller, Parisc List
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Rik van Riel

Hi all,

On Tue, 22 Aug 2017 16:53:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   arch/parisc/include/uapi/asm/mman.h
> 
> between commit:
> 
>   1c190151447d ("parisc: Add MADV_HWPOISON and MADV_SOFT_OFFLINE")
> 
> from the parisc-hd tree and commit:
> 
>   115d20ededaf ("mm,fork: introduce MADV_WIPEONFORK")
> 
> from the akpm-current 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.
> 
> diff --cc arch/parisc/include/uapi/asm/mman.h
> index 9a9c2fe4be50,f6eec376e5fa..000000000000
> --- a/arch/parisc/include/uapi/asm/mman.h
> +++ b/arch/parisc/include/uapi/asm/mman.h
> @@@ -57,9 -60,9 +57,12 @@@
>   					   overrides the coredump filter bits */
>   #define MADV_DODUMP	70		/* Clear the MADV_NODUMP flag */
>   
> + #define MADV_WIPEONFORK 71		/* Zero memory on fork, child only */
> + #define MADV_KEEPONFORK 72		/* Undo MADV_WIPEONFORK */
> + 
>  +#define MADV_HWPOISON     100		/* poison a page for testing */
>  +#define MADV_SOFT_OFFLINE 101		/* soft offline page for testing */
>  +
>   /* compatibility flags */
>   #define MAP_FILE	0
>   #define MAP_VARIABLE	0

Just a reminder that the above conflict still exists.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the akpm-current tree with the parisc-hd tree
@ 2017-08-22  6:53 Stephen Rothwell
  2017-09-05  0:34 ` Stephen Rothwell
  0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2017-08-22  6:53 UTC (permalink / raw)
  To: Andrew Morton, Helge Deller, Parisc List
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Rik van Riel

Hi Andrew,

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

  arch/parisc/include/uapi/asm/mman.h

between commit:

  1c190151447d ("parisc: Add MADV_HWPOISON and MADV_SOFT_OFFLINE")

from the parisc-hd tree and commit:

  115d20ededaf ("mm,fork: introduce MADV_WIPEONFORK")

from the akpm-current 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 arch/parisc/include/uapi/asm/mman.h
index 9a9c2fe4be50,f6eec376e5fa..000000000000
--- a/arch/parisc/include/uapi/asm/mman.h
+++ b/arch/parisc/include/uapi/asm/mman.h
@@@ -57,9 -60,9 +57,12 @@@
  					   overrides the coredump filter bits */
  #define MADV_DODUMP	70		/* Clear the MADV_NODUMP flag */
  
+ #define MADV_WIPEONFORK 71		/* Zero memory on fork, child only */
+ #define MADV_KEEPONFORK 72		/* Undo MADV_WIPEONFORK */
+ 
 +#define MADV_HWPOISON     100		/* poison a page for testing */
 +#define MADV_SOFT_OFFLINE 101		/* soft offline page for testing */
 +
  /* compatibility flags */
  #define MAP_FILE	0
  #define MAP_VARIABLE	0

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the akpm-current tree with the parisc-hd tree
@ 2016-09-21  5:20 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2016-09-21  5:20 UTC (permalink / raw)
  To: Andrew Morton, Helge Deller, Parisc List
  Cc: linux-next, linux-kernel, Vineet Gupta

Hi Andrew,

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

  arch/parisc/Kconfig

between commit:

  b5d5cf2b8a68 ("parisc: Drop BROKEN_RODATA config option")

from the parisc-hd tree and commit:

  7b4d24d8c01d ("atomic64: no need for CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE")

from the akpm-current 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 arch/parisc/Kconfig
index f8dc10dcf292,8a96bdcc3807..000000000000
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@@ -14,7 -14,7 +14,6 @@@ config PARIS
  	select BUILDTIME_EXTABLE_SORT
  	select HAVE_PERF_EVENTS
  	select GENERIC_ATOMIC64 if !64BIT
- 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 -	select BROKEN_RODATA
  	select GENERIC_IRQ_PROBE
  	select GENERIC_PCI_IOMAP
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the akpm-current tree with the parisc-hd tree
@ 2015-03-30  9:09 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2015-03-30  9:09 UTC (permalink / raw)
  To: Andrew Morton, Helge Deller, Parisc List
  Cc: linux-next, linux-kernel, Matthew Wilcox, Dave Anglin, Kees Cook

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

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/parisc/include/asm/Kbuild between commit 476840458128 ("parisc:
Eliminate sg_virt_addr() and private scatterlist.h") from the parisc-hd
tree and commit e494f4a463cd ("parisc: switch to using asm-generic for
seccomp.h") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/parisc/include/asm/Kbuild
index a5f037535aab,12b341d04f88..000000000000
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@@ -20,7 -20,7 +20,8 @@@ generic-y += param.
  generic-y += percpu.h
  generic-y += poll.h
  generic-y += preempt.h
 +generic-y += scatterlist.h
+ generic-y += seccomp.h
  generic-y += segment.h
  generic-y += topology.h
  generic-y += trace_clock.h

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, back to index

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-09  5:33 linux-next: manual merge of the akpm-current tree with the parisc-hd tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2017-08-22  6:53 Stephen Rothwell
2017-09-05  0:34 ` Stephen Rothwell
2017-09-05  6:09   ` Helge Deller
2017-09-05  6:58     ` Stephen Rothwell
2016-09-21  5:20 Stephen Rothwell
2015-03-30  9:09 Stephen Rothwell

Linux-parisc archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-parisc/0 linux-parisc/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-parisc linux-parisc/ https://lore.kernel.org/linux-parisc \
		linux-parisc@vger.kernel.org linux-parisc@archiver.kernel.org
	public-inbox-index linux-parisc


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-parisc


AGPL code for this site: git clone https://public-inbox.org/ public-inbox