Commit a6f844d
committed
Merge tag 'v5.18' into rdma.git for-next
Following patches have dependencies.
Resolve the merge conflict in
drivers/net/ethernet/mellanox/mlx5/core/main.c by keeping the new names
for the fs functions following linux-next:
https://lore.kernel.org/r/20220519113529.226bc3e2@canb.auug.org.au/
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>1,795 files changed
Lines changed: 17889 additions & 11488 deletions
File tree
- Documentation
- ABI/testing
- arm64
- dev-tools/kunit
- devicetree/bindings
- arm/tegra
- bus
- clock
- devfreq/event
- display
- bridge
- msm
- panel
- samsung
- dma
- extcon
- gpu
- hwmon
- i2c
- iio
- adc
- dac
- input
- interconnect
- interrupt-controller
- leds
- media
- memory-controllers
- ddr
- mfd
- mmc
- mtd
- net
- can
- dsa
- nfc
- pci
- phy
- pinctrl
- power
- supply
- regulator
- remoteproc
- reset
- rng
- rtc
- serial
- soc/samsung
- sound
- spi
- sram
- thermal
- ufs
- usb
- driver-api
- filesystems
- caching
- ext4
- networking
- dsa
- process
- security
- virt/kvm
- x86
- vm
- arch
- arc
- boot/dts
- include/asm
- kernel
- mm
- arm64
- boot/dts
- amlogic
- freescale
- qcom
- rockchip
- include/asm
- kernel
- vdso32
- vdso
- kvm
- hyp/nvhe
- vgic
- mm
- arm
- boot/dts
- configs
- include/asm
- kernel
- mach-davinci
- mach-ep93xx
- mach-exynos
- mach-iop32x
- mach-omap2
- mach-vexpress
- mm
- xen
- mips
- include/asm
- kernel
- parisc
- configs
- include/asm
- kernel
- math-emu
- mm
- powerpc
- include/asm
- kernel
- vdso
- kvm
- mm
- perf
- platforms/pseries
- riscv
- boot/dts
- microchip
- sifive
- configs
- include/asm
- kernel
- kvm
- mm
- s390
- configs
- include/asm
- kernel
- kvm
- lib
- mm
- sparc/include/asm
- x86
- entry
- events
- intel
- include/asm
- kernel
- cpu
- microcode
- fpu
- kvm
- mmu
- svm
- vmx
- lib
- mm
- pat
- net
- pci
- platform/pvh
- power
- xen
- xtensa
- kernel
- platforms/iss
- block
- drivers
- acpi
- android
- ata
- base
- firmware_loader
- block
- drbd
- null_blk
- bus
- fsl-mc
- mhi/host
- cdrom
- char
- ipmi
- clk
- at91
- bcm
- microchip
- qcom
- sunxi-ng
- sunxi
- cpufreq
- cpuidle
- crypto
- cxl
- dma-buf
- dma
- dw-edma
- idxd
- mediatek
- edac
- firewire
- firmware
- arm_scmi
- cirrus
- gpio
- gpu
- drm
- amd
- amdgpu
- amdkfd
- display
- amdgpu_dm
- dc
- clk_mgr
- dce100
- dcn315
- dcn316
- core
- dcn10
- dcn20
- dcn21
- dcn30
- dcn31
- dml
- dcn20
- dcn31
- dsc
- inc
- hw
- modules/info_packet
- pm
- legacy-dpm
- powerplay
- hwmgr
- swsmu
- smu13
- bridge
- dp
- i915
- display
- gem
- gt
- uc
- imx
- msm
- adreno
- disp
- dpu1
- mdp5
- dp
- dsi
- nouveau
- nvkm
- engine/device
- subdev/pmu
- panel
- radeon
- sun4i
- vc4
- vmwgfx
- ipu-v3
- hv
- hwmon
- pmbus
- i2c
- busses
- idle
- iio
- adc
- chemical
- dac
- filter
- imu
- bmi160
- inv_icm42600
- magnetometer
- proximity
- infiniband
- core
- hw
- hfi1
- irdma
- mlx5
- sw
- rdmavt
- rxe
- siw
- input
- keyboard
- touchscreen
- interconnect
- qcom
- iommu
- arm
- arm-smmu-v3
- arm-smmu
- intel
- irqchip
- md
- bcache
- media
- platform
- nxp
- rockchip/rga
- tuners
- memory
- message/fusion
- misc
- eeprom
- habanalabs/common
- mmc
- core
- host
- mtd/nand/raw
- net
- bonding
- can
- m_can
- dsa
- b53
- microchip
- mv88e6xxx
- ocelot
- realtek
- ethernet
- aquantia/atlantic
- hw_atl
- broadcom
- bnx2x
- bnxt
- genet
- cadence
- cavium/thunder
- chelsio/cxgb4
- dec/tulip
- faraday
- freescale
- dpaa2
- dpaa
- enetc
- fungible/funcore
- hisilicon
- hns3
- hns3_common
- hns3pf
- hns
- huawei/hinic
- ibm
- intel
- e1000e
- i40e
- iavf
- ice
- igb
- igc
- ixgbe
- marvell
- mediatek
- mellanox
- mlx5/core
- diag
- en
- tc
- act
- lag
- lib
- steering
- mlxsw
- micrel
- microchip/lan966x
- mscc
- myricom/myri10ge
- pensando/ionic
- qlogic
- qede
- qed
- sfc
- smsc
- stmicro/stmmac
- ti
- xilinx
- hippi
- ipa
- mctp
- mdio
- phy
- ppp
- slip
- usb
- vmxnet3
- vxlan
- wan
- wireguard
- wireless
- ath
- ath10k
- ath11k
- ath9k
- broadcom/brcm80211/brcmfmac
- intel/iwlwifi
- marvell/mwifiex
- mediatek/mt76/mt76x2
- ti/wlcore
- nfc
- nfcmrvl
- pn533
- nvme/host
- pci
- controller
- dwc
- perf
- phy
- amlogic
- motorola
- samsung
- ti
- pinctrl
- aspeed
- intel
- mediatek
- qcom
- samsung
- stm32
- sunplus
- sunxi
- platform
- surface
- aggregator
- x86
- dell
- intel
- pmc
- pmt
- uncore-frequency
- power/supply
- ptp
- regulator
- reset
- tegra
- rtc
- s390
- block
- net
- scsi
- aic7xxx
- bnx2fc
- bnx2i
- cxgbi
- device_handler
- hisi_sas
- ibmvscsi_tgt
- isci
- lpfc
- megaraid
- mpt3sas
- mvsas
- pcmcia
- pm8001
- qedi
- qla2xxx
- ufs
- slimbus
- soc/imx
- spi
- staging/r8188eu/core
- target
- iscsi
- tee/optee
- thermal
- intel/int340x_thermal
- tty
- serial
- 8250
- usb
- cdns3
- class
- core
- dwc3
- gadget
- function
- legacy
- host
- misc
- mtu3
- phy
- serial
- typec
- tcpm
- ucsi
- vdpa/mlx5/net
- vfio/pci
- vhost
- video
- fbdev
- aty
- core
- kyro
- matrox
- mb862xx
- mmp
- omap
- sis
- virtio
- xen
- fs
- afs
- btrfs
- cachefiles
- ceph
- cifs
- erofs
- ext4
- f2fs
- fscache
- gfs2
- hugetlbfs
- jbd2
- kernfs
- ksmbd
- nfsd
- nfs
- notify/fanotify
- proc
- sysfs
- udf
- xfs
- zonefs
- include
- acpi
- asm-generic
- dt-bindings/clock
- linux
- ceph
- gpio
- mmc
- mtd
- sched
- sunrpc
- usb
- memory
- net
- bluetooth
- netns
- tc_act
- scsi
- soc/mscc
- sound
- trace/events
- uapi/linux
- kernel
- cgroup
- dma
- entry
- events
- irq
- sched
- time
- trace
- lib
- dim
- lz4
- mm
- kasan
- kfence
- net
- batman-adv
- bluetooth
- bpf
- bridge
- can
- ceph
- core
- dccp
- decnet
- dsa
- ipv4
- netfilter
- ipv6
- key
- l3mdev
- mac80211
- mctp
- mptcp
- netfilter
- ipvs
- netlink
- nfc
- nci
- openvswitch
- packet
- rds
- rxrpc
- sched
- sctp
- smc
- sunrpc
- auth_gss
- xprtrdma
- tls
- wireless
- xdp
- xfrm
- samples/trace_events
- scripts
- gcc-plugins
- security/selinux/ss
- sound
- core
- drivers
- firewire/fireworks
- hda
- isa
- galaxy
- wavefront
- oss/dmasound
- pci
- ali5451
- au88x0
- aw2
- ca0106
- cs5535audio
- echoaudio
- emu10k1
- hda
- ice1712
- korg1212
- lola
- lx6464es
- nm256
- oxygen
- riptide
- rme9652
- soc
- atmel
- codecs
- fsl
- generic
- intel
- boards
- common
- meson
- sof
- usb
- x86
- tools
- arch
- arm64/include/asm
- x86/include/asm
- bpf/bpftool
- build
- feature
- include
- linux
- uapi/linux
- lib/perf
- objtool
- include/objtool
- perf
- Documentation
- arch
- arm64/util
- powerpc/util
- s390/util
- x86/util
- bench
- tests
- attr
- shell
- util
- c++
- power/x86/intel-speed-select
- testing
- nvdimm/test
- radix-tree
- selftests
- bpf
- prog_tests
- progs
- drivers/net
- mlxsw
- spectrum-2
- ocelot
- kvm
- aarch64
- include
- riscv
- x86_64
- lib
- riscv
- x86_64
- x86_64
- mqueue
- net
- bpf
- forwarding
- mptcp
- pid_namespace
- pidfd
- proc
- seccomp
- vDSO
- vm
- wireguard
- qemu
- arch
- x86
- virt/kvm
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| 48 | + | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
| |||
204 | 205 | | |
205 | 206 | | |
206 | 207 | | |
| 208 | + | |
207 | 209 | | |
208 | 210 | | |
209 | 211 | | |
| |||
249 | 251 | | |
250 | 252 | | |
251 | 253 | | |
| 254 | + | |
252 | 255 | | |
253 | 256 | | |
254 | 257 | | |
| |||
391 | 394 | | |
392 | 395 | | |
393 | 396 | | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
394 | 401 | | |
395 | 402 | | |
396 | 403 | | |
| |||
Lines changed: 26 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
119 | | - | |
| 119 | + | |
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
| |||
212 | 212 | | |
213 | 213 | | |
214 | 214 | | |
215 | | - | |
| 215 | + | |
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
| |||
246 | 246 | | |
247 | 247 | | |
248 | 248 | | |
249 | | - | |
250 | | - | |
251 | | - | |
| 249 | + | |
252 | 250 | | |
253 | 251 | | |
254 | 252 | | |
| |||
257 | 255 | | |
258 | 256 | | |
259 | 257 | | |
260 | | - | |
261 | | - | |
262 | | - | |
263 | 258 | | |
264 | | - | |
265 | | - | |
266 | | - | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
267 | 268 | | |
268 | | - | |
269 | | - | |
270 | | - | |
| 269 | + | |
271 | 270 | | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
276 | 279 | | |
277 | 280 | | |
278 | 281 | | |
| |||
288 | 291 | | |
289 | 292 | | |
290 | 293 | | |
291 | | - | |
292 | | - | |
293 | | - | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
294 | 298 | | |
295 | 299 | | |
296 | 300 | | |
| |||
345 | 349 | | |
346 | 350 | | |
347 | 351 | | |
348 | | - | |
| 352 | + | |
349 | 353 | | |
350 | 354 | | |
351 | 355 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
22 | 23 | | |
23 | | - | |
| 24 | + | |
24 | 25 | | |
25 | | - | |
26 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
| 13 | + | |
13 | 14 | | |
14 | | - | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
228 | 228 | | |
229 | 229 | | |
230 | 230 | | |
231 | | - | |
| 231 | + | |
232 | 232 | | |
233 | 233 | | |
234 | | - | |
| 234 | + | |
235 | 235 | | |
236 | 236 | | |
237 | 237 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
189 | 189 | | |
190 | 190 | | |
191 | 191 | | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
192 | 195 | | |
193 | 196 | | |
194 | 197 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | | - | |
| 44 | + | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
51 | 56 | | |
52 | 57 | | |
53 | 58 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | 16 | | |
18 | 17 | | |
19 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | 37 | | |
39 | 38 | | |
40 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
59 | | - | |
60 | 58 | | |
61 | 59 | | |
62 | 60 | | |
| |||
66 | 64 | | |
67 | 65 | | |
68 | 66 | | |
69 | | - | |
70 | | - | |
71 | 67 | | |
72 | 68 | | |
73 | 69 | | |
| |||
0 commit comments