Commit d31e955
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The only slightly tricky merge conflict was the netdevsim because the
mutex locking fix overlapped a lot of driver reload reorganization.
The rest were (relatively) trivial in nature.
Signed-off-by: David S. Miller <davem@davemloft.net>File tree
623 files changed
+5913
-3528
lines changed- Documentation
- arm64
- devicetree/bindings
- arm
- interrupt-controller
- media
- pinctrl
- regulator
- riscv
- networking
- device_drivers
- intel
- pensando
- arch
- arc
- boot/dts
- configs
- kernel
- arm64
- boot/dts
- allwinner
- broadcom/stingray
- freescale
- marvell
- rockchip
- include/asm
- kernel
- kvm
- arm
- boot/dts
- configs
- include/asm
- kernel
- mach-davinci
- mach-omap2
- mm
- mips
- bcm63xx
- include/asm
- vdso
- kernel
- mm
- parisc/kernel
- powerpc/kvm
- riscv
- include/asm
- kernel
- mm
- s390
- boot
- kernel
- um/drivers
- x86
- boot/compressed
- events
- amd
- intel
- hyperv
- include/asm
- kernel
- apic
- cpu
- kvm
- vmx
- xen
- block
- drivers
- acpi
- nfit
- amba
- android
- ata
- base/power
- block
- bus
- cpufreq
- cpuidle
- crypto/chelsio/chtls
- dma
- qcom
- ti
- xilinx
- edac
- firmware/efi
- libstub
- test
- gpu/drm
- amd
- amdgpu
- display/dc
- calcs
- core
- dcn10
- dcn20
- dcn21
- dml
- dcn20
- dsc
- powerplay/hwmgr
- arm/display/komeda
- i915
- display
- panfrost
- radeon
- scheduler
- v3d
- hid
- i2c-hid
- intel-ish-hid/ishtp
- i2c/busses
- infiniband
- core
- hw
- cxgb4
- hfi1
- hns
- mlx5
- qedr
- sw/siw
- input/touchscreen
- iommu
- irqchip
- isdn/capi
- macintosh
- mfd
- mmc/host
- net
- bonding
- dsa
- sja1105
- ethernet
- arc
- broadcom/bnxt
- chelsio/cxgb4
- cortina
- faraday
- freescale
- dpaa2
- google/gve
- hisilicon
- intel
- e1000
- i40e
- igb
- igc
- ixgbe
- marvell
- mellanox
- mlx4
- mlx5/core
- en_accel
- en
- fpga
- mlxsw
- mscc
- netronome/nfp
- pensando/ionic
- qlogic/qed
- realtek
- stmicro/stmmac
- fjes
- hamradio
- hyperv
- ipvlan
- netdevsim
- phy
- ppp
- team
- usb
- wimax/i2400m
- wireless
- intel/iwlwifi
- fw
- api
- mvm
- pcie
- intersil/hostap
- mediatek/mt76
- mt76x2
- realtek/rtlwifi
- nvme/host
- of
- opp
- pinctrl
- aspeed
- bcm
- berlin
- intel
- mvebu
- regulator
- s390/crypto
- scsi
- device_handler
- lpfc
- qla2xxx
- soc/imx
- staging/wlan-ng
- target
- thermal
- tty/serial/8250
- usb
- cdns3
- class
- gadget/udc
- misc
- serial
- vfio
- vhost
- virtio
- fs
- btrfs
- cifs
- fuse
- gfs2
- nfs
- include
- acpi
- linux
- mlx5
- platform_data
- sunrpc
- net
- rdma
- sound
- trace/events
- uapi/linux
- kernel
- bpf
- cgroup
- events
- power
- sched
- time
- trace
- lib/vdso
- net
- 8021q
- atm
- batman-adv
- bluetooth
- bridge
- netfilter
- caif
- core
- dccp
- decnet
- dsa
- ieee802154/6lowpan
- ipv4
- ipv6
- l2tp
- netfilter
- ipvs
- netrom
- nfc
- openvswitch
- phonet
- rose
- rxrpc
- sched
- sctp
- smc
- sunrpc
- xprtrdma
- tipc
- unix
- vmw_vsock
- wireless
- xdp
- scripts
- mod
- security/lockdown
- sound
- core
- firewire/bebob
- hda
- pci/hda
- soc
- codecs
- intel/boards
- rockchip
- samsung
- sh/rcar
- sof
- intel
- stm
- usb
- tools
- arch/x86/include/uapi/asm
- include/uapi/linux
- perf
- jvmti
- util
- testing/selftests
- bpf
- kvm
- include/x86_64
- lib/x86_64
- x86_64
- net
- virt/kvm
- arm
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
623 files changed
+5913
-3528
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
196 | 196 | | |
197 | 197 | | |
198 | 198 | | |
199 | | - | |
| 199 | + | |
| 200 | + | |
200 | 201 | | |
201 | 202 | | |
202 | 203 | | |
| |||
229 | 230 | | |
230 | 231 | | |
231 | 232 | | |
| 233 | + | |
232 | 234 | | |
233 | 235 | | |
234 | 236 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
94 | 99 | | |
95 | 100 | | |
96 | 101 | | |
| |||
126 | 131 | | |
127 | 132 | | |
128 | 133 | | |
129 | | - | |
| 134 | + | |
130 | 135 | | |
131 | 136 | | |
132 | 137 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
496 | 496 | | |
497 | 497 | | |
498 | 498 | | |
499 | | - | |
| 499 | + | |
500 | 500 | | |
501 | 501 | | |
502 | 502 | | |
503 | 503 | | |
504 | | - | |
| 504 | + | |
505 | 505 | | |
506 | 506 | | |
507 | 507 | | |
| |||
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
6 | 9 | | |
7 | 10 | | |
8 | 11 | | |
| |||
Lines changed: 3 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | 30 | | |
32 | 31 | | |
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
36 | 35 | | |
37 | | - | |
38 | 36 | | |
39 | 37 | | |
40 | 38 | | |
| |||
89 | 87 | | |
90 | 88 | | |
91 | 89 | | |
92 | | - | |
93 | | - | |
94 | | - | |
| 90 | + | |
| 91 | + | |
95 | 92 | | |
96 | 93 | | |
97 | 94 | | |
| |||
Lines changed: 42 additions & 44 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
60 | 59 | | |
61 | 60 | | |
62 | 61 | | |
63 | 62 | | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
92 | 90 | | |
93 | 91 | | |
94 | 92 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
34 | | - | |
| 33 | + | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
| |||
66 | 68 | | |
67 | 69 | | |
68 | 70 | | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
| 71 | + | |
| 72 | + | |
75 | 73 | | |
76 | 74 | | |
77 | 75 | | |
| |||
93 | 91 | | |
94 | 92 | | |
95 | 93 | | |
96 | | - | |
97 | 94 | | |
98 | 95 | | |
99 | 96 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
141 | | - | |
142 | | - | |
143 | | - | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
144 | 144 | | |
145 | 145 | | |
146 | 146 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
438 | 438 | | |
439 | 439 | | |
440 | 440 | | |
441 | | - | |
442 | | - | |
| 441 | + | |
| 442 | + | |
443 | 443 | | |
444 | | - | |
| 444 | + | |
445 | 445 | | |
446 | 446 | | |
447 | 447 | | |
| |||
0 commit comments