From: Justin Forbes <[email protected]>

Merge branch 'os-build' into 'configs/2020-06-04/arch/arm64'

# Conflicts:
#   redhat/configs/fedora/generic/CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK
diff a/.clang-format b/.clang-format
--- a/.clang-format
+++ b/.clang-format
@@ -111,6 +111,7 @@ ForEachMacros:
   - 'css_for_each_descendant_pre'
   - 'device_for_each_child_node'
   - 'dma_fence_chain_for_each'
+  - 'do_for_each_ftrace_op'
   - 'drm_atomic_crtc_for_each_plane'
   - 'drm_atomic_crtc_state_for_each_plane'
   - 'drm_atomic_crtc_state_for_each_plane_state'
@@ -136,6 +137,7 @@ ForEachMacros:
   - 'for_each_active_dev_scope'
   - 'for_each_active_drhd_unit'
   - 'for_each_active_iommu'
+  - 'for_each_aggr_pgid'
   - 'for_each_available_child_of_node'
   - 'for_each_bio'
   - 'for_each_board_func_rsrc'
@@ -201,11 +203,13 @@ ForEachMacros:
   - 'for_each_matching_node'
   - 'for_each_matching_node_and_match'
   - 'for_each_member'
-  - 'for_each_memblock'
+  - 'for_each_mem_region'
   - 'for_each_memblock_type'
   - 'for_each_memcg_cache_index'
   - 'for_each_mem_pfn_range'
+  - '__for_each_mem_range'
   - 'for_each_mem_range'
+  - '__for_each_mem_range_rev'
   - 'for_each_mem_range_rev'
   - 'for_each_migratetype_order'
   - 'for_each_msi_entry'
@@ -234,6 +238,7 @@ ForEachMacros:
   - 'for_each_node_state'
   - 'for_each_node_with_cpus'
   - 'for_each_node_with_property'
+  - 'for_each_nonreserved_multicast_dest_pgid'
   - 'for_each_of_allnodes'
   - 'for_each_of_allnodes_from'
   - 'for_each_of_cpu_node'
@@ -256,6 +261,7 @@ ForEachMacros:
   - 'for_each_pci_dev'
   - 'for_each_pci_msi_entry'
   - 'for_each_pcm_streams'
+  - 'for_each_physmem_range'
   - 'for_each_populated_zone'
   - 'for_each_possible_cpu'
   - 'for_each_present_cpu'
@@ -265,6 +271,9 @@ ForEachMacros:
   - 'for_each_process_thread'
   - 'for_each_property_of_node'
   - 'for_each_registered_fb'
+  - 'for_each_requested_gpio'
+  - 'for_each_requested_gpio_in_range'
+  - 'for_each_reserved_mem_range'
   - 'for_each_reserved_mem_region'
   - 'for_each_rtd_codec_dais'
   - 'for_each_rtd_codec_dais_rollback'
@@ -278,12 +287,17 @@ ForEachMacros:
   - 'for_each_sg'
   - 'for_each_sg_dma_page'
   - 'for_each_sg_page'
+  - 'for_each_sgtable_dma_page'
+  - 'for_each_sgtable_dma_sg'
+  - 'for_each_sgtable_page'
+  - 'for_each_sgtable_sg'
   - 'for_each_sibling_event'
   - 'for_each_subelement'
   - 'for_each_subelement_extid'
   - 'for_each_subelement_id'
   - '__for_each_thread'
   - 'for_each_thread'
+  - 'for_each_unicast_dest_pgid'
   - 'for_each_wakeup_source'
   - 'for_each_zone'
   - 'for_each_zone_zonelist'
@@ -415,6 +429,7 @@ ForEachMacros:
   - 'rbtree_postorder_for_each_entry_safe'
   - 'rdma_for_each_block'
   - 'rdma_for_each_port'
+  - 'rdma_umem_for_each_dma_block'
   - 'resource_list_for_each_entry'
   - 'resource_list_for_each_entry_safe'
   - 'rhl_for_each_entry_rcu'
@@ -464,6 +479,7 @@ ForEachMacros:
   - 'v4l2_m2m_for_each_src_buf'
   - 'v4l2_m2m_for_each_src_buf_safe'
   - 'virtio_device_for_each_vq'
+  - 'while_for_each_ftrace_op'
   - 'xa_for_each'
   - 'xa_for_each_marked'
   - 'xa_for_each_range'
diff a/.gitattributes b/.gitattributes
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,5 +2,3 @@
 *.h   diff=cpp
 *.dtsi diff=dts
 *.dts  diff=dts
-/redhat                export-ignore
-makefile       export-ignore
diff a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@
 *.tab.[ch]
 *.tar
 *.xz
+*.zst
 Module.symvers
 modules.builtin
 modules.order
@@ -56,6 +57,7 @@ modules.order
 /linux
 /vmlinux
 /vmlinux.32
+/vmlinux.symvers
 /vmlinux-gdb.py
 /vmlinuz
 /System.map
@@ -142,17 +144,24 @@ x509.genkey
 /allrandom.config
 /allyes.config
 
+# Kconfig savedefconfig output
+/defconfig
+
 # Kdevelop4
 *.kdev4
 
 # Clang's compilation database file
 /compile_commands.json
 
+<<<<<<< HEAD
 #
 # Red Hat
 #
 configs/*.config
 localversion
 
+# Documentation toolchain
+sphinx_*/
+
 # GitLab CI configuration
 !.gitlab-ci.yml
diff a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,169 @@
-# CI definitions for ark-patches and internal are maintained in a single file
-# outside the main repository because the two branches are regularly merged
-# together in release branches. Rather than trying to keep the two branches in
-# sync or have merge conflicts each time we merge the two branches, the
-# definition is stored externally and included in each branch.
-#
-# To update any CI jobs, please submit any merge requests to
-# https://gitlab.com/cki-project/kernel-ark-ci/.
-include:
-  - remote: 
'https://gitlab.com/cki-project/kernel-ark-ci/raw/master/gitlab-ci.yml'
+# This CI will only work for project members. CI for public contributors
+# runs via a webhook on the merge requests. There's nothing you have to do if
+# you want your changes tested -- created pipeline will be automatically
+# linked in the merge request and appropriate labels will be added to it.
+# Changes to this file will NOT be reflected in the webhook testing.
+
+stages:
+  - test
+  - build
+  - deploy
+
+workflow:
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+
+trigger_pipeline:
+  stage: test
+  variables:
+    # The following ones are required by CKI pipeline definition
+    git_url: ${CI_MERGE_REQUEST_PROJECT_URL}
+    branch: ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
+    commit_hash: ${CI_COMMIT_SHA}
+    mr_id: ${CI_MERGE_REQUEST_IID}
+    mr_url: 
${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}
+    title: ${CI_COMMIT_TITLE}
+    name: kernel-ark-${CI_MERGE_REQUEST_ID}
+
+    # We only need srpm so skip the rest of the stages
+    kernel_type: upstream
+    make_target: rpm
+    builder_image: registry.gitlab.com/cki-project/containers/builder-rawhide
+    builder_image_tag: latest
+    srpm_make_target: dist-srpm
+    skip_build: 'true'
+    skip_publish: 'true'
+    skip_test: 'true'
+
+  trigger:
+    project: redhat/red-hat-ci-tools/kernel/cki-runs/trusted-pipelines
+    branch: kernel-ark
+    strategy: depend
+
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: never
+    - when: on_success
+
+# scheduled job
+merge_upstream:
+  image: registry.gitlab.com/cki-project/containers/builder-fedora
+  variables:
+    GIT_DEPTH: "0"
+    GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/kernel-ark
+  before_script:
+    - echo "fastestmirror=true" >> /etc/dnf/dnf.conf
+    - dnf -y install python3-gitlab git openssh-clients dnf-utils gnupg2
+    - git config user.name "Fedora Kernel Team"
+    - git config user.email "[email protected]"
+    - echo "$PYTHON_GITLAB_CONFIG" >> ~/.python-gitlab.cfg
+    # Need SSH since the clone is set up without write access.
+    - eval $(ssh-agent -s)
+    - echo "$PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$GITLAB_KNOWN_HOSTS" >> ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+    - git remote add gitlab [email protected]:cki-project/kernel-ark.git
+    - gpg2 --import "$TORVALDS_GPG_KEY"
+  script:
+    - git checkout --track origin/master && git describe
+    - git checkout --track origin/os-build && git describe
+    - export PROJECT_ID="$CI_PROJECT_ID"
+    - make dist-merge-upstream-push || exit 1
+  retry: 2
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RAWHIDE_RELEASE == "false"'
+
+# scheduled job
+rawhide_release:
+  image: registry.gitlab.com/cki-project/containers/builder-fedora
+  variables:
+    GIT_DEPTH: "0"
+    GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/kernel-ark
+  before_script:
+    - echo "fastestmirror=true" >> /etc/dnf/dnf.conf
+    - dnf -y install python3-gitlab git openssh-clients dnf-utils gnupg2
+    - git config user.name "Fedora Kernel Team"
+    - git config user.email "[email protected]"
+    - echo "$PYTHON_GITLAB_CONFIG" >> ~/.python-gitlab.cfg
+    # Need SSH since the clone is set up without write access.
+    - eval $(ssh-agent -s)
+    - echo "$PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$GITLAB_KNOWN_HOSTS" >> ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+    - git remote add gitlab [email protected]:cki-project/kernel-ark.git
+    - gpg2 --import "$TORVALDS_GPG_KEY"
+  script:
+    - git checkout --track origin/master && git describe
+    - git checkout --track origin/ark-latest && git describe
+    - git checkout --track origin/os-build && git describe
+    - export PROJECT_ID="$CI_PROJECT_ID"
+    - redhat/scripts/ci/ark-create-release.sh "master" "$CI_PROJECT_ID" || 
exit_code=$?
+    - if [ $exit_code -eq 3 ]; then echo "Tag exists, halting" && exit 0; fi;
+    - if [ $exit_code -ne 0 ]; then echo "Unable to create release tag" && 
exit 1; fi;
+    - git push gitlab os-build
+    - >
+      for branch in $(git branch | grep configs/"$(date +%F)"); do
+        git push \
+          -o merge_request.create \
+          -o merge_request.target=os-build \
+          -o merge_request.remove_source_branch \
+          gitlab "$branch"
+      done;
+    - git push gitlab "$(git describe)"
+    - git push gitlab ark/*
+    - git push -f gitlab ark-latest
+  retry: 2
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $RAWHIDE_RELEASE == "true"'
+
+test_docs:
+  stage: test
+  image: registry.gitlab.com/cki-project/containers/python
+  before_script:
+    - python3 -m venv ~/docs-venv
+    - source ~/docs-venv/bin/activate
+    - pip install sphinx
+    - cd redhat/docs/
+  script: make SPHINXOPTS="-W" html
+  rules:
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "os-build"'
+      changes:
+        - redhat/docs/**/*
+
+
+docs:
+  stage: build
+  image: registry.gitlab.com/cki-project/containers/python
+  before_script:
+    - python3 -m venv ~/docs-venv
+    - source ~/docs-venv/bin/activate
+    - pip install sphinx
+    - cd redhat/docs/
+  script: make SPHINXOPTS="-W" html
+  artifacts:
+    paths:
+      - redhat/docs/_build/html/
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "os-build"'
+      changes:
+        - redhat/docs/**/*
+
+pages:
+  stage: deploy
+  image: registry.gitlab.com/cki-project/containers/python
+  dependencies:
+    - docs
+  script:
+    - mv redhat/docs/_build/html/ public/
+  artifacts:
+    paths:
+      - public
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "os-build"'
+      changes:
+        - redhat/docs/**/*
diff a/.mailmap b/.mailmap
--- a/.mailmap
+++ b/.mailmap
@@ -2,37 +2,44 @@
 # This list is used by git-shortlog to fix a few botched name translations
 # in the git archive, either because the author's full name was messed up
 # and/or not always written the same way, making contributions from the
-# same person appearing not to be so or badly displayed.
+# same person appearing not to be so or badly displayed. Also allows for
+# old email addresses to map to new email addresses.
 #
-# repo-abbrev: /pub/scm/linux/kernel/git/
+# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
+#
+# Please keep this list dictionary sorted.
 #
-
 Aaron Durbin <[email protected]>
 Adam Oldham <[email protected]>
 Adam Radford <[email protected]>
-Adrian Bunk <[email protected]>
 Adriana Reus <[email protected]> <[email protected]>
+Adrian Bunk <[email protected]>
 Alan Cox <[email protected]>
 Alan Cox <[email protected]>
-Aleksey Gorelov <[email protected]>
 Aleksandar Markovic <[email protected]> 
<[email protected]>
-Alex Shi <[email protected]> <[email protected]>
-Alex Shi <[email protected]> <[email protected]>
+Aleksey Gorelov <[email protected]>
+Alexander Lobakin <[email protected]> <[email protected]>
+Alexander Lobakin <[email protected]> <[email protected]>
+Alexander Lobakin <[email protected]> <[email protected]>
 Alexandre Belloni <[email protected]> 
<[email protected]>
-Alexei Starovoitov <[email protected]> <[email protected]>
 Alexei Starovoitov <[email protected]> <[email protected]>
 Alexei Starovoitov <[email protected]> <[email protected]>
+Alexei Starovoitov <[email protected]> <[email protected]>
+Alex Shi <[email protected]> <[email protected]>
+Alex Shi <[email protected]> <[email protected]>
 Al Viro <[email protected]>
 Al Viro <[email protected]>
+Andi Kleen <[email protected]> <[email protected]>
 Andi Shyti <[email protected]> <[email protected]>
 Andreas Herrmann <[email protected]>
-Andrey Ryabinin <[email protected]> <[email protected]>
 Andrew Morton <[email protected]>
-Andrew Murray <[email protected]> <[email protected]>
 Andrew Murray <[email protected]> <[email protected]>
+Andrew Murray <[email protected]> <[email protected]>
 Andrew Vasquez <[email protected]>
+Andrey Ryabinin <[email protected]> <[email protected]>
 Andy Adamson <[email protected]>
-Antoine Tenart <[email protected]>
+Antoine Tenart <[email protected]> <[email protected]>
+Antoine Tenart <[email protected]> <[email protected]>
 Antonio Ospite <[email protected]> <[email protected]>
 Archit Taneja <[email protected]>
 Ard Biesheuvel <[email protected]> <[email protected]>
@@ -40,40 +47,47 @@ Arnaud Patard <[email protected]>
 Arnd Bergmann <[email protected]>
 Axel Dyks <[email protected]>
 Axel Lin <[email protected]>
-Bart Van Assche <[email protected]> <[email protected]>
 Bart Van Assche <[email protected]> <[email protected]>
+Bart Van Assche <[email protected]> <[email protected]>
 Ben Gardner <[email protected]>
 Ben M Cahill <[email protected]>
 Björn Steinbrink <[email protected]>
-Boris Brezillon <[email protected]> <[email protected]>
-Boris Brezillon <[email protected]> <[email protected]>
+Björn Töpel <[email protected]> <[email protected]>
+Björn Töpel <[email protected]> <[email protected]>
 Boris Brezillon <[email protected]> <[email protected]>
 Boris Brezillon <[email protected]> <[email protected]>
+Boris Brezillon <[email protected]> <[email protected]>
+Boris Brezillon <[email protected]> <[email protected]>
 Brian Avery <[email protected]>
 Brian King <[email protected]>
+Changbin Du <[email protected]> <[email protected]>
+Changbin Du <[email protected]> <[email protected]>
 Chao Yu <[email protected]> <[email protected]>
 Chao Yu <[email protected]> <[email protected]>
-Christoph Hellwig <[email protected]>
 Christophe Ricard <[email protected]>
+Christoph Hellwig <[email protected]>
 Corey Minyard <[email protected]>
 Damian Hobson-Garcia <[email protected]>
-Daniel Borkmann <[email protected]> <[email protected]>
-Daniel Borkmann <[email protected]> <[email protected]>
+Daniel Borkmann <[email protected]> <[email protected]>
 Daniel Borkmann <[email protected]> <[email protected]>
 Daniel Borkmann <[email protected]> <[email protected]>
-Daniel Borkmann <[email protected]> <[email protected]>
+Daniel Borkmann <[email protected]> <[email protected]>
+Daniel Borkmann <[email protected]> <[email protected]>
 Daniel Borkmann <[email protected]> <[email protected]>
 David Brownell <[email protected]>
 David Woodhouse <[email protected]>
-Dengcheng Zhu <[email protected]> <[email protected]>
-Dengcheng Zhu <[email protected]> <[email protected]>
 Dengcheng Zhu <[email protected]> <[email protected]>
 Dengcheng Zhu <[email protected]> <[email protected]>
+Dengcheng Zhu <[email protected]> <[email protected]>
+Dengcheng Zhu <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
-Dmitry Eremin-Solenikov <[email protected]>
-Dmitry Safonov <[email protected]> <[email protected]>
-Dmitry Safonov <[email protected]> <[email protected]>
+Dmitry Baryshkov <[email protected]>
+Dmitry Baryshkov <[email protected]> <[[email protected]]>
+Dmitry Baryshkov <[email protected]> <[email protected]>
+Dmitry Baryshkov <[email protected]> <[email protected]>
 Dmitry Safonov <[email protected]> <[email protected]>
+Dmitry Safonov <[email protected]> <[email protected]>
+Dmitry Safonov <[email protected]> <[email protected]>
 Domen Puncer <[email protected]>
 Douglas Gilbert <[email protected]>
 Ed L. Cashin <[email protected]>
@@ -84,51 +98,68 @@ Felix Kuhling <[email protected]>
 Felix Moeller <[email protected]>
 Filipe Lautert <[email protected]>
 Franck Bui-Huu <[email protected]>
-Frank Rowand <[email protected]> <[email protected]>
 Frank Rowand <[email protected]> <[email protected]>
 Frank Rowand <[email protected]> <[email protected]>
+Frank Rowand <[email protected]> <[email protected]>
 Frank Zago <[email protected]>
 Gao Xiang <[email protected]> <[email protected]>
 Gao Xiang <[email protected]> <[email protected]>
+Gerald Schaefer <[email protected]> <[email protected]>
+Gerald Schaefer <[email protected]> <[email protected]>
+Gerald Schaefer <[email protected]> <[email protected]>
 Greg Kroah-Hartman <greg@echidna.(none)>
 Greg Kroah-Hartman <[email protected]>
 Greg Kroah-Hartman <[email protected]>
+Greg Kurz <[email protected]> <[email protected]>
 Gregory CLEMENT <[email protected]> 
<[email protected]>
+Gustavo Padovan <[email protected]>
+Gustavo Padovan <[email protected]>
 Hanjun Guo <[email protected]> <[email protected]>
+Heiko Carstens <[email protected]> <[email protected]>
+Heiko Carstens <[email protected]> <[email protected]>
 Henk Vergonet <[email protected]>
 Henrik Kretzschmar <[email protected]>
 Henrik Rydberg <[email protected]>
 Herbert Xu <[email protected]>
+Huacai Chen <[email protected]> <[email protected]>
+Huacai Chen <[email protected]> <[email protected]>
 Jacob Shin <[email protected]>
 Jaegeuk Kim <[email protected]> <[email protected]>
-Jaegeuk Kim <[email protected]> <[email protected]>
 Jaegeuk Kim <[email protected]> <[email protected]>
+Jaegeuk Kim <[email protected]> <[email protected]>
 Jakub Kicinski <[email protected]> <[email protected]>
 James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <[email protected]>
 James E Wilson <[email protected]>
-James Hogan <[email protected]> <[email protected]>
 James Hogan <[email protected]> <[email protected]>
+James Hogan <[email protected]> <[email protected]>
 James Ketrenos <jketreno@io.(none)>
 Jan Glauber <[email protected]> <[email protected]>
 Jan Glauber <[email protected]> <[email protected]>
 Jan Glauber <[email protected]> <[email protected]>
+Jarkko Sakkinen <[email protected]> <[email protected]>
 Jason Gunthorpe <[email protected]> <[email protected]>
+Jason Gunthorpe <[email protected]> <[email protected]>
 Jason Gunthorpe <[email protected]> <[email protected]>
-Javi Merino <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
+Javi Merino <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
-Jean Tourrilhes <[email protected]>
 <[email protected]> <[email protected]>
+Jean Tourrilhes <[email protected]>
 Jeff Garzik <[email protected]>
-Jeff Layton <[email protected]> <[email protected]>
 Jeff Layton <[email protected]> <[email protected]>
 Jeff Layton <[email protected]> <[email protected]>
+Jeff Layton <[email protected]> <[email protected]>
 Jens Axboe <[email protected]>
 Jens Osterkamp <[email protected]>
+Jiri Slaby <[email protected]> <[email protected]>
+Jiri Slaby <[email protected]> <[email protected]>
+Jiri Slaby <[email protected]> <[email protected]>
+Jiri Slaby <[email protected]> <[email protected]>
+Jiri Slaby <[email protected]> <[email protected]>
 Johan Hovold <[email protected]> <[email protected]>
 Johan Hovold <[email protected]> <[email protected]>
 John Paul Adrian Glaubitz <[email protected]>
@@ -144,30 +175,38 @@ Juha Yrjola <[email protected]>
 Julien Thierry <[email protected]> <[email protected]>
 Kamil Konieczny <[email protected]> <[email protected]>
 Kay Sievers <[email protected]>
+Kees Cook <[email protected]> <[email protected]>
+Kees Cook <[email protected]> <[email protected]>
+Kees Cook <[email protected]> <[email protected]>
+Kees Cook <[email protected]> <[email protected]>
 Kenneth W Chen <[email protected]>
+Konstantin Khlebnikov <[email protected]> <[email protected]>
 Konstantin Khlebnikov <[email protected]> <[email protected]>
 Koushik <[email protected]>
-Krzysztof Kozlowski <[email protected]> <[email protected]>
 Krzysztof Kozlowski <[email protected]> <[email protected]>
+Krzysztof Kozlowski <[email protected]> <[email protected]>
 Kuninori Morimoto <[email protected]>
-Leon Romanovsky <[email protected]> <[email protected]>
-Leon Romanovsky <[email protected]> <[email protected]>
 Leonardo Bras <[email protected]> <[email protected]>
 Leonid I Ananiev <[email protected]>
+Leon Romanovsky <[email protected]> <[email protected]>
+Leon Romanovsky <[email protected]> <[email protected]>
+Leon Romanovsky <[email protected]> <[email protected]>
 Linas Vepstas <[email protected]>
-Linus Lüssing <[email protected]> <[email protected]>
 Linus Lüssing <[email protected]> <[email protected]>
-Li Yang <[email protected]> <[email protected]>
+Linus Lüssing <[email protected]> <[email protected]>
+<[email protected]> <[email protected]>
 Li Yang <[email protected]> <[email protected]>
+Li Yang <[email protected]> <[email protected]>
 Lukasz Luba <[email protected]> <[email protected]>
 Maciej W. Rozycki <[email protected]> <[email protected]>
-Marc Zyngier <[email protected]> <[email protected]>
 Marcin Nowakowski <[email protected]> <[email protected]>
+Marc Zyngier <[email protected]> <[email protected]>
 Mark Brown <[email protected]>
+Mark Starovoytov <[email protected]> <[email protected]>
 Mark Yao <[email protected]> <[email protected]>
-Martin Kepplinger <[email protected]> <[email protected]>
 Martin Kepplinger <[email protected]> <[email protected]>
 Martin Kepplinger <[email protected]> <[email protected]>
+Martin Kepplinger <[email protected]> <[email protected]>
 Mathieu Othacehe <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
@@ -177,22 +216,25 @@ Matthew Wilcox <[email protected]> <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
 Matthieu CASTET <[email protected]>
-Mauro Carvalho Chehab <[email protected]> <[email protected]>
+Matt Ranostay <[email protected]> <[email protected]>
+Matt Ranostay <[email protected]> Matthew Ranostay 
<[email protected]>
+Matt Ranostay <[email protected]> <[email protected]>
+Matt Redfearn <[email protected]> <[email protected]>
 Mauro Carvalho Chehab <[email protected]> <[email protected]>
+Mauro Carvalho Chehab <[email protected]> <[email protected]>
 Mauro Carvalho Chehab <[email protected]> <[email protected]>
+Mauro Carvalho Chehab <[email protected]> <[email protected]>
 Mauro Carvalho Chehab <[email protected]> <[email protected]>
 Mauro Carvalho Chehab <[email protected]> <[email protected]>
-Mauro Carvalho Chehab <[email protected]> <[email protected]>
 Mauro Carvalho Chehab <[email protected]> <[email protected]>
-Matt Ranostay <[email protected]> Matthew Ranostay 
<[email protected]>
-Matt Ranostay <[email protected]> <[email protected]>
-Matt Ranostay <[email protected]> <[email protected]>
-Matt Redfearn <[email protected]> <[email protected]>
 Maxime Ripard <[email protected]> <[email protected]>
 Maxime Ripard <[email protected]> <[email protected]>
 Mayuresh Janorkar <[email protected]>
 Michael Buesch <[email protected]>
 Michel Dänzer <[email protected]>
+Mike Rapoport <[email protected]> <[email protected]>
+Mike Rapoport <[email protected]> <[email protected]>
+Mike Rapoport <[email protected]> <[email protected]>
 Miodrag Dinic <[email protected]> <[email protected]>
 Miquel Raynal <[email protected]> <[email protected]>
 Mitesh shah <[email protected]>
@@ -216,13 +258,13 @@ Paolo 'Blaisorblade' Giarrusso <[email protected]>
 Patrick Mochel <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
+Paul E. McKenney <[email protected]> <[email protected]>
 Paul E. McKenney <[email protected]> <[email protected]>
 Paul E. McKenney <[email protected]> <[email protected]>
-Paul E. McKenney <[email protected]> <[email protected]>
 Paul E. McKenney <[email protected]> <[email protected]>
 Peter A Jonsson <[email protected]>
-Peter Oruba <[email protected]>
 Peter Oruba <[email protected]>
+Peter Oruba <[email protected]>
 Pratyush Anand <[email protected]> <[email protected]>
 Praveen BP <[email protected]>
 Punit Agrawal <[email protected]> <[email protected]>
@@ -235,23 +277,24 @@ Ralf Baechle <[email protected]>
 Ralf Wildenhues <[email protected]>
 Randy Dunlap <[email protected]> <[email protected]>
 Rémi Denis-Courmont <[email protected]>
-Ricardo Ribalda <[email protected]> <[email protected]>
 Ricardo Ribalda <[email protected]> <[email protected]>
 Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado 
<[email protected]>
+Ricardo Ribalda <[email protected]> <[email protected]>
 Ross Zwisler <[email protected]> <[email protected]>
 Rudolf Marek <[email protected]>
 Rui Saraiva <[email protected]>
 Sachin P Sant <[email protected]>
-Sarangdhar Joshi <[email protected]>
+Sakari Ailus <[email protected]> <[email protected]>
 Sam Ravnborg <[email protected]>
-Santosh Shilimkar <[email protected]>
 Santosh Shilimkar <[email protected]>
+Santosh Shilimkar <[email protected]>
+Sarangdhar Joshi <[email protected]>
 Sascha Hauer <[email protected]>
 S.Çağlar Onur <[email protected]>
-Sakari Ailus <[email protected]> <[email protected]>
+Sean Christopherson <[email protected]> <[email protected]>
 Sean Nyekjaer <[email protected]> <[email protected]>
-Sebastian Reichel <[email protected]> <[email protected]>
 Sebastian Reichel <[email protected]> <[email protected]>
+Sebastian Reichel <[email protected]> <[email protected]>
 Sedat Dilek <[email protected]> <[email protected]>
 Shiraz Hashim <[email protected]> <[email protected]>
 Shuah Khan <[email protected]> <[email protected]>
@@ -262,42 +305,43 @@ Simon Arlott <[email protected]> <[email protected]>
 Simon Kelley <[email protected]>
 Stéphane Witzmann <[email protected]>
 Stephen Hemminger <[email protected]>
+Steve Wise <[email protected]> <[email protected]>
+Steve Wise <[email protected]> <[email protected]>
 Subash Abhinov Kasiviswanathan <[email protected]>
 Subhash Jadavani <[email protected]>
 Sudeep Holla <[email protected]> Sudeep KarkadaNagesha 
<[email protected]>
 Sumit Semwal <[email protected]>
+Takashi YOSHII <[email protected]>
 Tejun Heo <[email protected]>
 Thomas Graf <[email protected]>
 Thomas Pedersen <[email protected]>
 Tiezhu Yang <[email protected]> <[email protected]>
 Todor Tomov <[email protected]> <[email protected]>
 Tony Luck <[email protected]>
-TripleX Chung <[email protected]> <[email protected]>
 TripleX Chung <[email protected]> <[email protected]>
+TripleX Chung <[email protected]> <[email protected]>
 Tsuneo Yoshioka <[email protected]>
+Tycho Andersen <[email protected]> <[email protected]>
 Uwe Kleine-König <[email protected]>
+Uwe Kleine-König <[email protected]>
+Uwe Kleine-König <[email protected]>
 Uwe Kleine-König <[email protected]>
 Uwe Kleine-König <[email protected]>
 Valdis Kletnieks <[email protected]>
 Vinod Koul <[email protected]> <[email protected]>
 Vinod Koul <[email protected]> <[email protected]>
 Vinod Koul <[email protected]> <[email protected]>
+Viresh Kumar <[email protected]> <[email protected]>
 Viresh Kumar <[email protected]> <[email protected]>
 Viresh Kumar <[email protected]> <[email protected]>
-Viresh Kumar <[email protected]> <[email protected]>
 Vivien Didelot <[email protected]> <[email protected]>
 Vlad Dogaru <[email protected]> <[email protected]>
-Vladimir Davydov <[email protected]> <[email protected]>
 Vladimir Davydov <[email protected]> <[email protected]>
-Takashi YOSHII <[email protected]>
+Vladimir Davydov <[email protected]> <[email protected]>
+WeiXiong Liao <[email protected]> <[email protected]>
 Will Deacon <[email protected]> <[email protected]>
-Wolfram Sang <[email protected]> <[email protected]>
 Wolfram Sang <[email protected]> <[email protected]>
+Wolfram Sang <[email protected]> <[email protected]>
 Yakir Yang <[email protected]> <[email protected]>
 Yusuke Goda <[email protected]>
-Gustavo Padovan <[email protected]>
-Gustavo Padovan <[email protected]>
-Changbin Du <[email protected]> <[email protected]>
-Changbin Du <[email protected]> <[email protected]>
-Steve Wise <[email protected]> <[email protected]>
-Steve Wise <[email protected]> <[email protected]>
+Zhu Yanjun <[email protected]> <[email protected]>
diff a/CREDITS b/CREDITS
--- a/CREDITS
+++ b/CREDITS
@@ -34,7 +34,7 @@ S: Romania
 
 N: Mark Adler
 E: [email protected]
-W: http://alumnus.caltech.edu/~madler/
+W: https://alumnus.caltech.edu/~madler/
 D: zlib decompression
 
 N: Monalisa Agrawal
@@ -62,7 +62,7 @@ S: United Kingdom
 
 N: Werner Almesberger
 E: [email protected]
-W: http://www.almesberger.net/
+W: https://www.almesberger.net/
 D: dosfs, LILO, some fd features, ATM, various other hacks here and there
 S: Buenos Aires
 S: Argentina
@@ -96,9 +96,9 @@ S: USA
 
 N: Erik Andersen
 E: [email protected]
-W: http://www.codepoet.org/
+W: https://www.codepoet.org/
 P: 1024D/30D39057 1BC4 2742 E885 E4DE 9301  0C82 5F9B 643E 30D3 9057
-D: Maintainer of ide-cd and Uniform CD-ROM driver, 
+D: Maintainer of ide-cd and Uniform CD-ROM driver,
 D: ATAPI CD-Changer support, Major 2.1.x CD-ROM update.
 S: 352 North 525 East
 S: Springville, Utah 84663
@@ -114,7 +114,7 @@ S: Canada K2P 0X3
 
 N: H. Peter Anvin
 E: [email protected]
-W: http://www.zytor.com/~hpa/
+W: https://www.zytor.com/~hpa/
 P: 2047/2A960705 BA 03 D3 2C 14 A8 A8 BD  1E DF FE 69 EE 35 BD 74
 D: Author of the SYSLINUX boot loader, maintainer of the linux.* news
 D: hierarchy and the Linux Device List; various kernel hacks
@@ -124,7 +124,7 @@ S: USA
 
 N: Andrea Arcangeli
 E: [email protected]
-W: http://www.kernel.org/pub/linux/kernel/people/andrea/
+W: https://www.kernel.org/pub/linux/kernel/people/andrea/
 P: 1024D/68B9CB43 13D9 8355 295F 4823 7C49  C012 DFA1 686E 68B9 CB43
 P: 1024R/CB4660B9 CC A0 71 81 F4 A0 63 AC  C0 4B 81 1D 8C 15 C8 E5
 D: Parport hacker
@@ -191,6 +191,10 @@ N: Krishna Balasubramanian
 E: [email protected]
 D: Wrote SYS V IPC (part of standard kernel since 0.99.10)
 
+B: Robert Baldyga
+E: [email protected]
+D: Samsung S3FWRN5 NCI NFC Controller
+
 N: Chris Ball
 E: [email protected]
 D: Former maintainer of the MMC/SD/SDIO subsystem.
@@ -259,7 +263,7 @@ N: Paul Barton-Davis
 E: [email protected]
 D: Driver for WaveFront soundcards (Turtle Beach Maui, Tropez, Tropez+)
 D: Various bugfixes and changes to sound drivers
-S: USA 
+S: USA
 
 N: Carlos Henrique Bauer
 E: [email protected]
@@ -339,7 +343,7 @@ S: Haifa, Israel
 
 N: Johannes Berg
 E: [email protected]
-W: http://johannes.sipsolutions.net/
+W: https://johannes.sipsolutions.net/
 P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D  8532 E0F3 73F3 7BF9 099A
 D: powerpc & 802.11 hacker
 
@@ -376,7 +380,7 @@ D: Original author of the Linux networking code
 
 N: Anton Blanchard
 E: [email protected]
-W: http://samba.org/~anton/
+W: https://samba.org/~anton/
 P: 1024/8462A731 4C 55 86 34 44 59 A7 99  2B 97 88 4A 88 9A 0D 97
 D: sun4 port, Sparc hacker
 
@@ -509,7 +513,7 @@ S: Sweden
 
 N: Paul Bristow
 E: [email protected]
-W: http://paulbristow.net/linux/idefloppy.html
+W: https://paulbristow.net/linux/idefloppy.html
 D: Maintainer of IDE/ATAPI floppy driver
 
 N: Stefano Brivio
@@ -518,7 +522,7 @@ D: Broadcom B43 driver
 
 N: Dominik Brodowski
 E: [email protected]
-W: http://www.brodo.de/
+W: https://www.brodo.de/
 P: 1024D/725B37C6  190F 3E77 9C89 3B6D BECD  46EE 67C3 0308 725B 37C6
 D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils
 S: Tuebingen, Germany
@@ -706,6 +710,10 @@ S: Las Cuevas 2385 - Bo Guemes
 S: Las Heras, Mendoza CP 5539
 S: Argentina
 
+N: Jay Cliburn
+E: [email protected]
+D: ATLX Ethernet drivers
+
 N: Steven P. Cole
 E: [email protected]
 E: [email protected]
@@ -736,6 +744,11 @@ S: (ask for current address)
 S: Portland, Oregon
 S: USA
 
+N: Jason Cooper
+D: ARM/Marvell SOC co-maintainer
+D: irqchip co-maintainer
+D: MVEBU PCI DRIVER co-maintainer
+
 N: Robin Cornelius
 E: [email protected]
 D: Ralink rt2x00 WLAN driver
@@ -845,6 +858,12 @@ D: trivial hack to add variable address length routing to 
Rose.
 D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO
 D: ax25-utils maintainer.
 
+N: Kamil Debski
+E: [email protected]
+D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers
+D: Samsung USB2 phy drivers
+D: PWM fan driver
+
 N: Helge Deller
 E: [email protected]
 W: http://www.parisc-linux.org/
@@ -865,7 +884,7 @@ D: Promise DC4030VL caching HD controller drivers
 
 N: Todd J. Derr
 E: [email protected]
-W: http://www.wordsmith.org/~tjd
+W: https://www.wordsmith.org/~tjd
 D: Random console hacks and other miscellaneous stuff
 S: 3000 FORE Drive
 S: Warrendale, Pennsylvania 15086
@@ -894,8 +913,8 @@ S: USA
 
 N: Matt Domsch
 E: [email protected]
-W: http://www.dell.com/linux
-W: http://domsch.com/linux
+W: https://www.dell.com/linux
+W: https://domsch.com/linux
 D: Linux/IA-64
 D: Dell PowerEdge server, SCSI layer, misc drivers, and other patches
 S: Dell Inc.
@@ -992,7 +1011,7 @@ S: USA
 
 N: Randy Dunlap
 E: [email protected]
-W: http://www.infradead.org/~rdunlap/
+W: https://www.infradead.org/~rdunlap/
 D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
 D: x86 SMP, ACPI, bootflag hacking
 D: documentation, builds
@@ -1157,7 +1176,7 @@ S: Germany
 
 N: Jeremy Fitzhardinge
 E: [email protected]
-W: http://www.goop.org/~jeremy
+W: https://www.goop.org/~jeremy
 D: author of userfs filesystem
 D: Improved mmap and munmap handling
 D: General mm minor tidyups
@@ -1195,7 +1214,7 @@ N: Daniel J. Frasnelli
 E: [email protected]
 W: http://www.alphalinux.org/
 P: 1024/3EF87611 B9 F1 44 50 D3 E8 C2 80  DA E5 55 AA 56 7C 42 DA
-D: DEC Alpha hacker 
+D: DEC Alpha hacker
 D: Miscellaneous bug squisher
 
 N: Jim Freeman
@@ -1269,6 +1288,10 @@ D: Major kbuild rework during the 2.5 cycle
 D: ISDN Maintainer
 S: USA
 
+N: Gerrit Renker
+E: [email protected]
+D: DCCP protocol support.
+
 N: Philip Gladstone
 E: [email protected]
 D: Kernel / timekeeping stuff
@@ -1295,7 +1318,7 @@ S: P.O. Box 76, Epping
 S: New South Wales, 2121
 S: Australia
 
-N: Carlos E. Gorges 
+N: Carlos E. Gorges
 E: [email protected]
 D: fix smp support on cmpci driver
 P: 2048G/EA3C4B19 FF31 33A6 0362 4915 B7EB  E541 17D0 0379 EA3C 4B19
@@ -1336,7 +1359,7 @@ E: [email protected]
 E: [email protected]
 D: Current Belkin USB Serial Adapter F5U103 hacker
 D: Kernel hacker, embedded systems
-S: 7802 Fitzwater Road   
+S: 7802 Fitzwater Road
 S: Brecksville, OH  44141-1334
 S: USA
 
@@ -1377,7 +1400,7 @@ N: Grant Guenther
 E: [email protected]
 W: http://www.torque.net/linux-pp.html
 D: original author of ppa driver for parallel port ZIP drive
-D: original architect of the parallel-port sharing scheme 
+D: original architect of the parallel-port sharing scheme
 D: PARIDE subsystem: drivers for parallel port IDE & ATAPI devices
 S: 44 St. Joseph Street, Suite 506
 S: Toronto, Ontario, M4Y 2W4
@@ -1460,7 +1483,7 @@ S: The Netherlands
 
 N: Oliver Hartkopp
 E: [email protected]
-W: http://www.volkswagen.de
+W: https://www.volkswagen.de
 D: Controller Area Network (network layer core)
 S: Brieffach 1776
 S: 38436 Wolfsburg
@@ -1519,7 +1542,7 @@ N: Benjamin Herrenschmidt
 E: [email protected]
 D: Various parts of PPC/PPC64 & PowerMac
 S: 312/107 Canberra Avenue
-S: Griffith, ACT 2603 
+S: Griffith, ACT 2603
 S: Australia
 
 N: Andreas Herrmann
@@ -1599,13 +1622,13 @@ S: Germany
 
 N: Kenji Hollis
 E: [email protected]
-W: http://www.bitgate.com/
+W: https://www.bitgate.com/
 D: Berkshire PC Watchdog Driver
 D: Small/Industrial Driver Project
 
 N: Nick Holloway
 E: [email protected]
-W: http://www.pyrites.org.uk/
+W: https://www.pyrites.org.uk/
 P: 1024/36115A04 F4E1 3384 FCFD C055 15D6  BA4C AB03 FBF8 3611 5A04
 D: Occasional Linux hacker...
 S: (ask for current address)
@@ -1655,7 +1678,7 @@ S: USA
 
 N: Harald Hoyer
 E: [email protected]
-W: http://www.harald-hoyer.de
+W: https://www.harald-hoyer.de
 D: ip_masq_quake
 D: md boot support
 S: Am Strand 5
@@ -1821,7 +1844,7 @@ S: Hungary
 N: Bernhard Kaindl
 E: [email protected]
 E: [email protected]
-D: Author of a menu based configuration tool, kmenu, which 
+D: Author of a menu based configuration tool, kmenu, which
 D: is the predecessor of 'make menuconfig' and 'make xconfig'.
 D: digiboard driver update(modularisation work and 2.1.x upd)
 S: Tallak 95
@@ -1856,7 +1879,7 @@ E: [email protected]
 D: Author of the COSA/SRP sync serial board driver.
 D: Port of the syncppp.c from the 2.0 to the 2.1 kernel.
 P: 1024/D3498839 0D 99 A7 FB 20 66 05 D7  8B 35 FC DE 05 B1 8A 5E
-W: http://www.fi.muni.cz/~kas/
+W: https://www.fi.muni.cz/~kas/
 S: c/o Faculty of Informatics, Masaryk University
 S: Botanicka' 68a
 S: 602 00 Brno
@@ -1906,6 +1929,15 @@ S: 660 Harvard Ave. #7
 S: Santa Clara, CA 95051
 S: USA
 
+N: Kukjin Kim
+E: [email protected]
+D: Samsung S3C, S5P and Exynos ARM architectures
+
+N: Sangbeom Kim
+E: [email protected]
+D: Samsung SoC Audio (ASoC) drivers
+D: Samsung PMIC (RTC, regulators, MFD) drivers
+
 N: Russell King
 E: [email protected]
 D: Linux/arm integrator, maintainer & hacker
@@ -1942,6 +1974,10 @@ S: Post Office Box 611311
 S: San Jose, California 95161-1311
 S: USA
 
+N: Hartmut Knaack
+E: [email protected]
+D: IIO subsystem and drivers
+
 N: Thorsten Knabe
 E: Thorsten Knabe <[email protected]>
 E: Thorsten Knabe <[email protected]>
@@ -1999,7 +2035,7 @@ W: http://www.xos.nl/
 D: IP transparent proxy support
 S: X/OS Experts in Open Systems BV
 S: Kruislaan 419
-S: 1098 VA Amsterdam 
+S: 1098 VA Amsterdam
 S: The Netherlands
 
 N: Goran Koruga
@@ -2017,7 +2053,7 @@ S: Prague, Czech Republic
 
 N: Gene Kozin
 E: [email protected]
-W: http://www.sangoma.com
+W: https://www.sangoma.com
 D: WAN Router & Sangoma WAN drivers
 S: Sangoma Technologies Inc.
 S: 7170 Warden Avenue, Unit 2
@@ -2071,7 +2107,7 @@ S: Germany
 
 N: Andrzej M. Krzysztofowicz
 E: [email protected]
-D: Some 8-bit XT disk driver and devfs hacking 
+D: Some 8-bit XT disk driver and devfs hacking
 D: Aladdin 1533/1543(C) chipset IDE
 D: PIIX chipset IDE
 S: ul. Matemblewska 1B/10
@@ -2110,9 +2146,13 @@ E: [email protected]
 E: [email protected]
 D: Original author of software suspend
 
+N: Alexey Kuznetsov
+E: [email protected]
+D: Author and maintainer of large parts of the networking stack
+
 N: Jaroslav Kysela
 E: [email protected]
-W: http://www.perex.cz
+W: https://www.perex.cz
 D: Original Author and Maintainer for HP 10/100 Mbit Network Adapters
 D: ISA PnP
 S: Sindlovy Dvory 117
@@ -2316,7 +2356,7 @@ S: Finland
 
 N: Daniel J. Maas
 E: [email protected]
-W: http://www.maasdigital.com
+W: https://www.maasdigital.com
 D: dv1394
 
 N: Hamish Macdonald
@@ -2446,7 +2486,7 @@ E: [email protected]
 D: Logical Volume Manager
 S: Bartningstr. 12
 S: 64289 Darmstadt
-S: Germany 
+S: Germany
 
 N: Mark W. McClelland
 E: [email protected]
@@ -2482,15 +2522,6 @@ W: http://www.rdrop.com/users/paulmck/
 D: RCU and variants
 D: rcutorture module
 
-N: Mike McLagan
-E: [email protected]
-W: http://www.invlogic.com/~mmclagan
-D: DLCI/FRAD drivers for Sangoma SDLAs
-S: Innovative Logic Corp
-S: Post Office Box 1068
-S: Laurel, Maryland 20732
-S: USA
-
 N: Bradley McLean
 E: [email protected]
 D: Device driver hacker
@@ -2530,7 +2561,7 @@ E: [email protected]
 P: 1024/04B6E8F5 6C 77 33 CA CC D6 22 03  AB AB 15 A3 AE AD 39 7D
 D: Kernel hacker. PostgreSQL hacker. Software watchdog daemon.
 D: Maintainer of several Debian packages
-S: Th.-Heuss-Str. 61 
+S: Th.-Heuss-Str. 61
 S: D-41812 Erkelenz
 S: Germany
 
@@ -2647,7 +2678,7 @@ D: bug fixes, documentation, minor hackery
 
 N: Paul Moore
 E: [email protected]
-W: http://www.paul-moore.com
+W: https://www.paul-moore.com
 D: NetLabel, SELinux, audit
 
 N: James Morris
@@ -2677,6 +2708,10 @@ N: Wolfgang Muees
 E: [email protected]
 D: Auerswald USB driver
 
+N: Shrijeet Mukherjee
+E: [email protected]
+D: Network routing domains (VRF).
+
 N: Paul Mundt
 E: [email protected]
 D: SuperH maintainer
@@ -2768,7 +2803,7 @@ E: [email protected]
 W: http://www.i-Connect.Net/~mike/
 D: Developer and maintainer of the EATA-DMA SCSI driver
 D: Co-developer EATA-PIO SCSI driver
-D: /proc/scsi and assorted other snippets 
+D: /proc/scsi and assorted other snippets
 S: Zum Schiersteiner Grund 2
 S: 55127 Mainz
 S: Germany
@@ -2786,7 +2821,7 @@ N: David C. Niemi
 E: [email protected]
 W: http://www.tux.org/~niemi/
 D: Assistant maintainer of Mtools, fdutils, and floppy driver
-D: Administrator of Tux.Org Linux Server, http://www.tux.org
+D: Administrator of Tux.Org Linux Server, https://www.tux.org
 S: 2364 Old Trail Drive
 S: Reston, Virginia 20191
 S: USA
@@ -2835,6 +2870,10 @@ D: IPX development and support
 N: Venkatesh Pallipadi (Venki)
 D: x86/HPET
 
+N: Kyungmin Park
+E: [email protected]
+D: Samsung S5Pv210 and Exynos4210 mobile platforms
+
 N: David Parsons
 E: [email protected]
 D: improved memory detection code.
@@ -2850,7 +2889,7 @@ S: USA
 
 N: Mikulas Patocka
 E: [email protected]
-W: http://artax.karlin.mff.cuni.cz/~mikulas/
+W: https://artax.karlin.mff.cuni.cz/~mikulas/
 P: 1024/BB11D2D5 A0 F1 28 4A C4 14 1E CF  92 58 7A 8F 69 BC A4 D3
 D: Read/write HPFS filesystem
 S: Weissova 8
@@ -2872,7 +2911,7 @@ D: RFC2385 Support for TCP
 
 N: Barak A. Pearlmutter
 E: [email protected]
-W: http://www.cs.unm.edu/~bap/
+W: https://www.cs.unm.edu/~bap/
 P: 512/602D785D 9B A1 83 CD EE CB AD 93  20 C6 4C B7 F5 E9 60 D4
 D: Author of mark-and-sweep GC integrated by Alan Cox
 S: Computer Science Department
@@ -3002,7 +3041,7 @@ D: Embedded PowerPC 4xx/6xx/7xx/74xx support
 S: Chandler, Arizona 85249
 S: USA
 
-N: Frederic Potter 
+N: Frederic Potter
 E: [email protected]
 D: Some PCI kernel support
 
@@ -3035,7 +3074,7 @@ S: United Kingdom
 
 N: Daniel Quinlan
 E: [email protected]
-W: http://www.pathname.com/~quinlan/
+W: https://www.pathname.com/~quinlan/
 D: FSSTND coordinator; FHS editor
 D: random Linux documentation, patches, and hacks
 S: 4390 Albany Drive #41A
@@ -3130,7 +3169,7 @@ S: France
 
 N: Rik van Riel
 E: [email protected]
-W: http://www.surriel.com/
+W: https://www.surriel.com/
 D: Linux-MM site, Documentation/admin-guide/sysctl/*, swap/mm readaround
 D: kswapd fixes, random kernel hacker, rmap VM,
 D: nl.linux.org administrator, minor scheduler additions
@@ -3246,7 +3285,7 @@ S: Germany
 
 N: Paul `Rusty' Russell
 E: [email protected]
-W: http://ozlabs.org/~rusty
+W: https://ozlabs.org/~rusty
 D: Ruggedly handsome.
 D: netfilter, ipchains with Michael Neuling.
 S: 52 Moore St
@@ -3369,7 +3408,7 @@ S: Germany
 
 N: Robert Schwebel
 E: [email protected]
-W: http://www.schwebel.de
+W: https://www.schwebel.de
 D: Embedded hacker and book author,
 D: AMD Elan support for Linux
 S: Pengutronix
@@ -3435,21 +3474,21 @@ S: Klosterweg 28 / i309
 S: 76131 Karlsruhe
 S: Germany
 
-N: James Simmons 
+N: James Simmons
 E: [email protected]
-E: [email protected] 
+E: [email protected]
 D: Frame buffer device maintainer
 D: input layer development
 D: tty/console layer
-D: various mipsel devices 
-S: 115 Carmel Avenue 
+D: various mipsel devices
+S: 115 Carmel Avenue
 S: El Cerrito CA 94530
-S: USA 
+S: USA
 
 N: Jaspreet Singh
 E: [email protected]
 W: www.sangoma.com
-D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards 
+D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards
 S: Sangoma Technologies Inc.,
 S: 1001 Denison Street
 S: Suite 101
@@ -3473,7 +3512,7 @@ N: Craig Small
 E: [email protected]
 E: [email protected] (packet radio)
 D: Gracilis PackeTwin device driver
-D: RSPF daemon 
+D: RSPF daemon
 S: 10 Stockalls Place
 S: Minto, NSW, 2566
 S: Australia
@@ -3545,7 +3584,7 @@ S: Australia
 N: Henrik Storner
 E: [email protected]
 W: http://www.image.dk/~storner/
-W: http://www.sslug.dk/
+W: https://www.sslug.dk/
 D: Configure script: Invented tristate for module-configuration
 D: vfat/msdos integration, kerneld docs, Linux promotion
 D: Miscellaneous bug-fixes
@@ -3579,7 +3618,7 @@ S: USA
 
 N: Eugene Surovegin
 E: [email protected]
-W: http://kernel.ebshome.net/
+W: https://kernel.ebshome.net/
 P: 1024D/AE5467F1 FF22 39F1 6728 89F6 6E6C  2365 7602 F33D AE54 67F1
 D: Embedded PowerPC 4xx: EMAC, I2C, PIC and random hacks/fixes
 S: Sunnyvale, California 94085
@@ -3609,7 +3648,7 @@ S: France
 
 N: Urs Thuermann
 E: [email protected]
-W: http://www.volkswagen.de
+W: https://www.volkswagen.de
 D: Controller Area Network (network layer core)
 S: Brieffach 1776
 S: 38436 Wolfsburg
@@ -3656,7 +3695,7 @@ S: Canada K2L 1S2
 
 N: Andrew Tridgell
 E: [email protected]
-W: http://samba.org/tridge/
+W: https://samba.org/tridge/
 D: dosemu, networking, samba
 S: 3 Ballow Crescent
 S: MacGregor A.C.T 2615
@@ -3683,7 +3722,7 @@ N: Tsu-Sheng Tsao
 E: [email protected]
 D: IGMP(Internet Group Management Protocol) version 2
 S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
-S: Taipei 
+S: Taipei
 S: Taiwan 112
 S: Republic of China
 S: 24335 Delta Drive
@@ -3844,7 +3883,7 @@ D: Produced the Slackware distribution, updated the 
SVGAlib
 D: patches for ghostscript, worked on color 'ls', etc.
 S: 301 15th Street S.
 S: Moorhead, Minnesota 56560
-S: USA 
+S: USA
 
 N: Jos Vos
 E: [email protected]
@@ -3852,7 +3891,7 @@ W: http://www.xos.nl/
 D: Various IP firewall updates, ipfwadm
 S: X/OS Experts in Open Systems BV
 S: Kruislaan 419
-S: 1098 VA Amsterdam 
+S: 1098 VA Amsterdam
 S: The Netherlands
 
 N: Jeroen Vreeken
@@ -3894,7 +3933,7 @@ D: The Linux Support Team Erlangen
 N: David Weinehall
 E: [email protected]
 P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36  E1D1 D14E 8526 DC47 CA16
-W: http://www.acc.umu.se/~tao/
+W: https://www.acc.umu.se/~tao/
 D: v2.0 kernel maintainer
 D: Fixes for the NE/2-driver
 D: Miscellaneous MCA-support
@@ -3919,7 +3958,7 @@ S: USA
 N: Harald Welte
 E: [email protected]
 P: 1024D/30F48BFF DBDE 6912 8831 9A53 879B  9190 5DA5 C655 30F4 8BFF
-W: http://gnumonks.org/users/laforge
+W: https://gnumonks.org/users/laforge
 D: netfilter: new nat helper infrastructure
 D: netfilter: ULOG, ECN, DSCP target
 D: netfilter: TTL match
@@ -4087,10 +4126,14 @@ S: B-1206 Jingmao Guojigongyu
 S: 16 Baliqiao Nanjie, Beijing 101100
 S: People's Repulic of China
 
+N: Aviad Yehezkel
+E: [email protected]
+D: Kernel TLS implementation and offload support.
+
 N: Victor Yodaiken
 E: [email protected]
 D: RTLinux (RealTime Linux)
-S: POB 1822 
+S: POB 1822
 S: Socorro NM, 87801
 S: USA
 
@@ -4144,6 +4187,10 @@ S: 1507 145th Place SE #B5
 S: Bellevue, Washington 98007
 S: USA
 
+N: Wensong Zhang
+E: [email protected]
+D: IP virtual server (IPVS).
+
 N: Haojian Zhuang
 E: [email protected]
 D: MMP support
@@ -4188,7 +4235,7 @@ D: EISA/sysfs subsystem
 S: France
 
 # Don't add your name here, unless you really _are_ after Marc
-# alphabetically. Leonard used to be very proud of being the 
+# alphabetically. Leonard used to be very proud of being the
 # last entry, and he'll get positively pissed if he can't even
 # be second-to-last.  (and this file really _is_ supposed to be
 # in alphabetic order)
diff a/Documentation/ABI/README b/Documentation/ABI/README
--- a/Documentation/ABI/README
+++ b/Documentation/ABI/README
@@ -32,7 +32,7 @@ The different levels of stability are:
        layout of the files below for details on how to do this.)
 
   obsolete/
-       This directory documents interfaces that are still remaining in
+       This directory documents interfaces that are still remaining in
        the kernel, but are marked to be removed at some later point in
        time.  The description of the interface will document the reason
        why it is obsolete and when it can be expected to be removed.
@@ -58,6 +58,14 @@ Users:               All users of this interface who wish to 
be notified when
                be changed further.
 
 
+Note:
+   The fields should be use a simple notation, compatible with ReST markup.
+   Also, the file **should not** have a top-level index, like::
+
+       ===
+       foo
+       ===
+
 How things move between levels:
 
 Interfaces in stable may move to obsolete, as long as the proper
diff a/Documentation/ABI/obsolete/sysfs-class-dax 
b/Documentation/ABI/obsolete/sysfs-class-dax
--- a/Documentation/ABI/obsolete/sysfs-class-dax
+++ b/Documentation/ABI/obsolete/sysfs-class-dax
@@ -8,11 +8,11 @@ Description:  Device DAX is the device-centric analogue of 
Filesystem
                system.  Device DAX is strict, precise and predictable.
                Specifically this interface:
 
-               1/ Guarantees fault granularity with respect to a given
-               page size (pte, pmd, or pud) set at configuration time.
+               1. Guarantees fault granularity with respect to a given
+                  page size (pte, pmd, or pud) set at configuration time.
 
-               2/ Enforces deterministic behavior by being strict about
-               what fault scenarios are supported.
+               2. Enforces deterministic behavior by being strict about
+                  what fault scenarios are supported.
 
                The /sys/class/dax/ interface enumerates all the
                device-dax instances in the system. The ABI is
diff a/Documentation/ABI/obsolete/sysfs-class-net-batman-adv 
b/Documentation/ABI/obsolete/sysfs-class-net-batman-adv
--- a/Documentation/ABI/obsolete/sysfs-class-net-batman-adv
+++ /dev/null
@@ -1,32 +0,0 @@
-This ABI is deprecated and will be removed after 2021. It is
-replaced with the batadv generic netlink family.
-
-What:           /sys/class/net/<iface>/batman-adv/elp_interval
-Date:           Feb 2014
-Contact:        Linus Lüssing <[email protected]>
-Description:
-                Defines the interval in milliseconds in which batman
-                emits probing packets for neighbor sensing (ELP).
-
-What:           /sys/class/net/<iface>/batman-adv/iface_status
-Date:           May 2010
-Contact:        Marek Lindner <[email protected]>
-Description:
-                Indicates the status of <iface> as it is seen by batman.
-
-What:           /sys/class/net/<iface>/batman-adv/mesh_iface
-Date:           May 2010
-Contact:        Marek Lindner <[email protected]>
-Description:
-                The /sys/class/net/<iface>/batman-adv/mesh_iface file
-                displays the batman mesh interface this <iface>
-                currently is associated with.
-
-What:           /sys/class/net/<iface>/batman-adv/throughput_override
-Date:           Feb 2014
-Contact:        Antonio Quartulli <[email protected]>
-description:
-                Defines the throughput value to be used by B.A.T.M.A.N. V
-                when estimating the link throughput using this interface.
-                If the value is set to 0 then batman-adv will try to
-                estimate the throughput by itself.
diff a/Documentation/ABI/obsolete/sysfs-class-net-mesh 
b/Documentation/ABI/obsolete/sysfs-class-net-mesh
--- a/Documentation/ABI/obsolete/sysfs-class-net-mesh
+++ /dev/null
@@ -1,110 +0,0 @@
-This ABI is deprecated and will be removed after 2021. It is
-replaced with the batadv generic netlink family.
-
-What:           /sys/class/net/<mesh_iface>/mesh/aggregated_ogms
-Date:           May 2010
-Contact:        Marek Lindner <[email protected]>
-Description:
-                Indicates whether the batman protocol messages of the
-                mesh <mesh_iface> shall be aggregated or not.
-
-What:           /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation
-Date:           May 2011
-Contact:        Antonio Quartulli <[email protected]>
-Description:
-                Indicates whether the data traffic going from a
-                wireless client to another wireless client will be
-                silently dropped. <vlan_subdir> is empty when referring
-               to the untagged lan.
-
-What:           /sys/class/net/<mesh_iface>/mesh/bonding
-Date:           June 2010
-Contact:        Simon Wunderlich <[email protected]>
-Description:
-                Indicates whether the data traffic going through the
-                mesh will be sent using multiple interfaces at the
-                same time (if available).
-
-What:           /sys/class/net/<mesh_iface>/mesh/bridge_loop_avoidance
-Date:           November 2011
-Contact:        Simon Wunderlich <[email protected]>
-Description:
-                Indicates whether the bridge loop avoidance feature
-                is enabled. This feature detects and avoids loops
-                between the mesh and devices bridged with the soft
-                interface <mesh_iface>.
-
-What:           /sys/class/net/<mesh_iface>/mesh/fragmentation
-Date:           October 2010
-Contact:        Andreas Langer <[email protected]>
-Description:
-                Indicates whether the data traffic going through the
-                mesh will be fragmented or silently discarded if the
-                packet size exceeds the outgoing interface MTU.
-
-What:           /sys/class/net/<mesh_iface>/mesh/gw_bandwidth
-Date:           October 2010
-Contact:        Marek Lindner <[email protected]>
-Description:
-                Defines the bandwidth which is propagated by this
-                node if gw_mode was set to 'server'.
-
-What:           /sys/class/net/<mesh_iface>/mesh/gw_mode
-Date:           October 2010
-Contact:        Marek Lindner <[email protected]>
-Description:
-                Defines the state of the gateway features. Can be
-                either 'off', 'client' or 'server'.
-
-What:           /sys/class/net/<mesh_iface>/mesh/gw_sel_class
-Date:           October 2010
-Contact:        Marek Lindner <[email protected]>
-Description:
-                Defines the selection criteria this node will use
-                to choose a gateway if gw_mode was set to 'client'.
-
-What:           /sys/class/net/<mesh_iface>/mesh/hop_penalty
-Date:           Oct 2010
-Contact:        Linus Lüssing <[email protected]>
-Description:
-                Defines the penalty which will be applied to an
-                originator message's tq-field on every hop.
-
-What:          /sys/class/net/<mesh_iface>/mesh/isolation_mark
-Date:          Nov 2013
-Contact:       Antonio Quartulli <[email protected]>
-Description:
-               Defines the isolation mark (and its bitmask) which
-               is used to classify clients as "isolated" by the
-               Extended Isolation feature.
-
-What:           /sys/class/net/<mesh_iface>/mesh/multicast_mode
-Date:           Feb 2014
-Contact:        Linus Lüssing <[email protected]>
-Description:
-                Indicates whether multicast optimizations are enabled
-                or disabled. If set to zero then all nodes in the
-                mesh are going to use classic flooding for any
-                multicast packet with no optimizations.
-
-What:           /sys/class/net/<mesh_iface>/mesh/network_coding
-Date:           Nov 2012
-Contact:        Martin Hundeboll <[email protected]>
-Description:
-                Controls whether Network Coding (using some magic
-                to send fewer wifi packets but still the same
-                content) is enabled or not.
-
-What:           /sys/class/net/<mesh_iface>/mesh/orig_interval
-Date:           May 2010
-Contact:        Marek Lindner <[email protected]>
-Description:
-                Defines the interval in milliseconds in which batman
-                sends its protocol messages.
-
-What:           /sys/class/net/<mesh_iface>/mesh/routing_algo
-Date:           Dec 2011
-Contact:        Marek Lindner <[email protected]>
-Description:
-                Defines the routing procotol this mesh instance
-                uses to find the optimal paths through the mesh.
diff a/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra 
b/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
--- a/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
+++ b/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
@@ -7,10 +7,13 @@ Description:  It is possible to switch the cpi setting of the 
mouse with the
                setting reported by the mouse. This number has to be further
                processed to receive the real dpi value:
 
+               ===== ====
                VALUE DPI
+               ===== ====
                1     400
                2     800
                4     1600
+               ===== ====
 
                This file is readonly.
                Has never been used. If bookkeeping is done, it's done in 
userland tools.
diff a/Documentation/ABI/obsolete/sysfs-gpio 
b/Documentation/ABI/obsolete/sysfs-gpio
--- a/Documentation/ABI/obsolete/sysfs-gpio
+++ b/Documentation/ABI/obsolete/sysfs-gpio
@@ -13,6 +13,8 @@ Description:
   GPIOs are identified as they are inside the kernel, using integers in
   the range 0..INT_MAX.  See Documentation/admin-guide/gpio for more 
information.
 
+  ::
+
     /sys/class/gpio
        /export ... asks the kernel to export a GPIO to userspace
        /unexport ... to return a GPIO to the kernel
diff a/Documentation/ABI/obsolete/sysfs-selinux-checkreqprot 
b/Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
--- a/Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
+++ b/Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
@@ -15,7 +15,7 @@ Description:
        actual protection), and Android and Linux distributions have been
        explicitly writing a "0" to /sys/fs/selinux/checkreqprot during
        initialization for some time.  Support for setting checkreqprot to 1
-       will be removed in a future kernel release, at which point the kernel
+       will be removed no sooner than June 2021, at which point the kernel
        will always cease using checkreqprot internally and will always
        check the actual protections being applied upon mmap/mprotect calls.
        The checkreqprot selinuxfs node will remain for backward compatibility
diff a/Documentation/ABI/removed/devfs b/Documentation/ABI/removed/devfs
--- a/Documentation/ABI/removed/devfs
+++ b/Documentation/ABI/removed/devfs
@@ -5,6 +5,7 @@ Description:
        devfs has been unmaintained for a number of years, has unfixable
        races, contains a naming policy within the kernel that is
        against the LSB, and can be replaced by using udev.
+
        The files fs/devfs/*, include/linux/devfs_fs*.h were removed,
        along with the assorted devfs function calls throughout the
        kernel tree.
diff a/Documentation/ABI/removed/raw1394 b/Documentation/ABI/removed/raw1394
--- a/Documentation/ABI/removed/raw1394
+++ b/Documentation/ABI/removed/raw1394
@@ -7,6 +7,7 @@ Description:
        to implement sensible device security policies, and its low level
        of abstraction that required userspace clients to duplicate much
        of the kernel's ieee1394 core functionality.
+
        Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
        firewire-core.
 
diff a/Documentation/ABI/removed/sysfs-class-rfkill 
b/Documentation/ABI/removed/sysfs-class-rfkill
--- a/Documentation/ABI/removed/sysfs-class-rfkill
+++ b/Documentation/ABI/removed/sysfs-class-rfkill
@@ -10,4 +10,4 @@ Description:  This file was deprecated because there no 
longer was a way to
                claim just control over a single rfkill instance.
                This file was scheduled to be removed in 2012, and was removed
                in 2016.
-Values:        0: Kernel handles events
+Values:                0: Kernel handles events
diff a/Documentation/ABI/removed/video1394 b/Documentation/ABI/removed/video1394
--- a/Documentation/ABI/removed/video1394
+++ b/Documentation/ABI/removed/video1394
@@ -8,6 +8,7 @@ Description:
        performance issues in its first generation.  Any video1394 user had
        to use raw1394 + libraw1394 too because video1394 did not provide
        asynchronous I/O for device discovery and configuration.
+
        Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
        firewire-core.
 
diff a/Documentation/ABI/stable/firewire-cdev 
b/Documentation/ABI/stable/firewire-cdev
--- a/Documentation/ABI/stable/firewire-cdev
+++ b/Documentation/ABI/stable/firewire-cdev
@@ -14,13 +14,17 @@ Description:
                Each /dev/fw* is associated with one IEEE 1394 node, which can
                be remote or local nodes.  Operations on a /dev/fw* file have
                different scope:
+
                  - The 1394 node which is associated with the file:
+
                          - Asynchronous request transmission
                          - Get the Configuration ROM
                          - Query node ID
                          - Query maximum speed of the path between this node
                            and local node
+
                  - The 1394 bus (i.e. "card") to which the node is attached to:
+
                          - Isochronous stream transmission and reception
                          - Asynchronous stream transmission and reception
                          - Asynchronous broadcast request transmission
@@ -31,7 +35,9 @@ Description:
                            manager
                          - Query cycle time
                          - Bus reset initiation, bus reset event reception
+
                  - All 1394 buses:
+
                          - Allocation of IEEE 1212 address ranges on the local
                            link layers, reception of inbound requests to such
                            an address range, asynchronous response transmission
@@ -43,6 +49,7 @@ Description:
                userland implement different access permission models, some
                operations are restricted to /dev/fw* files that are associated
                with a local node:
+
                          - Addition of descriptors or directories to the local
                            nodes' Configuration ROM
                          - PHY packet transmission and reception
@@ -55,50 +62,50 @@ Description:
                The following file operations are supported:
 
                open(2)
-               Currently the only useful flags are O_RDWR.
+                   Currently the only useful flags are O_RDWR.
 
                ioctl(2)
-               Initiate various actions.  Some take immediate effect, others
-               are performed asynchronously while or after the ioctl returns.
-               See the inline documentation in <linux/firewire-cdev.h> for
-               descriptions of all ioctls.
+                   Initiate various actions.  Some take immediate effect, 
others
+                   are performed asynchronously while or after the ioctl 
returns.
+                   See the inline documentation in <linux/firewire-cdev.h> for
+                   descriptions of all ioctls.
 
                poll(2), select(2), epoll_wait(2) etc.
-               Watch for events to become available to be read.
+                   Watch for events to become available to be read.
 
                read(2)
-               Receive various events.  There are solicited events like
-               outbound asynchronous transaction completion or isochronous
-               buffer completion, and unsolicited events such as bus resets,
-               request reception, or PHY packet reception.  Always use a read
-               buffer which is large enough to receive the largest event that
-               could ever arrive.  See <linux/firewire-cdev.h> for descriptions
-               of all event types and for which ioctls affect reception of
-               events.
+                   Receive various events.  There are solicited events like
+                   outbound asynchronous transaction completion or isochronous
+                   buffer completion, and unsolicited events such as bus 
resets,
+                   request reception, or PHY packet reception.  Always use a 
read
+                   buffer which is large enough to receive the largest event 
that
+                   could ever arrive.  See <linux/firewire-cdev.h> for 
descriptions
+                   of all event types and for which ioctls affect reception of
+                   events.
 
                mmap(2)
-               Allocate a DMA buffer for isochronous reception or transmission
-               and map it into the process address space.  The arguments should
-               be used as follows:  addr = NULL, length = the desired buffer
-               size, i.e. number of packets times size of largest packet,
-               prot = at least PROT_READ for reception and at least PROT_WRITE
-               for transmission, flags = MAP_SHARED, fd = the handle to the
-               /dev/fw*, offset = 0.
+                   Allocate a DMA buffer for isochronous reception or 
transmission
+                   and map it into the process address space.  The arguments 
should
+                   be used as follows:  addr = NULL, length = the desired 
buffer
+                   size, i.e. number of packets times size of largest packet,
+                   prot = at least PROT_READ for reception and at least 
PROT_WRITE
+                   for transmission, flags = MAP_SHARED, fd = the handle to the
+                   /dev/fw*, offset = 0.
 
                Isochronous reception works in packet-per-buffer fashion except
                for multichannel reception which works in buffer-fill mode.
 
                munmap(2)
-               Unmap the isochronous I/O buffer from the process address space.
+                   Unmap the isochronous I/O buffer from the process address 
space.
 
                close(2)
-               Besides stopping and freeing I/O contexts that were associated
-               with the file descriptor, back out any changes to the local
-               nodes' Configuration ROM.  Deallocate isochronous channels and
-               bandwidth at the IRM that were marked for kernel-assisted
-               re- and deallocation.
-
-Users:         libraw1394
-               libdc1394
-               libhinawa
+                   Besides stopping and freeing I/O contexts that were 
associated
+                   with the file descriptor, back out any changes to the local
+                   nodes' Configuration ROM.  Deallocate isochronous channels 
and
+                   bandwidth at the IRM that were marked for kernel-assisted
+                   re- and deallocation.
+
+Users:         libraw1394;
+               libdc1394;
+               libhinawa;
                tools like linux-firewire-utils, fwhack, ...
diff a/Documentation/ABI/stable/sysfs-acpi-pmprofile 
b/Documentation/ABI/stable/sysfs-acpi-pmprofile
--- a/Documentation/ABI/stable/sysfs-acpi-pmprofile
+++ b/Documentation/ABI/stable/sysfs-acpi-pmprofile
@@ -1,22 +1,26 @@
-What:          /sys/firmware/acpi/pm_profile
+What:          /sys/firmware/acpi/pm_profile
 Date:          03-Nov-2011
 KernelVersion: v3.2
 Contact:       [email protected]
-Description:   The ACPI pm_profile sysfs interface exports the platform
+Description:   The ACPI pm_profile sysfs interface exports the platform
                power management (and performance) requirement expectations
                as provided by BIOS. The integer value is directly passed as
                retrieved from the FADT ACPI table.
-Values:         For possible values see ACPI specification:
+
+Values:                For possible values see ACPI specification:
                5.2.9 Fixed ACPI Description Table (FADT)
                Field: Preferred_PM_Profile
 
                Currently these values are defined by spec:
-               0 Unspecified
-               1 Desktop
-               2 Mobile
-               3 Workstation
-               4 Enterprise Server
-               5 SOHO Server
-               6 Appliance PC
-               7 Performance Server
+
+               == =================
+               0  Unspecified
+               1  Desktop
+               2  Mobile
+               3  Workstation
+               4  Enterprise Server
+               5  SOHO Server
+               6  Appliance PC
+               7  Performance Server
                >7 Reserved
+               == =================
diff a/Documentation/ABI/stable/sysfs-bus-firewire 
b/Documentation/ABI/stable/sysfs-bus-firewire
--- a/Documentation/ABI/stable/sysfs-bus-firewire
+++ b/Documentation/ABI/stable/sysfs-bus-firewire
@@ -47,6 +47,7 @@ Description:
                IEEE 1394 node device attribute.
                Read-only and immutable.
 Values:                1: The sysfs entry represents a local node (a 
controller card).
+
                0: The sysfs entry represents a remote node.
 
 
@@ -125,7 +126,9 @@ Description:
                Read-only attribute, immutable during the target's lifetime.
                Format, as exposed by firewire-sbp2 since 2.6.22, May 2007:
                Colon-separated hexadecimal string representations of
+
                        u64 EUI-64 : u24 directory_ID : u16 LUN
+
                without 0x prefixes, without whitespace.  The former sbp2 driver
                (removed in 2.6.37 after being superseded by firewire-sbp2) used
                a somewhat shorter format which was not as close to SAM.

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/408
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/[email protected]

Reply via email to