summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2023-01-18 08:38:45 +0300
committerJoel Stanley <joel@jms.id.au>2023-02-23 07:35:33 +0300
commit5a4bad9f7410cf4e8766609322c6489d2c2f07e5 (patch)
treeb9f296b841dcb9125f9dc2562eda3e7861ce5594
parent6764c56f08bdd95ee1bb38a634ef2c9a61f66265 (diff)
downloadopenbmc-5a4bad9f7410cf4e8766609322c6489d2c2f07e5.tar.xz
linux-aspeed: Move to Linux v6.1
This moves the OpenBMC kernel to a v6.1 base for ASPEED. This release is supported upstream until the end of 2026. There are 91 patches in the tree, with 38 of those patches not yet queued for merging in v6.3. The remaining out of tree patches include: Andrew Jeffery (6): dt-bindings: hwmon: pmbus: Add Maxim MAX31785 documentation pmbus (max31785): Add support for devicetree configuration pmbus (core): One-shot retries for failure to set page pmbus (max31785): Wrap all I2C accessors in one-shot failure handlers ARM: dts: aspeed: witherspoon: Update max31785 node ipmi: kcs_bmc: Add a "raw" character device interface Cédric Le Goater (1): /dev/mem: add a devmem kernel parameter to activate the device Eddie James (13): leds: pca955x: Refactor with helper functions and renaming leds: pca955x: Use pointers to driver data rather than I2C client leds: pca955x: Optimize probe led selection leds: pca955x: Add HW blink support dt-bindings: soc: Add Aspeed XDMA Engine soc: aspeed: Add XDMA Engine Driver soc: aspeed: xdma: Add user interface soc: aspeed: xdma: Add reset ioctl soc: aspeed: xdma: Add trace events i2c: core: Add mux root adapter operations iio: si7020: Lock root adapter to wait for reset ARM: dts: aspeed: Fix pca9849 compatible ARM: dts: aspeed: p10bmc: Update battery node name Jae Hyun Yoo (1): clk: ast2600: enable BCLK for PCI/PCIe bus always Joel Stanley (8): net: ftgmac100: Ensure tx descriptor updates are visible ARM: aspeed: Add debugfs directory ARM: soc: aspeed: Add secure boot controller support dt-bindings: trivial-devices: Remove Infineon SLB9673 TPM ARM: config: aspeed_g5: Enable SSIF BMC driver ARM: config: aspeed: Remove FIRMWARE_MEMMAP tpm: tis-i2c: Add more compatible strings ARM: config: aspeed: Add Apemre SMPro drivers Johannes Holland (1): dt-bindings: tpm: Add schema for TIS I2C devices Potin Lai (1): mtd: spi-nor: winbond: Add support for w25q01jvq Change-Id: Iaeac739503b63fc070de31fd03395899855ed8f7 Signed-off-by: Joel Stanley <joel@jms.id.au>
-rw-r--r--meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index bee834950d..f18777c3af 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
@@ -1,6 +1,6 @@
-KBRANCH ?= "dev-6.0"
-LINUX_VERSION ?= "6.0.19"
+KBRANCH ?= "dev-6.1"
+LINUX_VERSION ?= "6.1.12"
-SRCREV="67c9407e1f03a3c40bd6101aa3db32fce5717a58"
+SRCREV="cac6306557586ba4479dab12c3e5efcb67e63388"
require linux-aspeed.inc