aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2024-01-08Add linux-next specific files for 20240108HEADnext-20240108masterStephen Rothwell4-0/+16054
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2024-01-08Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.gitStephen Rothwell119-775/+1062
# Conflicts: # arch/x86/include/asm/paravirt_types.h # arch/x86/include/asm/percpu.h
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell41-308/+713
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git # Conflicts: # Documentation/devicetree/bindings/connector/usb-connector.yaml
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell16-39/+785
git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git
2024-01-08Merge branch 'nolibc' of ↵Stephen Rothwell9-50/+318
git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
2024-01-08Merge branch 'for-next/kspp' of ↵Stephen Rothwell3-2/+16
git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git
2024-01-08Merge branch 'for-next/kspp' of ↵Stephen Rothwell21-124/+208
git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
2024-01-08Merge branch 'bitmap-for-next' of https://github.com/norov/linux.gitStephen Rothwell49-417/+634
# Conflicts: # drivers/tty/serial/sc16is7xx.c
2024-01-08Merge branch 'for-next/execve' of ↵Stephen Rothwell2-1/+15
git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git # Conflicts: # MAINTAINERS
2024-01-08Merge branch 'sysctl-next' of ↵Stephen Rothwell32-102/+122
git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git
2024-01-08Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.gitStephen Rothwell28-72/+274
2024-01-08Merge branch 'next' of ↵Stephen Rothwell12-76/+1004
git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git
2024-01-08Merge branch 'slab/for-next' of ↵Stephen Rothwell29-5373/+1094
git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell1-0/+8
git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git
2024-01-08Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.gitStephen Rothwell19-33/+987
2024-01-08Merge branch 'zstd-next' of https://github.com/terrelln/linux.gitStephen Rothwell58-2594/+4789
2024-01-08Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.gitStephen Rothwell30-119/+1374
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git
2024-01-08Merge branch 'auxdisplay' of https://github.com/ojeda/linux.gitStephen Rothwell1-9/+3
2024-01-08Merge branch 'next' of ↵Stephen Rothwell2-2/+18
git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git
2024-01-08Merge branch 'ntb-next' of https://github.com/jonmason/ntb.gitStephen Rothwell2-2/+2
2024-01-08Merge branch 'libnvdimm-for-next' of ↵Stephen Rothwell8-63/+71
git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
2024-01-08Merge branch 'rtc-next' of ↵Stephen Rothwell17-47/+935
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
2024-01-08Merge branch 'kunit' of ↵Stephen Rothwell30-146/+978
git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell8-44/+192
git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell4-14/+89
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell53-362/+515
git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell162-1696/+8324
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
2024-01-08Merge branch 'gpio/for-next' of ↵Stephen Rothwell36-718/+2181
git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell7-72/+129
git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git
2024-01-08Merge branch 'linux-next' of ↵Stephen Rothwell14-69/+483
git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell5-29/+88
git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell97-1730/+2567
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell10-266/+639
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell39-282/+1867
git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
2024-01-08Merge branch 'counter-next' of ↵Stephen Rothwell1-1/+0
git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git
2024-01-08Merge branch 'staging-next' of ↵Stephen Rothwell50-2423/+1264
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
2024-01-08Merge branch 'next' of git://github.com/awilliam/linux-vfio.gitStephen Rothwell34-164/+1754
2024-01-08Merge branch 'gnss-next' of ↵Stephen Rothwell2-20/+17
git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell11-44/+62
git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell31-78/+1168
git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
2024-01-08Merge branch 'icc-next' of ↵Stephen Rothwell3-736/+124
git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git
2024-01-08Merge branch 'char-misc-next' of ↵Stephen Rothwell300-2648/+24175
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git # Conflicts: # drivers/android/binder_alloc.c
2024-01-08Merge branch 'tty-next' of ↵Stephen Rothwell172-1568/+1673
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
2024-01-08Merge branch 'usb-next' of ↵Stephen Rothwell142-1516/+3912
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
2024-01-08Merge branch 'driver-core-next' of ↵Stephen Rothwell52-263/+246
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
2024-01-08Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.gitStephen Rothwell3-11/+7
2024-01-08Merge branch 'for-leds-next' of ↵Stephen Rothwell24-201/+1449
git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell1-3/+3
git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
2024-01-08Merge branch 'for-firmware-next' of ↵Stephen Rothwell2-3/+5
git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell4-32/+64
git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell60-799/+5344
git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git # Conflicts: # drivers/platform/x86/wmi.c
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell19-10/+42
git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git
2024-01-08Merge branch 'next' of https://github.com/kvm-x86/linux.gitStephen Rothwell66-1033/+1538
2024-01-08Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.gitStephen Rothwell27-446/+1184
2024-01-08Merge branch 'next' of ↵Stephen Rothwell6-4/+49
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell34-414/+968
git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
2024-01-08Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.gitStephen Rothwell63-654/+3162
2024-01-08Merge branch 'rcu/next' of ↵Stephen Rothwell20-67/+151
git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell19-600/+1261
git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git # Conflicts: # fs/tracefs/inode.c
2024-01-08Merge branch 'edac-for-next' of ↵Stephen Rothwell35-182/+331
git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git
2024-01-08Merge branch 'timers/drivers/next' of ↵Stephen Rothwell6-12/+36
git://git.linaro.org/people/daniel.lezcano/linux.git
2024-01-08Merge branch 'master' of ↵Stephen Rothwell244-3334/+5747
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell59-1722/+2155
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell2-24/+48
git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell2-8/+29
git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell63-1042/+1278
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git # Conflicts: # arch/Kconfig
2024-01-08Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.gitStephen Rothwell31-137/+307
2024-01-08Merge branch 'next' of ↵Stephen Rothwell2-13/+5
git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell19-525/+477
git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
2024-01-08Merge branch 'next-integrity' of ↵Stephen Rothwell8-7/+62
git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
2024-01-08Merge branch 'apparmor-next' of ↵Stephen Rothwell9-74/+52
git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
2024-01-08Merge branch 'next' of ↵Stephen Rothwell66-122/+1776
git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell32-187/+722
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell28-341/+613
git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
2024-01-08next-20231221/backlightStephen Rothwell9-78/+515
2024-01-08rtc: class: Remove usage of the deprecated ida_simple_xx() APIChristophe JAILLET1-1/+1
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove(). This is less verbose. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/4f2c049cb09d46fed336e22445c71988b4f340d6.1702962419.git.christophe.jaillet@wanadoo.fr Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
2024-01-08Merge branch 'for-mfd-next' of ↵Stephen Rothwell42-377/+476
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell28-319/+771
git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell2-5/+5
git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
2024-01-08Merge branch 'for-next' of git://git.kernel.dk/linux-block.gitStephen Rothwell100-3587/+2147
# Conflicts: # fs/btrfs/zoned.h
2024-01-08Merge branch 'next' of ↵Stephen Rothwell51-541/+1226
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
2024-01-08Merge branch 'modules-next' of ↵Stephen Rothwell2-2/+2
git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git
2024-01-08rtc: MAINTAINERS: drop Alessandro ZummoKrzysztof Kozlowski1-1/+0
Last email from Alessandro was in 2016, so remove him from maintainers of the RTC subsystem. Stale maintainer entries hide information whether subsystem needs help, has a bus-factor or is even orphaned. Link: https://lore.kernel.org/all/?q=f%3A%22Alessandro+Zummo%22 Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20231211132600.101090-1-krzysztof.kozlowski@linaro.org Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
2024-01-08rtc: ma35d1: remove hardcoded UIE supportAlexandre Belloni1-20/+0
Let the core handle UIE instead of enabling it forcefully at probe which means the RTC will generate an interrupt every second even when nobody cares. Link: https://lore.kernel.org/r/20231217225831.48581-1-alexandre.belloni@bootlin.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
2024-01-08dt-bindings: rtc: qcom-pm8xxx: fix inconsistent exampleJohan Hovold1-18/+18
The PM8921 is an SSBI PMIC but in the binding example it is described as being part of an SPMI PMIC while using an SSBI address. Make the example consistent by using the sibling PM8941 SPMI PMIC instead. Fixes: 8138c5f0318c ("dt-bindings: rtc: qcom-pm8xxx-rtc: Add qcom pm8xxx rtc bindings") Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20231130173223.12794-1-johan+linaro@kernel.org Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell239-3101/+5859
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell5-29/+370
https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell55-907/+4706
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell5-13/+85
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell24-3444/+186
git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git # Conflicts: # drivers/video/fbdev/amba-clcd.c # drivers/video/fbdev/vermilion/vermilion.c
2024-01-08rtc: rv8803: Add power management supportStefan Eichenberger1-0/+29
Add power management support to the driver. This allows a SoC to wake from suspend using the nINT provided by the RTC. Only register it as a wakeup device if the interrupt is provided and handled. Signed-off-by: Stefan Eichenberger <eichest@gmail.com> Link: https://lore.kernel.org/r/20231122181611.164792-1-eichest@gmail.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
2024-01-08rtc: ds3232: avoid unused-const-variable warningAkinobu Mita1-2/+2
Fix the following warning when CONFIG_I2C is not set but CONFIG_SPI_MASTER is set. warning: 'ds3232_pm_ops' defined but not used [-Wunused-const-variable=] 'ds3232_pm_ops' is only used by rtc-ds3232 i2c driver, so move the device PM callbacks inside #if IS_ENABLED(CONFIG_I2C). Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202311172325.33tTniaJ-lkp@intel.com/ Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Link: https://lore.kernel.org/r/20231118092200.829808-1-akinobu.mita@gmail.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
2024-01-08rtc: lpc24xx: add missing dependencyAntoniu Miclaus1-0/+1
The driver depends on COMMON_CLK. Add the dependency in Kconfig. Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com> Link: https://lore.kernel.org/r/20231114114532.37840-1-antoniu.miclaus@analog.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
2024-01-08Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linuxStephen Rothwell9-43/+155
2024-01-08Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intelStephen Rothwell27-405/+381
2024-01-08Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linuxStephen Rothwell188-2012/+3651
2024-01-08Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-miscStephen Rothwell1-3/+1
2024-01-08Merge branch 'for-linux-next' of ↵Stephen Rothwell4-9/+9
git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
2024-01-08Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.gitStephen Rothwell1505-23041/+129120
2024-01-08rtc: tps6594: Add driver for TPS6594 RTCEsteban Blanc3-0/+467
TPS6594 PMIC is a MFD. This patch adds support for the RTC found inside TPS6594 family of PMIC. Alarm is also supported. Signed-off-by: Esteban Blanc <eblanc@baylibre.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Tested-by: Thomas Richard <thomas.richard@bootlin.com> Link: https://lore.kernel.org/r/20231107094701.2223486-1-eblanc@baylibre.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
2024-01-08Merge branch 'master' of ↵Stephen Rothwell205-5776/+10084
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git # Conflicts: # Documentation/driver-api/index.rst
2024-01-08Merge branch 'mtd/next' of ↵Stephen Rothwell34-464/+740
git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
2024-01-08Merge branch 'master' of ↵Stephen Rothwell6-9/+44
git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
2024-01-08Merge branch 'main' of ↵Stephen Rothwell1820-108978/+93142
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git # Conflicts: # Documentation/driver-api/index.rst
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell74-632/+1760
git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell5-25/+17
git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
2024-01-08Merge branch 'opp/linux-next' of ↵Stephen Rothwell5-172/+244
git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell25-141/+100
git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
2024-01-08Merge branch 'cpupower' of ↵Stephen Rothwell1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git
2024-01-08Merge branch 'linux-next' of ↵Stephen Rothwell83-1489/+2992
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
2024-01-08Merge branch 'master' of git://linuxtv.org/media_tree.gitStephen Rothwell478-5193/+38135
2024-01-08Merge branch 'docs-next' of git://git.lwn.net/linux.gitStephen Rothwell153-790/+3202
2024-01-08Merge branch 'hwmon-next' of ↵Stephen Rothwell48-495/+3059
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
2024-01-08Merge branch 'i3c/next' of ↵Stephen Rothwell5-7/+66
git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
2024-01-08Merge branch 'i2c/for-next' of ↵Stephen Rothwell85-823/+737
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell37-1050/+2834
git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
2024-01-08Merge branch 'for-next/pstore' of ↵Stephen Rothwell3-66/+46
git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
2024-01-08Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.gitStephen Rothwell71-630/+1107
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell51-1148/+1022
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git # Conflicts: # Documentation/filesystems/porting.rst # fs/overlayfs/copy_up.c # fs/tracefs/inode.c
2024-01-08Merge branch 'vfs.all' of ↵Stephen Rothwell228-3809/+7895
git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
2024-01-08Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.gitStephen Rothwell146-2943/+12727
2024-01-08Merge branch 'next' of ↵Stephen Rothwell12-88/+539
git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git
2024-01-08Merge branch 'overlayfs-next' of ↵Stephen Rothwell9-74/+76
git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git
2024-01-08Merge branch 'master' of ↵Stephen Rothwell14-197/+306
https://github.com/Paragon-Software-Group/linux-ntfs3.git
2024-01-08Merge branch 'nfsd-next' of ↵Stephen Rothwell37-781/+907
git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux # Conflicts: # fs/nfsd/nfsctl.c
2024-01-08Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.gitStephen Rothwell26-123/+181
2024-01-08Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.gitStephen Rothwell6-38/+48
2024-01-08Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.gitStephen Rothwell5-31/+52
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell21-151/+182
git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
2024-01-08Merge branch 'dev' of ↵Stephen Rothwell16-269/+395
git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
2024-01-08Merge branch 'dev' of ↵Stephen Rothwell11-101/+140
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
2024-01-08Merge branch 'for_next' of ↵Stephen Rothwell7-113/+148
git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git
2024-01-08Merge branch 'exportfs-next' of ↵Stephen Rothwell6-33/+17
git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
2024-01-08Merge branch 'dev' of ↵Stephen Rothwell5-92/+335
git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git
2024-01-08Merge branch 'dev' of ↵Stephen Rothwell6-230/+218
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell2-2/+2
git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
2024-01-08Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.gitStephen Rothwell3-36/+34
2024-01-08Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.gitStephen Rothwell17-788/+1101
2024-01-08Merge branch 'master' of git://github.com/ceph/ceph-client.gitStephen Rothwell4-21/+24
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell61-3159/+3854
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
2024-01-08Merge branch 'afs-next' of ↵Stephen Rothwell44-1692/+3544
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git
2024-01-08Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.gitStephen Rothwell5-25/+29
2024-01-08Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.gitStephen Rothwell125-5888/+7028
2024-01-08Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.gitStephen Rothwell3-5/+7
2024-01-08Merge branch 'next' of ↵Stephen Rothwell34-459/+212
git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell50-456/+518
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
2024-01-08Merge branch 'riscv-soc-for-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell41-704/+1394
git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell100-603/+2190
git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell2-3/+3
git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
2024-01-08Merge branch 'mips-next' of ↵Stephen Rothwell10-81/+53
git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git # Conflicts: # arch/mips/kernel/traps.c
2024-01-08Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.gitStephen Rothwell1-6/+7
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell14-22/+13
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
2024-01-08Merge branch 'loongarch-next' of ↵Stephen Rothwell11-145/+551
git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
2024-01-08Merge branch 'clk-next' of ↵Stephen Rothwell75-797/+4044
git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
2024-01-08Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.gitStephen Rothwell0-0/+0
2024-01-08Merge branch 'ti-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell11-89/+232
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell0-0/+0
https://git.linaro.org/people/jens.wiklander/linux-tee.git
2024-01-08Merge branch 'sunxi/for-next' of ↵Stephen Rothwell1-3/+2
git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
2024-01-08Merge branch 'stm32-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git
2024-01-08Merge branch 'for-linux-next' of ↵Stephen Rothwell5-9/+26
git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell2-86/+101
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell1-0/+3
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
2024-01-08Merge branch 'next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell26-66/+19516
git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
2024-01-08Merge branch 'next' of https://github.com/Broadcom/stblinux.gitStephen Rothwell0-0/+0
2024-01-08Merge branch 'at91-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell8-266/+2160
git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell0-0/+0
git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell987-7678/+60928
git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git # Conflicts: # arch/arm/kernel/perf_event_v6.c
2024-01-08Merge branch 'for-next/core' of ↵Stephen Rothwell80-807/+2292
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
2024-01-08Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.gitStephen Rothwell3-1/+38
2024-01-07ipvlan: Remove usage of the deprecated ida_simple_xx() APIChristophe JAILLET1-6/+6
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove(). This is less verbose. Note that the upper bound of ida_alloc_range() is inclusive while the one of ida_simple_get() was exclusive. So calls have been updated accordingly. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2024-01-07ipvlan: Fix a typo in a commentChristophe JAILLET1-1/+1
s/diffentiate/differentiate/ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2024-01-08Merge branch 'master' of ↵Stephen Rothwell62-228/+202
git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git # Conflicts: # arch/mips/include/asm/traps.h
2024-01-08Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.gitStephen Rothwell6-46/+70
2024-01-08Merge branch 'perf-tools-next' of ↵Stephen Rothwell248-2140/+7842
git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git
2024-01-08Merge branch 'clang-format' of https://github.com/ojeda/linux.gitStephen Rothwell1-19/+73
2024-01-08Merge branch 'for-next' of ↵Stephen Rothwell46-532/+1522
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
2024-01-07vgacon: drop IA64 reference in VGA_CONSOLE dependency listLukas Bulwahn1-1/+1
Commit e9e3300b6e77 ("vgacon: rework Kconfig dependencies") turns the dependencies into a positive list of supported architectures, which includes the IA64 architecture, but in the meantime, this architecture is removed in commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture"). Drop the reference to IA64 architecture in the dependency list of the VGA_CONSOLE config definition. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Helge Deller <deller@gmx.de>
2024-01-07video/logo: use %u format specifier for unsigned int valuesColin Ian King1-3/+3
Currently the %d format specifier is being used for unsigned int values. Fix this by using the correct %u format specifier. Cleans up cppcheck warnings: warning: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Reviewed-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Helge Deller <deller@gmx.de>
2024-01-07parisc/power: Fix power soft-off button emulation on qemuHelge Deller1-1/+1
Make sure to start the kthread to check the power button on qemu as well if the power button address was provided. This fixes the qemu built-in system_powerdown runtime command. Fixes: d0c219472980 ("parisc/power: Add power soft-off when running on qemu") Signed-off-by: Helge Deller <deller@gmx.de> Cc: stable@vger.kernel.org # v6.0+
2024-01-07parisc/firmware: Fix F-extend for PDC addressesHelge Deller1-2/+2
When running with narrow firmware (64-bit kernel using a 32-bit firmware), extend PDC addresses into the 0xfffffff0.00000000 region instead of the 0xf0f0f0f0.00000000 region. This fixes the power button on the C3700 machine in qemu (64-bit CPU with 32-bit firmware), and my assumption is that the previous code was really never used (because most 64-bit machines have a 64-bit firmware), or it just worked on very old machines because they may only decode 40-bit of virtual addresses. Cc: stable@vger.kernel.org Signed-off-by: Helge Deller <deller@gmx.de>
2024-01-08Merge branch 'mm-everything' of ↵Stephen Rothwell89-257/+373
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-01-08Merge branch 'mm-nonmm-stable' of ↵Stephen Rothwell160-1155/+1110
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-01-08Merge branch 'mm-stable' of ↵Stephen Rothwell238-4770/+11061
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
2024-01-07smb: client: stop revalidating reparse points unnecessarilyPaulo Alcantara3-81/+57
Query dir responses don't provide enough information on reparse points such as major/minor numbers and symlink targets other than reparse tags, however we don't need to unconditionally revalidate them only because they are reparse points. Instead, revalidate them only when their ctime or reparse tag has changed. For instance, Windows Server updates ctime of reparse points when their data have changed. Signed-off-by: Paulo Alcantara (SUSE) <pc@manguebit.com> Signed-off-by: Steve French <stfrench@microsoft.com>
2024-01-07cifs: Pass unbyteswapped eof value into SMB2_set_eof()David Howells3-25/+20
Change SMB2_set_eof() to take eof as CPU order rather than __le64 and pass it directly rather than by pointer. This moves the conversion down into SMB_set_eof() rather than all of its callers and means we don't need to undo it for the traceline. Signed-off-by: David Howells <dhowells@redhat.com> cc: Jeff Layton <jlayton@kernel.org> cc: linux-cifs@vger.kernel.org Signed-off-by: Steve French <stfrench@microsoft.com>
2024-01-07smb3: Improve exception handling in allocate_mr_list()Markus Elfring1-2/+2
The kfree() function was called in one case by the allocate_mr_list() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software. Thus use another label. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Steve French <stfrench@microsoft.com>
2024-01-07cifs: fix in logging in cifs_chan_update_ifaceShyam Prasad N1-6/+8
Recently, cifs_chan_update_iface was modified to not remove an iface if a suitable replacement was not found. With that, there were two conditionals that were exactly the same. This change removes that extra condition check. Also, fixed a logging in the same function to indicate the correct message. Signed-off-by: Shyam Prasad N <sprasad@microsoft.com> Signed-off-by: Steve French <stfrench@microsoft.com>
2024-01-07smb: client: handle special files and symlinks in SMB3 POSIXPaulo Alcantara1-21/+29
Parse reparse points in SMB3 posix query info as they will be supported and required by the new specification. Signed-off-by: Paulo Alcantara (SUSE) <pc@manguebit.com> Signed-off-by: Steve French <stfrench@microsoft.com>
2024-01-07smb: client: cleanup smb2_query_reparse_point()Paulo Alcantara3-139/+39
Use smb2_compound_op() with SMB2_OP_GET_REPARSE to get reparse point. Signed-off-by: Paulo Alcantara (SUSE) <pc@manguebit.com> Signed-off-by: Steve French <stfrench@microsoft.com>