Commit e958da0d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Cross-merge networking fixes after downstream PR.

Conflicts:

include/linux/filter.h
kernel/bpf/core.c
  66e13b61 ("bpf: verifier: prevent userspace memory access")
  d503a04f ("bpf: Add support for certain atomics in bpf_arena to x86 JIT")
https://lore.kernel.org/all/20240429114939.210328b0@canb.auug.org.au/



No adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents dcc61472 545c4944

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ Praveen BP <praveenbp@ti.com> 
Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>

Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Puranjay Mohan <puranjay@kernel.org> <puranjay12@gmail.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -3423,6 +3423,9 @@ 
			arch-independent options, each of which is an

			aggregation of existing arch-specific options.



			Note, "mitigations" is supported if and only if the

			kernel was built with CPU_MITIGATIONS=y.



			off

				Disable all optional CPU mitigations.  This

				improves system performance, but it may also

Documentation/core-api/workqueue.rst

+3 −3
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ configuration, worker pools and how workqueues map to the pools: :: 
  events_unbound           unbound  9  9 10 10  8

  events_freezable         percpu   0  2  4  6

  events_power_efficient   percpu   0  2  4  6

  events_freezable_power_  percpu   0  2  4  6

  events_freezable_pwr_ef  percpu   0  2  4  6

  rcu_gp                   percpu   0  2  4  6

  rcu_par_gp               percpu   0  2  4  6

  slub_flushwq             percpu   0  2  4  6
@@ -694,7 +694,7 @@ Use tools/workqueue/wq_monitor.py to monitor workqueue operations: :: 
  events_unbound              38306     0      0.1       -       7       -       -

  events_freezable                0     0      0.0       0       0       -       -

  events_power_efficient      29598     0      0.2       0       0       -       -

  events_freezable_power_        10     0      0.0       0       0       -       -

  events_freezable_pwr_ef        10     0      0.0       0       0       -       -

  sock_diag_events                0     0      0.0       0       0       -       -



                              total  infl  CPUtime  CPUhog CMW/RPR  mayday rescued
@@ -704,7 +704,7 @@ Use tools/workqueue/wq_monitor.py to monitor workqueue operations: :: 
  events_unbound              38322     0      0.1       -       7       -       -

  events_freezable                0     0      0.0       0       0       -       -

  events_power_efficient      29603     0      0.2       0       0       -       -

  events_freezable_power_        10     0      0.0       0       0       -       -

  events_freezable_pwr_ef        10     0      0.0       0       0       -       -

  sock_diag_events                0     0      0.0       0       0       -       -



  ...

Documentation/devicetree/bindings/eeprom/at24.yaml

+1 −4
Original line number Diff line number Diff line
@@ -68,14 +68,10 @@ properties: 
                  pattern: cs16$

              - items:

                  pattern: c32$

              - items:

                  pattern: c32d-wl$

              - items:

                  pattern: cs32$

              - items:

                  pattern: c64$

              - items:

                  pattern: c64d-wl$

              - items:

                  pattern: cs64$

              - items:
@@ -136,6 +132,7 @@ properties: 
              - renesas,r1ex24128

              - samsung,s524ad0xd1

          - const: atmel,24c128

      - pattern: '^atmel,24c(32|64)d-wl$' # Actual vendor is st



  label:

    description: Descriptive name of the EEPROM.

Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml

+2 −0
Original line number Diff line number Diff line
@@ -120,7 +120,9 @@ additionalProperties: 
        slew-rate: true

        gpio-hog: true

        gpios: true

        input: true

        input-enable: true

        output-enable: true

        output-high: true

        output-low: true

        line-name: true