Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the mips tree with Linus' tree
@ 2019-08-11 23:19 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2019-08-11 23:19 UTC (permalink / raw)
  To: Ralf Baechle, James Hogan
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Paul Cercueil, Paul Burton, Mauro Carvalho Chehab

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

Hi all,

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

  Documentation/index.rst

between commit:

  08a69058c02f ("docs: power: add it to to the main documentation index")

from Linus' tree and commit:

  97689a1a3fda ("doc: Add doc for the Ingenic TCU hardware")

from the mips 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 Documentation/index.rst
index 2df5a3da563c,87214feda41f..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -145,7 -143,7 +145,8 @@@ implementation
     arm64/index
     ia64/index
     m68k/index
+    mips/index
 +   powerpc/index
     riscv/index
     s390/index
     sh/index

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

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

* Re: linux-next: manual merge of the mips tree with Linus' tree
  2019-08-07  0:25 Stephen Rothwell
@ 2019-08-07  7:42 ` Arnd Bergmann
  0 siblings, 0 replies; 24+ messages in thread
From: Arnd Bergmann @ 2019-08-07  7:42 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Ralf Baechle, James Hogan, Linux Next Mailing List,
	Linux Kernel Mailing List, Paul Burton

On Wed, Aug 7, 2019 at 2:25 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the mips tree got a conflict in:
>
>   arch/mips/include/asm/vdso/vdso.h
> ( arch/mips/vdso/vdso.h in Linus' tree)
>
> between commit:
>
>   ee38d94a0ad8 ("page flags: prioritize kasan bits over last-cpuid")
>
> from Linus' tree and commit:
>
>   6393e6064486 ("mips: fix vdso32 build, again")
>
> from the mips tree.
>
> I fixed it up (I just used the mips tree version) 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.

Yes, that resolution is correct. My original fix for the issue in ee38d94a0ad8
got folded into that patch when it was merged, but as the vdso is now
completely different in the mips tree, the newer fix is needed there
compared to what is in Linus' tree.

       Arnd

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2019-08-07  0:25 Stephen Rothwell
  2019-08-07  7:42 ` Arnd Bergmann
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2019-08-07  0:25 UTC (permalink / raw)
  To: Ralf Baechle, James Hogan
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Arnd Bergmann, Paul Burton

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

Hi all,

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

  arch/mips/include/asm/vdso/vdso.h
( arch/mips/vdso/vdso.h in Linus' tree)

between commit:

  ee38d94a0ad8 ("page flags: prioritize kasan bits over last-cpuid")

from Linus' tree and commit:

  6393e6064486 ("mips: fix vdso32 build, again")

from the mips tree.

I fixed it up (I just used the mips tree version) 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] 24+ messages in thread

* linux-next: manual merge of the mips tree with Linus' tree
@ 2019-05-12 23:47 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2019-05-12 23:47 UTC (permalink / raw)
  To: Ralf Baechle, James Hogan
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Thomas Bogendoerfer, Paul Burton

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

Hi all,

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

  arch/mips/sgi-ip27/ip27-irq.c

between commit:

  e4952b0c2c03 ("MIPS: SGI-IP27: Fix use of unchecked pointer in shutdown_bridge_irq")

from Linus' tree and commit:

  e6308b6d35ea ("MIPS: SGI-IP27: abstract chipset irq from bridge")

from the mips tree.

I fixed it up (the latter removed the code modified by the former) 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] 24+ messages in thread

* linux-next: manual merge of the mips tree with Linus' tree
@ 2018-08-23 22:37 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2018-08-23 22:37 UTC (permalink / raw)
  To: Ralf Baechle, James Hogan
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Paul Burton,
	Nick Desaulniers

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

Hi all,

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

  include/linux/compiler_types.h

between commit:

  815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive")

from Linus' tree and commit:

  04f264d3a8b0 ("compiler.h: Allow arch-specific asm/compiler.h")

from the mips 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/compiler_types.h
index 90479a0f3986,4be464a07612..000000000000
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@@ -54,20 -54,44 +54,32 @@@ extern void __chk_io_ptr(const volatil
  
  #ifdef __KERNEL__
  
 -#ifdef __GNUC__
 -#include <linux/compiler-gcc.h>
 -#endif
 -
 -#if defined(CC_USING_HOTPATCH) && !defined(__CHECKER__)
 -#define notrace __attribute__((hotpatch(0,0)))
 -#else
 -#define notrace __attribute__((no_instrument_function))
 -#endif
 -
 -/* Intel compiler defines __GNUC__. So we will overwrite implementations
 - * coming from above header files here
 - */
 -#ifdef __INTEL_COMPILER
 -# include <linux/compiler-intel.h>
 -#endif
 -
 -/* Clang compiler defines __GNUC__. So we will overwrite implementations
 - * coming from above header files here
 - */
 +/* Compiler specific macros. */
  #ifdef __clang__
  #include <linux/compiler-clang.h>
 +#elif defined(__INTEL_COMPILER)
 +#include <linux/compiler-intel.h>
 +#elif defined(__GNUC__)
 +/* The above compilers also define __GNUC__, so order is important here. */
 +#include <linux/compiler-gcc.h>
 +#else
 +#error "Unknown compiler"
  #endif
  
+ /*
+  * Some architectures need to provide custom definitions of macros provided
+  * by linux/compiler-*.h, and can do so using asm/compiler.h. We include that
+  * conditionally rather than using an asm-generic wrapper in order to avoid
+  * build failures if any C compilation, which will include this file via an
+  * -include argument in c_flags, occurs prior to the asm-generic wrappers being
+  * generated.
+  */
+ #ifdef CONFIG_HAVE_ARCH_COMPILER_H
+ #include <asm/compiler.h>
+ #endif
+ 
  /*
 - * Generic compiler-dependent macros required for kernel
 + * Generic compiler-independent macros required for kernel
   * build go below this comment. Actual compiler/compiler version
   * specific implementations come from the above header files
   */

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

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2017-07-11  0:04 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2017-07-11  0:04 UTC (permalink / raw)
  To: Ralf Baechle, James Hogan
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Paul Burton,
	Tero Kristo, Stephen Boyd

Hi all,

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

  drivers/clk/Kconfig

between commit:

  b745c0794e2f ("clk: keystone: Add sci-clk driver support")

from Linus' tree and commit:

  5e2722808156 ("clk: boston: Add a driver for MIPS Boston board clocks")

from the mips 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/clk/Kconfig
index d406b087553f,251a22139e73..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -221,7 -219,7 +221,8 @@@ config COMMON_CLK_VC
  
  source "drivers/clk/bcm/Kconfig"
  source "drivers/clk/hisilicon/Kconfig"
+ source "drivers/clk/imgtec/Kconfig"
 +source "drivers/clk/keystone/Kconfig"
  source "drivers/clk/mediatek/Kconfig"
  source "drivers/clk/meson/Kconfig"
  source "drivers/clk/mvebu/Kconfig"

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2017-01-03  0:26 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2017-01-03  0:26 UTC (permalink / raw)
  To: Ralf Baechle, Al Viro; +Cc: linux-next, linux-kernel, Paul Burton

Hi Ralf,

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

  arch/mips/kernel/mips_ksyms.c

between commit:

  7c0f6ba682b9 ("Replace <asm/uaccess.h> with <linux/uaccess.h> globally")

from Linus' tree and commit:

  238f9fbc3244 ("MIPS: Export {copy, clear}_page functions alongside their definitions")

from the mips tree.

I fixed it up (I just deleted the file) 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

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

* Re: linux-next: manual merge of the mips tree with Linus' tree
  2016-01-24 22:25 Stephen Rothwell
@ 2016-01-25  7:42 ` Ralf Baechle
  0 siblings, 0 replies; 24+ messages in thread
From: Ralf Baechle @ 2016-01-25  7:42 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dan Williams, James Hogan

On Mon, Jan 25, 2016 at 09:25:10AM +1100, Stephen Rothwell wrote:

> 
> Today's linux-next merge of the mips tree got conflicts in:
> 
>   arch/mips/kvm/tlb.c
> 
> between commit:
> 
>   ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t")
> 
> from Linus' tree and commit:
> 
>   cb1b447f0c36 ("MIPS: KVM: Convert EXPORT_SYMBOL to _GPL")
> 
> from the mips tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Linus has pulled so I'm reseting my branch for you back to v4.5-rc1.

Thanks,

  Ralf

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2016-01-24 22:25 Stephen Rothwell
  2016-01-25  7:42 ` Ralf Baechle
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2016-01-24 22:25 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, Dan Williams, James Hogan

Hi Ralf,

Today's linux-next merge of the mips tree got conflicts in:

  arch/mips/kvm/tlb.c

between commit:

  ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t")

from Linus' tree and commit:

  cb1b447f0c36 ("MIPS: KVM: Convert EXPORT_SYMBOL to _GPL")

from the mips 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/mips/kvm/tlb.c
index 570479c03bdc,0939b1d6f910..000000000000
--- a/arch/mips/kvm/tlb.c
+++ b/arch/mips/kvm/tlb.c
@@@ -35,17 -35,17 +35,17 @@@
  #define PRIx64 "llx"
  
  atomic_t kvm_mips_instance;
- EXPORT_SYMBOL(kvm_mips_instance);
+ EXPORT_SYMBOL_GPL(kvm_mips_instance);
  
  /* These function pointers are initialized once the KVM module is loaded */
 -pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
 +kvm_pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
- EXPORT_SYMBOL(kvm_mips_gfn_to_pfn);
+ EXPORT_SYMBOL_GPL(kvm_mips_gfn_to_pfn);
  
 -void (*kvm_mips_release_pfn_clean)(pfn_t pfn);
 +void (*kvm_mips_release_pfn_clean)(kvm_pfn_t pfn);
- EXPORT_SYMBOL(kvm_mips_release_pfn_clean);
+ EXPORT_SYMBOL_GPL(kvm_mips_release_pfn_clean);
  
 -bool (*kvm_mips_is_error_pfn)(pfn_t pfn);
 +bool (*kvm_mips_is_error_pfn)(kvm_pfn_t pfn);
- EXPORT_SYMBOL(kvm_mips_is_error_pfn);
+ EXPORT_SYMBOL_GPL(kvm_mips_is_error_pfn);
  
  uint32_t kvm_mips_get_kernel_asid(struct kvm_vcpu *vcpu)
  {

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2015-10-01  1:13 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2015-10-01  1:13 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, Paul Burton

Hi Ralf,

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

  arch/mips/include/asm/mips-cm.h

between commit:

  7573b94e08ae ("MIPS: CM: Provide a function to map from CPU to VP ID.")

from Linus' tree and commit:

  3d04e4b34962 ("MIPS: Enable L2 prefetching for CM >= 2.5")

from the mips 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/mips/include/asm/mips-cm.h
index 1f1927ab4269,36530fd8a9bf..000000000000
--- a/arch/mips/include/asm/mips-cm.h
+++ b/arch/mips/include/asm/mips-cm.h
@@@ -194,7 -194,8 +194,9 @@@ BUILD_CM_RW(reg3_mask,		MIPS_CM_GCB_OF
  BUILD_CM_R_(gic_status,		MIPS_CM_GCB_OFS + 0xd0)
  BUILD_CM_R_(cpc_status,		MIPS_CM_GCB_OFS + 0xf0)
  BUILD_CM_RW(l2_config,		MIPS_CM_GCB_OFS + 0x130)
 +BUILD_CM_RW(sys_config2,	MIPS_CM_GCB_OFS + 0x150)
+ BUILD_CM_RW(l2_pft_control,	MIPS_CM_GCB_OFS + 0x300)
+ BUILD_CM_RW(l2_pft_control_b,	MIPS_CM_GCB_OFS + 0x308)
  
  /* Core Local & Core Other register accessor functions */
  BUILD_CM_Cx_RW(reset_release,	0x00)
@@@ -317,10 -319,20 +320,24 @@@ BUILD_CM_Cx_R_(tcid_8_priority,	0x80
  #define CM_GCR_L2_CONFIG_ASSOC_SHF		0
  #define CM_GCR_L2_CONFIG_ASSOC_MSK		(_ULCAST_(0xff) << 0)
  
 +/* GCR_SYS_CONFIG2 register fields */
 +#define CM_GCR_SYS_CONFIG2_MAXVPW_SHF		0
 +#define CM_GCR_SYS_CONFIG2_MAXVPW_MSK		(_ULCAST_(0xf) << 0)
 +
+ /* GCR_L2_PFT_CONTROL register fields */
+ #define CM_GCR_L2_PFT_CONTROL_PAGEMASK_SHF	12
+ #define CM_GCR_L2_PFT_CONTROL_PAGEMASK_MSK	(_ULCAST_(0xfffff) << 12)
+ #define CM_GCR_L2_PFT_CONTROL_PFTEN_SHF		8
+ #define CM_GCR_L2_PFT_CONTROL_PFTEN_MSK		(_ULCAST_(0x1) << 8)
+ #define CM_GCR_L2_PFT_CONTROL_NPFT_SHF		0
+ #define CM_GCR_L2_PFT_CONTROL_NPFT_MSK		(_ULCAST_(0xff) << 0)
+ 
+ /* GCR_L2_PFT_CONTROL_B register fields */
+ #define CM_GCR_L2_PFT_CONTROL_B_CEN_SHF		8
+ #define CM_GCR_L2_PFT_CONTROL_B_CEN_MSK		(_ULCAST_(0x1) << 8)
+ #define CM_GCR_L2_PFT_CONTROL_B_PORTID_SHF	0
+ #define CM_GCR_L2_PFT_CONTROL_B_PORTID_MSK	(_ULCAST_(0xff) << 0)
+ 
  /* GCR_Cx_COHERENCE register fields */
  #define CM_GCR_Cx_COHERENCE_COHDOMAINEN_SHF	0
  #define CM_GCR_Cx_COHERENCE_COHDOMAINEN_MSK	(_ULCAST_(0xff) << 0)

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2015-02-22  0:22 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2015-02-22  0:22 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, David Daney, Steven J. Hill

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

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/mm/tlb-r4k.c between commit 9ead8632bbf4 ("MIPS: Fix
C0_Pagegrain[IEC] support") from Linus' tree and commit a5770df09541
("MIPS: Add set/clear CP0 macros for PageGrain register") from the mips
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/mips/mm/tlb-r4k.c
index 30639a6e9b8c,b2afa49beab0..000000000000
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@@ -485,13 -485,11 +485,14 @@@ static void r4k_tlb_configure(void
  		 * Enable the no read, no exec bits, and enable large virtual
  		 * address.
  		 */
 +		u32 pg = PG_RIE | PG_XIE;
++
++		if (cpu_has_rixiex)
++			pg |= PG_IEC;
  #ifdef CONFIG_64BIT
 -		set_c0_pagegrain(PG_RIE | PG_XIE | PG_ELPA);
 -#else
 -		set_c0_pagegrain(PG_RIE | PG_XIE);
 +		pg |= PG_ELPA;
  #endif
- 		if (cpu_has_rixiex)
- 			pg |= PG_IEC;
- 		write_c0_pagegrain(pg);
++		set_c0_pagegrain(pg);
  	}
  
  	temp_tlb_entry = current_cpu_data.tlbsize - 1;

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

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2015-02-22  0:15 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2015-02-22  0:15 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, Steven J. Hill, Kirill A. Shutemov

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

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/include/asm/pgtable-bits.h between commit b32da82e28ce
("mips: drop _PAGE_FILE and pte_file()-related helpers") from Linus'
tree and commit 05f9883a2899 ("MIPS: Usage and cosmetic cleanups of
page table bits.") from the mips 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/mips/include/asm/pgtable-bits.h
index fc807aa5ec8d,156fd6eb1e03..000000000000
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@@ -167,9 -150,13 +150,9 @@@
  
  #endif /* defined(CONFIG_PHYS_ADDR_T_64BIT && defined(CONFIG_CPU_MIPS32) */
  
- #ifndef _PFN_SHIFT
- #define _PFN_SHIFT		    PAGE_SHIFT
- #endif
 -/*
 - * _PAGE_FILE semantics: set:pagecache unset:swap
 - */
 -#define _PAGE_FILE		_PAGE_MODIFIED
+ #define _PAGE_SILENT_READ	_PAGE_VALID
+ #define _PAGE_SILENT_WRITE	_PAGE_DIRTY
+ 
  #define _PFN_MASK		(~((1 << (_PFN_SHIFT)) - 1))
  
  #ifndef _PAGE_NO_READ

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

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

* Re: linux-next: manual merge of the mips tree with Linus'  tree
  2015-02-13  0:11 Stephen Rothwell
@ 2015-02-13 10:28 ` Ralf Baechle
  0 siblings, 0 replies; 24+ messages in thread
From: Ralf Baechle @ 2015-02-13 10:28 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, James Cowgill, Markos Chandras

On Fri, Feb 13, 2015 at 11:11:50AM +1100, Stephen Rothwell wrote:

> Today's linux-next merge of the mips tree got a conflict in
> arch/mips/kernel/elf.c between commit fd75a33e0002 ("MIPS: ELF: fix
> loading o32 binaries on 64-bit kernels") from Linus' tree and commit
> d8fb6537f1d4 ("MIPS: kernel: elf: Improve the overall ABI and FPU mode
> checks") from the mips tree.
> 
> I fixed it up (the latter seems to be a superset of the former) and can
> carry the fix as necessary (no action is required).

Due to an unrelated MIPS-specific issue I've yanked the merge that contained
this specific commit for the time being.

  Ralf

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

* linux-next: manual merge of the mips tree with Linus'  tree
@ 2015-02-13  0:11 Stephen Rothwell
  2015-02-13 10:28 ` Ralf Baechle
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2015-02-13  0:11 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, James Cowgill, Markos Chandras

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

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/kernel/elf.c between commit fd75a33e0002 ("MIPS: ELF: fix
loading o32 binaries on 64-bit kernels") from Linus' tree and commit
d8fb6537f1d4 ("MIPS: kernel: elf: Improve the overall ABI and FPU mode
checks") from the mips tree.

I fixed it up (the latter seems to be a superset of the former) and can
carry the fix as necessary (no action is required).

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

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

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2014-06-03  0:50 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2014-06-03  0:50 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, Markos Chandras

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

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/mti-malta/malta-memory.c between commit 2ff89d64f23e ("MIPS:
malta: memory.c: Initialize the 'memsize' variable") from Linus' tree
and commit acd8bc1a70ff ("MIPS: malta: Remove 'maybe_unused' attribute
from ememsize{, _str}") from the mips 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/mips/mti-malta/malta-memory.c
index f2364e419682,1ca34887d990..000000000000
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@@ -26,8 -26,8 +26,8 @@@ unsigned long physical_memsize = 0L
  
  fw_memblock_t * __init fw_getmdesc(int eva)
  {
- 	char *memsize_str, *ememsize_str __maybe_unused = NULL, *ptr;
- 	unsigned long memsize = 0, ememsize __maybe_unused = 0;
+ 	char *memsize_str, *ememsize_str = NULL, *ptr;
 -	unsigned long memsize, ememsize = 0;
++	unsigned long memsize = 0, ememsize = 0;
  	static char cmdline[COMMAND_LINE_SIZE] __initdata;
  	int tmp;
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2012-10-04  0:35 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2012-10-04  0:35 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, David Howells, David Daney

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

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/include/asm/octeon/octeon-model.h between commit a1ce39288e6f
("UAPI: (Scripted) Convert #include "..." to #include <path/...> in
kernel system headers") from the  tree and commit 5cf02e5554a4 ("MIPS:
OCTEON: Add detection of cnf71xx parts") from the mips 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/mips/include/asm/octeon/octeon-model.h
index 23b895c,93398f6..0000000
--- a/arch/mips/include/asm/octeon/octeon-model.h
+++ b/arch/mips/include/asm/octeon/octeon-model.h
@@@ -313,6 -323,14 +323,14 @@@ static inline int __octeon_is_model_run
  const char *octeon_model_get_string(uint32_t chip_id);
  const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);
  
+ /*
+  * Return the octeon family, i.e., ProcessorID of the PrID register.
+  */
+ static inline uint32_t cvmx_get_octeon_family(void)
+ {
+ 	return cvmx_get_proc_id() & OCTEON_FAMILY_MASK;
+ }
+ 
 -#include "octeon-feature.h"
 +#include <asm/octeon/octeon-feature.h>
  
  #endif /* __OCTEON_MODEL_H__ */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2012-10-01  3:58 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2012-10-01  3:58 UTC (permalink / raw)
  To: Ralf Baechle
  Cc: linux-next, linux-kernel, Wei Yongjun, David S. Miller, David Daney

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

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
drivers/net/ethernet/octeon/octeon_mgmt.c between commit df555b665367
("netdev: octeon: fix return value check in octeon_mgmt_init_phy()") from
Linus' tree and commit eeae05aa2169 ("netdev: octeon_mgmt: Add support
for 1Gig ports") from the mips 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 drivers/net/ethernet/octeon/octeon_mgmt.c
index a688a2d,5be431c..0000000
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@@ -722,10 -973,8 +973,8 @@@ static int octeon_mgmt_init_phy(struct 
  				   octeon_mgmt_adjust_link, 0,
  				   PHY_INTERFACE_MODE_MII);
  
 -	if (p->phydev == NULL)
 +	if (!p->phydev)
- 		return -1;
- 
- 	phy_start_aneg(p->phydev);
+ 		return -ENODEV;
  
  	return 0;
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* Re: linux-next: manual merge of the mips tree with Linus' tree
  2011-11-07  0:04 Stephen Rothwell
@ 2011-11-07 10:18 ` Ralf Baechle
  0 siblings, 0 replies; 24+ messages in thread
From: Ralf Baechle @ 2011-11-07 10:18 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Yong Zhang, David Daney

On Mon, Nov 07, 2011 at 11:04:03AM +1100, Stephen Rothwell wrote:

> Today's linux-next merge of the mips tree got a conflict in
> arch/mips/kernel/perf_event.c between commit e5dcb58aa510 ("MIPS: perf:
> Reorganize contents of perf support files") from Linus' tree and commit
> 6e8722f887b2 ("MIPS: irq: Remove IRQF_DISABLED") from the mips tree.
> 
> The former moved the code that the latter modified and it appeasr to have
> been fixed up in its new position.  So I just used the version of this
> file that is in Linus' tree.

Time to rebase, I think.  I hope Linus is going to make an -rc1 soon.

  Ralf

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2011-11-07  0:04 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2011-11-07  0:04 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, Manuel Lauss, Yong Zhang

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

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/alchemy/common/dbdma.c between commit f2e442fd2ff4 ("MIPS:
Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines") from Linus' tree
and commit 6e8722f887b2 ("MIPS: irq: Remove IRQF_DISABLED") from the mips
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/mips/alchemy/common/dbdma.c
index 0e63ee4,4025d77..0000000
--- a/arch/mips/alchemy/common/dbdma.c
+++ b/arch/mips/alchemy/common/dbdma.c
@@@ -1019,8 -1037,19 +1019,7 @@@ static int __init dbdma_setup(unsigned 
  	dbdma_gptr->ddma_inten = 0xffff;
  	au_sync();
  
- 	ret = request_irq(irq, dbdma_interrupt, IRQF_DISABLED, "dbdma",
- 			  (void *)dbdma_gptr);
 -	switch (alchemy_get_cputype()) {
 -	case ALCHEMY_CPU_AU1550:
 -		irq_nr = AU1550_DDMA_INT;
 -		break;
 -	case ALCHEMY_CPU_AU1200:
 -		irq_nr = AU1200_DDMA_INT;
 -		break;
 -	default:
 -		return -ENODEV;
 -	}
 -
 -	ret = request_irq(irq_nr, dbdma_interrupt, 0,
 -			"Au1xxx dbdma", (void *)dbdma_gptr);
++	ret = request_irq(irq, dbdma_interrupt, 0, "dbdma", (void *)dbdma_gptr);
  	if (ret)
  		printk(KERN_ERR "Cannot grab DBDMA interrupt!\n");
  	else {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2011-11-07  0:04 Stephen Rothwell
  2011-11-07 10:18 ` Ralf Baechle
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2011-11-07  0:04 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, Yong Zhang, David Daney

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

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/kernel/perf_event.c between commit e5dcb58aa510 ("MIPS: perf:
Reorganize contents of perf support files") from Linus' tree and commit
6e8722f887b2 ("MIPS: irq: Remove IRQF_DISABLED") from the mips tree.

The former moved the code that the latter modified and it appeasr to have
been fixed up in its new position.  So I just used the version of this
file that is in Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* Re: linux-next: manual merge of the mips tree with Linus' tree
  2009-12-15  7:26 ` Michal Simek
@ 2009-12-15 19:27   ` Ralf Baechle
  0 siblings, 0 replies; 24+ messages in thread
From: Ralf Baechle @ 2009-12-15 19:27 UTC (permalink / raw)
  To: Michal Simek
  Cc: Stephen Rothwell, linux-next, linux-kernel, Li Hong, Wu Zhangjin

On Tue, Dec 15, 2009 at 08:26:42AM +0100, Michal Simek wrote:

> >Today's linux-next merge of the mips tree got a conflict in
> >scripts/recordmcount.pl between commits
> >e2d753fac5b3954a3b6001f98479f0435fe7c868 ("tracing: Correct the check for
> >number of arguments in recordmcount.pl") and
> >7d241ff0567b9503d79ee775c40927d09b509f83 ("microblaze: ftrace: Add
> >dynamic trace support") from Linus' tree and commits
> >84bc2d35f211a83e806711c94f78a227c4810848 ("MIPS: Tracing: Add an endian
> >argument to scripts/recordmcount.pl") and
> >b2b11a5cb24b8f234bc4746dc40722b01fa45a43 ("MIPS: Tracing: Add dynamic
> >function tracer support") from the mips tree.
> >
> >These conflicts are now between Linus' tree and the mips tree so, Ralf,
> >you should be able to fix them up by merging with Linus' tree.
> >
> >I have fixed them up (see below) (for the first pair of commits above, I
> >used the mips tree version) and can carry the fix for a while.
> 
> Yes, because I sent pull request to Linus and he added Microblaze
> patches to his tree. Sorry for this additional work but you had
> chance to pull your tree first.

No problem.   That's sorted and new pull rq is out.

  Ralf

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

* Re: linux-next: manual merge of the mips tree with Linus' tree
  2009-12-14 23:20 Stephen Rothwell
@ 2009-12-15  7:26 ` Michal Simek
  2009-12-15 19:27   ` Ralf Baechle
  0 siblings, 1 reply; 24+ messages in thread
From: Michal Simek @ 2009-12-15  7:26 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Ralf Baechle, linux-next, linux-kernel, Li Hong, Wu Zhangjin

Stephen Rothwell wrote:
> Hi Ralf,
> 
> Today's linux-next merge of the mips tree got a conflict in
> scripts/recordmcount.pl between commits
> e2d753fac5b3954a3b6001f98479f0435fe7c868 ("tracing: Correct the check for
> number of arguments in recordmcount.pl") and
> 7d241ff0567b9503d79ee775c40927d09b509f83 ("microblaze: ftrace: Add
> dynamic trace support") from Linus' tree and commits
> 84bc2d35f211a83e806711c94f78a227c4810848 ("MIPS: Tracing: Add an endian
> argument to scripts/recordmcount.pl") and
> b2b11a5cb24b8f234bc4746dc40722b01fa45a43 ("MIPS: Tracing: Add dynamic
> function tracer support") from the mips tree.
> 
> These conflicts are now between Linus' tree and the mips tree so, Ralf,
> you should be able to fix them up by merging with Linus' tree.
> 
> I have fixed them up (see below) (for the first pair of commits above, I
> used the mips tree version) and can carry the fix for a while.

Yes, because I sent pull request to Linus and he added Microblaze 
patches to his tree. Sorry for this additional work but you had chance 
to pull your tree first.

Michal


-- 
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2009-12-14 23:20 Stephen Rothwell
  2009-12-15  7:26 ` Michal Simek
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2009-12-14 23:20 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel, Michal Simek, Li Hong, Wu Zhangjin

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
scripts/recordmcount.pl between commits
e2d753fac5b3954a3b6001f98479f0435fe7c868 ("tracing: Correct the check for
number of arguments in recordmcount.pl") and
7d241ff0567b9503d79ee775c40927d09b509f83 ("microblaze: ftrace: Add
dynamic trace support") from Linus' tree and commits
84bc2d35f211a83e806711c94f78a227c4810848 ("MIPS: Tracing: Add an endian
argument to scripts/recordmcount.pl") and
b2b11a5cb24b8f234bc4746dc40722b01fa45a43 ("MIPS: Tracing: Add dynamic
function tracer support") from the mips tree.

These conflicts are now between Linus' tree and the mips tree so, Ralf,
you should be able to fix them up by merging with Linus' tree.

I have fixed them up (see below) (for the first pair of commits above, I
used the mips tree version) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc scripts/recordmcount.pl
index 9cf0a6f,d016c71..0000000
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@@ -295,9 -245,60 +295,63 @@@ if ($arch eq "x86_64") 
      $ld .= " -m elf64_sparc";
      $cc .= " -m64";
      $objcopy .= " -O elf64-sparc";
 +} elsif ($arch eq "microblaze") {
 +    # Microblaze calls '_mcount' instead of plain 'mcount'.
 +    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
+ 
+ } elsif ($arch eq "mips") {
+     # To enable module support, we need to enable the -mlong-calls option
+     # of gcc for module, after using this option, we can not get the real
+     # offset of the calling to _mcount, but the offset of the lui
+     # instruction or the addiu one. herein, we record the address of the
+     # first one, and then we can replace this instruction by a branch
+     # instruction to jump over the profiling function to filter the
+     # indicated functions, or swith back to the lui instruction to trace
+     # them, which means dynamic tracing.
+     #
+     #       c:	3c030000 	lui	v1,0x0
+     #			c: R_MIPS_HI16	_mcount
+     #			c: R_MIPS_NONE	*ABS*
+     #			c: R_MIPS_NONE	*ABS*
+     #      10:	64630000 	daddiu	v1,v1,0
+     #			10: R_MIPS_LO16	_mcount
+     #			10: R_MIPS_NONE	*ABS*
+     #			10: R_MIPS_NONE	*ABS*
+     #      14:	03e0082d 	move	at,ra
+     #      18:	0060f809 	jalr	v1
+     #
+     # for the kernel:
+     #
+     #     10:   03e0082d        move    at,ra
+     #	  14:   0c000000        jal     0 <loongson_halt>
+     #                    14: R_MIPS_26   _mcount
+     #                    14: R_MIPS_NONE *ABS*
+     #                    14: R_MIPS_NONE *ABS*
+     #	 18:   00020021        nop
+     if ($is_module eq "0") {
+ 	    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
+     } else {
+ 	    $mcount_regex = "^\\s*([0-9a-fA-F]+): R_MIPS_HI16\\s+_mcount\$";
+     }
+     $objdump .= " -Melf-trad".$endian."mips ";
+ 
+     if ($endian eq "big") {
+ 	    $endian = " -EB ";
+ 	    $ld .= " -melf".$bits."btsmip";
+     } else {
+ 	    $endian = " -EL ";
+ 	    $ld .= " -melf".$bits."ltsmip";
+     }
+ 
+     $cc .= " -mno-abicalls -fno-pic -mabi=" . $bits . $endian;
+     $ld .= $endian;
+ 
+     if ($bits == 64) {
+ 	    $function_regex =
+ 		"^([0-9a-fA-F]+)\\s+<(.|[^\$]L.*?|\$[^L].*?|[^\$][^L].*?)>:";
+ 	    $type = ".dword";
+     }
+ 
  } else {
      die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD";
  }

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

* linux-next: manual merge of the mips tree with Linus' tree
@ 2009-08-18  8:23 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2009-08-18  8:23 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-next, linux-kernel

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

Hi Ralf,

The linux-next merge of the mips tree gets conflicts between several
commits from Linus' tree and (basically) the same commits from the mips
tree.  I have been getting these for some time.  The mips tree for
linux-next hasn't been updated since June 6 and doing a manula merge with
Linus' tree (or rebasing it on top of Linus' tree) would fix most of these
conflicts:

$ git merge mips
Auto-merging arch/mips/Kconfig
Auto-merging arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
Auto-merging arch/mips/cavium-octeon/octeon-irq.c
Auto-merging arch/mips/include/asm/cpu-features.h
Auto-merging arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
Auto-merging arch/mips/mm/c-r4k.c
Auto-merging arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
Auto-merging arch/mips/sibyte/Kconfig
Auto-merging arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
Auto-merging arch/mips/txx9/generic/setup.c
Auto-merging arch/mips/txx9/rbtx4939/setup.c
Auto-merging drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
Auto-merging drivers/char/hw_random/Makefile
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
Auto-merging drivers/dma/Kconfig
Auto-merging drivers/dma/Makefile
Auto-merging drivers/dma/txx9dmac.c
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Automatic merge failed; fix conflicts and then commit the result.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

end of thread, back to index

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-11 23:19 linux-next: manual merge of the mips tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-08-07  0:25 Stephen Rothwell
2019-08-07  7:42 ` Arnd Bergmann
2019-05-12 23:47 Stephen Rothwell
2018-08-23 22:37 Stephen Rothwell
2017-07-11  0:04 Stephen Rothwell
2017-01-03  0:26 Stephen Rothwell
2016-01-24 22:25 Stephen Rothwell
2016-01-25  7:42 ` Ralf Baechle
2015-10-01  1:13 Stephen Rothwell
2015-02-22  0:22 Stephen Rothwell
2015-02-22  0:15 Stephen Rothwell
2015-02-13  0:11 Stephen Rothwell
2015-02-13 10:28 ` Ralf Baechle
2014-06-03  0:50 Stephen Rothwell
2012-10-04  0:35 Stephen Rothwell
2012-10-01  3:58 Stephen Rothwell
2011-11-07  0:04 Stephen Rothwell
2011-11-07  0:04 Stephen Rothwell
2011-11-07 10:18 ` Ralf Baechle
2009-12-14 23:20 Stephen Rothwell
2009-12-15  7:26 ` Michal Simek
2009-12-15 19:27   ` Ralf Baechle
2009-08-18  8:23 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 linux-next@archiver.kernel.org
	public-inbox-index linux-next


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