Johannes Berg a0efa2f362 Merge net-next/main to resolve conflicts ...

The wireless-next tree was based on something older, and there
are now conflicts between -rc2 and work here. Merge net-next,
which has enough of -rc2 for the conflicts to happen, resolving
them in the process.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

2024-10-09 08:59:22 +02:00

..

axis-fifo

staging: axis-fifo: Fix indentation

2024-04-09 17:44:54 +02:00

fbtft

staging: fbtft: Use backlight power constants

2024-08-13 11:26:12 +02:00

fieldbus

driver core: have match() callback in struct bus_type take a const *

2024-07-03 15:16:54 +02:00

gdm724x

…

greybus

Revert "staging: greybus: Fix capitalization and punctuation inconsistencies"

2024-09-11 15:56:26 +02:00

iio

Merge 6.11-rc7 into char-misc-next

2024-09-09 08:36:23 +02:00

media

move asm/unaligned.h to linux/unaligned.h

2024-10-02 17:23:23 -04:00

most

staging: most: video: Fixed minor capitalization and grammatical issues

2024-07-30 09:20:26 +02:00

nvec

staging: nvec: Use IRQF_NO_AUTOEN flag in request_irq()

2024-09-13 07:30:23 +02:00

octeon

netdev_features: convert NETIF_F_LLTX to dev->lltx

2024-09-03 11:36:43 +02:00

olpc_dcon

staging: olpc_dcon: Use backlight power constants

2024-08-13 11:26:13 +02:00

rtl8712

Merge net-next/main to resolve conflicts

2024-10-09 08:59:22 +02:00

rtl8723bs

Merge net-next/main to resolve conflicts

2024-10-09 08:59:22 +02:00

rts5208

Merge tag 'staging-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2024-05-22 12:11:48 -07:00

sm750fb

…

vc04_services

staging: vchiq_core: Pass enumerated flag instead of int

2024-09-11 15:54:04 +02:00

vme_user

staging: vme_user: changed geoid data type from int to u32

2024-09-05 16:45:01 +02:00

vt6655

Merge net-next/main to resolve conflicts

2024-10-09 08:59:22 +02:00

vt6656

staging: don't recommend using lib80211

2024-10-08 21:52:28 +02:00

Kconfig

Merge net-next/main to resolve conflicts

2024-10-09 08:59:22 +02:00

Makefile

Merge net-next/main to resolve conflicts

2024-10-09 08:59:22 +02:00