Hi all,
Today's linux-next merge of the jc_docs tree got a conflict in:
MAINTAINERS
between commit:
2f5947dfcaec ("Documentation: move Documentation/virtual to
Documentation/virt")
from Linus' tree and commit:
bff9e34c6785 ("docs: fix broken doc references due to renames")
from the jc
Hi Jon,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/x86/x86_64/mm.txt
between commit:
89502a019790 ("x86/mm: Fix the 56-bit addresses memory map in
Documentation/x86/x86_64/mm.txt")
from Linus' tree and commit:
b88679d2f2b9 ("Documentation: x86: conver
Hi Jon,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/process/index.rst
between commit:
9ed95129ffca ("Documentation: Add a file explaining the Linux kernel license
enforcement policy")
from Linus' tree and commit:
13277782dd4b ("Documentation: add Kerne
Hi Jonathan,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/process/index.rst
between commit:
9ed95129ffcab ("Documentation: Add a file explaining the Linux kernel license
enforcement policy")
from Linus' tree and commit:
13277782dd4bc ("Documentation: ad
Hi Jon,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/DocBook/Makefile
between commit:
43f71d93a0cb ("doc-rst: Remove the media docbook")
from Linus' tree and commit:
bdf107d87eb8 ("DocBook: use DOCBOOKS="" to ignore DocBooks instead of
IGNORE_DOCBOOKS=1
Hi Jonathan,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/Changes
between commit:
283e8ba2dfde ("MODSIGN: Change from CMS to PKCS#7 signing if the openssl is
too old")
from Linus' tree and commit:
1c3a54e257f7 ("Documentation/Changes: Add bc in "Current
6 matches
Mail list logo
