mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-31 03:39:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
dc2ef94d892634fba912e4fdeb01cd1c19346c9a
linux/drivers
History
Stephen Rothwell 10ea77e49c net/mlx5e: fix up for "net/mlx5e: Move MACsec flow steering operations to be used as core library" 
Recent merge had a conflict in:

  drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c

between commit:

  aeb660171b ("net/mlx5e: fix double free in macsec_fs_tx_create_crypto_table_groups")

from Linus' tree and commit:

  cb5ebe4896f9 ("net/mlx5e: Move MACsec flow steering operations to be used as core library")

from the mlx5-next tree. This was missed and the former commit
got lost, bring it back.

Fixes: 3c5066c6b0 ("Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20230815123725.4ef5b7b9@canb.auug.org.au
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-24 18:58:46 -07:00
..
accel
Merge tag 'drm-misc-fixes-2023-08-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
2023-08-18 06:08:58 +10:00
accessibility
speakup: add HAS_IOPORT dependency for SPEAKUP_SERIALIO
2023-05-31 19:17:40 +01:00
acpi
ACPI: resource: Fix IRQ override quirk for PCSpecialist Elimina Pro 16 M
2023-08-21 12:48:52 +02:00
amba
…
android
binder: fix memory leak in binder_init()
2023-08-04 15:25:01 +02:00
ata
ata,scsi: do not issue START STOP UNIT on resume
2023-08-02 17:01:12 +09:00
atm
…
auxdisplay
Merge tag 'drm-next-2023-06-29' of git://anongit.freedesktop.org/drm/drm
2023-06-29 11:00:17 -07:00
base
driver core: cpu: Fix the fallback cpu_show_gds() name
2023-08-11 20:36:02 +02:00
bcma
…
block
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-08-24 10:51:39 -07:00
bluetooth
Bluetooth: btrtl: Load FW v2 otherwise FW v1 for RTL8852C
2023-08-11 11:57:13 -07:00
bus
Merge branch 'omap-for-v6.5/ti-sysc' into omap-for-v6.5/fixes
2023-08-02 10:49:57 +03:00
cdrom
cdrom/gdrom: Fix build error
2023-06-29 08:09:31 -06:00
cdx
cdx: Replace custom mcdi logging with print_hex_dump_debug()
2023-06-15 13:42:16 +02:00
char
tpm_tis: Opt-in interrupts
2023-08-12 02:36:28 +03:00
clk
Merge tag 'clk-meson-fixes-v6.5-1' of https://github.com/BayLibre/clk-meson into clk-fixes
2023-07-26 11:47:57 -07:00
clocksource
Merge tag 'riscv-for-linus-6.5-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
2023-06-30 09:37:26 -07:00
comedi
comedi: make all 'class' structures const
2023-06-23 10:29:02 +02:00
connector
connector/cn_proc: Allow non-root users access
2023-07-23 11:34:22 +01:00
counter
Merge tag 'counter-fixes-for-6.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-linus
2023-08-04 15:17:29 +02:00
cpufreq
cpufreq: amd-pstate: fix global sysfs attribute type
2023-08-07 19:41:48 +02:00
cpuidle
cpuidle: psci: Move enabling OSI mode after power domains creation
2023-08-08 16:07:01 +02:00
crypto
Revert "crypto: caam - adjust RNG timing to support more devices"
2023-08-18 16:47:02 +08:00
cxl
cxl/memdev: Only show sanitize sysfs files when supported
2023-07-28 13:16:54 -06:00
dax
dax: enable dax fault handler to report VM_FAULT_HWPOISON
2023-06-26 07:54:23 -06:00
dca
…
devfreq
PM / devfreq: mtk-cci: Fix variable deferencing before NULL check
2023-05-29 23:25:31 +09:00
dio
…
dma
dmaengine: xilinx: xdma: Fix typo
2023-08-07 00:01:41 +05:30
dma-buf
dma-buf/dma-resv: Stop leaking on krealloc() failure
2023-07-15 13:57:30 +02:00
edac
Merge tag 'ras_core_for_v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2023-06-26 15:09:18 -07:00
eisa
…
extcon
extcon: Switch i2c drivers back to use .probe()
2023-06-01 23:42:28 +09:00
firewire
firewire: net: fix use after free in fwnet_finish_incoming_packet()
2023-06-24 14:03:46 +09:00
firmware
firmware: arm_scmi: Fix chan_free cleanup on SMC
2023-07-20 13:31:58 +01:00
fpga
Merge tag 'char-misc-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2023-07-03 12:46:47 -07:00
fsi
…
gnss
…
gpio
gpiolib: fix reference leaks when removing GPIO chips still in use
2023-08-16 13:35:50 +02:00
gpu
drm/qxl: fix UAF on handle creation
2023-08-18 06:57:38 +10:00
greybus
…
hid
Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
2023-07-13 19:13:24 -07:00
hsi
HSI: omap_ssi_port: Drop error checking for debugfs_create_dir
2023-05-27 18:50:27 +02:00
hte
…
hv
x86/hyperv: Improve code for referencing hyperv_pcpu_input_arg
2023-06-28 17:53:25 +00:00
hwmon
hwmon: (aquacomputer_d5next) Add selective 200ms delay after sending ctrl report
2023-08-09 21:09:47 -07:00
hwspinlock
hwspinlock: omap: drop of_match_ptr for ID table
2023-06-14 08:15:24 -07:00
hwtracing
Merge tag 'char-misc-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2023-07-03 12:46:47 -07:00
i2c
i2c: bcm-iproc: Fix bcm_iproc_i2c_isr deadlock issue
2023-08-14 18:17:13 +02:00
i3c
i3c: master: svc: add NACK check after start byte sent
2023-06-05 00:50:51 +02:00
idle
Revert "intel_idle: Add support for using intel_idle in a VM guest using just hlt"
2023-07-19 20:10:03 +02:00
iio
iio: cros_ec: Fix the allocation size for cros_ec_command
2023-07-29 12:21:21 +01:00
infiniband
Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
2023-08-24 11:32:18 -07:00
input
Merge tag 'soc-arm-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2023-06-29 15:28:33 -07:00
interconnect
interconnect: qcom: sa8775p: add enable_mask for bcm nodes
2023-07-11 15:44:43 +03:00
iommu
iommufd: Set end correctly when doing batch carry
2023-07-27 11:27:20 -03:00
ipack
…
irqchip
Merge tag 'irq_urgent_for_v6.5_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2023-07-30 10:59:19 -07:00
isdn
mISDN: Update parameter type of dsp_cmx_send()
2023-08-03 18:08:32 -07:00
leds
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-08-24 10:51:39 -07:00
macintosh
macintosh: Use of_property_read_reg() to parse "reg"
2023-06-21 14:08:54 +10:00
mailbox
mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0
2023-06-30 17:35:45 -05:00
mcb
…
md
dm cache policy smq: ensure IO doesn't prevent cleaner policy progress
2023-07-25 11:55:50 -04:00
media
Merge tag 'media/v6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2023-08-19 13:13:55 +02:00
memory
memory: tegra: make icc_set_bw return zero if BWMGR not supported
2023-07-25 22:09:20 +02:00
memstick
memstick r592: make memstick_debug_get_tpc_name() static
2023-06-12 15:16:19 +02:00
message
scsi: message: fusion: Add HAS_IOPORT dependencies
2023-05-31 19:59:26 -04:00
mfd
Merge tag 'mfd-next-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2023-07-03 10:55:04 -07:00
misc
misc: tps6594-esm: Disable ESM for rev 1 PMIC
2023-08-04 15:52:51 +02:00
mmc
mmc: f-sdh30: fix order of function calls in sdhci_f_sdh30_remove
2023-08-15 13:24:29 +02:00
most
staging: most: Replace all non-returning strlcpy with strscpy
2023-06-01 07:07:37 -07:00
mtd
mtd: rawnand: fsl_upm: Fix an off-by one test in fun_exec_op()
2023-07-27 16:54:23 +02:00
mux
mux: adg792a: Switch back to use i2c_driver's .probe()
2023-06-15 13:42:18 +02:00
net
net/mlx5e: fix up for "net/mlx5e: Move MACsec flow steering operations to be used as core library"
2023-08-24 18:58:46 -07:00
nfc
nfc: virtual_ncidev: Use module_misc_device macro to simplify the code
2023-08-16 09:54:16 +01:00
ntb
ntb: hw: amd: Fix debugfs_create_dir error checking
2023-07-08 13:55:44 -04:00
nubus
…
nvdimm
dax: enable dax fault handler to report VM_FAULT_HWPOISON
2023-06-26 07:54:23 -06:00
nvme
Merge tag 'block-6.5-2023-08-11' of git://git.kernel.dk/linux
2023-08-11 12:14:08 -07:00
nvmem
nvmem: rmem: Use NVMEM_DEVID_AUTO
2023-06-15 13:42:18 +02:00
of
of/platform: increase refcount of fwnode
2023-08-21 16:12:28 -05:00
opp
OPP: Properly propagate error along when failing to get icc_path
2023-06-27 07:35:14 +05:30
parisc
parisc: Move proc_mckinley_root and proc_runway_root to sba_iommu
2023-08-10 22:22:03 +02:00
parport
parport: gsc: remove DMA leftover code
2023-08-03 14:40:37 +02:00
pci
Merge tag 'pci-v6.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
2023-08-11 09:39:17 -07:00
pcmcia
pcmcia: rsrc_nonstatic: Fix memory leak in nonstatic_release_resource_db()
2023-06-15 13:42:18 +02:00
peci
…
perf
perf: RISC-V: Remove PERF_HES_STOPPED flag checking in riscv_pmu_start()
2023-07-12 07:41:23 -07:00
phy
phy: hisilicon: Fix an out of bounds check in hisi_inno_phy_probe()
2023-07-24 16:23:37 +05:30
pinctrl
pinctrl: qcom: Add intr_target_width field to support increased number of interrupt targets
2023-08-10 10:48:15 +02:00
platform
platform/mellanox: Fix mlxbf-tmfifo not handling all virtio CONSOLE notifications
2023-08-23 17:13:36 +02:00
pnp
…
power
Merge tag 'for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
2023-07-03 17:23:16 -07:00
powercap
powercap: intel_rapl: Fix a sparse warning in TPMI interface
2023-08-01 13:45:08 +02:00
pps
…
ps3
…
ptp
net: ptp: create a mock-up PTP Hardware Clock driver
2023-08-09 15:59:21 -07:00
pwm
Merge tag 'pwm/for-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2023-07-05 12:55:06 -07:00
rapidio
…
ras
…
regulator
regulator: qcom-rpmh: Fix LDO 12 regulator for PM8550
2023-08-07 15:13:27 +01:00
remoteproc
Merge tag 'rproc-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
2023-07-03 17:03:05 -07:00
reset
Merge tag 'soc-drivers-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2023-06-29 15:22:19 -07:00
rpmsg
…
rtc
Merge tag 'rtc-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
2023-07-03 10:43:10 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-08-03 14:34:37 -07:00
sbus
oradax: make 'cl' a static const structure
2023-06-23 10:27:02 +02:00
scsi
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2023-08-13 08:43:26 -07:00
sh
…
siox
…
slimbus
…
soc
soc: aspeed: socinfo: Add kfree for kstrdup
2023-08-12 12:12:58 +02:00
soundwire
soundwire: amd: Fix a check for errors in probe()
2023-07-13 11:09:07 +05:30
spi
spi: spi-qcom-qspi: Add mem_ops to avoid PIO for badly sized reads
2023-07-26 12:47:20 +01:00
spmi
…
ssb
…
staging
Merge tag 'staging-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2023-07-30 11:47:56 -07:00
target
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2023-07-08 12:35:18 -07:00
tc
…
tee
Merge tag 'soc-drivers-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
2023-06-29 15:22:19 -07:00
thermal
powercap: intel_rapl: Fix a sparse warning in TPMI interface
2023-08-01 13:45:08 +02:00
thunderbolt
thunderbolt: Fix memory leak in tb_handle_dp_bandwidth_request()
2023-08-04 16:17:47 +03:00
tty
serial: core: Fix serial core port id, including multiport devices
2023-08-11 21:19:22 +02:00
ufs
scsi: ufs: renesas: Fix private allocation
2023-08-07 21:34:08 -04:00
uio
uio: dfl: add vendor-specific feature id
2023-05-31 19:00:37 +01:00
usb
usb: dwc3: Properly handle processing of pending events
2023-08-04 14:57:23 +02:00
vdpa
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2023-08-18 12:44:56 -07:00
vfio
net/mlx5: Allocate completion EQs dynamically
2023-08-07 10:53:52 -07:00
vhost
vhost-scsi: Rename vhost_scsi_iov_to_sgl
2023-08-10 15:24:28 -04:00
video
fbdev: goldfishfb: Do not check 0 for platform_get_irq()
2023-08-15 23:39:33 +02:00
virt
Merge tag 'wq-for-6.5-cleanup-ordered' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2023-06-27 16:46:06 -07:00
virtio
virtio-mem: check if the config changed before fake offlining memory
2023-08-10 15:51:46 -04:00
vlynq
…
w1
connector/cn_proc: Add filtering to fix some bugs
2023-07-23 11:34:22 +01:00
watchdog
watchdog: sp5100_tco: support Hygon FCH/SCH (Server Controller Hub)
2023-06-26 14:30:07 +02:00
xen
xen: speed up grant-table reclaim
2023-07-27 07:53:12 +02:00
zorro
…
Kconfig
…
Makefile
…