Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the risc-v tree with Linus' tree
@ 2021-03-30 22:40 Stephen Rothwell
  2021-04-02  4:33 ` Palmer Dabbelt
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2021-03-30 22:40 UTC (permalink / raw)
  To: Palmer Dabbelt, Paul Walmsley
  Cc: Alexandre Ghiti, Linux Kernel Mailing List,
	Linux Next Mailing List, Palmer Dabbelt


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

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/mm/kasan_init.c

between commits:

  f3773dd031de ("riscv: Ensure page table writes are flushed when initializing KASAN vmalloc")
  78947bdfd752 ("RISC-V: kasan: Declare kasan_shallow_populate() static")

from Linus' tree and commit:

  2da073c19641 ("riscv: Cleanup KASAN_VMALLOC support")

from the risc-v tree.

I fixed it up (I think - 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/riscv/mm/kasan_init.c
index 4f85c6d0ddf8,2c39f0386673..000000000000
--- a/arch/riscv/mm/kasan_init.c
+++ b/arch/riscv/mm/kasan_init.c
@@@ -153,44 -141,31 +141,33 @@@ static void __init kasan_populate(void 
  
  	local_flush_tlb_all();
  	memset(start, KASAN_SHADOW_INIT, end - start);
  }
  
+ static void __init kasan_shallow_populate_pgd(unsigned long vaddr, unsigned long end)
+ {
+ 	unsigned long next;
+ 	void *p;
+ 	pgd_t *pgd_k = pgd_offset_k(vaddr);
+ 
+ 	do {
+ 		next = pgd_addr_end(vaddr, end);
+ 		if (pgd_page_vaddr(*pgd_k) == (unsigned long)lm_alias(kasan_early_shadow_pmd)) {
+ 			p = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
+ 			set_pgd(pgd_k, pfn_pgd(PFN_DOWN(__pa(p)), PAGE_TABLE));
+ 		}
+ 	} while (pgd_k++, vaddr = next, vaddr != end);
+ }
+ 
  static void __init kasan_shallow_populate(void *start, void *end)
  {
  	unsigned long vaddr = (unsigned long)start & PAGE_MASK;
  	unsigned long vend = PAGE_ALIGN((unsigned long)end);
- 	unsigned long pfn;
- 	int index;
- 	void *p;
- 	pud_t *pud_dir, *pud_k;
- 	pgd_t *pgd_dir, *pgd_k;
- 	p4d_t *p4d_dir, *p4d_k;
- 
- 	while (vaddr < vend) {
- 		index = pgd_index(vaddr);
- 		pfn = csr_read(CSR_SATP) & SATP_PPN;
- 		pgd_dir = (pgd_t *)pfn_to_virt(pfn) + index;
- 		pgd_k = init_mm.pgd + index;
- 		pgd_dir = pgd_offset_k(vaddr);
- 		set_pgd(pgd_dir, *pgd_k);
- 
- 		p4d_dir = p4d_offset(pgd_dir, vaddr);
- 		p4d_k  = p4d_offset(pgd_k, vaddr);
- 
- 		vaddr = (vaddr + PUD_SIZE) & PUD_MASK;
- 		pud_dir = pud_offset(p4d_dir, vaddr);
- 		pud_k = pud_offset(p4d_k, vaddr);
- 
- 		if (pud_present(*pud_dir)) {
- 			p = early_alloc(PAGE_SIZE, NUMA_NO_NODE);
- 			pud_populate(&init_mm, pud_dir, p);
- 		}
- 		vaddr += PAGE_SIZE;
- 	}
+ 
+ 	kasan_shallow_populate_pgd(vaddr, vend);
 +
 +	local_flush_tlb_all();
  }
  
  void __init kasan_init(void)
  {
  	phys_addr_t _start, _end;

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

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

* Re: linux-next: manual merge of the risc-v tree with Linus' tree
  2021-03-30 22:40 linux-next: manual merge of the risc-v tree with Linus' tree Stephen Rothwell
@ 2021-04-02  4:33 ` Palmer Dabbelt
  0 siblings, 0 replies; 10+ messages in thread
From: Palmer Dabbelt @ 2021-04-02  4:33 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Paul Walmsley, alex, linux-kernel, linux-next

On Tue, 30 Mar 2021 15:40:34 PDT (-0700), Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the risc-v tree got a conflict in:
>
>   arch/riscv/mm/kasan_init.c
>
> between commits:
>
>   f3773dd031de ("riscv: Ensure page table writes are flushed when initializing KASAN vmalloc")
>   78947bdfd752 ("RISC-V: kasan: Declare kasan_shallow_populate() static")
>
> from Linus' tree and commit:
>
>   2da073c19641 ("riscv: Cleanup KASAN_VMALLOC support")
>
> from the risc-v tree.
>
> I fixed it up (I think - 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.

They're my own trees ;)

I'm not so great at reading merge diffs, but the right fix here is to 
have the local_flush_tlb_all() after the call to 
kasan_shallow_populate_pgd(), just as there is one after 
kasan_populate_pgd().  My merge diff looks like this

diff --cc arch/riscv/mm/kasan_init.c
index 2c39f0386673,4f85c6d0ddf8..ec0029097251
--- a/arch/riscv/mm/kasan_init.c
+++ b/arch/riscv/mm/kasan_init.c
@@@ -162,8 -159,36 +162,10 @@@ static void __init kasan_shallow_popula
  {
        unsigned long vaddr = (unsigned long)start & PAGE_MASK;
        unsigned long vend = PAGE_ALIGN((unsigned long)end);
 -      unsigned long pfn;
 -      int index;
 -      void *p;
 -      pud_t *pud_dir, *pud_k;
 -      pgd_t *pgd_dir, *pgd_k;
 -      p4d_t *p4d_dir, *p4d_k;
 -
 -      while (vaddr < vend) {
 -              index = pgd_index(vaddr);
 -              pfn = csr_read(CSR_SATP) & SATP_PPN;
 -              pgd_dir = (pgd_t *)pfn_to_virt(pfn) + index;
 -              pgd_k = init_mm.pgd + index;
 -              pgd_dir = pgd_offset_k(vaddr);
 -              set_pgd(pgd_dir, *pgd_k);
 -
 -              p4d_dir = p4d_offset(pgd_dir, vaddr);
 -              p4d_k  = p4d_offset(pgd_k, vaddr);
 -
 -              vaddr = (vaddr + PUD_SIZE) & PUD_MASK;
 -              pud_dir = pud_offset(p4d_dir, vaddr);
 -              pud_k = pud_offset(p4d_k, vaddr);
 -
 -              if (pud_present(*pud_dir)) {
 -                      p = early_alloc(PAGE_SIZE, NUMA_NO_NODE);
 -                      pud_populate(&init_mm, pud_dir, p);
 -              }
 -              vaddr += PAGE_SIZE;
 -      }
 +
 +      kasan_shallow_populate_pgd(vaddr, vend);
+
+       local_flush_tlb_all();
  }

  void __init kasan_init(void)

which doesn't include the diff to kasan_shallow_populate_pgd().  Not 
sure if that's just because my diff is in the other direction, though.  
The expected result is that kasan_shallow_populate_pgd() exists both pre 
and post merge.

>
> -- 
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/riscv/mm/kasan_init.c
> index 4f85c6d0ddf8,2c39f0386673..000000000000
> --- a/arch/riscv/mm/kasan_init.c
> +++ b/arch/riscv/mm/kasan_init.c
> @@@ -153,44 -141,31 +141,33 @@@ static void __init kasan_populate(void 
>   
>   	local_flush_tlb_all();
>   	memset(start, KASAN_SHADOW_INIT, end - start);
>   }
>   
> + static void __init kasan_shallow_populate_pgd(unsigned long vaddr, unsigned long end)
> + {
> + 	unsigned long next;
> + 	void *p;
> + 	pgd_t *pgd_k = pgd_offset_k(vaddr);
> + 
> + 	do {
> + 		next = pgd_addr_end(vaddr, end);
> + 		if (pgd_page_vaddr(*pgd_k) == (unsigned long)lm_alias(kasan_early_shadow_pmd)) {
> + 			p = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
> + 			set_pgd(pgd_k, pfn_pgd(PFN_DOWN(__pa(p)), PAGE_TABLE));
> + 		}
> + 	} while (pgd_k++, vaddr = next, vaddr != end);
> + }
> + 
>   static void __init kasan_shallow_populate(void *start, void *end)
>   {
>   	unsigned long vaddr = (unsigned long)start & PAGE_MASK;
>   	unsigned long vend = PAGE_ALIGN((unsigned long)end);
> - 	unsigned long pfn;
> - 	int index;
> - 	void *p;
> - 	pud_t *pud_dir, *pud_k;
> - 	pgd_t *pgd_dir, *pgd_k;
> - 	p4d_t *p4d_dir, *p4d_k;
> - 
> - 	while (vaddr < vend) {
> - 		index = pgd_index(vaddr);
> - 		pfn = csr_read(CSR_SATP) & SATP_PPN;
> - 		pgd_dir = (pgd_t *)pfn_to_virt(pfn) + index;
> - 		pgd_k = init_mm.pgd + index;
> - 		pgd_dir = pgd_offset_k(vaddr);
> - 		set_pgd(pgd_dir, *pgd_k);
> - 
> - 		p4d_dir = p4d_offset(pgd_dir, vaddr);
> - 		p4d_k  = p4d_offset(pgd_k, vaddr);
> - 
> - 		vaddr = (vaddr + PUD_SIZE) & PUD_MASK;
> - 		pud_dir = pud_offset(p4d_dir, vaddr);
> - 		pud_k = pud_offset(p4d_k, vaddr);
> - 
> - 		if (pud_present(*pud_dir)) {
> - 			p = early_alloc(PAGE_SIZE, NUMA_NO_NODE);
> - 			pud_populate(&init_mm, pud_dir, p);
> - 		}
> - 		vaddr += PAGE_SIZE;
> - 	}
> + 
> + 	kasan_shallow_populate_pgd(vaddr, vend);
>  +
>  +	local_flush_tlb_all();
>   }
>   
>   void __init kasan_init(void)
>   {
>   	phys_addr_t _start, _end;

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

* linux-next: manual merge of the risc-v tree with Linus' tree
@ 2021-06-14 23:26 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2021-06-14 23:26 UTC (permalink / raw)
  To: Palmer Dabbelt, Paul Walmsley
  Cc: Jisheng Zhang, Linux Kernel Mailing List,
	Linux Next Mailing List, Liu Shixin, Palmer Dabbelt


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

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/Kconfig

between commit:

  42e0e0b453bc ("riscv: code patching only works on !XIP_KERNEL")

from Linus' tree and commits:

  3332f4190674 ("riscv: mremap speedup - enable HAVE_MOVE_PUD and HAVE_MOVE_PMD")
  14512690a165 ("riscv: Enable HAVE_ARCH_HUGE_VMAP for 64BIT")

from the risc-v 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/riscv/Kconfig
index 18ec0f9bb8d5,227033595994..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -61,11 -60,12 +61,12 @@@ config RISC
  	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
  	select HANDLE_DOMAIN_IRQ
  	select HAVE_ARCH_AUDITSYSCALL
+ 	select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT
 -	select HAVE_ARCH_JUMP_LABEL
 -	select HAVE_ARCH_JUMP_LABEL_RELATIVE
 +	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
 +	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL
  	select HAVE_ARCH_KASAN if MMU && 64BIT
  	select HAVE_ARCH_KASAN_VMALLOC if MMU && 64BIT
 -	select HAVE_ARCH_KGDB
 +	select HAVE_ARCH_KGDB if !XIP_KERNEL
  	select HAVE_ARCH_KGDB_QXFER_PKT
  	select HAVE_ARCH_MMAP_RND_BITS if MMU
  	select HAVE_ARCH_SECCOMP_FILTER
@@@ -80,9 -81,11 +82,11 @@@
  	select HAVE_GCC_PLUGINS
  	select HAVE_GENERIC_VDSO if MMU && 64BIT
  	select HAVE_IRQ_TIME_ACCOUNTING
 -	select HAVE_KPROBES
 -	select HAVE_KPROBES_ON_FTRACE
 -	select HAVE_KRETPROBES
 +	select HAVE_KPROBES if !XIP_KERNEL
 +	select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL
 +	select HAVE_KRETPROBES if !XIP_KERNEL
+ 	select HAVE_MOVE_PMD
+ 	select HAVE_MOVE_PUD
  	select HAVE_PCI
  	select HAVE_PERF_EVENTS
  	select HAVE_PERF_REGS

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

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

* linux-next: manual merge of the risc-v tree with Linus' tree
@ 2021-04-26 23:42 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2021-04-26 23:42 UTC (permalink / raw)
  To: Palmer Dabbelt, Paul Walmsley
  Cc: Geert Uytterhoeven, Linux Kernel Mailing List,
	Linux Next Mailing List, Nick Kossifidis, Palmer Dabbelt


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

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/kernel/setup.c

between commit:

  ce989f1472ae ("RISC-V: Fix out-of-bounds accesses in init_resources()")

from Linus' tree and commit:

  ffe0e5261268 ("RISC-V: Improve init_resources()")

from the risc-v tree.

I fixed it up (I used the latter since it fixed the same problem as the
former but in a different way) 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

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

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

* linux-next: manual merge of the risc-v tree with Linus' tree
@ 2021-02-23 22:00 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2021-02-23 22:00 UTC (permalink / raw)
  To: Palmer Dabbelt, Paul Walmsley
  Cc: Arnd Bergmann, Damien Le Moal, Linux Kernel Mailing List,
	Linux Next Mailing List, Palmer Dabbelt


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

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  drivers/soc/Makefile

between commit:

  89d4f98ae90d ("ARM: remove zte zx platform")

from Linus' tree and commits:

  08734e0581a5 ("riscv: Use vendor name for K210 SoC support")
  e134d426e1a3 ("soc: canaan: Sort the Makefile alphabetically")

from the risc-v 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 drivers/soc/Makefile
index 9bceb12b291d,34b23645be14..000000000000
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -28,4 -29,4 +29,3 @@@ obj-y				+= ti
  obj-$(CONFIG_ARCH_U8500)	+= ux500/
  obj-$(CONFIG_PLAT_VERSATILE)	+= versatile/
  obj-y				+= xilinx/
- obj-$(CONFIG_SOC_KENDRYTE)	+= kendryte/
 -obj-$(CONFIG_ARCH_ZX)		+= zte/

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

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

* linux-next: manual merge of the risc-v tree with Linus' tree
@ 2020-10-25 22:01 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2020-10-25 22:01 UTC (permalink / raw)
  To: Palmer Dabbelt, Paul Walmsley
  Cc: Bill Wendling, Linux Kernel Mailing List,
	Linux Next Mailing List, Masahiro Yamada, Palmer Dabbelt


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

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/kernel/vdso/Makefile

between commit:

  a96843372331 ("kbuild: explicitly specify the build id style")

from Linus' tree and commit:

  f69e1c7418b1 ("RISC-V: Fix the VDSO symbol generaton for binutils-2.35+")

from the risc-v 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/riscv/kernel/vdso/Makefile
index 7d6a94d45ec9,a8ecf102e09b..000000000000
--- a/arch/riscv/kernel/vdso/Makefile
+++ b/arch/riscv/kernel/vdso/Makefile
@@@ -43,6 -43,8 +43,8 @@@ $(obj)/vdso.o: $(obj)/vdso.s
  SYSCFLAGS_vdso.so.dbg = $(c_flags)
  $(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE
  	$(call if_changed,vdsold)
+ SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \
 -	-Wl,--build-id -Wl,--hash-style=both
++	-Wl,--build-id=sha1 -Wl,--hash-style=both
  
  # We also create a special relocatable object that should mirror the symbol
  # table and layout of the linked DSO. With ld --just-symbols we can then

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

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

* linux-next: manual merge of the risc-v tree with Linus' tree
@ 2020-01-13 22:05 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2020-01-13 22:05 UTC (permalink / raw)
  To: Palmer Dabbelt, Paul Walmsley
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Amanieu d'Antras, Christian Brauner, Nick Hu, Vincent Chen


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

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/Kconfig

between commit:

  20bda4ed62f5 ("riscv: Implement copy_thread_tls")

from Linus' tree and commit:

  d0f057940663 ("riscv: Add KASAN support")
  5b800fd350d6 ("riscv: add required functions to enable HAVE_REGS_AND_STACK_ACCESS_API")
  a630fb824cf5 ("riscv: Add support for restartable sequence")

from the risc-v 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/riscv/Kconfig
index fa7dc03459e7,9220071bb7da..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -65,7 -63,9 +63,10 @@@ config RISC
  	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
  	select HAVE_ARCH_MMAP_RND_BITS if MMU
  	select ARCH_HAS_GCOV_PROFILE_ALL
 +	select HAVE_COPY_THREAD_TLS
+ 	select HAVE_ARCH_KASAN if MMU && 64BIT
+ 	select HAVE_REGS_AND_STACK_ACCESS_API
+ 	select HAVE_RSEQ
  
  config ARCH_MMAP_RND_BITS_MIN
  	default 18 if 64BIT

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

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

* Re: linux-next: manual merge of the risc-v tree with Linus' tree
  2020-01-06  1:50 ` Paul Walmsley
@ 2020-01-06  1:55   ` Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2020-01-06  1:55 UTC (permalink / raw)
  To: Paul Walmsley
  Cc: Palmer Dabbelt, Paul Walmsley, Linux Next Mailing List,
	Linux Kernel Mailing List


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

Hi Paul,

On Sun, 5 Jan 2020 17:50:35 -0800 (PST) Paul Walmsley <paul.walmsley@sifive.com> wrote:
> 
> Thanks, I just reset our for-next branch to v5.5-rc5, so this won't 
> reappear.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: manual merge of the risc-v tree with Linus' tree
  2020-01-05 22:32 Stephen Rothwell
@ 2020-01-06  1:50 ` Paul Walmsley
  2020-01-06  1:55   ` Stephen Rothwell
  0 siblings, 1 reply; 10+ messages in thread
From: Paul Walmsley @ 2020-01-06  1:50 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Palmer Dabbelt, Paul Walmsley, Linux Next Mailing List,
	Linux Kernel Mailing List

Hi Stephen,

On Mon, 6 Jan 2020, Stephen Rothwell wrote:

> Today's linux-next merge of the risc-v tree got a conflict in:
> 
>   Documentation/riscv/patch-acceptance.rst
> 
> between commit:
> 
>   0e194d9da198 ("Documentation: riscv: add patch acceptance guidelines")
> 
> from Linus' tree and commit:
> 
>   d89a1a16d7dc ("Documentation: riscv: add patch acceptance guidelines")
> 
> from the risc-v tree.
> 
> I fixed it up (I used the version from Linus' tree as that was committed
> later) 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.

Thanks, I just reset our for-next branch to v5.5-rc5, so this won't 
reappear.

- Paul

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

* linux-next: manual merge of the risc-v tree with Linus' tree
@ 2020-01-05 22:32 Stephen Rothwell
  2020-01-06  1:50 ` Paul Walmsley
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2020-01-05 22:32 UTC (permalink / raw)
  To: Palmer Dabbelt, Paul Walmsley
  Cc: Linux Next Mailing List, Linux Kernel Mailing List


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

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  Documentation/riscv/patch-acceptance.rst

between commit:

  0e194d9da198 ("Documentation: riscv: add patch acceptance guidelines")

from Linus' tree and commit:

  d89a1a16d7dc ("Documentation: riscv: add patch acceptance guidelines")

from the risc-v tree.

I fixed it up (I used the version from Linus' tree as that was committed
later) 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

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

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

end of thread, back to index

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-30 22:40 linux-next: manual merge of the risc-v tree with Linus' tree Stephen Rothwell
2021-04-02  4:33 ` Palmer Dabbelt
  -- strict thread matches above, loose matches on Subject: below --
2021-06-14 23:26 Stephen Rothwell
2021-04-26 23:42 Stephen Rothwell
2021-02-23 22:00 Stephen Rothwell
2020-10-25 22:01 Stephen Rothwell
2020-01-13 22:05 Stephen Rothwell
2020-01-05 22:32 Stephen Rothwell
2020-01-06  1:50 ` Paul Walmsley
2020-01-06  1:55   ` Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/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-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

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


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