Unverified Commit e23654f5 authored by Christian Brauner's avatar Christian Brauner
Browse files

Merge tag 'fuse-fixes-6.17-rc5' of... 

Merge tag 'fuse-fixes-6.17-rc5' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse into vfs.fixes

fuse fixes for 6.17-rc5

* tag 'fuse-fixes-6.17-rc5' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: (6 commits)
  fuse: Block access to folio overlimit
  fuse: fix fuseblk i_blkbits for iomap partial writes
  fuse: reflect cached blocksize if blocksize was changed
  fuse: prevent overflow in copy_file_range return value
  fuse: check if copy_file_range() returns larger than requested size
  fuse: do not allow mapping a non-regular backing file

Link: https://lore.kernel.org/CAJfpeguEVMMyw_zCb+hbOuSxdE2Z3Raw=SJsq=Y56Ae6dn2W3g@mail.gmail.com


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parents bb585591 9d81ba6d

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ Domen Puncer <domen@coderock.org> 
Douglas Gilbert <dougg@torque.net>

Drew Fustini <fustini@kernel.org> <drew@pdp7.com>

<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>

Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <easwar.hariharan@intel.com>

Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <eahariha@linux.microsoft.com>

Ed L. Cashin <ecashin@coraid.com>

Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>

Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>

Documentation/admin-guide/cgroup-v2.rst

+2 −2
Original line number Diff line number Diff line
@@ -435,8 +435,8 @@ both cgroups. 
Controlling Controllers

-----------------------



Availablity

~~~~~~~~~~~

Availability

~~~~~~~~~~~~



A controller is available in a cgroup when it is supported by the kernel (i.e.,

compiled in, not disabled and not attached to a v1 hierarchy) and listed in the

Documentation/devicetree/bindings/regulator/infineon,ir38060.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Infineon Buck Regulators with PMBUS interfaces



maintainers:

  - Not Me.

  - Guenter Roeck <linux@roeck-us.net>



allOf:

  - $ref: regulator.yaml#

Documentation/networking/mptcp-sysctl.rst

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ add_addr_timeout - INTEGER (seconds) 
	resent to an MPTCP peer that has not acknowledged a previous

	ADD_ADDR message.



	Do not retransmit if set to 0.



	The default value matches TCP_RTO_MAX. This is a per-namespace

	sysctl.

Documentation/process/security-bugs.rst

+16 −9
Original line number Diff line number Diff line
@@ -8,8 +8,22 @@ like to know when a security bug is found so that it can be fixed and 
disclosed as quickly as possible.  Please report security bugs to the

Linux kernel security team.



Contact

-------

The security team and maintainers almost always require additional

information beyond what was initially provided in a report and rely on

active and efficient collaboration with the reporter to perform further

testing (e.g., verifying versions, configuration options, mitigations, or

patches). Before contacting the security team, the reporter must ensure

they are available to explain their findings, engage in discussions, and

run additional tests.  Reports where the reporter does not respond promptly

or cannot effectively discuss their findings may be abandoned if the

communication does not quickly improve.



As it is with any bug, the more information provided the easier it

will be to diagnose and fix.  Please review the procedure outlined in

'Documentation/admin-guide/reporting-issues.rst' if you are unclear about what

information is helpful.  Any exploit code is very helpful and will not

be released without consent from the reporter unless it has already been

made public.



The Linux kernel security team can be contacted by email at

<security@kernel.org>.  This is a private list of security officers
@@ -19,13 +33,6 @@ that can speed up the process considerably. It is possible that the 
security team will bring in extra help from area maintainers to

understand and fix the security vulnerability.



As it is with any bug, the more information provided the easier it

will be to diagnose and fix.  Please review the procedure outlined in

'Documentation/admin-guide/reporting-issues.rst' if you are unclear about what

information is helpful.  Any exploit code is very helpful and will not

be released without consent from the reporter unless it has already been

made public.



Please send plain text emails without attachments where possible.

It is much harder to have a context-quoted discussion about a complex

issue if all the details are hidden away in attachments.  Think of it like a