Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Documentation/filesystems/proc.rst
between commit:
059db4341303 ("Documentation/filesystems/proc.rst: copy-editing cleanup")
from the jc_docs tree and commit:
7079aa70a489 ("doc, mm: clarify /proc//oom_score va
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Documentation/admin-guide/cgroup-v2.rst
between commit:
6ee0fac199e1 ("docs: fix memory.low description in cgroup-v2.rst")
from the jc_docs tree and commit:
3968bb6dec48 ("mm, memcg: proportional memory.{low,mi
On Wed, May 09, 2018 at 11:11:36AM -0600, Jonathan Corbet wrote:
> On Wed, 9 May 2018 18:53:28 +0200
> Andrea Parri wrote:
>
> > > Now that I look a little closer, I think the real issue is that the
> > > "features" documentation assumes that there's a Kconfig option for each,
> > > but there isn
On Wed, 9 May 2018 18:53:28 +0200
Andrea Parri wrote:
> > Now that I look a little closer, I think the real issue is that the
> > "features" documentation assumes that there's a Kconfig option for each,
> > but there isn't in this case. The lack of a Kconfig option does not,
> > this time around
On Wed, May 09, 2018 at 08:59:20AM -0600, Jonathan Corbet wrote:
> On Wed, 9 May 2018 15:28:24 +0200
> Andrea Parri wrote:
>
> > > BTW, it would be nice if the the question "Why was this file removed?" was
> > > answered by that jc_docs commit message ... I actually wonder if this
> > > file nee
On Wed, 9 May 2018 15:28:24 +0200
Andrea Parri wrote:
> > BTW, it would be nice if the the question "Why was this file removed?" was
> > answered by that jc_docs commit message ... I actually wonder if this
> > file needs to return (I have no way of knowing).
>
> My bad; thanks for pointing t
Really Cc-ing Ingo:
On Wed, May 09, 2018 at 03:28:24PM +0200, Andrea Parri wrote:
> On Wed, May 09, 2018 at 08:25:26PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > Documentation/features/vm/pte_special/arch-supp
On Wed, May 09, 2018 at 08:25:26PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> Documentation/features/vm/pte_special/arch-support.txt
>
> between commit:
>
> 2bef69a385b4 ("Documentation/features/vm: Remove arch suppo
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
Documentation/features/vm/pte_special/arch-support.txt
between commit:
2bef69a385b4 ("Documentation/features/vm: Remove arch support status file for
'pte_special'")
from the jc_docs tree and commit:
1099dc900e
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/Kconfig.debug
between commit:
63d0977c0e85 ("lib/Kconfig.debug: correct documentation paths")
from the jc_docs tree and commit:
2c81218d9f29 ("Kconfig: lib/Kconfig.debug: fix references to Documenation")
Memory) ; Taku Izumi
>
> Subject: linux-next: manual merge of the akpm-current tree with the
> jc_docs tree
>
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> Documentation/kernel-parameters.txt
>
> between commit:
>
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/page_alloc.c
between commit:
9daacf51b428 ("Documentation/kernel-parameters: update KMG units")
from the jc_docs tree and commit:
f0a906868be1 ("mm/page_alloc.c: introduce kernelcore=mirror option")
from
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
Documentation/kernel-parameters.txt
between commit:
9daacf51b428 ("Documentation/kernel-parameters: update KMG units")
from the jc_docs tree and commit:
f0a906868be1 ("mm/page_alloc.c: introduce kernelcore=m
13 matches
Mail list logo
