Merge tag 'v5.1-rc5' into for-5.2/block
Pull in v5.1-rc5 to resolve two conflicts. One is in BFQ, in just
a comment, and is trivial. The other one is a conflict due to a
later fix in the bio multi-page work, and needs a bit more care.
* tag 'v5.1-rc5': (476 commits)
Linux 5.1-rc5
fs: prevent page refcount overflow in pipe_buf_get
mm: prevent get_user_pages() from overflowing page refcount
mm: add 'try_get_page()' helper function
mm: make page ref count overflow check tighter and more explicit
clk: imx: Fix PLL_1416X not rounding rates
clk: mediatek: fix clk-gate flag setting
arm64: futex: Fix FUTEX_WAKE_OP atomic ops with non-zero result value
iommu/amd: Set exclusion range correctly
clang-format: Update with the latest for_each macro list
perf/core: Fix perf_event_disable_inatomic() race
block: fix the return errno for direct IO
Revert "SUNRPC: Micro-optimise when the task is known not to be sleeping"
NFSv4.1 fix incorrect return value in copy_file_range
xprtrdma: Fix helper that drains the transport
NFS: Fix handling of reply page vector
NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.
dma-debug: only skip one stackframe entry
platform/x86: pmc_atom: Drop __initconst on dmi table
nvmet: fix discover log page when offsets are used
...
Signed-off-by:
Jens Axboe <axboe@kernel.dk>
No related branches found
No related tags found
Showing
- .clang-format 24 additions, 0 deletions.clang-format
- .mailmap 2 additions, 0 deletions.mailmap
- Documentation/accounting/psi.txt 6 additions, 6 deletionsDocumentation/accounting/psi.txt
- Documentation/bpf/btf.rst 4 additions, 4 deletionsDocumentation/bpf/btf.rst
- Documentation/devicetree/bindings/arm/cpus.yaml 1 addition, 1 deletionDocumentation/devicetree/bindings/arm/cpus.yaml
- Documentation/devicetree/bindings/hwmon/adc128d818.txt 2 additions, 2 deletionsDocumentation/devicetree/bindings/hwmon/adc128d818.txt
- Documentation/lzo.txt 5 additions, 3 deletionsDocumentation/lzo.txt
- Documentation/networking/bpf_flow_dissector.rst 126 additions, 0 deletionsDocumentation/networking/bpf_flow_dissector.rst
- Documentation/networking/index.rst 1 addition, 0 deletionsDocumentation/networking/index.rst
- MAINTAINERS 21 additions, 7 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arc/include/asm/syscall.h 3 additions, 4 deletionsarch/arc/include/asm/syscall.h
- arch/arm/boot/dts/am335x-evm.dts 22 additions, 4 deletionsarch/arm/boot/dts/am335x-evm.dts
- arch/arm/boot/dts/am335x-evmsk.dts 22 additions, 4 deletionsarch/arm/boot/dts/am335x-evmsk.dts
- arch/arm/boot/dts/am33xx-l4.dtsi 2 additions, 2 deletionsarch/arm/boot/dts/am33xx-l4.dtsi
- arch/arm/boot/dts/rk3288-tinker.dtsi 2 additions, 1 deletionarch/arm/boot/dts/rk3288-tinker.dtsi
- arch/arm/boot/dts/rk3288-veyron.dtsi 0 additions, 2 deletionsarch/arm/boot/dts/rk3288-veyron.dtsi
- arch/arm/boot/dts/rk3288.dtsi 9 additions, 11 deletionsarch/arm/boot/dts/rk3288.dtsi
- arch/arm/boot/dts/sama5d2-pinfunc.h 1 addition, 1 deletionarch/arm/boot/dts/sama5d2-pinfunc.h
- arch/arm/boot/dts/ste-nomadik-nhk15.dts 4 additions, 5 deletionsarch/arm/boot/dts/ste-nomadik-nhk15.dts
Loading
Please register or sign in to comment