From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 976A62BD0B for ; Sun, 1 Mar 2026 04:18:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772338698; cv=none; b=JBV6jpsPtYhs6i7nBDUURn/1nk7euT3egWhbgX+OmG7PEb9PFRscqu8ZdK4KUKNfW03AstxW5DNNnaH1ESnwFCvoYsfjzBvUIEGh6HbYUzY2/1z7GQbgM9gvOGLt+NZ/00Nis8ozjc0wSuSmyTSJoE1T85sJh6xhKwXycQWqRJg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772338698; c=relaxed/simple; bh=oVw1MSZhQ1iEmq6MbKizmVvXO7ipZVq7ookYE2kgFZ4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=S2OKEcv9oeZkWQTsewrxmeRuNOMZiRV3GPdKKbOZPVLtFuCP0gkTe2/YtzevZI4bjDs2CEey+bk5Y9/FcECGiKaDxVw0e1f12coAi2rMoqm0Gf6sPJmT54IK03dZxPGPCSs/vVZukKXTenn/jxtnm522ay1lbzlYIALUo2F79XM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=a/81MnHY; arc=none smtp.client-ip=209.85.160.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a/81MnHY" Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-506a6cf8242so26193671cf.1 for ; Sat, 28 Feb 2026 20:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772338682; x=1772943482; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/ZkfsozaHXbBx7100ZBNPLQCg44uxCNxMI5qUxruxSE=; b=a/81MnHYhCqbmA1fhBtYCn+mqlUG5R05ng6K0UPHbRUZTFWzWT4AwrucAWvwQ/DU5D O+8h0bcTencchzzvL0CRNM+XNk8MbRDTebbpnxjiHaMLZTJgrCoLbcxlMJjq3TD8F+RQ KMRhjPOjMSN/QB+R4gUTpNk0edmUBn1ZSE9m7BzdCl+16BHeMl9YHhnDdCSfMA8pUCc6 nudiYzoMGOUfYBWhUhh0zDfteTittHtbGUgCuyXdOx0VNoBWrTVAwTd8VMv7MAZajsyC v9Mznw4FUGzG91sjSQo05YY7VJ1yRlsvZDw245KY0To3YK6AKweWKXX+ISAO+zeN9LVI 71yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772338682; x=1772943482; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/ZkfsozaHXbBx7100ZBNPLQCg44uxCNxMI5qUxruxSE=; b=VkGEpMP2qSQTVvR9hiZWn+rMtrKVyBMq2c/e1/ZEW2sFkInnvHG51CR95EoYIq2LDp v54sOuhC8xOQkM+iQldA/Kkbfa11nIDxMGxfNIm3S+8YDyG5iJzXZTfaqWOL2zyJBm9k wyS53p+SHJyezG0F1y7F93rEJf3ALLP06VOyFMy591DG1IIxsmZ3rX1SZ19CtgigbF6/ 7SlTmeNPsq18IF5yAFCdn8eZgV4nvfJUgp5+eeL8TEVu/03bBtMl8UesXuIJlQ98TByi 5pB1uuXlGPJT20vVXOQs5zUC/wu1ELe54nXWdmRPZkSPqnmcI4UtNYqVAxmYkyzneRSW 3rLg== X-Forwarded-Encrypted: i=1; AJvYcCVydMfEs8SFTI21gbua9qO+CfTtGekVPRZ6Pp4Wj6zK4p8ya+eBjI8iz3bw6G13627vRc8F1t6T7gKfgjKm@lists.linux.dev X-Gm-Message-State: AOJu0YyCSDBv0qV9ZRlncdc1Reh7B8l+m+cem68LPZp/vMR3qnjyD7Rx Ep8iajdJIxTJqrEjTrCfMYa+orpeBt3Zb/36Naagru01Zp03BFHDAfH3 X-Gm-Gg: ATEYQzwDE4P8hjcnOj0CiP95fZ6HGpys2LBj7vd5rHHYcJgMBa5v1YiG55KX1yX5XfF 7nCEntz4j1b5Yopl3DVmbrQrcg8h2CUiLdKR5qfC6V1BUlwuEdWSWtRgnz/MXmagXTnI62E6Tpv M/T08nt2qr1BtzNVMFPap+RvWm7/VjtJx+iDiHbAI5cBKsxcfKfsXFMsL1po9IQ9CAgYjnAnqFj SpY15L4DSdDaIifEMTraqExcVwxA7SCp66GlAD9nvU1Mpfmx0NIoSsxCMCfZIm13E7lqyPoGCpm 6FnYNry+fiDDI02i4rUfe30ZY9OlMUt7biqiSNdVSSHVmvZsAF90Ut2O7ZG3EJ4bt6ynG53Jpgq hzop0YdmXDFx9aqUGO0YeRCV4QEs+18pYIpIl7h4BoiSz8YWv+CusU3rons+LS+dxSvTRE9zOKf z5IfGXi/Zcdg0qkW1Pag1aoat+AcV9eiuyzRo1ORd4hb2PkWNXFMitF8f8/9rnZ10z0wvx0Y+mf 9yZBQibvOd9A0CMTTTx5OC5Yem0hBKXk/Ng6Fke0Uyf+Q== X-Received: by 2002:a05:622a:1984:b0:502:a100:4054 with SMTP id d75a77b69052e-507528c1f89mr112425121cf.23.1772338681043; Sat, 28 Feb 2026 20:18:01 -0800 (PST) Received: from rusty.tail87dd8.ts.net (host-28-207.ilmon.monticello.illinois.us.clients.pavlovmedia.net. [216.171.28.207]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cbbf64ef00sm857647385a.10.2026.02.28.20.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Feb 2026 20:17:59 -0800 (PST) From: Jack Tanner To: hansg@kernel.org, mchehab@kernel.org Cc: sakari.ailus@linux.intel.com, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, Mark Brown Subject: [PATCH] Add linux-next specific files for 20260227 Date: Sat, 28 Feb 2026 22:17:27 -0600 Message-ID: <20260301041728.577647-1-jtanner0786@gmail.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mark Brown Signed-off-by: Mark Brown --- Next/SHA1s | 410 +++ Next/Trees | 410 +++ Next/kselftest-targets | 109 + Next/merge.log | 5403 ++++++++++++++++++++++++++++++++++++++++ localversion-next | 1 + 5 files changed, 6333 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/kselftest-targets create mode 100644 Next/merge.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..5806134a95f7 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,410 @@ +Name SHA1 +---- ---- +origin a75cb869a8ccc88b0bc7a44e1597d9c7995c56e5 +ext4-fixes d250bdf531d9cd4096fedbb9f172bb2ca660c868 +vfs-brauner-fixes a0b4c7a49137ed21279f354eb59f49ddae8dffc2 +fscrypt-current 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +fsverity-current 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +btrfs-fixes 0f8fa612bfed95c48148c4bdb4fc9e3432dbf8c0 +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +nfsd-fixes 364410170ab33f6e7ef0eb2afb12bf89b0feb3a6 +v9fs-fixes 2014c95afecee3e76ca4a56956a936e23283f05b +fscrypt 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +btrfs 2927626c182f789d036d323b81ebd878095e3663 +ceph cfdde144ae455b8612a756fe7419d57c9b7833c1 +cifs c5ec22ff13e9ce3226756ced7115be79beffb1b5 +configfs 6363844fdbbb76afe1d44d678fe0746390204a5f +ecryptfs 2a9cb23307db71319e6b841e1c3d70066c0ff660 +dlm 2c3a0b730012ef87aaaf35243e1fbe9880666f7c +erofs 4a2d046e4b13202a6301a993961f5b30ae4d7119 +exfat 4637b4cdd7aebfa2e38fa39f4db91fa089b809c5 +ext3 93a803d2ab6413e159926d34f08ff0a598b65d2c +ext4 4f5e8e6f012349a107531b02eed5b5ace6181449 +f2fs 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +fsverity 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +fuse 57c2258dd2d044d0abbec6a9cf60603bb1661a67 +gfs2 f103ebb33da99365ffbc9eb54cae85180a3e5da4 +jfs 7833570dae833028337bb53b7f389825b910c100 +ksmbd a75cb869a8ccc88b0bc7a44e1597d9c7995c56e5 +nfs 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 +nfs-anna dd2fdc3504592d85e549c523b054898a036a6afe +nfsd 1ce833edaf7e8249ecce17c15e3a6d2430326308 +ntfs 7c76484fbb222e82f1db34009eb441d08db0a158 +ntfs3 e8619bcb08b3012117cb2dbac8d02e78a39646cc +orangefs 9e835108a9ae1c37aef52a6f8d53265f474904a1 +overlayfs 869056dbbd636f8f256b695f39c102eb3ce2edd0 +ubifs 11efa98bcc0d00271e8f66c7c940c284f973f39d +v9fs da2519ee01067fe9dee9bafac407ca1d8b276af3 +v9fs-ericvh 2014c95afecee3e76ca4a56956a936e23283f05b +xfs 650b774cf94495465d6a38c31bb1a6ce697b6b37 +zonefs a42938e80357a13f8b8592111e63f2e33a919863 +vfs-brauner a22b63e878868412efc08d3b3f4d21d13e49ebda +vfs 0787a93baa1aab9fd0cb8500105d11d3d3a58f7a +mm-hotfixes e002d4b70d364aab323e3b2c0d4bf31ff359c66e +fs-current bf2f406d038c1614047b31163af665b1f01a85a7 +kbuild-current 153d29932f0b4c39c1ff950e097b9fd8a5af1a98 +arc-current d7b8f8e20813f0179d8ef519541a3527e7661d3a +arm-current 23ea2a4c72323feb6e3e025e8a6f18336513d5ad +arm64-fixes df6e4ab654dc482c1d45776257a62ac10e14086c +arm-soc-fixes c3cb2722e28969650c58d6defb09d57339a2a223 +davinci-current 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +drivers-memory-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current cb39cf99d88e8f2c68a41fb3bb01c4f40a8fcc30 +powerpc-fixes 9ace4753a5202b02191d54e9fdf7f9e3d02b85eb +s390-fixes d879ac6756b662a085a743e76023c768c3241579 +net be11a537224d72b906db6b98510619770298c8a4 +bpf 6881af27f9ea0f5ca8f606f573ef5cc25ca31fe4 +ipsec 0c0eef8ccd2413b0a10eb6bbd3442333b1e64dd2 +netfilter baed0d9ba91d4f390da12d5039128ee897253d60 +ipvs baed0d9ba91d4f390da12d5039128ee897253d60 +wireless 6668c6f2dde1d6693e5c7a512ba2d6b27002644c +ath 7259b1a0e54c2d3051ac8f1eb01de121b11118ea +iwlwifi fb7f54aa2a99b07945911152c5d3d4a6eb39f797 +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes 7c2889af823340d1d410939b9d547bf184d5fa54 +sound-current 71c1978ab6d2c6d48c31311855f1a85377c152ae +sound-asoc-fixes 32fc4168fa56f6301d858c778a3d712774e9657e +regmap-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +regulator-fixes bfd7db781e2e7a99b086d645a104d16e368f58ff +spi-fixes e96493229a6399e902062213c6381162464cdd50 +pci-current c22533c66ccae10511ad6a7afc34bb26c47577e3 +driver-core.current 78437ab3b769f80526416570f60173c89858dd84 +tty.current 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +usb.current 1be3b77de4eb89af8ae2fd6610546be778e25589 +usb-serial-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +phy 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +staging.current a75281626fc8fa6dc6c9cc314ee423e8bc45203b +iio-fixes 9990cd4f8827bd1ae3fb6eb7407630d8d463c430 +counter-current 9448598b22c50c8a5bb77a9103e2d49f134c9578 +char-misc.current a0b9b0f1433c845bda708753db32befef78e0f1f +soundwire-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +thunderbolt-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +input-current 7adaaee5edd35a423ae199c41b86bd1ed60ed483 +crypto-current 0ce90934c0a6baac053029ad28566536ae50d604 +libcrypto-fixes 201ceb94aa1def0024a7c18ce643e5f65026be06 +vfio-fixes 61ceaf236115f20f4fdd7cf60f883ada1063349a +kselftest-fixes 6e39903c73df08b256322d04c4dfe4a82ec63a45 +dmaengine-fixes ee66bc29578391c9b48523dc9119af67bd5c7c0f +backlight-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mtd-fixes 0410e1a4c545c769c59c6eda897ad5d574d0c865 +mfd-fixes aa6e63373d91f82628b20f6fae7ffe9b97b568a5 +v4l-dvb-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +reset-fixes e0cf84109bc6c6768337123f1de24ff56b41c91b +mips-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +at91-fixes 94ad504e67cd3be94fa1b2fed0cb87da0d8f9396 +omap-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +kvm-fixes 0de4a0eec25b9171f2a2abb1a820e125e6797770 +kvms390-fixes 5f9df945d4e862979b50e4ecaba3dc81fb06e8ed +kvm-arm-fixes 6316366129d2885fae07c2774f4b7ae0a45fb55d +hwmon-fixes 07ed4f05bbfd2bc014974dcc4297fd3aa1cb88c0 +nvdimm-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +cxl-fixes e46f25f5a81f6f1a9ab93bcda80d5dfaea9f4897 +dma-mapping-fixes d5b5e8149af0f5efed58653cbebf1cb3258ce49a +drivers-x86-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +samsung-krzk-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pinctrl-samsung-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +devicetree-fixes 81122fba08fa3ccafab6ed272a5c6f2203923a7e +dt-krzk-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +scsi-fixes 2f38fd99c0004676d835ae96ac4f3b54edc02c82 +drm-fixes 103d53eb6fb11cfc3d502eb7b6efa706e139b947 +drm-intel-fixes eb4a7139e97374f42b7242cc754e77f1623fbcd5 +mmc-fixes 901084c51a0a8fb42a3f37d2e9c62083c495f824 +rtc-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +gnss-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +hyperv-fixes 622d68772ddf07573cf88e833afe8ba6c70ac748 +risc-v-fixes 11212007bf29af0ff03f7fa2df4e0ab822af87bd +riscv-dt-fixes 4ade402d5d89cd0a254d8329209c098417d13ac0 +riscv-soc-fixes 0528a348b04b327a4611e29589beb4c9ae81304a +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx 8bf22c33e7a172fbc72464f4cc484d23a6b412ba +gpio-brgl-fixes ec2cceadfae72304ca19650f9cac4b2a97b8a2fc +gpio-intel-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pinctrl-intel-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +auxdisplay-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +kunit-fixes c33b68801fbe9d5ee8a9178beb5747ec65873530 +memblock-fixes f043a93fff9e3e3e648b6525483f59104b0819fa +renesas-fixes 379c590113ce46f605439d4887996c60ab8820cc +perf-current 8934827db5403eae57d4537114a9ff88b0a8460f +efi-fixes 4b22ec1685ce1fc0d862dcda3225d852fb107995 +battery-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +iommufd-fixes 2724138b2f7f6299812b3404e23b124304834759 +rust-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +w1-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pmdomain-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +i2c-host-fixes b4b4d88ebfbfd3aadb4c9a0f2bfe1abdbaf5822c +sparc-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +clk-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +thead-clk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pwrseq-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +thead-dt-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes b042fdf18e89a347177a49e795d8e5184778b5b6 +trace-fixes 9678e53179aa7e907360f5b5b275769008a69b80 +tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82 +spacemit-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +tip-fixes adb7b8318d487b8a0b43fd4133ad31be2bb4b4bb +slab-fixes 3d8e30e6c0043e62931cd832ee770950816f7de6 +drm-msm-fixes ac47870fd795549f03d57e0879fc730c79119f4b +uml-fixes df447a3b4a4b961c9979b4b3ffb74317394b9b40 +fwctl-fixes f8f9c1f4d0c7a64600e2ca312dec824a0bc2f1da +devsec-tsm-fixes c2012263047689e495e81c96d7d5b0586299578d +drm-rust-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +tenstorrent-dt-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc-fixes 36d9579fed6c9429aa172f77bd28c58696ce8e2b +rust 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +rust-alloc 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init aeb5ecad5316f6af160993915163367290825b6b +rust-timekeeping 4521438fb076f8a6a52f45b0e508f6ef10ac0c49 +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mm-stable 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mm-nonmm-stable 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mm-unstable df9c51269a5e2a6fbca2884a756a4011a5e78748 +mm-nonmm-unstable 8d1137446fc20db26308c6d4138f3329c3a3df17 +kbuild 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf 0feca0b788567debbaec6a9a329f5bee1b15c705 +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm b9cbb9e3bed3ffd40201fc28398f5f0a5f9a324a +arm64 773b24bcedc16a4a29e8579d66ec67ca7aa0014f +arm-perf ab26d9c85554c4ff1d95ca8341522880ed9219d6 +arm-soc 862ad12fb14cdad9c647100fbc16f7d8171b4470 +amlogic e3194dfb772304a1b7ca3bcfccacefec3468b7bf +asahi-soc d31647c698f632e0c08080a760e004ba4d71f8dd +at91 d75e671528b49294fc4c4be2152a71b93c7df1be +bmc 710dbb13377c80a6e39ef049a517665841e3221e +broadcom 8bb18f06da3148bdae80b4a7266d9966a1dc0f52 +cix 4d24b32aa342e32f93ab8e73f0cce579502abec0 +davinci 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +drivers-memory a969a0835152984a0f556434eafdee0b84213670 +fsl cf8e9203cc653f0a82639f7ce8089fa92afe6739 +imx-mxs 8487f650127b3092d66940688da23bf03b6236ae +mediatek e96c48a291fb02709d8cd9135b0616aff2251012 +mvebu 8dcbe20fc92456507eb4d15fa1892dbba592e1af +omap 35ca43aadd4ea05e0f2af1e38deb134f84a4042a +qcom 85694946ded4155d81c70dcde58f828b3dc16372 +renesas 927d8d109186af0a85ec2a6e7d6fecd322c61fc8 +reset 938ce3b16582657e67f3bd8a7efa59089c467c90 +rockchip 0a4016644751b4292ceb09afc15e2f8dfae53ca0 +samsung-krzk 9218a95a4f2eb719ba8d1621f122ddf9b118ccf0 +scmi 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +sophgo 9aa6068586a9b4cd34cf04f8dee72a7283ab4ae4 +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +stm32 291f393298f72091490dfa70ab4a0ebdbb4c7d7e +sunxi fb20ccf70cf695f178d7c32e2d33b376560df0ff +tee dca52747925434aae27deb46a15a8ea10f623686 +tegra 5ce9dde55d5849ccf901ec0227c4809bc2189cf7 +tenstorrent-dt a71e6e8eea8ae2d624f097911f43357bba06d2a5 +thead-dt 34ce47c9cdfdd30317fb5b1b71c73ba9c2016a20 +ti 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +xilinx 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +socfpga ee0deebb9d5a4e3129b4c433a70cd34db9abbcf6 +clk 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +clk-imx 3e6b0227b93c708e93e33f6c3485bad077650766 +clk-renesas 84eca77af2ad61cdd45dce940fc175349147b5cd +thead-clk baf4fc7c03bd0f68c768cfe27829674bd060c6b4 +csky 817d21578d51e801df58ab012654486a71073074 +loongarch 7dff99b354601dd01829e1511711846e04340a69 +m68k cb39cf99d88e8f2c68a41fb3bb01c4f40a8fcc30 +m68knommu 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +microblaze 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mips 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +openrisc 0dfffa5479d6260d04d021f69203b1926f73d889 +parisc-hd 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +powerpc e2071f9ce42b6985a40feaf98d2f5f7ce0fca006 +risc-v 18be4ca5cb4e5a86833de97d331f5bc14a6c5a6d +riscv-dt 7982b62bedbb19044a3bff6b252273d9e7047f47 +riscv-soc fd69c5b3002c39889bc271116cc4e08cd02d7b21 +s390 5cd0301c8849012071302d289a817739c118efb1 +sh 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +sparc d844152d85cfcc7d2ef9430a25882604c12da279 +uml c87c79345ea8ff917354e9223d44034e4aef2690 +xtensa 0d4b3ca115b5436d7e68453527566db3e87ab7f0 +fs-next 4d750717498bbc1d8801281c32453a5f23d0bbe8 +printk 08c32fa109b6e4f6e4b1af6a59b3bd3f76c36c0e +pci bba5917ad454a97fd6fa81599a1f63d06916278e +pstore bb5278a89dad28bddf3b880e68fa7847960f2fb4 +hid 0f96b90e8531b50481b07328943122b16ba59721 +i2c a7ccf182b2aba40a6f7f601182e1fa17294d94dd +i2c-host 079a015b5a630a87632f5585247d1ff7fd80086b +i3c ed318b3fb4ab317c533d38d160326fa5d7569497 +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging addb1581d9b6a44e29f9f00855deffe66abe3526 +jc_docs b8c904a37608c9b2ef4ffa35f44a7e552454df51 +v4l-dvb f505e978d1a0442adbbde48aed38c084ddea6d6e +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm af08929c57ceb426876c5c3afbe40962f82fabdf +cpufreq-arm 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +cpupower 4ca3c45eb30b9331013a12acb84bb62b20fafe28 +devfreq 73b32f1304a4748684902d6fcf4712e79c37adb5 +pmdomain 7ad7f43e568b8601586657ff9024fb4f30de7d36 +opp 3d2398f44a2d48fb1c575a6e0bc6b38f3e689e22 +thermal 0061030929e2d09398ade9fae320528bdcba2bed +rdma 58409f0d4dd3f9e987214064e49b088823934304 +net-next fd6dad4e1ae296b67b87291256878a58dad36c93 +bpf-next f620af11c27b8ec9994a39fe968aa778112d1566 +ipsec-next d2adf01780b8957b31f4954d56646b02de956f65 +mlx5-next 49e41f3ea3f7545c732a0b399cb123173afc5cfe +netfilter-next c7f5c6fb0f2b1a44490a36582a251f0a304d6b0c +ipvs-next c7f5c6fb0f2b1a44490a36582a251f0a304d6b0c +bluetooth 85e59519f724e2284fedb145e2546e6bc893093b +wireless-next 0314e382cf02983eb3c33ac537ad9701e7858bc9 +ath-next ff49eba595df500e4ddccc593088c8a4ab5f2c27 +iwlwifi-next 66af8ac52d10ea229d5755b8700e2fe86fc037f7 +wpan-next 1dd9291eb90378f8096669d9cb33761fd84599e0 +wpan-staging 1dd9291eb90378f8096669d9cb33761fd84599e0 +mtd 43db6366fc2de02050e66389f5628d3fdc9af10a +nand d9a2a92b4209838c513f31eecc6c8bef4a107ab2 +spi-nor ed26bd40df11ee438d623adc9c6cc2a7bf9c5dd3 +crypto 0ce90934c0a6baac053029ad28566536ae50d604 +libcrypto 5366a35e2ec6cb6771251f2c0be605e3aa166027 +drm 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc bbe814bcb961ed2f30706ffdc806f18150709d2d +amdgpu 9973e64bd6ee7642860a6f3b6958cbf14e89cabd +drm-intel 40d2f5820951dee818d05c14677277048bd85f9f +drm-msm 50c4a49f7292b33b454ea1a16c4f77d6965405dc +drm-msm-lumag 50c4a49f7292b33b454ea1a16c4f77d6965405dc +drm-xe a235e7d0098337c3f2d1e8f3610c719a589e115f +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev 17d5abba81b8b964e2407cd0c25dde0cc7952636 +regmap 37983fad7f3ef296fa0504c8e945987459dc5487 +sound 71c1978ab6d2c6d48c31311855f1a85377c152ae +ieee1394 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +sound-asoc 4ca9ef39c4079204888bdf47ba30db73a2e14743 +modules f9d69d5e7bde2295eb7488a56f094ac8f5383b92 +input 4410a3f14c305de493036b7d982f24b84e4c8e03 +block 745c6406acc980e1410c1c706449f9663620a814 +device-mapper 218b16992a37ea97b9e09b7659a25a864fb9976f +libata 46a9d97069cab311738c950d0fcef85a459c7b8f +pcmcia 4a81f78caa53e0633cf311ca1526377d9bff7479 +mmc 6a4a4c1cc0012590b8bebf6c95d51687d39b420c +mfd 845776177cf3b75be4e27213425f25dcb630d817 +backlight 83333aa97441ba7ce32b91e8a007c72d316a1c67 +battery 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +regulator ea07847b38e2238d170e930ab911dbe7a57991a8 +security 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +apparmor 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +integrity 397f9c2d778d3394e20143b9f47fa39838ae3bea +selinux 8dc51459ef702bcc0ef5fb26bb4d362b38aa56c2 +smack 33d589ed60ae433b483761987b85e0d24e54584e +tomoyo dc96fb256daa177f714be45792fe873d9c7bbd47 +tpmdd d79526b89571ae447c1a5cfd3d627efa07098348 +watchdog 450517fa5aae98b857c68743fd12ce93e4b8989d +iommu ad095636604604b3574c1920260b1360c25ced6f +audit 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +devicetree be4b91d9aae51cfbc1d80f899c0f8aad081fc711 +dt-krzk 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mailbox 75df94d05fc03fd9d861eaf79ce10fbb7a548bd8 +spi 7ec4dc64e4445af22eee8c3f9bc4d32747b918c1 +tip ab300bb01a8cae2ea226835445df40c37b552fc5 +clockevents a83f9c04be4e807d1c3961eec3fe3310c60ed9aa +edac 148f30165b4bd17983f0b1f7c926fb66725f8959 +ftrace 3156e85dfa08d3b518416dcdd745cca094b8bdd1 +rcu ed062c41dfda2de8d1712c91e089303dae013bb7 +paulmck 7f8fcc6f09fb732745b3252f481def76b18fb99c +kvm b1195183ed42f1522fae3fe44ebee3af437aa000 +kvm-arm 6316366129d2885fae07c2774f4b7ae0a45fb55d +kvms390 e3372ffb5f9e2dda3da259b768aab6271672b90d +kvm-ppc 9448598b22c50c8a5bb77a9103e2d49f134c9578 +kvm-riscv 376e2f8cca2816c489a9196e65cc904d1a907fd2 +kvm-x86 183bb0ce8c77b0fd1fb25874112bc8751a461e49 +xen-tip 5043d7ed39dfdce3107d6642aa31bb7736547104 +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues 9cb8b0f289560728dbb8b88158e7a957e2e90a14 +sched-ext d19e1ccdec559a1f4ec34fae165487475aa4ed22 +drivers-x86 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +chrome-platform 286386820d524a76647b8a1de9e4122270da6975 +chrome-platform-firmware 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +hsi 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +leds-lj b2c87f5e98cd88095dbc6802197526703d5e4e48 +ipmi cae66f1a1dcd23e17da5a015ef9d731129f9d2dd +driver-core 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +usb bb375c251ab40bdbc5272008fcf2bc6cd5266610 +thunderbolt 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +usb-serial 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +tty 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +char-misc 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +coresight 87c266bb30dc09979b7b7e8f962598367d626b57 +fastrpc 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +fpga ae801944cbfb70326afc373c11a282d1ce3bae97 +icc 0e841d1d561376828ea9ecdf7d591f491046924c +iio 70a9ae59c5b1f2f5501e78e2d85bfeefd153f854 +phy-next 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +soundwire 4b8fc2b17272d4379f3c80cee2d6d8b7d998fa8f +extcon 24c76540a08b79c89aa991b9f05aed7d5d81ae95 +gnss 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +vfio 96ca4caf9066f5ebd35b561a521af588a8eb0215 +w1 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +spmi 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +staging 2f0dad8baae2042482b50977fd1d215d051510df +counter-next ad415677b7e3b733270adaf04e3a7a9c46f1e929 +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine c8e9b1d9febc83ee94944695a07cfd40a1b29743 +cgroup 085f067389d12bd9800c0a9672a174c1de7a8069 +scsi 2f38fd99c0004676d835ae96ac4f3b54edc02c82 +scsi-mkp 23187576db340953b2c1cb4874eaa7904f16e1fc +vhost ebcff9dacaf2c1418f8bc927388186d7d3674603 +rpmsg 75a617cd8cd5ee09e303517128fc5e2206a8ce83 +gpio-brgl c7f92042d3f3d4f084794f5314fa10366084179c +gpio-intel 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pinctrl 5d9eaad9439d6b059777e89ee2eee3b663827469 +pinctrl-intel 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pinctrl-renesas d192fa0d198439e98622dff8b8c95e605a2b3843 +pinctrl-samsung 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pwm 9321f9d27fbaf6c4f32772fc2620961a0c492135 +ktest d3042cbe84a060b4df764eb6c5300bbe20d125ca +kselftest 6d6ad32e22f028c525d5df471c5522616e645a6b +kunit 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +kunit-next db0c35ca36526f3072affcb573631ccf8c85f827 +livepatching 51ab33fc0a8bef9454849371ef897a1241911b37 +rtc 969c3cca0f3b88682cd833cee4cf01b0915629a3 +nvdimm a9ba6733c7f1096c4506bf4e34a546e07242df74 +at24 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +ntb 7b3302c687cae50d9506c77ad9d40f8c242e9c79 +seccomp 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +slimbus 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +nvmem bfab89e362066c5556c0c39fc1c2651e7e50e740 +xarray 863810caeb3cf04ee479f3944a678574001af7a9 +hyperv 158ebb578cd5f7881fdc7c4ecebddcf9463f91fd +auxdisplay 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mhi 91a0b0dce350766675961892ba4431363c4e29f7 +memblock f56ccc32468ee7885d3a9175e7d2cb608d301521 +cxl 63fbf275fa9f18f7020fb8acf54fa107e51d0f23 +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 948a013a54c47d5eba06e644b99d4927a8bc62f8 +unicode bcfee135d584714c2130031c7e28aafa91057b9a +slab 9042e77a5c29d42a56540b9402c8cc01b1c126e7 +random bb9ff576fdff48c242876f55098a3ee20a29df5d +landlock 8ff74a72b8af3672beca7f6b6b72557a9db94382 +sysctl d174174c6776a340f5c25aab1ac47a2dd950f380 +execve 46a03ea50b5f380bdb99178b8f90b39c6ba1f528 +bitmap 057581cd67327093fbc90012436ae6465e05488d +hte 92dfd92f747698352b256cd9ddd7497bb7ebe9c8 +kspp b76fb1fc995ee51339cbfb1d4ffbbfb1b19d2e9b +nolibc c8ece5c8184771088cb74a6cfd7882195e3e658d +iommufd f8f9c1f4d0c7a64600e2ca312dec824a0bc2f1da +turbostat ef0e60083f768b32cda17b1b0ca9519405db89a6 +pwrseq 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +capabilities-next 071588136007482d70fd2667b827036bc60b1f8f +ipe 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +kcsan dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa +crc 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +keys-next 965e9a2cf23b066d8bdeb690dff9cd7089c5f667 +fwctl f8f9c1f4d0c7a64600e2ca312dec824a0bc2f1da +devsec-tsm 43185067c6fd55b548ecb648a69d9569fcf622b5 +hisilicon 6c177775dcc5e70a64ddf4ee842c66af498f2c7c +kthread fa39ec4f89f2637ed1cdbcde3656825951787668 +drm-rust 4a49fe23e357b48845e31fe9c28a802c05458198 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..521b5268c440 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,410 @@ +Trees included into this release: + +Name Url +---- --- +origin https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +ext4-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +fscrypt https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +btrfs https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph https://github.com/ceph/ceph-client.git#master +cifs git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs https://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git#ntfs-next +ntfs3 https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git#for-next +overlayfs https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs https://github.com/martinetd/linux#9p-next +v9fs-ericvh https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +vfs-brauner https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-hotfixes https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-fixes-for-next +arc-current https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes https://github.com/sophgo/linux.git#fixes +sophgo-soc-fixes https://github.com/sophgo/linux.git#soc-fixes +m68k-current https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/#master +ipsec https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +iwlwifi https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#fixes +wpan https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-linus +tty.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +libcrypto-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-fixes +vfio-fixes https://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +kvm-arm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#fixes +hwmon-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes +drivers-x86-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next-fixes +mmc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git#perf-tools +efi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +sparc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +thead-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-fixes +pwrseq-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-fixes +ftrace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes https://github.com/spacemit-com/linux#fixes +tip-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +slab-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +drm-msm-fixes https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +uml-fixes https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +fwctl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-rc +devsec-tsm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#fixes +drm-rust-fixes https://gitlab.freedesktop.org/drm/rust/kernel.git#drm-rust-fixes +tenstorrent-dt-fixes https://github.com/tenstorrent/linux.git#tenstorrent-dt-fixes +drm-misc-fixes https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +rust https://github.com/Rust-for-Linux/linux.git#rust-next +rust-alloc https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray https://github.com/Rust-for-Linux/linux.git#xarray-next +rust-analyzer https://github.com/Rust-for-Linux/linux.git#rust-analyzer-next +mm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-unstable +mm-nonmm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-for-next +clang-format https://github.com/ojeda/linux.git#clang-format +perf https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#master +alpha https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom https://github.com/Broadcom/stblinux.git#next +cix https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git#for-next +davinci https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git#soc_fsl +imx-mxs https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git#for-next +mediatek https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset https://git.pengutronix.de/git/pza/linux#reset/next +rockchip https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo https://github.com/sophgo/linux.git#for-next +sophgo-soc https://github.com/sophgo/linux.git#soc-for-next +spacemit https://github.com/spacemit-com/linux#for-next +stm32 https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git#next +tegra https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +tenstorrent-dt https://github.com/tenstorrent/linux.git#tenstorrent-dt-for-next +thead-dt https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-for-next +ti https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx https://github.com/Xilinx/linux-xlnx.git#for-next +socfpga https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git#for-next +clk https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +thead-clk https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-for-next +csky https://github.com/c-sky/csky-linux.git#linux-next +loongarch https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git://git.monstr.eu/linux-2.6-microblaze.git#next +mips https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc https://github.com/openrisc/linux.git#for-next +parisc-hd https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa https://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +printk https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i3c https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git://git.lwn.net/linux.git#docs-next +v4l-dvb git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git://linuxtv.org/mchehab/media-next.git#master +pm https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +iwlwifi-next https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#next +wpan-next https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +libcrypto https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-next +drm https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu https://gitlab.freedesktop.org/agd5f/linux.git#drm-next +drm-intel https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next +drm-msm https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-xe https://gitlab.freedesktop.org/drm/xe/kernel.git#drm-xe-next +etnaviv https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git#modules-next +input https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git#for-next +device-mapper https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack https://github.com/cschaufler/smack-next#next +tomoyo git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git#timers/drivers/next +edac https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux#next +paulmck https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 https://github.com/kvm-x86/linux.git#next +xen-tip https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi https://github.com/cminyard/linux-ipmi.git#for-next +driver-core https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-next +usb https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio https://github.com/awilliam/linux-vfio.git#next +w1 https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux https://gitlab.com/peda-linux/mux.git#for-next +dmaengine https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio-brgl https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git#for-next +rtc https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb https://github.com/jonmason/ntb.git#ntb-next +seccomp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +slimbus https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git://git.infradead.org/users/willy/xarray.git#main +hyperv https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd https://github.com/terrelln/linux.git#zstd-next +efi https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +sysctl https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap https://github.com/norov/linux.git#bitmap-for-next +hte https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +nolibc https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +keys-next https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +fwctl https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon https://github.com/hisilicon/linux-hisi.git#for-next +kthread https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next +drm-rust https://gitlab.freedesktop.org/drm/rust/kernel.git#drm-rust-next +drm-nova https://gitlab.freedesktop.org/drm/nova.git#nova-next diff --git a/Next/kselftest-targets b/Next/kselftest-targets new file mode 100644 index 000000000000..932bb653513e --- /dev/null +++ b/Next/kselftest-targets @@ -0,0 +1,109 @@ +acct +amd-pstate +breakpoints +cachestat +cgroup +clone3 +connector +core +coredump +cpufreq +cpu-hotplug +damon +devices/error_logs +devices/probe +dmabuf-heaps +drivers/dma-buf +drivers/net/bonding +drivers/net/team +drivers/net/virtio_net +dt +efivarfs +exec +filelock +filesystems +filesystems/binderfs +filesystems/epoll +filesystems/fat +filesystems/mount-notify +filesystems/overlayfs +filesystems/statmount +firmware +fpu +ftrace +futex +gpio +intel_pstate +iommu +ipc +ir +kcmp +kmod +kselftest_harness +kvm +landlock +lib +livepatch +lkdtm +locking +lsm +media_tests +membarrier +memory-hotplug +mincore +module +mount +mount_setattr +move_mount_set_group +mseal_system_mappings +namespaces +nci +net/can +net/forwarding +net/hsr +net/openvswitch +net/packetdrill +net/tcp_ao +pcie_bwctrl +pci_endpoint +perf_events +pidfd +pid_namespace +powerpc +power_supply +proc +pstore +ptp +ptrace +resctrl +ring-buffer +riscv +rlimits +rseq +rtc +rust +safesetid +sched +seccomp +sgx +signal +size +sparc64 +splice +static_keys +sync +syscall_user_dispatch +sysctl +tc-testing +tdx +timens +timers +tmpfs +tpm2 +tty +user_events +vDSO +verification +watchdog +x86 +zram diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..9ddd02421f3f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5403 @@ +$ date -R +Fri, 27 Feb 2026 06:40:15 +0000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f4d0ec0aa20d4 Merge tag 'erofs-for-7.0-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs +Merging origin/master (a75cb869a8ccc Merge tag 'v7.0-rc1-ksmbd-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating f4d0ec0aa20d4..a75cb869a8ccc +Fast-forward (no commit created; -m option ignored) + .mailmap | 9 +- + Documentation/admin-guide/sysctl/net.rst | 3 + + MAINTAINERS | 42 +++--- + arch/sparc/kernel/iommu.c | 2 + + arch/sparc/kernel/pci_sun4v.c | 2 + + arch/um/drivers/ubd_kern.c | 10 +- + drivers/acpi/osi.c | 13 ++ + drivers/acpi/sleep.c | 8 ++ + drivers/bluetooth/hci_qca.c | 24 ++-- + drivers/char/ipmi/ipmi_ipmb.c | 5 + + drivers/char/ipmi/ipmi_msghandler.c | 143 ++++++++++++++------- + drivers/char/ipmi/ipmi_si_intf.c | 37 ++++-- + drivers/char/ipmi/ipmi_si_ls2k.c | 2 +- + drivers/cpufreq/intel_pstate.c | 14 +- + drivers/dpll/zl3073x/core.c | 7 +- + drivers/dpll/zl3073x/core.h | 28 ++++ + drivers/dpll/zl3073x/dpll.c | 7 +- + drivers/dpll/zl3073x/ref.c | 25 +++- + drivers/dpll/zl3073x/regs.h | 1 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/cache.c | 13 ++ + drivers/infiniband/core/cma.c | 6 +- + drivers/infiniband/core/core_priv.h | 3 + + drivers/infiniband/core/device.c | 34 ++++- + drivers/infiniband/core/umem_dmabuf.c | 4 +- + drivers/infiniband/core/uverbs_std_types_dmabuf.c | 2 + + drivers/infiniband/hw/bng_re/bng_dev.c | 56 +++----- + drivers/infiniband/hw/efa/efa_verbs.c | 2 +- + drivers/infiniband/hw/ionic/ionic_controlpath.c | 2 +- + drivers/infiniband/hw/ionic/ionic_ibdev.c | 2 + + drivers/infiniband/hw/irdma/verbs.c | 2 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 5 +- + drivers/net/dsa/sja1105/sja1105_main.c | 9 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 7 + + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 54 ++++---- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.h | 5 + + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 2 + + .../mellanox/mlx5/core/steering/sws/dr_dbg.c | 4 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 5 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + + drivers/net/ethernet/xscale/ixp4xx_eth.c | 5 +- + drivers/net/ethernet/xscale/ptp_ixp46x.c | 3 + + drivers/net/netconsole.c | 3 +- + drivers/net/ovpn/tcp.c | 57 +++++--- + drivers/net/phy/phy_device.c | 25 ++-- + drivers/net/phy/qcom/qca807x.c | 2 +- + drivers/net/team/team_core.c | 26 +++- + drivers/net/usb/kalmia.c | 7 + + drivers/net/usb/kaweth.c | 15 ++- + drivers/net/usb/lan78xx.c | 2 - + drivers/net/usb/pegasus.c | 48 ++++++- + drivers/net/wan/farsync.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 2 +- + drivers/net/wireless/marvell/libertas/main.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + drivers/nfc/pn533/usb.c | 1 + + drivers/pmdomain/imx/gpcv2.c | 4 +- + fs/smb/server/Kconfig | 1 + + fs/smb/server/auth.c | 4 +- + fs/smb/server/smb2pdu.c | 5 +- + fs/smb/server/transport_rdma.c | 4 +- + fs/squashfs/cache.c | 3 + + include/linux/gfp.h | 7 +- + include/linux/liveupdate.h | 9 +- + include/linux/overflow.h | 8 +- + include/linux/pm_runtime.h | 16 +-- + include/net/af_vsock.h | 13 +- + include/net/bluetooth/l2cap.h | 8 +- + include/net/inet_connection_sock.h | 4 +- + include/net/netns/vsock.h | 3 + + include/net/sock.h | 2 +- + include/net/tcp.h | 4 +- + include/rdma/rdma_cm.h | 2 +- + include/trace/events/kmem.h | 8 +- + init/Kconfig | 2 +- + kernel/dma/direct.h | 2 +- + kernel/kcsan/kcsan_test.c | 2 +- + kernel/liveupdate/luo_file.c | 41 +++--- + mm/damon/core.c | 3 + + mm/huge_memory.c | 3 + + mm/kfence/core.c | 29 ++++- + mm/memfd_luo.c | 7 +- + mm/mm_init.c | 6 +- + mm/page_alloc.c | 3 +- + net/bluetooth/hci_sock.c | 1 + + net/bluetooth/hci_sync.c | 2 +- + net/bluetooth/iso.c | 1 + + net/bluetooth/l2cap_core.c | 103 ++++++++++----- + net/bluetooth/l2cap_sock.c | 16 ++- + net/bluetooth/sco.c | 1 + + net/core/dev.c | 35 +++-- + net/core/skbuff.c | 23 +++- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp_fastopen.c | 2 +- + net/ipv4/tcp_input.c | 18 ++- + net/ipv4/tcp_ipv4.c | 8 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/udplite.c | 3 +- + net/ipv6/tcp_ipv6.c | 98 ++++++-------- + net/ipv6/udplite.c | 3 +- + net/ipv6/xfrm6_policy.c | 7 +- + net/kcm/kcmsock.c | 21 ++- + net/mac80211/link.c | 2 + + net/mac80211/mesh.c | 3 + + net/mac80211/mlme.c | 3 + + net/mptcp/subflow.c | 6 +- + net/netfilter/nf_conntrack_h323_asn1.c | 2 +- + net/psp/psp_main.c | 39 +++++- + net/rds/connection.c | 3 + + net/rds/tcp_listen.c | 26 +--- + net/smc/af_smc.c | 6 +- + net/socket.c | 2 +- + net/tipc/name_table.c | 6 +- + net/tls/tls_sw.c | 2 +- + net/vmw_vsock/af_vsock.c | 19 ++- + net/wireless/core.c | 1 + + net/wireless/radiotap.c | 4 +- + net/wireless/wext-compat.c | 2 +- + net/xfrm/espintcp.c | 2 +- + net/xfrm/xfrm_device.c | 12 +- + net/xfrm/xfrm_policy.c | 11 +- + tools/testing/selftests/drivers/net/hw/rss_ctx.py | 100 +++++++++++++- + tools/testing/selftests/drivers/net/team/Makefile | 1 + + .../testing/selftests/drivers/net/team/refleak.sh | 17 +++ + .../net/packetdrill/tcp_rcv_zero_wnd_fin.pkt | 27 ++++ + tools/testing/selftests/vsock/vmtest.sh | 39 +++--- + 134 files changed, 1212 insertions(+), 529 deletions(-) + create mode 100755 tools/testing/selftests/drivers/net/team/refleak.sh + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_rcv_zero_wnd_fin.pkt +Merging ext4-fixes/fixes (d250bdf531d9c ext4: fix iloc.bh leak in ext4_xattr_inode_update_ref) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (a0b4c7a49137e netfs: Fix unbuffered/DIO writes to dispatch subrequests in strict sequence) +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Merge made by the 'ort' strategy. + fs/iomap/direct-io.c | 15 ++- + fs/netfs/direct_write.c | 228 ++++++++++++++++++++++++++++++++++++++++--- + fs/netfs/internal.h | 4 +- + fs/netfs/write_collect.c | 21 ---- + fs/netfs/write_issue.c | 41 +------- + include/linux/kthread.h | 21 +++- + include/trace/events/netfs.h | 4 +- + kernel/exit.c | 6 ++ + kernel/kthread.c | 41 +------- + 9 files changed, 266 insertions(+), 115 deletions(-) +Merging fscrypt-current/for-current (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (0f8fa612bfed9 Merge branch 'misc-7.0' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/block-group.c +Auto-merging fs/btrfs/delayed-inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/qgroup.c +Auto-merging fs/btrfs/relocation.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/volumes.c +Merge made by the 'ort' strategy. + fs/btrfs/block-group.c | 1 - + fs/btrfs/delayed-inode.c | 2 +- + fs/btrfs/disk-io.c | 36 +++++++++++++++++++++--------------- + fs/btrfs/extent-tree.c | 8 +++++++- + fs/btrfs/inode.c | 19 +++++++++++++++++-- + fs/btrfs/ioctl.c | 7 ++++++- + fs/btrfs/qgroup.c | 2 +- + fs/btrfs/relocation.c | 6 ++++++ + fs/btrfs/scrub.c | 2 +- + fs/btrfs/tree-checker.c | 4 ++-- + fs/btrfs/volumes.c | 8 +++++--- + 11 files changed, 67 insertions(+), 28 deletions(-) +Merging vfs-fixes/fixes (49c5d168a3a8f udf: fix nls leak on udf_fill_super() failure) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/udf/super.c +Merge made by the 'ort' strategy. + fs/udf/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging erofs-fixes/fixes (05f7e89ab9731 Linux 6.19) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (364410170ab33 nfsd: report the requested maximum number of threads instead of number running) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Auto-merging fs/nfsd/nfsctl.c +Merge made by the 'ort' strategy. + Documentation/netlink/specs/nfsd.yaml | 4 ++-- + fs/nfsd/nfsctl.c | 22 +++++++++++----------- + fs/nfsd/nfssvc.c | 7 ++++--- + 3 files changed, 17 insertions(+), 16 deletions(-) +Merging v9fs-fixes/fixes/next (2014c95afecee Linux 6.14-rc1) +$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging fscrypt/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging btrfs/for-next (2927626c182f7 Merge branch 'for-next-next-v7.0-20260226' into for-next-20260226) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/Makefile | 4 + + fs/btrfs/backref.c | 38 ++- + fs/btrfs/block-group.c | 90 ++++-- + fs/btrfs/block-rsv.c | 25 ++ + fs/btrfs/compression.c | 15 +- + fs/btrfs/compression.h | 3 - + fs/btrfs/ctree.c | 15 +- + fs/btrfs/delayed-ref.c | 28 ++ + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/direct-io.c | 11 +- + fs/btrfs/disk-io.c | 234 +++++++-------- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 106 ++++++- + fs/btrfs/extent_io.c | 64 ++-- + fs/btrfs/extent_io.h | 2 +- + fs/btrfs/file-item.c | 13 +- + fs/btrfs/file-item.h | 6 +- + fs/btrfs/file.c | 4 +- + fs/btrfs/free-space-tree.c | 9 +- + fs/btrfs/fs.h | 4 +- + fs/btrfs/inode.c | 111 +++---- + fs/btrfs/ioctl.c | 21 +- + fs/btrfs/lzo.c | 11 +- + fs/btrfs/messages.h | 8 +- + fs/btrfs/misc.h | 18 +- + fs/btrfs/ordered-data.c | 43 +-- + fs/btrfs/ordered-data.h | 11 +- + fs/btrfs/print-tree.c | 14 +- + fs/btrfs/qgroup.c | 18 +- + fs/btrfs/raid-stripe-tree.c | 2 +- + fs/btrfs/raid56.c | 21 +- + fs/btrfs/reflink.c | 4 +- + fs/btrfs/relocation.c | 42 ++- + fs/btrfs/scrub.c | 22 +- + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 66 +++-- + fs/btrfs/space-info.h | 22 +- + fs/btrfs/super.h | 2 +- + fs/btrfs/tests/btrfs-tests.c | 3 + + fs/btrfs/tests/btrfs-tests.h | 10 + + fs/btrfs/tests/zoned-tests.c | 675 +++++++++++++++++++++++++++++++++++++++++++ + fs/btrfs/transaction.c | 55 ++-- + fs/btrfs/tree-log.c | 175 +++++++---- + fs/btrfs/tree-mod-log.c | 8 +- + fs/btrfs/volumes.c | 184 +++++++++++- + fs/btrfs/volumes.h | 34 +++ + fs/btrfs/zlib.c | 2 +- + fs/btrfs/zoned.c | 17 +- + fs/btrfs/zstd.c | 4 +- + 50 files changed, 1750 insertions(+), 539 deletions(-) + create mode 100644 fs/btrfs/tests/zoned-tests.c +Merging ceph/master (cfdde144ae455 ceph: assert loop invariants in ceph_writepages_start()) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (c5ec22ff13e9c smb: client: Use snprintf in cifs_set_cifscreds) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/cached_dir.c | 2 +- + fs/smb/client/cifs_fs_sb.h | 2 +- + fs/smb/client/cifs_ioctl.h | 8 -- + fs/smb/client/cifs_unicode.c | 14 ---- + fs/smb/client/cifs_unicode.h | 14 +++- + fs/smb/client/cifsacl.c | 17 ++-- + fs/smb/client/cifsfs.c | 84 ++++++++++---------- + fs/smb/client/cifsglob.h | 61 +++++++++++--- + fs/smb/client/connect.c | 80 ++++++++++--------- + fs/smb/client/dfs_cache.c | 2 +- + fs/smb/client/dir.c | 53 +++++++------ + fs/smb/client/file.c | 90 +++++++++++---------- + fs/smb/client/fs_context.c | 184 ++++++++++++++++++++++++------------------- + fs/smb/client/fs_context.h | 5 +- + fs/smb/client/inode.c | 146 ++++++++++++++++++---------------- + fs/smb/client/ioctl.c | 2 +- + fs/smb/client/link.c | 14 ++-- + fs/smb/client/misc.c | 16 ++-- + fs/smb/client/readdir.c | 39 ++++----- + fs/smb/client/reparse.c | 29 +++---- + fs/smb/client/reparse.h | 4 +- + fs/smb/client/smb1ops.c | 22 ++++-- + fs/smb/client/smb2file.c | 2 +- + fs/smb/client/smb2misc.c | 18 +---- + fs/smb/client/smb2ops.c | 8 +- + fs/smb/client/smb2pdu.c | 35 ++++---- + fs/smb/client/transport.c | 21 +++-- + fs/smb/client/xattr.c | 6 +- + 28 files changed, 524 insertions(+), 454 deletions(-) +Merging configfs/configfs-next (6363844fdbbb7 samples: configfs: Constify struct configfs_item_operations and configfs_group_operations) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +Already up to date. +Merging ecryptfs/next (2a9cb23307db7 ecryptfs: Annotate struct ecryptfs_message with __counted_by) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'ort' strategy. +Merging dlm/next (2c3a0b730012e dlm: Avoid -Wflex-array-member-not-at-end warning) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (4a2d046e4b132 erofs: fix interlaced plain identification for encoded extents) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (4637b4cdd7aeb exfat: use truncate_inode_pages_final() at evict_inode()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/inode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ext3/for_next (93a803d2ab641 Pull isofs name length improvement.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (4f5e8e6f01234 et4: allow zeroout when doing written to unwritten split) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (57c2258dd2d04 virtiofs: add FUSE protocol validation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/virtio_fs.c +Merge made by the 'ort' strategy. + fs/fuse/file.c | 6 ++++++ + fs/fuse/virtio_fs.c | 29 +++++++++++++++++++++++++---- + 2 files changed, 31 insertions(+), 4 deletions(-) +Merging gfs2/for-next (f103ebb33da99 gfs2: Fix data loss during inode evict) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/super.c +Merge made by the 'ort' strategy. + fs/gfs2/inode.c | 3 +-- + fs/gfs2/super.c | 54 +++++++++++++++++++++++++++++++++++------------------- + 2 files changed, 36 insertions(+), 21 deletions(-) +Merging jfs/jfs-next (7833570dae833 jfs: avoid -Wtautological-constant-out-of-range-compare warning) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (a75cb869a8ccc Merge tag 'v7.0-rc1-ksmbd-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (24d479d26b25b Linux 6.19-rc6) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (dd2fdc3504592 SUNRPC: fix gss_auth kref leak in gss_alloc_msg error path) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (1ce833edaf7e8 lockd: Relocate svc_version definitions to XDR layer) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfssvc.c +Merge made by the 'ort' strategy. + fs/lockd/clnt4xdr.c | 7 ++- + fs/lockd/clntlock.c | 2 +- + fs/lockd/clntproc.c | 2 +- + fs/lockd/clntxdr.c | 3 +- + fs/lockd/host.c | 31 +++++++++- + {include/linux => fs}/lockd/lockd.h | 94 +++++++++++++++++++++------- + fs/lockd/mon.c | 2 +- + {include/linux => fs}/lockd/nlm.h | 8 +-- + {include/linux => fs}/lockd/share.h | 8 +-- + fs/lockd/svc.c | 50 ++++----------- + fs/lockd/svc4proc.c | 77 ++++++++++++++++++----- + fs/lockd/svclock.c | 16 ++--- + fs/lockd/svcproc.c | 119 ++++++++++++++++++++++++++---------- + fs/lockd/svcshare.c | 5 +- + fs/lockd/svcsubs.c | 32 +++++++--- + fs/lockd/trace.h | 3 +- + fs/lockd/xdr.c | 3 +- + {include/linux => fs}/lockd/xdr.h | 15 +---- + fs/lockd/xdr4.c | 16 +---- + {include/linux => fs}/lockd/xdr4.h | 16 +---- + fs/nfs/nfs3proc.c | 1 + + fs/nfs/proc.c | 1 + + fs/nfs/sysfs.c | 4 +- + fs/nfsd/Kconfig | 10 --- + fs/nfsd/blocklayout.c | 72 ++++++++++++++++++++++ + fs/nfsd/debugfs.c | 4 ++ + fs/nfsd/lockd.c | 50 ++++++++------- + fs/nfsd/nfs4proc.c | 3 +- + fs/nfsd/nfs4state.c | 30 ++++++--- + fs/nfsd/nfs4xdr.c | 3 +- + fs/nfsd/nfscache.c | 3 +- + fs/nfsd/nfsctl.c | 2 +- + fs/nfsd/nfsd.h | 6 ++ + fs/nfsd/nfssvc.c | 10 ++- + fs/nfsd/state.h | 3 + + include/linux/lockd/bind.h | 26 ++++---- + include/linux/lockd/debug.h | 40 ------------ + include/linux/sunrpc/svc.h | 6 +- + net/sunrpc/auth_gss/gss_krb5_test.c | 93 +++++++++++++++------------- + net/sunrpc/cache.c | 62 +++++++++---------- + 40 files changed, 572 insertions(+), 366 deletions(-) + rename {include/linux => fs}/lockd/lockd.h (85%) + rename {include/linux => fs}/lockd/nlm.h (91%) + rename {include/linux => fs}/lockd/share.h (85%) + rename {include/linux => fs}/lockd/xdr.h (91%) + rename {include/linux => fs}/lockd/xdr4.h (80%) + delete mode 100644 include/linux/lockd/debug.h +Merging ntfs/ntfs-next (7c76484fbb222 ntfs: Remove impossible condition) +$ git merge -m Merge branch 'ntfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git ntfs/ntfs-next +Auto-merging CREDITS +Auto-merging MAINTAINERS +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + CREDITS | 9 +- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/ntfs.rst | 159 + + MAINTAINERS | 9 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ntfs/Kconfig | 47 + + fs/ntfs/Makefile | 10 + + fs/ntfs/aops.c | 263 ++ + fs/ntfs/attrib.c | 5425 +++++++++++++++++++++++++++++++++++ + fs/ntfs/attrib.h | 164 ++ + fs/ntfs/attrlist.c | 289 ++ + fs/ntfs/attrlist.h | 20 + + fs/ntfs/bdev-io.c | 117 + + fs/ntfs/bitmap.c | 287 ++ + fs/ntfs/bitmap.h | 100 + + fs/ntfs/collate.c | 146 + + fs/ntfs/collate.h | 36 + + fs/ntfs/compress.c | 1577 ++++++++++ + fs/ntfs/debug.c | 171 ++ + fs/ntfs/debug.h | 63 + + fs/ntfs/dir.c | 1236 ++++++++ + fs/ntfs/dir.h | 32 + + fs/ntfs/ea.c | 943 ++++++ + fs/ntfs/ea.h | 30 + + fs/ntfs/file.c | 1161 ++++++++ + fs/ntfs/index.c | 2117 ++++++++++++++ + fs/ntfs/index.h | 111 + + fs/ntfs/inode.c | 3820 ++++++++++++++++++++++++ + fs/ntfs/inode.h | 359 +++ + fs/ntfs/iomap.c | 870 ++++++ + fs/ntfs/iomap.h | 23 + + fs/ntfs/layout.h | 2346 +++++++++++++++ + fs/ntfs/lcnalloc.c | 1047 +++++++ + fs/ntfs/lcnalloc.h | 134 + + fs/ntfs/logfile.c | 778 +++++ + fs/ntfs/logfile.h | 245 ++ + fs/ntfs/malloc.h | 77 + + fs/ntfs/mft.c | 2922 +++++++++++++++++++ + fs/ntfs/mft.h | 94 + + fs/ntfs/mst.c | 194 ++ + fs/ntfs/namei.c | 1692 +++++++++++ + fs/ntfs/ntfs.h | 294 ++ + fs/ntfs/object_id.c | 158 + + fs/ntfs/object_id.h | 14 + + fs/ntfs/quota.c | 95 + + fs/ntfs/quota.h | 15 + + fs/ntfs/reparse.c | 573 ++++ + fs/ntfs/reparse.h | 20 + + fs/ntfs/runlist.c | 2066 +++++++++++++ + fs/ntfs/runlist.h | 97 + + fs/ntfs/super.c | 2770 ++++++++++++++++++ + fs/ntfs/sysctl.c | 55 + + fs/ntfs/sysctl.h | 26 + + fs/ntfs/time.h | 87 + + fs/ntfs/unistr.c | 477 +++ + fs/ntfs/upcase.c | 70 + + fs/ntfs/volume.h | 296 ++ + fs/ntfs3/Kconfig | 10 +- + fs/ntfs3/dir.c | 10 - + fs/ntfs3/file.c | 11 - + fs/ntfs3/inode.c | 16 +- + fs/ntfs3/ntfs_fs.h | 11 - + fs/ntfs3/super.c | 59 +- + include/uapi/linux/fs.h | 12 + + 65 files changed, 36250 insertions(+), 118 deletions(-) + create mode 100644 Documentation/filesystems/ntfs.rst + create mode 100644 fs/ntfs/Kconfig + create mode 100644 fs/ntfs/Makefile + create mode 100644 fs/ntfs/aops.c + create mode 100644 fs/ntfs/attrib.c + create mode 100644 fs/ntfs/attrib.h + create mode 100644 fs/ntfs/attrlist.c + create mode 100644 fs/ntfs/attrlist.h + create mode 100644 fs/ntfs/bdev-io.c + create mode 100644 fs/ntfs/bitmap.c + create mode 100644 fs/ntfs/bitmap.h + create mode 100644 fs/ntfs/collate.c + create mode 100644 fs/ntfs/collate.h + create mode 100644 fs/ntfs/compress.c + create mode 100644 fs/ntfs/debug.c + create mode 100644 fs/ntfs/debug.h + create mode 100644 fs/ntfs/dir.c + create mode 100644 fs/ntfs/dir.h + create mode 100644 fs/ntfs/ea.c + create mode 100644 fs/ntfs/ea.h + create mode 100644 fs/ntfs/file.c + create mode 100644 fs/ntfs/index.c + create mode 100644 fs/ntfs/index.h + create mode 100644 fs/ntfs/inode.c + create mode 100644 fs/ntfs/inode.h + create mode 100644 fs/ntfs/iomap.c + create mode 100644 fs/ntfs/iomap.h + create mode 100644 fs/ntfs/layout.h + create mode 100644 fs/ntfs/lcnalloc.c + create mode 100644 fs/ntfs/lcnalloc.h + create mode 100644 fs/ntfs/logfile.c + create mode 100644 fs/ntfs/logfile.h + create mode 100644 fs/ntfs/malloc.h + create mode 100644 fs/ntfs/mft.c + create mode 100644 fs/ntfs/mft.h + create mode 100644 fs/ntfs/mst.c + create mode 100644 fs/ntfs/namei.c + create mode 100644 fs/ntfs/ntfs.h + create mode 100644 fs/ntfs/object_id.c + create mode 100644 fs/ntfs/object_id.h + create mode 100644 fs/ntfs/quota.c + create mode 100644 fs/ntfs/quota.h + create mode 100644 fs/ntfs/reparse.c + create mode 100644 fs/ntfs/reparse.h + create mode 100644 fs/ntfs/runlist.c + create mode 100644 fs/ntfs/runlist.h + create mode 100644 fs/ntfs/super.c + create mode 100644 fs/ntfs/sysctl.c + create mode 100644 fs/ntfs/sysctl.h + create mode 100644 fs/ntfs/time.h + create mode 100644 fs/ntfs/unistr.c + create mode 100644 fs/ntfs/upcase.c + create mode 100644 fs/ntfs/volume.h +Merging ntfs3/master (e8619bcb08b30 fs/ntfs3: return folios from ntfs_lock_new_page()) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/ntfs_fs.h +Merge made by the 'ort' strategy. + fs/ntfs3/frecord.c | 47 ++++++++++++++++++--------------- + fs/ntfs3/index.c | 76 +++++++++++++++++++++++++++++++++++------------------- + fs/ntfs3/inode.c | 5 ++++ + fs/ntfs3/ntfs_fs.h | 3 --- + 4 files changed, 80 insertions(+), 51 deletions(-) +$ git am -3 ../patches/0001-ntfs3-Fix-merge-issue-with-ntfs3.patch +Applying: ntfs3: Fix merge issue with ntfs3 +Using index info to reconstruct a base tree... +M fs/ntfs3/inode.c +Falling back to patching base and 3-way merge... +Auto-merging fs/ntfs3/inode.c +No changes -- Patch already applied. +Merging orangefs/for-next (9e835108a9ae1 fs/orangefs: Replace deprecated strcpy with memcpy + strscpy) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (869056dbbd636 ovl: relax requirement for uuid=off,index=on) +$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (11efa98bcc0d0 ubi: ubi.h: fix kernel-doc warnings) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging drivers/mtd/ubi/ubi.h +Merge made by the 'ort' strategy. + drivers/mtd/ubi/ubi.h | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +Merging v9fs/9p-next (da2519ee01067 9p: fix memory leak in v9fs_init_fs_context error path) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Auto-merging fs/9p/vfs_super.c +Merge made by the 'ort' strategy. + fs/9p/vfs_super.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging v9fs-ericvh/ericvh/for-next (2014c95afecee Linux 6.14-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (650b774cf9449 xfs: add static size checks for ioctl UABI) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_ag.c | 28 +++++++++++++++++++++++ + fs/xfs/libxfs/xfs_ag.h | 3 +++ + fs/xfs/libxfs/xfs_inode_buf.c | 4 ++++ + fs/xfs/libxfs/xfs_metafile.c | 5 +++++ + fs/xfs/libxfs/xfs_ondisk.h | 52 ++++++++++++++++++++++++++++++------------- + fs/xfs/libxfs/xfs_sb.c | 3 +++ + fs/xfs/scrub/dir_repair.c | 2 +- + fs/xfs/scrub/orphanage.c | 7 +++++- + fs/xfs/xfs_fsops.c | 17 ++------------ + fs/xfs/xfs_health.c | 20 +++++++++++++++-- + fs/xfs/xfs_healthmon.c | 11 +++++---- + fs/xfs/xfs_icache.c | 18 +++++++++++---- + fs/xfs/xfs_mount.h | 2 +- + fs/xfs/xfs_notify_failure.c | 4 ++-- + fs/xfs/xfs_platform.h | 9 ++++++++ + fs/xfs/xfs_rtalloc.c | 44 ++++++++++++++++++++++++++++++------ + fs/xfs/xfs_stats.c | 17 +++++++++----- + fs/xfs/xfs_stats.h | 19 ++++++++-------- + fs/xfs/xfs_super.c | 4 ++-- + fs/xfs/xfs_verify_media.c | 4 ++-- + fs/xfs/xfs_zone_alloc.c | 6 ++--- + fs/xfs/xfs_zone_gc.c | 10 ++++----- + 22 files changed, 209 insertions(+), 80 deletions(-) +Merging zonefs/for-next (a42938e80357a zonefs: correct some spelling mistakes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (a22b63e878868 Merge branch 'vfs-7.1.xattr' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging fs/gfs2/super.c +Auto-merging net/socket.c +Merge made by the 'ort' strategy. + Documentation/filesystems/mount_api.rst | 4 - + fs/dcache.c | 4 +- + fs/f2fs/node.c | 4 +- + fs/f2fs/segment.h | 2 +- + fs/fs_context.c | 1 - + fs/fs_parser.c | 19 +- + fs/gfs2/super.c | 2 +- + fs/kernfs/dir.c | 15 +- + fs/kernfs/inode.c | 99 +---- + fs/kernfs/kernfs-internal.h | 5 +- + fs/nfs/internal.h | 2 +- + fs/nfs/write.c | 3 +- + fs/pidfs.c | 64 +-- + fs/xattr.c | 425 +++++++++++++------ + include/linux/backing-dev.h | 13 + + include/linux/fs_parser.h | 8 +- + include/linux/kernfs.h | 2 - + include/linux/shmem_fs.h | 2 +- + include/linux/xattr.h | 47 ++- + mm/shmem.c | 46 +- + net/socket.c | 119 ++++-- + .../testing/selftests/filesystems/xattr/.gitignore | 3 + + tools/testing/selftests/filesystems/xattr/Makefile | 6 + + .../filesystems/xattr/xattr_socket_test.c | 470 +++++++++++++++++++++ + .../filesystems/xattr/xattr_socket_types_test.c | 177 ++++++++ + .../filesystems/xattr/xattr_sockfs_test.c | 363 ++++++++++++++++ + 26 files changed, 1571 insertions(+), 334 deletions(-) + create mode 100644 tools/testing/selftests/filesystems/xattr/.gitignore + create mode 100644 tools/testing/selftests/filesystems/xattr/Makefile + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_types_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_sockfs_test.c +Merging vfs/for-next (0787a93baa1aa sysfs(2): fs_index() argument is _not_ a pathname) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (e002d4b70d364 memcg: fix slab accounting in refill_obj_stock() trylock path) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-block-zram | 4 +-- + Documentation/admin-guide/blockdev/zram.rst | 6 ++-- + drivers/block/zram/zram_drv.c | 24 +++++++------- + drivers/block/zram/zram_drv.h | 2 +- + include/linux/mm.h | 17 ++++------ + mm/cma.c | 5 ++- + mm/damon/core.c | 7 ++++- + mm/hugetlb.c | 4 +-- + mm/memcontrol.c | 2 +- + mm/memfd_luo.c | 49 +++++++++++++++++++++++++---- + mm/vmalloc.c | 1 + + tools/include/linux/gfp.h | 4 +++ + tools/include/linux/overflow.h | 19 +++++++++++ + tools/include/linux/slab.h | 9 ++++++ + 14 files changed, 113 insertions(+), 40 deletions(-) +Merging fs-current (bf2f406d038c1 Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + Documentation/netlink/specs/nfsd.yaml | 4 +- + fs/btrfs/block-group.c | 1 - + fs/btrfs/delayed-inode.c | 2 +- + fs/btrfs/disk-io.c | 36 +++--- + fs/btrfs/extent-tree.c | 8 +- + fs/btrfs/inode.c | 19 ++- + fs/btrfs/ioctl.c | 7 +- + fs/btrfs/qgroup.c | 2 +- + fs/btrfs/relocation.c | 6 + + fs/btrfs/scrub.c | 2 +- + fs/btrfs/tree-checker.c | 4 +- + fs/btrfs/volumes.c | 8 +- + fs/iomap/direct-io.c | 15 ++- + fs/netfs/direct_write.c | 228 +++++++++++++++++++++++++++++++--- + fs/netfs/internal.h | 4 +- + fs/netfs/write_collect.c | 21 ---- + fs/netfs/write_issue.c | 41 +----- + fs/nfsd/nfsctl.c | 22 ++-- + fs/nfsd/nfssvc.c | 7 +- + fs/udf/super.c | 2 +- + include/linux/kthread.h | 21 +++- + include/trace/events/netfs.h | 4 +- + kernel/exit.c | 6 + + kernel/kthread.c | 41 +----- + 24 files changed, 351 insertions(+), 160 deletions(-) +Merging kbuild-current/kbuild-fixes-for-next (153d29932f0b4 kbuild: install-extmod-build: Package resolve_btfids if necessary) +$ git merge -m Merge branch 'kbuild-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes-for-next +Merge made by the 'ort' strategy. + arch/alpha/kernel/vmlinux.lds.S | 1 + + arch/arc/kernel/vmlinux.lds.S | 1 + + arch/arm/boot/compressed/vmlinux.lds.S | 1 + + arch/arm/kernel/vmlinux-xip.lds.S | 1 + + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/arm64/kernel/vmlinux.lds.S | 1 + + arch/csky/kernel/vmlinux.lds.S | 1 + + arch/hexagon/kernel/vmlinux.lds.S | 1 + + arch/loongarch/kernel/vmlinux.lds.S | 1 + + arch/m68k/kernel/vmlinux-nommu.lds | 1 + + arch/m68k/kernel/vmlinux-std.lds | 1 + + arch/m68k/kernel/vmlinux-sun3.lds | 1 + + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/nios2/kernel/vmlinux.lds.S | 1 + + arch/openrisc/kernel/vmlinux.lds.S | 1 + + arch/parisc/boot/compressed/vmlinux.lds.S | 1 + + arch/parisc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/kernel/vmlinux.lds.S | 1 + + arch/riscv/kernel/vmlinux.lds.S | 1 + + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/sh/kernel/vmlinux.lds.S | 1 + + arch/sparc/kernel/vmlinux.lds.S | 1 + + arch/um/kernel/dyn.lds.S | 1 + + arch/um/kernel/uml.lds.S | 1 + + arch/x86/boot/compressed/vmlinux.lds.S | 2 +- + arch/x86/kernel/vmlinux.lds.S | 1 + + include/asm-generic/vmlinux.lds.h | 4 +++- + scripts/genksyms/parse.y | 4 ++-- + scripts/package/install-extmod-build | 4 ++++ + 29 files changed, 35 insertions(+), 4 deletions(-) +Merging arc-current/for-curr (d7b8f8e20813f Linux 6.16-rc5) +$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (23ea2a4c72323 ARM: 9468/1: fix memset64() on big-endian) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (df6e4ab654dc4 arm64: topology: Fix false warning in counters_read_on_cpu() for same-CPU reads) +$ git merge -m Merge branch 'for-next/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Merge made by the 'ort' strategy. + arch/arm64/include/asm/io.h | 26 ++++++-- + arch/arm64/include/asm/pgtable-prot.h | 3 - + arch/arm64/include/asm/tlbflush.h | 63 ++++++++++-------- + arch/arm64/kernel/acpi.c | 2 +- + arch/arm64/kernel/sys_compat.c | 2 +- + arch/arm64/kernel/topology.c | 21 ++++-- + arch/arm64/kvm/hyp/nvhe/mm.c | 2 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 8 +-- + arch/arm64/kvm/hyp/pgtable.c | 2 +- + arch/arm64/kvm/hyp/vhe/tlb.c | 10 +-- + arch/arm64/lib/delay.c | 6 +- + arch/arm64/mm/ioremap.c | 6 +- + arch/arm64/mm/mmap.c | 12 +++- + .../arm64/signal/testcases/gcs_prot_none_fault.c | 76 ++++++++++++++++++++++ + 14 files changed, 179 insertions(+), 60 deletions(-) + create mode 100644 tools/testing/selftests/arm64/signal/testcases/gcs_prot_none_fault.c +Merging arm-soc-fixes/arm/fixes (c3cb2722e2896 Merge tag 'qcom-drivers-fixes-for-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'davinci/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging sophgo-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b428 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (cb39cf99d88e8 m68k: sun3: Replace vsprintf() with bounded vsnprintf()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (9ace4753a5202 Linux 6.19-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (d879ac6756b66 s390/pfault: Fix virtual vs physical address confusion) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/include/asm/idle.h | 4 ++-- + arch/s390/include/asm/vtime.h | 34 ++++++++++++++++++++++++++++++++++ + arch/s390/kernel/entry.h | 2 -- + arch/s390/kernel/idle.c | 25 +++++-------------------- + arch/s390/kernel/ipl.c | 2 +- + arch/s390/kernel/irq.c | 20 ++++++++++++-------- + arch/s390/kernel/vtime.c | 42 ++++++++++-------------------------------- + arch/s390/mm/pfault.c | 4 ++-- + 8 files changed, 66 insertions(+), 67 deletions(-) +Merging net/main (be11a537224d7 net: ethernet: ti: am65-cpsw-nuss/cpsw-ale: Fix multicast entry handling in ALE table) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- + drivers/net/ethernet/ti/cpsw_ale.c | 9 +- + net/batman-adv/bat_v_elp.c | 10 +- + net/batman-adv/hard-interface.c | 8 +- + net/batman-adv/hard-interface.h | 1 + + net/bridge/br_private.h | 10 ++ + net/bridge/br_vlan_options.c | 26 ++- + net/core/skmsg.c | 14 +- + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_bpf.c | 2 +- + net/ipv4/tcp_input.c | 14 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv4/udp_bpf.c | 2 +- + net/sched/sch_ets.c | 12 +- + net/unix/af_unix.c | 8 +- + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/bridge_vlan_dump.sh | 204 ++++++++++++++++++++++++ + 18 files changed, 290 insertions(+), 41 deletions(-) + create mode 100755 tools/testing/selftests/net/bridge_vlan_dump.sh +Merging bpf/master (6881af27f9ea0 selftests/bpf: Fix OOB read in dmabuf_collector) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Merge made by the 'ort' strategy. + arch/arm64/net/bpf_jit_comp.c | 2 +- + kernel/bpf/devmap.c | 22 ++++-- + kernel/trace/bpf_trace.c | 4 +- + tools/bpf/resolve_btfids/Makefile | 7 +- + tools/bpf/resolve_btfids/main.c | 81 ++++++++++++++-------- + tools/include/linux/args.h | 4 ++ + tools/testing/selftests/bpf/DENYLIST.asan | 3 + + tools/testing/selftests/bpf/Makefile | 13 ++-- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 14 ++-- + tools/testing/selftests/bpf/bpf_util.h | 45 ++++++++---- + tools/testing/selftests/bpf/bpftool_helpers.c | 25 +++++-- + tools/testing/selftests/bpf/cgroup_helpers.c | 2 +- + tools/testing/selftests/bpf/jit_disasm_helpers.c | 18 ++--- + tools/testing/selftests/bpf/network_helpers.c | 5 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 3 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 2 +- + .../selftests/bpf/prog_tests/cgrp_local_storage.c | 4 +- + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 6 +- + tools/testing/selftests/bpf/prog_tests/dynptr.c | 5 +- + tools/testing/selftests/bpf/prog_tests/fd_array.c | 4 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 4 +- + .../testing/selftests/bpf/prog_tests/htab_update.c | 1 + + .../selftests/bpf/prog_tests/kmem_cache_iter.c | 7 +- + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 12 ++-- + .../selftests/bpf/prog_tests/lwt_seg6local.c | 2 +- + .../selftests/bpf/prog_tests/queue_stack_map.c | 4 +- + .../selftests/bpf/prog_tests/setget_sockopt.c | 2 +- + .../selftests/bpf/prog_tests/skc_to_unix_sock.c | 2 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 28 ++++---- + .../selftests/bpf/prog_tests/sockmap_listen.c | 2 +- + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 2 +- + .../bpf/prog_tests/struct_ops_private_stack.c | 4 +- + .../selftests/bpf/prog_tests/task_local_data.h | 2 +- + tools/testing/selftests/bpf/prog_tests/tc_opts.c | 6 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- + .../testing/selftests/bpf/prog_tests/test_sysctl.c | 3 + + .../selftests/bpf/prog_tests/test_tc_tunnel.c | 5 +- + .../selftests/bpf/prog_tests/test_veristat.c | 4 +- + tools/testing/selftests/bpf/prog_tests/test_xsk.c | 24 +++++-- + .../selftests/bpf/prog_tests/uprobe_multi_test.c | 6 +- + .../selftests/bpf/prog_tests/verifier_log.c | 2 +- + .../selftests/bpf/prog_tests/xdp_flowtable.c | 3 +- + .../selftests/bpf/prog_tests/xdp_metadata.c | 4 +- + tools/testing/selftests/bpf/progs/dmabuf_iter.c | 2 +- + tools/testing/selftests/bpf/test_progs.c | 38 +++++++--- + tools/testing/selftests/bpf/test_verifier.c | 2 +- + tools/testing/selftests/bpf/testing_helpers.c | 1 + + tools/testing/selftests/bpf/trace_helpers.c | 23 +++--- + tools/testing/selftests/bpf/trace_helpers.h | 11 ++- + tools/testing/selftests/bpf/veristat.c | 2 + + tools/testing/selftests/bpf/xdp_features.c | 3 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 4 +- + 52 files changed, 314 insertions(+), 172 deletions(-) + create mode 100644 tools/testing/selftests/bpf/DENYLIST.asan +Merging ipsec/master (0c0eef8ccd241 esp: fix skb leak with espintcp and async crypto) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/ipv4/esp4.c | 9 ++++++--- + net/ipv6/esp6.c | 9 ++++++--- + net/xfrm/xfrm_state.c | 1 + + net/xfrm/xfrm_user.c | 7 +++++-- + 4 files changed, 18 insertions(+), 8 deletions(-) +Merging netfilter/main (baed0d9ba91d4 netfilter: nf_conntrack_h323: fix OOB read in decode_choice()) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (baed0d9ba91d4 netfilter: nf_conntrack_h323: fix OOB read in decode_choice()) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (6668c6f2dde1d Merge tag 'wireless-2026-02-25' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (7259b1a0e54c2 wifi: ath12k: fix station lookup failure when disconnecting from AP) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Auto-merging drivers/net/wireless/ath/ath12k/mac.c +Auto-merging drivers/net/wireless/ath/ath12k/wmi.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath12k/mac.c | 6 +++--- + drivers/net/wireless/ath/ath12k/wmi.c | 36 +++++++++++++---------------------- + 2 files changed, 16 insertions(+), 26 deletions(-) +Merging iwlwifi/fixes (fb7f54aa2a99b wifi: iwlwifi: mvm: pause TCM on fast resume) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Already up to date. +Merging wpan/master (8ce4f287524c7 net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (7c2889af82334 RDMA/uverbs: Import DMA-BUF module in uverbs_std_types_dmabuf file) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (71c1978ab6d2c ASoC: SDCA: Fix comments for sdca_irq_request()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/hda/codecs/realtek/alc269.c | 37 +++++++++++++++- + sound/hda/codecs/side-codecs/cs35l56_hda.c | 7 +-- + sound/hda/controllers/intel.c | 2 + + sound/soc/amd/yc/acp6x-mach.c | 7 +++ + sound/soc/codecs/cs42l43-jack.c | 1 + + sound/soc/sdca/sdca_interrupts.c | 4 +- + sound/usb/endpoint.c | 10 +++-- + sound/usb/format.c | 70 +++++++++++++++++++++++++++--- + sound/usb/mixer_s1810c.c | 12 ++--- + sound/usb/mixer_scarlett2.c | 10 ++--- + sound/usb/qcom/qc_audio_offload.c | 2 +- + sound/usb/quirks.c | 6 ++- + sound/usb/stream.c | 3 ++ + sound/usb/usbaudio.h | 6 +++ + sound/usb/usx2y/us144mkii.c | 14 +++--- + sound/usb/usx2y/us144mkii_capture.c | 12 ++--- + sound/usb/usx2y/us144mkii_controls.c | 42 +++++++++--------- + sound/usb/usx2y/us144mkii_midi.c | 22 +++++----- + sound/usb/usx2y/us144mkii_playback.c | 10 ++--- + sound/usb/validate.c | 2 +- + 20 files changed, 196 insertions(+), 83 deletions(-) +Merging sound-asoc-fixes/for-linus (32fc4168fa56f ASoC: amd: yc: Add ASUS EXPERTBOOK BM1503CDA to quirk table) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (bfd7db781e2e7 regulator: Kconfig: fix a typo) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/regulator/mt6359-regulator.yaml | 4 ++-- + drivers/regulator/Kconfig | 2 +- + drivers/regulator/bq257xx-regulator.c | 3 +-- + drivers/regulator/fp9931.c | 7 +++---- + drivers/regulator/tps65185.c | 3 +++ + 5 files changed, 10 insertions(+), 9 deletions(-) +Merging spi-fixes/for-linus (e96493229a639 spi: stm32: fix missing pointer assignment in case of dma chaining) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 31 +--------------------- + drivers/spi/spi-stm32.c | 3 +++ + 2 files changed, 4 insertions(+), 30 deletions(-) +Merging pci-current/for-linus (c22533c66ccae PCI: dwc: ep: Flush MSI-X write before unmapping its ATU entry) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 25 ++++++++++++++++--------- + 2 files changed, 17 insertions(+), 10 deletions(-) +Merging driver-core.current/driver-core-linus (78437ab3b769f clk: scu/imx8qxp: do not register driver in probe()) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Merge made by the 'ort' strategy. + drivers/base/property.c | 27 +++++---- + drivers/clk/imx/clk-imx8qxp.c | 24 +++++++- + drivers/clk/imx/clk-scu.c | 12 +++- + drivers/clk/imx/clk-scu.h | 2 + + rust/kernel/io.rs | 131 ++++++++++++++++++++++++++++-------------- + rust/kernel/pci/io.rs | 24 ++++---- + 6 files changed, 150 insertions(+), 70 deletions(-) +Merging tty.current/tty-linus (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (1be3b77de4eb8 usb: image: mdc800: kill download URB on timeout) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/core/quirks.c | 9 ++++++++ + drivers/usb/gadget/function/f_ncm.c | 29 +++++++++++--------------- + drivers/usb/gadget/function/f_tcm.c | 14 +++++++++++++ + drivers/usb/gadget/function/u_ether_configfs.h | 11 +--------- + drivers/usb/gadget/function/u_ncm.h | 1 - + drivers/usb/gadget/legacy/ncm.c | 13 +++++++++--- + drivers/usb/image/mdc800.c | 6 ++++-- + drivers/usb/misc/yurex.c | 2 +- + 8 files changed, 51 insertions(+), 34 deletions(-) +Merging usb-serial-fixes/usb-linus (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (a75281626fc8f staging: rtl8723bs: fix potential out-of-bounds read in rtw_restruct_wmm_ie) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 15 ++++++++++----- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 ++++- + drivers/staging/sm750fb/sm750.c | 1 + + drivers/staging/sm750fb/sm750_hw.c | 22 +++++++++++----------- + 4 files changed, 26 insertions(+), 17 deletions(-) +Merging iio-fixes/fixes-togreg (9990cd4f8827b iio: imu: adis: Fix NULL pointer dereference in adis_init) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/ad7768-1.c | 13 +++++++++++-- + drivers/iio/chemical/bme680_core.c | 2 +- + drivers/iio/chemical/sps30_i2c.c | 2 +- + drivers/iio/chemical/sps30_serial.c | 2 +- + drivers/iio/dac/ds4424.c | 2 +- + drivers/iio/frequency/adf4377.c | 2 +- + drivers/iio/gyro/mpu3050-core.c | 18 +++++++++++++----- + drivers/iio/gyro/mpu3050-i2c.c | 3 +-- + drivers/iio/imu/adis.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 2 ++ + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 4 ++++ + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 2 ++ + drivers/iio/imu/inv_icm45600/inv_icm45600.h | 2 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_core.c | 11 ++++++++--- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 8 ++++++++ + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 ++ + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 5 ++++- + drivers/iio/industrialio-buffer.c | 6 ++++-- + drivers/iio/light/bh1780.c | 2 +- + drivers/iio/magnetometer/tlv493d.c | 2 +- + drivers/iio/potentiometer/mcp4131.c | 2 +- + drivers/iio/proximity/hx9023s.c | 6 ++++-- + 22 files changed, 73 insertions(+), 27 deletions(-) +Merging counter-current/counter-current (9448598b22c50 Linux 6.19-rc2) +$ git merge -m Merge branch 'counter-current' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (a0b9b0f1433c8 rust_binder: use lock_vma_under_rcu() in use_page_slow()) +$ git merge -m Merge branch 'char-misc-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'ort' strategy. + drivers/android/binder/page_range.rs | 84 ++++++++++++++++++++++------- + drivers/android/binder/process.rs | 3 +- + drivers/android/binder/range_alloc/array.rs | 35 +++++++++++- + drivers/android/binder/range_alloc/mod.rs | 4 +- + drivers/android/binder/range_alloc/tree.rs | 18 +++---- + drivers/android/binder/thread.rs | 17 +++--- + drivers/firmware/stratix10-rsu.c | 2 + + 7 files changed, 118 insertions(+), 45 deletions(-) +Merging soundwire-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (7adaaee5edd35 Input: synaptics-rmi4 - fix a locking bug in an error path) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Auto-merging drivers/input/mouse/bcm5974.c +Merge made by the 'ort' strategy. + drivers/input/mouse/bcm5974.c | 42 ++++++++++++++++++++++++++++++++++- + drivers/input/rmi4/rmi_f54.c | 4 ++-- + drivers/input/serio/i8042-acpipnpio.h | 7 ++++++ + 3 files changed, 50 insertions(+), 3 deletions(-) +Merging crypto-current/master (0ce90934c0a6b crypto: img-hash - Use unregister_ahashes in img_{un}register_algs) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging libcrypto-fixes/libcrypto-fixes (201ceb94aa1de kunit: irq: Ensure timer doesn't fire too frequently) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Merge made by the 'ort' strategy. + include/kunit/run-in-irq-context.h | 44 ++++++++++++++++++++++++-------------- + 1 file changed, 28 insertions(+), 16 deletions(-) +Merging vfio-fixes/for-linus (61ceaf236115f vfio: Prevent from pinned DMABUF importers to attach to VFIO DMABUF) +$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (6e39903c73df0 selftests/tracing: Fix test_multiple_writes stall) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (ee66bc2957839 dmaengine: idxd: Fix leaking event log memory) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/dw-edma/dw-edma-core.c | 8 +++++-- + drivers/dma/fsl-edma-main.c | 26 ++++++++++------------ + drivers/dma/idxd/cdev.c | 8 +++---- + drivers/dma/idxd/device.c | 45 ++++++++++++++++++++++++++------------ + drivers/dma/idxd/dma.c | 18 +++++++++++++++ + drivers/dma/idxd/idxd.h | 1 + + drivers/dma/idxd/init.c | 14 ++++++------ + drivers/dma/idxd/irq.c | 16 ++++++++++++++ + drivers/dma/idxd/sysfs.c | 1 + + 9 files changed, 95 insertions(+), 42 deletions(-) +Merging backlight-fixes/for-backlight-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (0410e1a4c545c mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()) +$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +- + drivers/mtd/parsers/redboot.c | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging mfd-fixes/for-mfd-fixes (aa6e63373d91f mfd: ls2kbmc: Use PCI API instead of direct accesses) +$ git merge -m Merge branch 'for-mfd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Merge made by the 'ort' strategy. +Merging v4l-dvb-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (e0cf84109bc6c reset: rzg2l-usbphy-ctrl: Check pwrrdy is valid before using it) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'ort' strategy. + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging mips-fixes/mips-fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (94ad504e67cd3 ARM: dts: microchip: sama7d65: fix size-cells property for i2c3) +$ git merge -m Merge branch 'at91-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (0de4a0eec25b9 Merge tag 'kvm-x86-fixes-6.19-rc8' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (5f9df945d4e86 KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging kvm-arm-fixes/fixes (6316366129d28 Merge branch kvm-arm64/misc-6.20 into kvmarm-master/next) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes +Already up to date. +Merging hwmon-fixes/hwmon (07ed4f05bbfd2 hwmon: (it87) Check the it87_lock() return value) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/hwmon/emc1403.rst | 2 +- + Documentation/hwmon/index.rst | 1 - + Documentation/hwmon/sa67.rst | 41 ---------- + MAINTAINERS | 1 - + drivers/hwmon/Kconfig | 10 --- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/aht10.c | 6 +- + drivers/hwmon/it87.c | 5 +- + drivers/hwmon/macsmc-hwmon.c | 51 ++++++------- + drivers/hwmon/sa67mcu-hwmon.c | 161 ---------------------------------------- + 10 files changed, 35 insertions(+), 244 deletions(-) + delete mode 100644 Documentation/hwmon/sa67.rst + delete mode 100644 drivers/hwmon/sa67mcu-hwmon.c +Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa1 Linux 6.16-rc4) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (e46f25f5a81f6 cxl/region: Test CXL_DECODER_F_NORMALIZED_ADDRESSING as a bitmask) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Merge made by the 'ort' strategy. + drivers/cxl/core/core.h | 18 ++++++++++++++++ + drivers/cxl/core/hdm.c | 2 +- + drivers/cxl/core/mbox.c | 11 ++++++++-- + drivers/cxl/core/memdev.c | 13 ++++++++---- + drivers/cxl/core/pmem.c | 42 +++++++++++++++++++++++++++++--------- + drivers/cxl/core/port.c | 52 ++++++++++++++++------------------------------- + drivers/cxl/core/region.c | 4 ++-- + drivers/cxl/cxl.h | 7 +++++++ + drivers/cxl/pmem.c | 22 +++++++++++++++++++- + 9 files changed, 117 insertions(+), 54 deletions(-) +Merging dma-mapping-fixes/dma-mapping-fixes (d5b5e8149af0f sparc: Fix page alignment in dma mapping) +$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Already up to date. +Merging drivers-x86-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (81122fba08fa3 of: fix reference count leak in of_alias_scan()) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (2f38fd99c0004 scsi: ufs: core: Fix shift out of bounds when MAXQ=32) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/scsi/lpfc/lpfc_init.c | 2 ++ + drivers/scsi/lpfc/lpfc_sli.c | 36 +++++++++++++++++++++++++----- + drivers/scsi/lpfc/lpfc_sli4.h | 3 +++ + drivers/scsi/mpi3mr/mpi3mr_fw.c | 32 +++++++++++++++------------ + drivers/scsi/pm8001/pm8001_sas.c | 5 +++-- + drivers/scsi/ses.c | 5 ++--- + drivers/scsi/snic/vnic_dev.c | 9 -------- + drivers/scsi/storvsc_drv.c | 5 +++-- + drivers/ufs/core/ufshcd.c | 47 +++++++++++++++++++++++++++++----------- + 10 files changed, 96 insertions(+), 49 deletions(-) +Merging drm-fixes/drm-fixes (103d53eb6fb11 Merge tag 'amd-drm-fixes-7.0-2026-02-26' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Merge made by the 'ort' strategy. + drivers/accel/amdxdna/aie2_ctx.c | 32 ++++++----- + drivers/accel/amdxdna/aie2_message.c | 15 +++-- + drivers/accel/amdxdna/aie2_pci.c | 40 +++++++++---- + drivers/accel/amdxdna/aie2_pm.c | 2 +- + drivers/accel/amdxdna/amdxdna_ctx.c | 24 ++++---- + drivers/accel/amdxdna/amdxdna_gem.c | 38 ++++++------- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 3 + + drivers/accel/amdxdna/amdxdna_pm.c | 2 + + drivers/accel/amdxdna/amdxdna_pm.h | 11 ++++ + drivers/accel/amdxdna/amdxdna_ubuf.c | 6 +- + drivers/accel/amdxdna/npu1_regs.c | 2 +- + drivers/accel/amdxdna/npu4_regs.c | 2 +- + drivers/accel/amdxdna/npu5_regs.c | 2 +- + drivers/accel/amdxdna/npu6_regs.c | 2 +- + drivers/accel/ethosu/ethosu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 12 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 22 ++++++-- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 5 -- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 5 -- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 4 ++ + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 23 +++++--- + drivers/gpu/drm/bridge/synopsys/dw-dp.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 6 +- + drivers/gpu/drm/drm_client_modeset.c | 3 +- + drivers/gpu/drm/drm_gpusvm.c | 10 ++-- + drivers/gpu/drm/i915/display/intel_alpm.c | 7 +-- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 4 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c | 12 ++-- + drivers/gpu/drm/tiny/sharp-memory.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 4 ++ + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 9 ++- + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 6 ++ + drivers/gpu/drm/xe/xe_gt.c | 66 ++++++++++++++++++---- + drivers/gpu/drm/xe/xe_sync.c | 30 +++++++--- + include/uapi/drm/drm_fourcc.h | 12 ++-- + 40 files changed, 300 insertions(+), 161 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (eb4a7139e9737 drm/i915/alpm: ALPM disable fixes) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (901084c51a0a8 mmc: core: Avoid bitfield RMW for claim/retune flags) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/host/dw_mmc-rockchip.c | 38 +++++++++++++++++++++++++++++++++++++- + drivers/mmc/host/mmci_qcom_dml.c | 1 + + drivers/mmc/host/sdhci-brcmstb.c | 2 +- + include/linux/mmc/host.h | 9 +++++---- + 4 files changed, 44 insertions(+), 6 deletions(-) +Merging rtc-fixes/rtc-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (622d68772ddf0 mshv: add arm64 support for doorbell & intercept SINTs) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + arch/x86/kernel/cpu/mshyperv.c | 5 +- + drivers/hv/mshv_root.h | 5 +- + drivers/hv/mshv_root_main.c | 64 ++------------ + drivers/hv/mshv_synic.c | 188 +++++++++++++++++++++++++++++++++++++---- + include/hyperv/hvgdk_mini.h | 2 + + 5 files changed, 188 insertions(+), 76 deletions(-) +Merging risc-v-fixes/fixes (11212007bf29a riscv: kgdb: fix several debug register assignment bugs) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/errata/thead/errata.c | 2 +- + arch/riscv/include/asm/atomic.h | 4 ++-- + arch/riscv/include/asm/elf.h | 4 ++-- + arch/riscv/include/asm/page.h | 5 ++++- + arch/riscv/include/asm/processor.h | 2 +- + arch/riscv/include/asm/thread_info.h | 2 +- + arch/riscv/kernel/acpi.c | 2 +- + arch/riscv/kernel/ftrace.c | 2 +- + arch/riscv/kernel/head.S | 2 +- + arch/riscv/kernel/kgdb.c | 7 ++++--- + arch/riscv/kernel/mcount-dyn.S | 2 +- + arch/riscv/kernel/module-sections.c | 2 +- + arch/riscv/kernel/probes/kprobes.c | 2 +- + arch/riscv/kernel/probes/uprobes.c | 2 +- + arch/riscv/kernel/smpboot.c | 8 ++------ + arch/riscv/kernel/soc.c | 2 +- + arch/riscv/kernel/suspend.c | 2 +- + arch/riscv/kernel/vmcore_info.c | 7 +++++++ + arch/riscv/kvm/tlb.c | 2 +- + arch/riscv/kvm/vcpu_pmu.c | 2 +- + arch/riscv/lib/csum.c | 2 +- + arch/riscv/lib/memmove.S | 4 ++-- + arch/riscv/mm/cacheflush.c | 2 +- + arch/riscv/mm/init.c | 5 ----- + arch/riscv/mm/physaddr.c | 4 ++-- + 25 files changed, 41 insertions(+), 39 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (4ade402d5d89c riscv: dts: starfive: Milk-V Mars CM Lite broken-cd) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-lite.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging riscv-soc-fixes/riscv-soc-fixes (0528a348b04b3 cache: ax45mp: Fix device node reference leak in ax45mp_cache_init()) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi +Auto-merging drivers/soc/microchip/mpfs-sys-controller.c +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/microchip/mpfs.dtsi | 2 ++ + drivers/cache/ax45mp_cache.c | 4 ++-- + drivers/cache/starfive_starlink_cache.c | 4 ++-- + drivers/soc/microchip/mpfs-sys-controller.c | 13 +++++++++---- + 4 files changed, 15 insertions(+), 8 deletions(-) +Merging fpga-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (8bf22c33e7a17 Merge tag 'net-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'spdx-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (ec2cceadfae72 gpiolib: normalize the return value of gc->get() on behalf of buggy drivers) +$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib-shared.c | 6 +++--- + drivers/gpio/gpiolib.c | 8 ++++++-- + 2 files changed, 9 insertions(+), 5 deletions(-) +Merging gpio-intel-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (c33b68801fbe9 kunit: make FAULT_TEST default to n when PANIC_ON_OOPS) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (f043a93fff9e3 mm: numa_memblks: Identify the accurate NUMA ID of CFMW) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging renesas-fixes/fixes (379c590113ce4 ARM: shmobile: smp: Enforce shmobile_smp_* alignment) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (8934827db5403 Merge tag 'kmalloc_obj-treewide-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (4b22ec1685ce1 efivarfs: fix error propagation in efivar_entry_get()) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging battery-fixes/fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (2724138b2f7f6 iommufd: Initialize batch->kind in batch_clear()) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging w1-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging i2c-host-fixes/i2c/i2c-host-fixes (b4b4d88ebfbfd i2c: imx-lpi2c: fix SMBus block read NACK after byte count) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Auto-merging drivers/i2c/busses/i2c-imx-lpi2c.c +Merge made by the 'ort' strategy. +Merging sparc-fixes/for-linus (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging thead-clk-fixes/thead-clk-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (1650a1b6cb1ae fgraph: Check ftrace_pids_enabled on registration for early filtering) +$ git merge -m Merge branch 'ftrace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (b042fdf18e89a tracing: Fix WARN_ON in tracing_buffers_mmap_close for split VMAs) +$ git merge -m Merge branch 'ring-buffer/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Already up to date. +Merging trace-fixes/trace/fixes (9678e53179aa7 tracing: Wake up poll waiters for hist files when removing an event) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (8b55572e51805 tracing/selftests: Add tracefs mount options test) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (adb7b8318d487 Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + arch/x86/entry/entry_fred.c | 5 +- + arch/x86/events/intel/uncore_snbep.c | 28 ++++++- + arch/x86/include/asm/bug.h | 6 +- + arch/x86/include/asm/cfi.h | 12 ++- + arch/x86/include/asm/irqflags.h | 4 +- + arch/x86/include/asm/linkage.h | 4 +- + arch/x86/include/asm/percpu.h | 2 +- + arch/x86/include/asm/runtime-const.h | 6 +- + arch/x86/include/asm/traps.h | 2 + + arch/x86/kernel/alternative.c | 29 +++++-- + arch/x86/kernel/traps.c | 2 +- + arch/x86/mm/extable.c | 7 +- + arch/x86/net/bpf_jit_comp.c | 13 +-- + drivers/irqchip/irq-gic-v3-its.c | 4 + + drivers/irqchip/irq-ls-extirq.c | 53 ++++++++----- + drivers/irqchip/irq-mmp.c | 2 +- + drivers/irqchip/irq-sifive-plic.c | 7 +- + fs/binfmt_elf.c | 3 +- + include/linux/irqchip/arm-gic-v3.h | 1 + + include/linux/jiffies.h | 40 +++++++++- + include/linux/rseq.h | 12 +++ + include/linux/rseq_entry.h | 8 +- + include/linux/sched.h | 1 + + include/uapi/linux/rseq.h | 26 +++++- + kernel/events/core.c | 87 ++++++++++++++------ + kernel/rseq.c | 8 +- + kernel/sched/core.c | 1 + + kernel/sched/ext.c | 4 +- + kernel/sched/fair.c | 150 ++++++++++++++++++++++++++--------- + kernel/sched/sched.h | 11 +++ + kernel/time/time.c | 19 ++--- + lib/Kconfig.debug | 4 +- + 32 files changed, 406 insertions(+), 155 deletions(-) +Merging slab-fixes/slab/for-next-fixes (3d8e30e6c0043 mm/slab: initialize slab->stride early to avoid memory ordering issues) +$ git merge -m Merge branch 'slab/for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Merge made by the 'ort' strategy. + include/linux/gfp_types.h | 2 ++ + include/linux/slab.h | 12 ----------- + mm/slab.h | 4 ++-- + mm/slub.c | 51 ++++++++++++++++++++++++++++++++--------------- + 4 files changed, 39 insertions(+), 30 deletions(-) +Merging drm-msm-fixes/msm-fixes (ac47870fd7955 drm/msm/dsi: fix hdisplay calculation when programming dsi registers) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Auto-merging drivers/gpu/drm/msm/msm_iommu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_iommu.c +Resolved 'drivers/gpu/drm/msm/msm_iommu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bf4ece41685e5] Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + + .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 12 ++--- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 12 ++--- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 12 ++--- + .../drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h | 12 ++--- + .../drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 12 ++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp_v13.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 52 ++++++---------------- + drivers/gpu/drm/msm/dsi/dsi_host.c | 14 +++--- + 10 files changed, 57 insertions(+), 76 deletions(-) +Merging uml-fixes/fixes (df447a3b4a4b9 um: Fix FD copy size in os_rcv_fd_msg()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (f8f9c1f4d0c7a Linux 6.19-rc3) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc +Already up to date. +Merging devsec-tsm-fixes/fixes (c201226304768 crypto/ccp: Allow multiple streams on the same root bridge) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-rust-fixes/drm-rust-fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'drm-rust-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/drm-rust-fixes +Already up to date. +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (3a8660878839f Linux 6.18-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://github.com/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (36d9579fed6c9 drm/solomon: Fix page start when updating rectangle in page addressing mode) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/solomon/ssd130x.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging rust/rust-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging rust-alloc/alloc-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e5 Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (aeb5ecad5316f rust: pin-init: Implement `InPlaceWrite` for `&'static mut MaybeUninit`) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Already up to date. +Merging rust-timekeeping/timekeeping-next (4521438fb076f rust: time: Implement basic arithmetic operations for Delta) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +Merging rust-xarray/xarray-next (c455f19bbe610 rust: xarray: add __rust_helper to helpers) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging rust-analyzer/rust-analyzer-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'rust-analyzer-next' of https://github.com/Rust-for-Linux/linux.git rust-analyzer/rust-analyzer-next +Already up to date. +Merging mm-stable/mm-stable (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm-unstable/mm-unstable (df9c51269a5e2 kfence: add kfence.fault parameter) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging MAINTAINERS +Auto-merging arch/riscv/mm/init.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 5 + + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/admin-guide/mm/kho.rst | 53 +- + Documentation/core-api/kho/abi.rst | 6 + + Documentation/core-api/kho/index.rst | 18 +- + Documentation/dev-tools/kfence.rst | 7 + + MAINTAINERS | 1 + + arch/alpha/include/asm/pgtable.h | 6 - + arch/arc/include/asm/pgtable.h | 3 - + arch/arc/mm/init.c | 2 - + arch/arm/include/asm/pgtable.h | 9 - + arch/arm/mm/mmu.c | 7 - + arch/arm/mm/nommu.c | 7 - + arch/arm64/include/asm/pgtable.h | 7 - + arch/arm64/include/asm/pkeys.h | 3 +- + arch/arm64/mm/gcs.c | 14 +- + arch/arm64/mm/init.c | 5 + + arch/arm64/mm/mmu.c | 9 +- + arch/csky/include/asm/pgtable.h | 3 - + arch/csky/mm/init.c | 3 - + arch/hexagon/include/asm/pgtable.h | 6 - + arch/hexagon/kernel/head.S | 5 - + arch/hexagon/kernel/hexagon_ksyms.c | 1 - + arch/loongarch/include/asm/pgtable.h | 9 - + arch/loongarch/mm/init.c | 3 - + arch/m68k/include/asm/pgtable_mm.h | 9 - + arch/m68k/include/asm/pgtable_no.h | 7 - + arch/m68k/mm/init.c | 9 - + arch/m68k/mm/mcfmmu.c | 2 - + arch/m68k/mm/motorola.c | 6 - + arch/m68k/mm/sun3mmu.c | 2 - + arch/microblaze/include/asm/pgtable.h | 10 - + arch/microblaze/kernel/head.S | 4 - + arch/microblaze/kernel/microblaze_ksyms.c | 2 - + arch/mips/mm/init.c | 11 +- + arch/nios2/include/asm/pgtable.h | 7 - + arch/nios2/kernel/head.S | 10 - + arch/nios2/kernel/nios2_ksyms.c | 1 - + arch/openrisc/include/asm/pgtable.h | 4 - + arch/openrisc/kernel/head.S | 3 - + arch/openrisc/kernel/or32_ksyms.c | 1 - + arch/openrisc/mm/init.c | 3 - + arch/parisc/include/asm/pgtable.h | 11 - + arch/parisc/mm/init.c | 6 - + arch/powerpc/include/asm/pgtable.h | 6 - + arch/powerpc/include/asm/pkeys.h | 8 +- + arch/powerpc/mm/book3s64/pkeys.c | 3 +- + arch/powerpc/mm/mem.c | 3 - + arch/riscv/include/asm/pgtable.h | 7 - + arch/riscv/kernel/usercfi.c | 12 +- + arch/riscv/mm/init.c | 4 - + arch/s390/mm/init.c | 4 +- + arch/sh/include/asm/pgtable.h | 8 - + arch/sh/include/asm/setup.h | 3 +- + arch/sh/kernel/head_32.S | 4 +- + arch/sh/kernel/sh_ksyms_32.c | 1 - + arch/sh/mm/init.c | 1 - + arch/sparc/include/asm/pgtable_32.h | 8 - + arch/sparc/include/asm/pgtable_64.h | 3 - + arch/sparc/include/asm/setup.h | 2 - + arch/sparc/kernel/head_32.S | 7 - + arch/sparc/mm/init_32.c | 4 - + arch/sparc/mm/init_64.c | 71 +- + arch/um/include/asm/pgtable.h | 9 - + arch/um/include/shared/kern_util.h | 1 - + arch/um/kernel/mem.c | 16 - + arch/um/kernel/um_arch.c | 1 - + arch/x86/include/asm/pgtable.h | 8 - + arch/x86/include/asm/pkeys.h | 3 +- + arch/x86/kernel/fpu/xstate.c | 3 +- + arch/x86/kernel/head_32.S | 4 - + arch/x86/kernel/head_64.S | 7 - + arch/x86/kernel/shstk.c | 12 +- + arch/x86/kvm/mmu/spte.h | 2 +- + arch/x86/mm/pkeys.c | 3 +- + arch/xtensa/include/asm/pgtable.h | 4 - + arch/xtensa/kernel/head.S | 3 - + arch/xtensa/kernel/xtensa_ksyms.c | 2 - + drivers/base/memory.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + drivers/virtio/virtio_balloon.c | 8 +- + fs/dax.c | 2 +- + fs/hugetlbfs/inode.c | 18 +- + fs/proc/meminfo.c | 3 +- + fs/proc/vmcore.c | 2 +- + include/asm-generic/tlb.h | 4 + + include/linux/damon.h | 3 +- + include/linux/kho/abi/kexec_handover.h | 144 +- + include/linux/kho/abi/memfd.h | 18 +- + include/linux/kho_radix_tree.h | 70 + + include/linux/maple_tree.h | 42 + + include/linux/memblock.h | 2 - + include/linux/memcontrol.h | 2 +- + include/linux/memfd.h | 12 + + include/linux/memory.h | 3 +- + include/linux/memory_hotplug.h | 16 +- + include/linux/mm.h | 38 +- + include/linux/mmzone.h | 14 + + include/linux/page-flags.h | 17 +- + include/linux/page_ref.h | 14 +- + include/linux/pgtable.h | 51 +- + include/linux/swap.h | 28 +- + include/linux/vm_event_item.h | 13 - + include/linux/vmalloc.h | 3 - + include/net/netmem.h | 15 +- + include/trace/events/huge_memory.h | 26 + + include/trace/events/vmscan.h | 103 +- + include/trace/stages/stage3_trace_output.h | 8 + + include/trace/stages/stage7_class_define.h | 19 + + kernel/liveupdate/Kconfig | 2 - + kernel/liveupdate/kexec_handover.c | 739 ++++---- + kernel/liveupdate/kexec_handover_debugfs.c | 23 - + kernel/liveupdate/kexec_handover_internal.h | 3 - + kernel/liveupdate/luo_core.c | 12 +- + lib/maple_tree.c | 2198 ++++++++++------------ + lib/test_maple_tree.c | 55 +- + mm/damon/core.c | 10 +- + mm/damon/ops-common.c | 2 +- + mm/damon/paddr.c | 3 +- + mm/damon/vaddr.c | 3 +- + mm/fadvise.c | 2 +- + mm/huge_memory.c | 2 +- + mm/hugetlb_vmemmap.c | 2 +- + mm/internal.h | 19 + + mm/kfence/core.c | 23 +- + mm/kfence/kfence.h | 16 +- + mm/kfence/report.c | 49 +- + mm/khugepaged.c | 79 +- + mm/kmemleak.c | 6 +- + mm/ksm.c | 14 +- + mm/memblock.c | 22 - + mm/memcontrol-v1.c | 89 +- + mm/memcontrol-v1.h | 8 +- + mm/memcontrol.c | 167 +- + mm/memfd.c | 4 +- + mm/memfd_luo.c | 35 +- + mm/memory.c | 25 +- + mm/memory_hotplug.c | 10 +- + mm/migrate.c | 2 +- + mm/migrate_device.c | 6 - + mm/mm_init.c | 28 + + mm/mmu_gather.c | 21 +- + mm/mmu_notifier.c | 18 +- + mm/mprotect.c | 2 +- + mm/page_alloc.c | 13 +- + mm/page_idle.c | 2 +- + mm/page_vma_mapped.c | 11 +- + mm/rmap.c | 2 +- + mm/shmem.c | 8 +- + mm/shrinker.c | 13 +- + mm/sparse-vmemmap.c | 10 +- + mm/swap.h | 22 +- + mm/swap_state.c | 72 +- + mm/swap_table.h | 140 +- + mm/swapfile.c | 1148 +++++------ + mm/userfaultfd.c | 4 +- + mm/util.c | 29 + + mm/vmalloc.c | 27 +- + mm/vmscan.c | 65 +- + mm/vmstat.c | 29 +- + mm/workingset.c | 49 +- + mm/zswap.c | 19 +- + net/core/netmem_priv.h | 23 +- + net/core/page_pool.c | 24 +- + tools/testing/radix-tree/maple.c | 308 ++- + tools/testing/selftests/cgroup/test_zswap.c | 136 ++ + tools/testing/selftests/kho/init.c | 20 - + tools/testing/selftests/mm/memory-failure.c | 1 - + tools/testing/selftests/mm/migration.c | 3 +- + tools/testing/selftests/mm/vm_util.c | 4 +- + 170 files changed, 3729 insertions(+), 3397 deletions(-) + create mode 100644 include/linux/kho_radix_tree.h +Merging mm-nonmm-unstable/mm-nonmm-unstable (8d1137446fc20 xor: use static_call for xor_gen) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/lockup-watchdogs.rst | 132 +++- + arch/alpha/Kconfig | 1 + + arch/arm/Kconfig | 1 + + arch/arm/lib/Makefile | 5 - + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/xor.h | 73 -- + arch/arm64/kernel/machine_kexec_file.c | 4 + + arch/arm64/lib/Makefile | 6 - + arch/loongarch/Kconfig | 1 + + arch/loongarch/include/asm/xor.h | 68 -- + arch/loongarch/include/asm/xor_simd.h | 34 - + arch/loongarch/lib/Makefile | 2 - + arch/loongarch/lib/xor_simd_glue.c | 72 -- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/xor.h | 47 -- + arch/powerpc/include/asm/xor_altivec.h | 22 - + arch/powerpc/kexec/elf_64.c | 4 + + arch/powerpc/lib/Makefile | 5 - + arch/powerpc/lib/xor_vmx.h | 22 - + arch/powerpc/lib/xor_vmx_glue.c | 63 -- + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/xor.h | 68 -- + arch/riscv/lib/Makefile | 1 - + arch/s390/Kconfig | 1 + + arch/s390/include/asm/xor.h | 21 - + arch/s390/lib/Makefile | 2 +- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/asm-prototypes.h | 1 - + arch/sparc/include/asm/xor.h | 9 - + arch/sparc/include/asm/xor_64.h | 79 --- + arch/sparc/lib/Makefile | 2 +- + arch/um/Kconfig | 1 + + arch/um/include/asm/xor.h | 24 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/xor_64.h | 28 - + arch/x86/kernel/kexec-bzimage64.c | 6 +- + crypto/Kconfig | 2 - + crypto/Makefile | 1 - + crypto/async_tx/async_xor.c | 16 +- + crypto/xor.c | 174 ----- + drivers/of/fdt.c | 21 + + drivers/of/kexec.c | 19 + + fs/btrfs/raid56.c | 27 +- + fs/proc/array.c | 2 +- + fs/squashfs/xz_wrapper.c | 6 +- + include/asm-generic/Kbuild | 1 - + include/asm-generic/xor.h | 738 --------------------- + include/linux/crash_core.h | 14 +- + include/linux/nmi.h | 1 + + include/linux/raid/xor.h | 28 +- + kernel/crash_dump_dm_crypt.c | 7 +- + kernel/exit.c | 8 +- + kernel/fork.c | 24 +- + kernel/panic.c | 47 +- + kernel/signal.c | 12 +- + kernel/watchdog.c | 41 +- + kernel/watchdog_buddy.c | 9 +- + lib/Kconfig | 1 + + lib/Makefile | 2 +- + lib/cmdline.c | 30 +- + lib/kstrtox.c | 37 +- + lib/raid/Kconfig | 7 + + lib/raid/Makefile | 2 + + lib/raid/xor/Makefile | 50 ++ + .../include/asm/xor.h => lib/raid/xor/alpha/xor.c | 48 +- + lib/raid/xor/alpha/xor_arch.h | 22 + + lib/raid/xor/arm/xor-neon-glue.c | 19 + + {arch/arm/lib => lib/raid/xor/arm}/xor-neon.c | 22 +- + .../include/asm/xor.h => lib/raid/xor/arm/xor.c | 107 +-- + lib/raid/xor/arm/xor_arch.h | 22 + + lib/raid/xor/arm64/xor-neon-glue.c | 26 + + {arch/arm64/lib => lib/raid/xor/arm64}/xor-neon.c | 94 +-- + lib/raid/xor/arm64/xor-neon.h | 6 + + lib/raid/xor/arm64/xor_arch.h | 21 + + lib/raid/xor/loongarch/xor_arch.h | 33 + + .../lib => lib/raid/xor/loongarch}/xor_simd.c | 0 + .../lib => lib/raid/xor/loongarch}/xor_simd.h | 0 + lib/raid/xor/loongarch/xor_simd_glue.c | 37 ++ + .../lib => lib/raid/xor/loongarch}/xor_template.c | 0 + lib/raid/xor/powerpc/xor_arch.h | 22 + + .../powerpc/lib => lib/raid/xor/powerpc}/xor_vmx.c | 40 +- + lib/raid/xor/powerpc/xor_vmx.h | 10 + + lib/raid/xor/powerpc/xor_vmx_glue.c | 28 + + lib/raid/xor/riscv/xor-glue.c | 25 + + {arch/riscv/lib => lib/raid/xor/riscv}/xor.S | 0 + lib/raid/xor/riscv/xor_arch.h | 17 + + {arch/s390/lib => lib/raid/xor/s390}/xor.c | 15 +- + lib/raid/xor/s390/xor_arch.h | 13 + + lib/raid/xor/sparc/xor-niagara-glue.c | 33 + + .../lib/xor.S => lib/raid/xor/sparc/xor-niagara.S | 346 +--------- + .../xor_32.h => lib/raid/xor/sparc/xor-sparc32.c | 32 +- + lib/raid/xor/sparc/xor-vis-glue.c | 34 + + lib/raid/xor/sparc/xor-vis.S | 348 ++++++++++ + lib/raid/xor/sparc/xor_arch.h | 35 + + lib/raid/xor/um/xor_arch.h | 9 + + .../asm/xor_avx.h => lib/raid/xor/x86/xor-avx.c | 52 +- + .../asm/xor_32.h => lib/raid/xor/x86/xor-mmx.c | 122 +--- + .../asm/xor.h => lib/raid/xor/x86/xor-sse.c | 105 +-- + lib/raid/xor/x86/xor_arch.h | 36 + + lib/raid/xor/xor-32regs-prefetch.c | 267 ++++++++ + lib/raid/xor/xor-32regs.c | 217 ++++++ + lib/raid/xor/xor-8regs-prefetch.c | 146 ++++ + lib/raid/xor/xor-8regs.c | 103 +++ + lib/raid/xor/xor-core.c | 187 ++++++ + lib/raid/xor/xor_impl.h | 60 ++ + lib/test-kstrtox.c | 6 + + lib/tests/cmdline_kunit.c | 56 ++ + scripts/bloat-o-meter | 6 +- + scripts/spelling.txt | 336 +++++----- + tools/testing/selftests/ipc/msgque.c | 3 + + 110 files changed, 2592 insertions(+), 2711 deletions(-) + delete mode 100644 arch/arm64/include/asm/xor.h + delete mode 100644 arch/loongarch/include/asm/xor.h + delete mode 100644 arch/loongarch/include/asm/xor_simd.h + delete mode 100644 arch/loongarch/lib/xor_simd_glue.c + delete mode 100644 arch/powerpc/include/asm/xor.h + delete mode 100644 arch/powerpc/include/asm/xor_altivec.h + delete mode 100644 arch/powerpc/lib/xor_vmx.h + delete mode 100644 arch/powerpc/lib/xor_vmx_glue.c + delete mode 100644 arch/riscv/include/asm/xor.h + delete mode 100644 arch/s390/include/asm/xor.h + delete mode 100644 arch/sparc/include/asm/xor.h + delete mode 100644 arch/sparc/include/asm/xor_64.h + delete mode 100644 arch/um/include/asm/xor.h + delete mode 100644 arch/x86/include/asm/xor_64.h + delete mode 100644 crypto/xor.c + delete mode 100644 include/asm-generic/xor.h + create mode 100644 lib/raid/Kconfig + create mode 100644 lib/raid/Makefile + create mode 100644 lib/raid/xor/Makefile + rename arch/alpha/include/asm/xor.h => lib/raid/xor/alpha/xor.c (95%) + create mode 100644 lib/raid/xor/alpha/xor_arch.h + create mode 100644 lib/raid/xor/arm/xor-neon-glue.c + rename {arch/arm/lib => lib/raid/xor/arm}/xor-neon.c (53%) + rename arch/arm/include/asm/xor.h => lib/raid/xor/arm/xor.c (59%) + create mode 100644 lib/raid/xor/arm/xor_arch.h + create mode 100644 lib/raid/xor/arm64/xor-neon-glue.c + rename {arch/arm64/lib => lib/raid/xor/arm64}/xor-neon.c (76%) + create mode 100644 lib/raid/xor/arm64/xor-neon.h + create mode 100644 lib/raid/xor/arm64/xor_arch.h + create mode 100644 lib/raid/xor/loongarch/xor_arch.h + rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_simd.c (100%) + rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_simd.h (100%) + create mode 100644 lib/raid/xor/loongarch/xor_simd_glue.c + rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_template.c (100%) + create mode 100644 lib/raid/xor/powerpc/xor_arch.h + rename {arch/powerpc/lib => lib/raid/xor/powerpc}/xor_vmx.c (69%) + create mode 100644 lib/raid/xor/powerpc/xor_vmx.h + create mode 100644 lib/raid/xor/powerpc/xor_vmx_glue.c + create mode 100644 lib/raid/xor/riscv/xor-glue.c + rename {arch/riscv/lib => lib/raid/xor/riscv}/xor.S (100%) + create mode 100644 lib/raid/xor/riscv/xor_arch.h + rename {arch/s390/lib => lib/raid/xor/s390}/xor.c (93%) + create mode 100644 lib/raid/xor/s390/xor_arch.h + create mode 100644 lib/raid/xor/sparc/xor-niagara-glue.c + rename arch/sparc/lib/xor.S => lib/raid/xor/sparc/xor-niagara.S (53%) + rename arch/sparc/include/asm/xor_32.h => lib/raid/xor/sparc/xor-sparc32.c (92%) + create mode 100644 lib/raid/xor/sparc/xor-vis-glue.c + create mode 100644 lib/raid/xor/sparc/xor-vis.S + create mode 100644 lib/raid/xor/sparc/xor_arch.h + create mode 100644 lib/raid/xor/um/xor_arch.h + rename arch/x86/include/asm/xor_avx.h => lib/raid/xor/x86/xor-avx.c (84%) + rename arch/x86/include/asm/xor_32.h => lib/raid/xor/x86/xor-mmx.c (87%) + rename arch/x86/include/asm/xor.h => lib/raid/xor/x86/xor-sse.c (90%) + create mode 100644 lib/raid/xor/x86/xor_arch.h + create mode 100644 lib/raid/xor/xor-32regs-prefetch.c + create mode 100644 lib/raid/xor/xor-32regs.c + create mode 100644 lib/raid/xor/xor-8regs-prefetch.c + create mode 100644 lib/raid/xor/xor-8regs.c + create mode 100644 lib/raid/xor/xor-core.c + create mode 100644 lib/raid/xor/xor_impl.h +Merging kbuild/kbuild-for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-for-next +Already up to date. +Merging clang-format/clang-format (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (0feca0b788567 perf script: Fix brcntr output with --xed) +$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/perf/builtin-script.c | 12 ++++--- + tools/perf/util/metricgroup.c | 6 ++-- + tools/perf/util/parse-events.c | 82 +++++++++++++++++++++++++++++++++--------- + 3 files changed, 76 insertions(+), 24 deletions(-) +Merging compiler-attributes/compiler-attributes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/dma-mapping-for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Already up to date. +Merging asm-generic/master (adbbd9714f805 scripts: headers_install.sh: Remove config leak ignore machinery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Already up to date. +Merging alpha/alpha-next (d58041d2c63e0 MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (b9cbb9e3bed3f Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (773b24bcedc16 arm64, compiler-context-analysis: Permit alias analysis through __READ_ONCE() with CONFIG_LTO=y) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Merge made by the 'ort' strategy. + arch/arm64/include/asm/rwonce.h | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) +Merging arm-perf/for-next/perf (ab26d9c85554c perf/cxlpmu: Replace IRQF_ONESHOT with IRQF_NO_THREAD) +$ git merge -m Merge branch 'for-next/perf' of https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (862ad12fb14cd soc: document merges) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 4 ++++ + arch/arm/boot/dts/arm/arm-realview-eb.dtsi | 2 +- + arch/arm/boot/dts/arm/arm-realview-pb1176.dts | 2 +- + arch/arm/boot/dts/arm/arm-realview-pb11mp.dts | 2 +- + arch/arm/boot/dts/arm/arm-realview-pbx.dtsi | 2 +- + 5 files changed, 8 insertions(+), 4 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (e3194dfb77230 Merge branch 'v6.20/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (d31647c698f63 Merge branch 'apple-soc/drivers-6.20' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging at91/at91-next (d75e671528b49 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging bmc/for-next (710dbb13377c8 Merge branches 'aspeed/arm/dt', 'aspeed/fixes' and 'nuvoton/arm64/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + arch/arm/boot/dts/aspeed/Makefile | 2 + + .../aspeed/aspeed-bmc-asrock-paul-ipmi-card.dts | 131 +++++++++++++++++++++ + .../aspeed/aspeed-bmc-asus-kommando-ipmi-card.dts | 117 ++++++++++++++++++ + .../dts/aspeed/aspeed-bmc-facebook-anacapa.dts | 22 ++++ + .../boot/dts/aspeed/aspeed-bmc-nvidia-msx4-bmc.dts | 1 + + .../dts/aspeed/openbmc-flash-layout-128-alt.dtsi | 32 +++++ + .../boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi | 3 - + drivers/soc/aspeed/aspeed-socinfo.c | 2 +- + 9 files changed, 308 insertions(+), 4 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-paul-ipmi-card.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asus-kommando-ipmi-card.dts + create mode 100644 arch/arm/boot/dts/aspeed/openbmc-flash-layout-128-alt.dtsi +Merging broadcom/next (8bb18f06da314 Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging arch/arm64/boot/dts/broadcom/bcm2712.dtsi +Merge made by the 'ort' strategy. + arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 28 ++++++++++++++++++++-- + .../boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi | 4 ++++ + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 14 +++++++++++ + 3 files changed, 44 insertions(+), 2 deletions(-) +Merging cix/for-next (4d24b32aa342e Merge remote-tracking branch 'cix/dt-bindings' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git cix/for-next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'davinci/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (a969a08351529 memory: brcmstb_memc: Expand LPDDR4 check to cover for LPDDR5) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + .../bindings/cache/baikal,bt1-l2-ctl.yaml | 63 ---- + drivers/memory/Kconfig | 11 - + drivers/memory/Makefile | 1 - + drivers/memory/brcmstb_memc.c | 8 +- + drivers/memory/bt1-l2-ctl.c | 323 --------------------- + drivers/memory/tegra/tegra124-emc.c | 2 +- + drivers/memory/tegra/tegra186-emc.c | 8 + + drivers/memory/tegra/tegra30-emc.c | 6 +- + 8 files changed, 17 insertions(+), 405 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/cache/baikal,bt1-l2-ctl.yaml + delete mode 100644 drivers/memory/bt1-l2-ctl.c +Merging fsl/soc_fsl (cf8e9203cc653 virt: fsl_hypervisor: fix header kernel-doc warnings) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. + drivers/base/platform-msi.c | 4 - + drivers/bus/fsl-mc/dprc-driver.c | 14 +-- + drivers/bus/fsl-mc/fsl-mc-bus.c | 4 +- + drivers/bus/fsl-mc/fsl-mc-msi.c | 166 +++++---------------------- + drivers/bus/fsl-mc/fsl-mc-private.h | 2 +- + drivers/irqchip/Kconfig | 6 - + drivers/irqchip/Makefile | 1 - + drivers/irqchip/irq-gic-its-msi-parent.c | 7 +- + drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 168 ---------------------------- + drivers/soc/fsl/qbman/qman.c | 24 +++- + drivers/soc/fsl/qe/qmc.c | 4 +- + include/linux/fsl/mc.h | 6 +- + include/linux/irqdomain_defs.h | 1 - + include/uapi/linux/fsl_hypervisor.h | 4 +- + 14 files changed, 65 insertions(+), 346 deletions(-) + delete mode 100644 drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +Merging imx-mxs/for-next (8487f650127b3 Merge branches 'imx/bindings', 'imx/dt', 'imx/dt64', 'imx/fixes' and 'imx/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 7 + + .../bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml | 78 ++ + arch/arm/boot/dts/nxp/imx/imx31.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx35.dtsi | 30 +- + arch/arm/boot/dts/nxp/imx/imx51-babbage.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx51-ts4800.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx53-qsb.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx53-smd.dts | 18 + + .../arm/boot/dts/nxp/imx/imx53-voipac-dmm-668.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sr-som-ti.dtsi | 8 +- + .../dts/nxp/imx/imx6ull-engicam-microgea-bmm.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx7s-warp.dts | 2 - + arch/arm64/boot/dts/freescale/Makefile | 1 + + .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi | 4 - + .../boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 10 +- + .../boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 78 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 4 + + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 32 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx91-11x11-evk.dts | 2 + + arch/arm64/boot/dts/freescale/imx91-tqma9131.dtsi | 20 +- + arch/arm64/boot/dts/freescale/imx91_93_common.dtsi | 54 ++ + .../boot/dts/freescale/imx93-11x11-evk-common.dtsi | 861 +++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 855 +------------------- + arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts | 12 + + arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 8 + + .../boot/dts/freescale/imx93-phyboard-nash.dts | 12 +- + .../boot/dts/freescale/imx93-phyboard-segin.dts | 12 +- + .../boot/dts/freescale/imx93-phycore-som.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi | 26 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 12 + + arch/arm64/boot/dts/freescale/imx93w-evk.dts | 28 + + arch/arm64/boot/dts/freescale/imx93w.dtsi | 110 +++ + arch/arm64/boot/dts/freescale/imx943-evk.dts | 21 + + arch/arm64/boot/dts/freescale/imx95-15x15-frdm.dts | 73 ++ + .../boot/dts/freescale/imx95-19x19-evk-sof.dts | 7 +- + arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 2 +- + .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx95.dtsi | 7 + + drivers/bus/imx-aipstz.c | 15 + + 42 files changed, 1493 insertions(+), 954 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-evk-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93w-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93w.dtsi +Merging mediatek/for-next (e96c48a291fb0 Merge branch 'v7.0-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt6359.dtsi | 4 +- + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 70 +++++++++++----------- + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 11 +--- + arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 4 +- + arch/arm64/boot/dts/mediatek/mt8365.dtsi | 5 +- + .../boot/dts/mediatek/mt8395-genio-common.dtsi | 4 +- + .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 4 +- + 8 files changed, 50 insertions(+), 54 deletions(-) +Merging mvebu/for-next (8dcbe20fc9245 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (35ca43aadd4ea Merge branch 'omap-for-v6.20/drivers' into tmp/omap-next-20260122.103154) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (85694946ded41 Merge branches 'arm64-defconfig-for-7.1', 'arm64-fixes-for-7.0', 'arm64-for-7.1', 'clk-fixes-for-7.0', 'clk-for-7.1' and 'drivers-for-7.1' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 13 + + .../bindings/clock/qcom,glymur-dispcc.yaml | 4 +- + .../bindings/clock/qcom,kaanapali-gxclkctl.yaml | 1 + + .../bindings/clock/qcom,sm8450-gpucc.yaml | 4 +- + .../bindings/clock/qcom,sm8450-videocc.yaml | 3 + + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 2 + + arch/arm64/boot/dts/qcom/Makefile | 4 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 1126 +--- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 1133 ++++ + arch/arm64/boot/dts/qcom/apq8096sg-db820c.dts | 15 + + arch/arm64/boot/dts/qcom/glymur-crd.dts | 598 ++ + arch/arm64/boot/dts/qcom/glymur.dtsi | 5913 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts | 2 - + arch/arm64/boot/dts/qcom/hamoa.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmcx0102.dtsi | 187 + + arch/arm64/boot/dts/qcom/pmh0101.dtsi | 68 + + arch/arm64/boot/dts/qcom/pmh0104-glymur.dtsi | 144 + + arch/arm64/boot/dts/qcom/pmh0110-glymur.dtsi | 144 + + arch/arm64/boot/dts/qcom/pmk8850.dtsi | 70 + + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 2 +- + arch/arm64/boot/dts/qcom/smb2370.dtsi | 45 + + arch/arm64/boot/dts/qcom/x1-asus-vivobook-s15.dtsi | 1362 +++++ + .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 1346 +---- + .../boot/dts/qcom/x1p42100-asus-vivobook-s15.dts | 43 + + arch/arm64/configs/defconfig | 8 + + drivers/clk/qcom/Kconfig | 30 +- + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/dispcc-glymur.c | 4 +- + drivers/clk/qcom/dispcc-sm8450.c | 2 +- + drivers/clk/qcom/gcc-glymur.c | 3 +- + drivers/clk/qcom/gpucc-glymur.c | 619 ++ + drivers/clk/qcom/gxclkctl-kaanapali.c | 1 + + drivers/clk/qcom/tcsrcc-glymur.c | 2 +- + drivers/clk/qcom/videocc-glymur.c | 533 ++ + drivers/firmware/qcom/qcom_scm.c | 1 + + drivers/soc/qcom/pmic_glink.c | 66 +- + include/dt-bindings/clock/qcom,glymur-gcc.h | 1 + + include/dt-bindings/clock/qcom,glymur-gpucc.h | 51 + + include/dt-bindings/clock/qcom,glymur-videocc.h | 45 + + 39 files changed, 11087 insertions(+), 2512 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/apq8096sg-db820c.dts + create mode 100644 arch/arm64/boot/dts/qcom/glymur-crd.dts + create mode 100644 arch/arm64/boot/dts/qcom/glymur.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmcx0102.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmh0101.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmh0104-glymur.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmh0110-glymur.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmk8850.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/smb2370.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1-asus-vivobook-s15.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-s15.dts + create mode 100644 drivers/clk/qcom/gpucc-glymur.c + create mode 100644 drivers/clk/qcom/videocc-glymur.c + create mode 100644 include/dt-bindings/clock/qcom,glymur-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,glymur-videocc.h +Merging renesas/next (927d8d109186a Merge branch 'renesas-dts-for-v7.1' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/renesas/ebisu.dtsi | 43 +++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 20 ++++++++++ + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 20 ++++++++++ + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 20 ++++++++++ + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 20 ++++++++++ + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 27 ++++++++++++++ + .../boot/dts/renesas/r8a779g3-sparrow-hawk.dts | 5 +++ + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 15 ++++++++ + .../boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts | 4 ++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 28 +++++++++++++- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 21 ++++++++++- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 13 +++++++ + 12 files changed, 232 insertions(+), 4 deletions(-) +Merging reset/reset/next (938ce3b165826 reset: spacemit: Add SpacemiT K3 reset driver) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (0a4016644751b Merge branch 'v7.1-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 9 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/rockchip/Makefile | 22 + + arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 23 - + .../boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts | 17 - + arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 3 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 2 + + .../boot/dts/rockchip/rk3399-nanopc-t4-hd702e.dtso | 96 ++ + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 + + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 20 - + .../dts/rockchip/rk3399-sapphire-excavator.dts | 2 + + arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts | 4 +- + .../dts/rockchip/rk3566-onething-edge-cube.dts | 342 +++++++ + .../dts/rockchip/rk3566-qnap-ts133-pcb-13.dtso | 64 ++ + .../boot/dts/rockchip/rk3568-anbernic-rg-ds.dts | 44 +- + .../dts/rockchip/rk3568-qnap-ts233-pcb-12-11.dtso | 93 ++ + .../dts/rockchip/rk3568-qnap-ts433-pcb-12-10.dtso | 151 +++ + arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 27 +- + arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts | 1020 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 28 + + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 8 +- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 16 + + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 39 + + arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts | 16 + + drivers/soc/rockchip/grf.c | 1 + + 25 files changed, 1974 insertions(+), 77 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4-hd702e.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-onething-edge-cube.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-qnap-ts133-pcb-13.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts233-pcb-12-11.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433-pcb-12-10.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts +Merging samsung-krzk/for-next (9218a95a4f2eb Merge branches 'next/soc' and 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/axis.yaml | 6 + + .../bindings/arm/samsung/samsung-boards.yaml | 2 + + .../bindings/clock/axis,artpec9-clock.yaml | 232 ++++ + .../bindings/firmware/google,gs101-acpm-ipc.yaml | 50 +- + arch/arm/boot/dts/samsung/Makefile | 1 + + arch/arm/boot/dts/samsung/exynos5250-manta.dts | 564 +++++++++ + arch/arm/mach-exynos/firmware.c | 4 +- + arch/arm64/boot/dts/exynos/Makefile | 1 + + arch/arm64/boot/dts/exynos/axis/Makefile | 3 +- + arch/arm64/boot/dts/exynos/axis/artpec9-alfred.dts | 36 + + .../boot/dts/exynos/axis/artpec9-pinctrl.dtsi | 115 ++ + arch/arm64/boot/dts/exynos/axis/artpec9.dtsi | 277 +++++ + arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts | 497 ++++++++ + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-artpec9.c | 1224 ++++++++++++++++++++ + drivers/clk/samsung/clk-gs101.c | 52 +- + drivers/clk/samsung/clk-pll.c | 185 ++- + drivers/clk/samsung/clk-pll.h | 17 + + drivers/firmware/samsung/exynos-acpm-dvfs.c | 9 +- + drivers/firmware/samsung/exynos-acpm-pmic.c | 16 +- + drivers/firmware/samsung/exynos-acpm.c | 14 +- + drivers/firmware/samsung/exynos-acpm.h | 8 +- + include/dt-bindings/clock/axis,artpec9-clk.h | 195 ++++ + 23 files changed, 3447 insertions(+), 62 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/axis,artpec9-clock.yaml + create mode 100644 arch/arm/boot/dts/samsung/exynos5250-manta.dts + create mode 100644 arch/arm64/boot/dts/exynos/axis/artpec9-alfred.dts + create mode 100644 arch/arm64/boot/dts/exynos/axis/artpec9-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/axis/artpec9.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts + create mode 100644 drivers/clk/samsung/clk-artpec9.c + create mode 100644 include/dt-bindings/clock/axis,artpec9-clk.h +Merging scmi/for-linux-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging sophgo/for-next (9aa6068586a9b Merge branch 'dt/riscv' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sophgo-soc/soc-for-next (c8754c7deab4c soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Already up to date. +Merging stm32/stm32-next (291f393298f72 arm/arm64: dts: st: Drop unused .dtsi) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'ort' strategy. +Merging sunxi/sunxi/for-next (fb20ccf70cf69 clk: sunxi-ng: sun55i-a523-r: Add missing r-spi module clock) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) +Merging tee/next (dca5274792543 Merge branches 'qcomtee_fixes_for_6.20', 'optee_update_for_6.20', 'tee_bus_callback_for_6.20', 'amdtee_update_for_6.20' and 'tee_sysfs_for_6.20' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (5ce9dde55d584 Merge branch for-6.20/arm64/dt-fixes into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/soc/tegra/pmc.c +Merge made by the 'ort' strategy. + MAINTAINERS | 14 +- + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 24 +-- + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 323 ++++++++++++++++++++++++++++++- + drivers/soc/tegra/cbb/tegra234-cbb.c | 35 +++- + drivers/soc/tegra/pmc.c | 2 + + 5 files changed, 375 insertions(+), 23 deletions(-) +Merging tenstorrent-dt/tenstorrent-dt-for-next (a71e6e8eea8ae riscv: defconfig: Enable Tenstorrent SoCs) +$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://github.com/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next +Already up to date. +Merging thead-dt/thead-dt-for-next (34ce47c9cdfdd riscv: dts: thead: lichee-pi-4a: enable HDMI) +$ git merge -m Merge branch 'thead-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts | 25 +++++++++ + arch/riscv/boot/dts/thead/th1520.dtsi | 66 +++++++++++++++++++++++ + 2 files changed, 91 insertions(+) +Merging ti/ti-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging socfpga/for-next (ee0deebb9d5a4 arm64: dts: socfpga: stratix10: Add emmc support) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/altera.yaml | 6 ++ + arch/arm64/boot/dts/altera/Makefile | 1 + + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 67 +----------------- + .../boot/dts/altera/socfpga_stratix10_socdk.dtsi | 71 +++++++++++++++++++ + .../dts/altera/socfpga_stratix10_socdk_emmc.dts | 81 ++++++++++++++++++++++ + 5 files changed, 161 insertions(+), 65 deletions(-) + create mode 100755 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi + create mode 100755 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts +Merging clk/clk-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (3e6b0227b93c7 clk: imx: fracn-gppll: Add 241.90 MHz Support) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (84eca77af2ad6 clk: renesas: r9a09g056: Add clock and reset entries for RTC) +$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/r9a09g056-cpg.c | 40 ++++++++++++++++++++----------------- + drivers/clk/renesas/r9a09g057-cpg.c | 40 ++++++++++++++++++------------------- + 2 files changed, 42 insertions(+), 38 deletions(-) +Merging thead-clk/thead-clk-for-next (baf4fc7c03bd0 clk: thead: th1520-ap: Support CPU frequency scaling) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging csky/linux-next (817d21578d51e csky: Remove compile warning for CONFIG_SMP) +$ git merge -m Merge branch 'linux-next' of https://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (7dff99b354601 Remove WARN_ALL_UNSEEDED_RANDOM kernel config option) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (cb39cf99d88e8 m68k: sun3: Replace vsprintf() with bounded vsnprintf()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (0dfffa5479d62 openrisc: define arch-specific version of nop()) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (05f7e89ab9731 Linux 6.19) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (e2071f9ce42b6 powerpc/pseries: plpks: export plpks_wrapping_is_supported) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging risc-v/for-next (18be4ca5cb4e5 riscv: lib: optimize strlen loop efficiency) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (7982b62bedbb1 riscv: dts: microchip: add pinctrl nodes for mpfs/icicle kit) +$ git merge -m Merge branch 'riscv-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi +Merge made by the 'ort' strategy. + .../boot/dts/microchip/mpfs-icicle-kit-common.dtsi | 1 - + .../boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 63 ++++++++ + arch/riscv/boot/dts/microchip/mpfs-pinctrl.dtsi | 167 +++++++++++++++++++++ + arch/riscv/boot/dts/microchip/mpfs.dtsi | 16 ++ + 4 files changed, 246 insertions(+), 1 deletion(-) + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-pinctrl.dtsi +Merging riscv-soc/riscv-soc-for-next (fd69c5b3002c3 Merge branch 'k230-basic' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml +Auto-merging Documentation/devicetree/bindings/timer/sifive,clint.yaml +Merge made by the 'ort' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/riscv/canaan.yaml | 8 +- + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/boot/dts/canaan/Makefile | 2 + + arch/riscv/boot/dts/canaan/k230-canmv.dts | 332 +++++++++++++++++++++ + arch/riscv/boot/dts/canaan/k230-evb.dts | 28 ++ + arch/riscv/boot/dts/canaan/k230-pinctrl.h | 18 ++ + arch/riscv/boot/dts/canaan/k230.dtsi | 157 ++++++++++ + 8 files changed, 546 insertions(+), 1 deletion(-) + create mode 100644 arch/riscv/boot/dts/canaan/k230-canmv.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-evb.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-pinctrl.h + create mode 100644 arch/riscv/boot/dts/canaan/k230.dtsi +Merging s390/for-next (5cd0301c88490 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (d844152d85cfc sparc: remove unused variable strtab) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (c87c79345ea8f Merge tag 'uml-for-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (0d4b3ca115b54 xtensa: align: validate access in fast_load_store) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging fs-next (4d750717498bb Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging MAINTAINERS +Auto-merging fs/btrfs/raid56.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + CREDITS | 9 +- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/mount_api.rst | 4 - + Documentation/filesystems/ntfs.rst | 159 + + MAINTAINERS | 9 + + drivers/mtd/ubi/ubi.h | 9 +- + fs/9p/vfs_super.c | 6 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/btrfs/Kconfig | 1 + + fs/btrfs/Makefile | 4 + + fs/btrfs/backref.c | 38 +- + fs/btrfs/block-group.c | 90 +- + fs/btrfs/block-rsv.c | 25 + + fs/btrfs/compression.c | 15 +- + fs/btrfs/compression.h | 3 - + fs/btrfs/ctree.c | 15 +- + fs/btrfs/delayed-ref.c | 28 + + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/direct-io.c | 11 +- + fs/btrfs/disk-io.c | 234 +- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 106 +- + fs/btrfs/extent_io.c | 64 +- + fs/btrfs/extent_io.h | 2 +- + fs/btrfs/file-item.c | 13 +- + fs/btrfs/file-item.h | 6 +- + fs/btrfs/file.c | 4 +- + fs/btrfs/free-space-tree.c | 9 +- + fs/btrfs/fs.h | 4 +- + fs/btrfs/inode.c | 111 +- + fs/btrfs/ioctl.c | 21 +- + fs/btrfs/lzo.c | 11 +- + fs/btrfs/messages.h | 8 +- + fs/btrfs/misc.h | 18 +- + fs/btrfs/ordered-data.c | 43 +- + fs/btrfs/ordered-data.h | 11 +- + fs/btrfs/print-tree.c | 14 +- + fs/btrfs/qgroup.c | 18 +- + fs/btrfs/raid-stripe-tree.c | 2 +- + fs/btrfs/raid56.c | 21 +- + fs/btrfs/reflink.c | 4 +- + fs/btrfs/relocation.c | 42 +- + fs/btrfs/scrub.c | 22 +- + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 66 +- + fs/btrfs/space-info.h | 22 +- + fs/btrfs/super.h | 2 +- + fs/btrfs/tests/btrfs-tests.c | 3 + + fs/btrfs/tests/btrfs-tests.h | 10 + + fs/btrfs/tests/zoned-tests.c | 675 +++ + fs/btrfs/transaction.c | 55 +- + fs/btrfs/tree-log.c | 175 +- + fs/btrfs/tree-mod-log.c | 8 +- + fs/btrfs/volumes.c | 184 +- + fs/btrfs/volumes.h | 34 + + fs/btrfs/zlib.c | 2 +- + fs/btrfs/zoned.c | 17 +- + fs/btrfs/zstd.c | 4 +- + fs/dcache.c | 4 +- + fs/exfat/inode.c | 2 +- + fs/f2fs/node.c | 4 +- + fs/f2fs/segment.h | 2 +- + fs/fs_context.c | 1 - + fs/fs_parser.c | 19 +- + fs/fuse/file.c | 6 + + fs/fuse/virtio_fs.c | 29 +- + fs/gfs2/inode.c | 3 +- + fs/gfs2/super.c | 56 +- + fs/kernfs/dir.c | 15 +- + fs/kernfs/inode.c | 99 +- + fs/kernfs/kernfs-internal.h | 5 +- + fs/lockd/clnt4xdr.c | 7 +- + fs/lockd/clntlock.c | 2 +- + fs/lockd/clntproc.c | 2 +- + fs/lockd/clntxdr.c | 3 +- + fs/lockd/host.c | 31 +- + {include/linux => fs}/lockd/lockd.h | 94 +- + fs/lockd/mon.c | 2 +- + {include/linux => fs}/lockd/nlm.h | 8 +- + {include/linux => fs}/lockd/share.h | 8 +- + fs/lockd/svc.c | 50 +- + fs/lockd/svc4proc.c | 77 +- + fs/lockd/svclock.c | 16 +- + fs/lockd/svcproc.c | 119 +- + fs/lockd/svcshare.c | 5 +- + fs/lockd/svcsubs.c | 32 +- + fs/lockd/trace.h | 3 +- + fs/lockd/xdr.c | 3 +- + {include/linux => fs}/lockd/xdr.h | 15 +- + fs/lockd/xdr4.c | 16 +- + {include/linux => fs}/lockd/xdr4.h | 16 +- + fs/nfs/internal.h | 2 +- + fs/nfs/nfs3proc.c | 1 + + fs/nfs/proc.c | 1 + + fs/nfs/sysfs.c | 4 +- + fs/nfs/write.c | 3 +- + fs/nfsd/Kconfig | 10 - + fs/nfsd/blocklayout.c | 72 + + fs/nfsd/debugfs.c | 4 + + fs/nfsd/lockd.c | 50 +- + fs/nfsd/nfs4proc.c | 3 +- + fs/nfsd/nfs4state.c | 30 +- + fs/nfsd/nfs4xdr.c | 3 +- + fs/nfsd/nfscache.c | 3 +- + fs/nfsd/nfsctl.c | 2 +- + fs/nfsd/nfsd.h | 6 + + fs/nfsd/nfssvc.c | 10 +- + fs/nfsd/state.h | 3 + + fs/ntfs/Kconfig | 47 + + fs/ntfs/Makefile | 10 + + fs/ntfs/aops.c | 263 + + fs/ntfs/attrib.c | 5425 ++++++++++++++++++++ + fs/ntfs/attrib.h | 164 + + fs/ntfs/attrlist.c | 289 ++ + fs/ntfs/attrlist.h | 20 + + fs/ntfs/bdev-io.c | 117 + + fs/ntfs/bitmap.c | 287 ++ + fs/ntfs/bitmap.h | 100 + + fs/ntfs/collate.c | 146 + + fs/ntfs/collate.h | 36 + + fs/ntfs/compress.c | 1577 ++++++ + fs/ntfs/debug.c | 171 + + fs/ntfs/debug.h | 63 + + fs/ntfs/dir.c | 1236 +++++ + fs/ntfs/dir.h | 32 + + fs/ntfs/ea.c | 943 ++++ + fs/ntfs/ea.h | 30 + + fs/ntfs/file.c | 1161 +++++ + fs/ntfs/index.c | 2117 ++++++++ + fs/ntfs/index.h | 111 + + fs/ntfs/inode.c | 3820 ++++++++++++++ + fs/ntfs/inode.h | 359 ++ + fs/ntfs/iomap.c | 870 ++++ + fs/ntfs/iomap.h | 23 + + fs/ntfs/layout.h | 2346 +++++++++ + fs/ntfs/lcnalloc.c | 1047 ++++ + fs/ntfs/lcnalloc.h | 134 + + fs/ntfs/logfile.c | 778 +++ + fs/ntfs/logfile.h | 245 + + fs/ntfs/malloc.h | 77 + + fs/ntfs/mft.c | 2922 +++++++++++ + fs/ntfs/mft.h | 94 + + fs/ntfs/mst.c | 194 + + fs/ntfs/namei.c | 1692 ++++++ + fs/ntfs/ntfs.h | 294 ++ + fs/ntfs/object_id.c | 158 + + fs/ntfs/object_id.h | 14 + + fs/ntfs/quota.c | 95 + + fs/ntfs/quota.h | 15 + + fs/ntfs/reparse.c | 573 +++ + fs/ntfs/reparse.h | 20 + + fs/ntfs/runlist.c | 2066 ++++++++ + fs/ntfs/runlist.h | 97 + + fs/ntfs/super.c | 2770 ++++++++++ + fs/ntfs/sysctl.c | 55 + + fs/ntfs/sysctl.h | 26 + + fs/ntfs/time.h | 87 + + fs/ntfs/unistr.c | 477 ++ + fs/ntfs/upcase.c | 70 + + fs/ntfs/volume.h | 296 ++ + fs/ntfs3/Kconfig | 10 +- + fs/ntfs3/dir.c | 10 - + fs/ntfs3/file.c | 11 - + fs/ntfs3/frecord.c | 47 +- + fs/ntfs3/index.c | 76 +- + fs/ntfs3/inode.c | 21 +- + fs/ntfs3/ntfs_fs.h | 14 - + fs/ntfs3/super.c | 59 +- + fs/pidfs.c | 64 +- + fs/smb/client/cached_dir.c | 2 +- + fs/smb/client/cifs_fs_sb.h | 2 +- + fs/smb/client/cifs_ioctl.h | 8 - + fs/smb/client/cifs_unicode.c | 14 - + fs/smb/client/cifs_unicode.h | 14 +- + fs/smb/client/cifsacl.c | 17 +- + fs/smb/client/cifsfs.c | 84 +- + fs/smb/client/cifsglob.h | 61 +- + fs/smb/client/connect.c | 80 +- + fs/smb/client/dfs_cache.c | 2 +- + fs/smb/client/dir.c | 53 +- + fs/smb/client/file.c | 90 +- + fs/smb/client/fs_context.c | 184 +- + fs/smb/client/fs_context.h | 5 +- + fs/smb/client/inode.c | 146 +- + fs/smb/client/ioctl.c | 2 +- + fs/smb/client/link.c | 14 +- + fs/smb/client/misc.c | 16 +- + fs/smb/client/readdir.c | 39 +- + fs/smb/client/reparse.c | 29 +- + fs/smb/client/reparse.h | 4 +- + fs/smb/client/smb1ops.c | 22 +- + fs/smb/client/smb2file.c | 2 +- + fs/smb/client/smb2misc.c | 18 +- + fs/smb/client/smb2ops.c | 8 +- + fs/smb/client/smb2pdu.c | 35 +- + fs/smb/client/transport.c | 21 +- + fs/smb/client/xattr.c | 6 +- + fs/xattr.c | 425 +- + fs/xfs/libxfs/xfs_ag.c | 28 + + fs/xfs/libxfs/xfs_ag.h | 3 + + fs/xfs/libxfs/xfs_inode_buf.c | 4 + + fs/xfs/libxfs/xfs_metafile.c | 5 + + fs/xfs/libxfs/xfs_ondisk.h | 52 +- + fs/xfs/libxfs/xfs_sb.c | 3 + + fs/xfs/scrub/dir_repair.c | 2 +- + fs/xfs/scrub/orphanage.c | 7 +- + fs/xfs/xfs_fsops.c | 17 +- + fs/xfs/xfs_health.c | 20 +- + fs/xfs/xfs_healthmon.c | 11 +- + fs/xfs/xfs_icache.c | 18 +- + fs/xfs/xfs_mount.h | 2 +- + fs/xfs/xfs_notify_failure.c | 4 +- + fs/xfs/xfs_platform.h | 9 + + fs/xfs/xfs_rtalloc.c | 44 +- + fs/xfs/xfs_stats.c | 17 +- + fs/xfs/xfs_stats.h | 19 +- + fs/xfs/xfs_super.c | 4 +- + fs/xfs/xfs_verify_media.c | 4 +- + fs/xfs/xfs_zone_alloc.c | 6 +- + fs/xfs/xfs_zone_gc.c | 10 +- + include/linux/backing-dev.h | 13 + + include/linux/fs_parser.h | 8 +- + include/linux/kernfs.h | 2 - + include/linux/lockd/bind.h | 26 +- + include/linux/lockd/debug.h | 40 - + include/linux/shmem_fs.h | 2 +- + include/linux/sunrpc/svc.h | 6 +- + include/linux/xattr.h | 47 +- + include/uapi/linux/fs.h | 12 + + mm/shmem.c | 46 +- + net/socket.c | 119 +- + net/sunrpc/auth_gss/gss_krb5_test.c | 93 +- + net/sunrpc/cache.c | 62 +- + .../testing/selftests/filesystems/xattr/.gitignore | 3 + + tools/testing/selftests/filesystems/xattr/Makefile | 6 + + .../filesystems/xattr/xattr_socket_test.c | 470 ++ + .../filesystems/xattr/xattr_socket_types_test.c | 177 + + .../filesystems/xattr/xattr_sockfs_test.c | 363 ++ + 239 files changed, 41033 insertions(+), 1974 deletions(-) + create mode 100644 Documentation/filesystems/ntfs.rst + create mode 100644 fs/btrfs/tests/zoned-tests.c + rename {include/linux => fs}/lockd/lockd.h (85%) + rename {include/linux => fs}/lockd/nlm.h (91%) + rename {include/linux => fs}/lockd/share.h (85%) + rename {include/linux => fs}/lockd/xdr.h (91%) + rename {include/linux => fs}/lockd/xdr4.h (80%) + create mode 100644 fs/ntfs/Kconfig + create mode 100644 fs/ntfs/Makefile + create mode 100644 fs/ntfs/aops.c + create mode 100644 fs/ntfs/attrib.c + create mode 100644 fs/ntfs/attrib.h + create mode 100644 fs/ntfs/attrlist.c + create mode 100644 fs/ntfs/attrlist.h + create mode 100644 fs/ntfs/bdev-io.c + create mode 100644 fs/ntfs/bitmap.c + create mode 100644 fs/ntfs/bitmap.h + create mode 100644 fs/ntfs/collate.c + create mode 100644 fs/ntfs/collate.h + create mode 100644 fs/ntfs/compress.c + create mode 100644 fs/ntfs/debug.c + create mode 100644 fs/ntfs/debug.h + create mode 100644 fs/ntfs/dir.c + create mode 100644 fs/ntfs/dir.h + create mode 100644 fs/ntfs/ea.c + create mode 100644 fs/ntfs/ea.h + create mode 100644 fs/ntfs/file.c + create mode 100644 fs/ntfs/index.c + create mode 100644 fs/ntfs/index.h + create mode 100644 fs/ntfs/inode.c + create mode 100644 fs/ntfs/inode.h + create mode 100644 fs/ntfs/iomap.c + create mode 100644 fs/ntfs/iomap.h + create mode 100644 fs/ntfs/layout.h + create mode 100644 fs/ntfs/lcnalloc.c + create mode 100644 fs/ntfs/lcnalloc.h + create mode 100644 fs/ntfs/logfile.c + create mode 100644 fs/ntfs/logfile.h + create mode 100644 fs/ntfs/malloc.h + create mode 100644 fs/ntfs/mft.c + create mode 100644 fs/ntfs/mft.h + create mode 100644 fs/ntfs/mst.c + create mode 100644 fs/ntfs/namei.c + create mode 100644 fs/ntfs/ntfs.h + create mode 100644 fs/ntfs/object_id.c + create mode 100644 fs/ntfs/object_id.h + create mode 100644 fs/ntfs/quota.c + create mode 100644 fs/ntfs/quota.h + create mode 100644 fs/ntfs/reparse.c + create mode 100644 fs/ntfs/reparse.h + create mode 100644 fs/ntfs/runlist.c + create mode 100644 fs/ntfs/runlist.h + create mode 100644 fs/ntfs/super.c + create mode 100644 fs/ntfs/sysctl.c + create mode 100644 fs/ntfs/sysctl.h + create mode 100644 fs/ntfs/time.h + create mode 100644 fs/ntfs/unistr.c + create mode 100644 fs/ntfs/upcase.c + create mode 100644 fs/ntfs/volume.h + delete mode 100644 include/linux/lockd/debug.h + create mode 100644 tools/testing/selftests/filesystems/xattr/.gitignore + create mode 100644 tools/testing/selftests/filesystems/xattr/Makefile + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_types_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_sockfs_test.c +Merging printk/for-next (08c32fa109b6e Merge branch 'for-6.20' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (bba5917ad454a Merge branch 'pci/msi') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Merge made by the 'ort' strategy. + Documentation/PCI/msi-howto.rst | 7 +++++-- + drivers/pci/msi/api.c | 5 +++++ + drivers/pci/msi/msi.c | 10 ++++++++++ + drivers/pci/pci.c | 7 +++---- + drivers/pci/pcie/aspm.c | 17 ++++++++++++----- + drivers/pci/tph.c | 9 ++++++--- + 6 files changed, 41 insertions(+), 14 deletions(-) +Merging pstore/for-next/pstore (bb5278a89dad2 pstore/ram: fix resource leak when ioremap() fails) +$ git merge -m Merge branch 'for-next/pstore' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Auto-merging fs/pstore/inode.c +Auto-merging fs/pstore/ram.c +Auto-merging fs/pstore/ram_core.c +Merge made by the 'ort' strategy. + fs/pstore/inode.c | 6 +++--- + fs/pstore/ram.c | 2 +- + fs/pstore/ram_core.c | 5 ++++- + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging hid/for-next (0f96b90e8531b Merge branch 'for-7.1/lenovo' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/hid/hid-apple.c +Auto-merging drivers/hid/hid-cmedia.c +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/usbhid/hid-pidff.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-hid-lenovo-go | 724 ++++++ + .../ABI/testing/sysfs-driver-hid-lenovo-go-s | 304 +++ + MAINTAINERS | 28 +- + drivers/hid/Kconfig | 24 + + drivers/hid/Makefile | 2 + + drivers/hid/hid-apple.c | 7 +- + drivers/hid/hid-asus.c | 15 +- + drivers/hid/hid-cmedia.c | 2 +- + drivers/hid/hid-core.c | 5 + + drivers/hid/hid-creative-sb0540.c | 2 +- + drivers/hid/hid-ids.h | 7 + + drivers/hid/hid-lenovo-go-s.c | 1509 ++++++++++++ + drivers/hid/hid-lenovo-go.c | 2497 ++++++++++++++++++++ + drivers/hid/hid-magicmouse.c | 6 +- + drivers/hid/hid-multitouch.c | 43 +- + drivers/hid/hid-zydacron.c | 2 +- + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 2 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 12 + + drivers/hid/usbhid/hid-pidff.c | 68 +- + drivers/hid/usbhid/hid-pidff.h | 9 + + include/linux/device.h | 46 + + include/linux/hid.h | 7 + + .../selftests/hid/tests/test_wacom_generic.py | 34 +- + 23 files changed, 5292 insertions(+), 63 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-lenovo-go + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-lenovo-go-s + create mode 100644 drivers/hid/hid-lenovo-go-s.c + create mode 100644 drivers/hid/hid-lenovo-go.c +Merging i2c/i2c/for-next (a7ccf182b2aba i2c: provide i2c_adapter_set_node()) +$ git merge -m Merge branch 'i2c/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-ali1535.c | 20 +++++++++---------- + drivers/i2c/busses/i2c-ali15x3.c | 20 +++++++++---------- + drivers/i2c/busses/i2c-amd-asf-plat.c | 4 ++-- + drivers/i2c/busses/i2c-amd756.c | 24 +++++++++++----------- + drivers/i2c/busses/i2c-bcm-kona.c | 4 ++-- + drivers/i2c/busses/i2c-bcm2835.c | 4 ++-- + drivers/i2c/busses/i2c-designware-amdisp.c | 2 +- + drivers/i2c/busses/i2c-designware-common.c | 2 +- + drivers/i2c/busses/i2c-gpio.c | 4 ++-- + drivers/i2c/busses/i2c-highlander.c | 2 +- + drivers/i2c/busses/i2c-isch.c | 32 +++++++++++++++--------------- + drivers/i2c/busses/i2c-keba.c | 2 +- + drivers/i2c/busses/i2c-ljca.c | 2 +- + drivers/i2c/busses/i2c-ls2x.c | 2 +- + drivers/i2c/busses/i2c-mlxbf.c | 19 +++++++++--------- + drivers/i2c/busses/i2c-mv64xxx.c | 4 ++-- + drivers/i2c/busses/i2c-mxs.c | 4 ++-- + drivers/i2c/busses/i2c-nforce2.c | 14 ++++++------- + drivers/i2c/busses/i2c-nomadik.c | 4 ++-- + drivers/i2c/busses/i2c-omap.c | 4 ++-- + drivers/i2c/busses/i2c-owl.c | 4 ++-- + drivers/i2c/busses/i2c-piix4.c | 14 ++++++------- + drivers/i2c/busses/i2c-powermac.c | 26 ++++++++++++------------ + drivers/i2c/busses/i2c-qcom-geni.c | 4 ++-- + drivers/i2c/busses/i2c-rcar.c | 6 +++--- + drivers/i2c/busses/i2c-rzv2m.c | 2 +- + drivers/i2c/busses/i2c-scmi.c | 6 +++--- + drivers/i2c/busses/i2c-st.c | 4 ++-- + drivers/i2c/busses/i2c-sun6i-p2wi.c | 8 ++++---- + drivers/i2c/busses/i2c-usbio.c | 2 +- + drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 2 +- + drivers/i2c/i2c-core-base.c | 5 +++++ + drivers/media/pci/saa7134/saa7134-i2c.c | 26 ++++++++++++------------ + include/linux/i2c.h | 22 ++++++++++++++++++++ + 34 files changed, 165 insertions(+), 139 deletions(-) +Merging i2c-host/i2c/i2c-host (079a015b5a630 dt-bindings: i2c: Add CP2112 HID USB to SMBus Bridge) +$ git merge -m Merge branch 'i2c/i2c-host' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Already up to date. +Merging i3c/i3c/next (ed318b3fb4ab3 i3c: dw-i3c-master: fix SIR reject bit mapping for dynamic addresses) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (1afafbaf749d8 firmware/dmi: Include product_family info to modalias) +$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (addb1581d9b6a dt-bindings: hwmon: convert npcm750-pwm-fan to DT schema) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/baikal,bt1-pvt.yaml | 105 -- + .../devicetree/bindings/hwmon/npcm750-pwm-fan.txt | 88 -- + .../bindings/hwmon/nuvoton,npcm750-pwm-fan.yaml | 139 +++ + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 3 + + .../devicetree/bindings/trivial-devices.yaml | 7 + + Documentation/hwmon/asus_ec_sensors.rst | 2 + + Documentation/hwmon/bt1-pvt.rst | 117 -- + Documentation/hwmon/ina2xx.rst | 25 +- + Documentation/hwmon/index.rst | 1 - + drivers/hwmon/Kconfig | 28 +- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/aht10.c | 10 + + drivers/hwmon/asus-ec-sensors.c | 21 + + drivers/hwmon/bt1-pvt.c | 1171 -------------------- + drivers/hwmon/bt1-pvt.h | 247 ----- + drivers/hwmon/gpd-fan.c | 8 + + drivers/hwmon/ina2xx.c | 36 +- + drivers/hwmon/pmbus/Kconfig | 9 + + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/pmbus.h | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 4 + + drivers/hwmon/pmbus/xdpe1a2g7b.c | 119 ++ + 22 files changed, 379 insertions(+), 1765 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/npcm750-pwm-fan.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,npcm750-pwm-fan.yaml + delete mode 100644 Documentation/hwmon/bt1-pvt.rst + delete mode 100644 drivers/hwmon/bt1-pvt.c + delete mode 100644 drivers/hwmon/bt1-pvt.h + create mode 100644 drivers/hwmon/pmbus/xdpe1a2g7b.c +Merging jc_docs/docs-next (b8c904a37608c Doc: dev-tools: Added Gentoo in the Operating system list under Getting Coccinelle) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/tainted-kernels.rst | 2 +- + Documentation/dev-tools/coccinelle.rst | 1 + + .../early-userspace/early_userspace_support.rst | 2 +- + .../features/perf/perf-regs/arch-support.txt | 2 +- + .../features/perf/perf-stackdump/arch-support.txt | 2 +- + Documentation/process/2.Process.rst | 2 +- + Documentation/process/changes.rst | 2 +- + Documentation/sphinx/translations.py | 1 + + Documentation/tools/rtla/rtla.rst | 6 +- + Documentation/translations/index.rst | 4 +- + .../translations/pt_BR/disclaimer-pt_BR.rst | 11 + + Documentation/translations/pt_BR/index.rst | 70 +++ + .../translations/pt_BR/process/changes.rst | 576 +++++++++++++++++++ + Documentation/translations/pt_BR/process/howto.rst | 637 +++++++++++++++++++++ + .../translations/zh_TW/admin-guide/README.rst | 2 +- + MAINTAINERS | 7 +- + 17 files changed, 1317 insertions(+), 12 deletions(-) + create mode 100644 Documentation/translations/pt_BR/disclaimer-pt_BR.rst + create mode 100644 Documentation/translations/pt_BR/index.rst + create mode 100644 Documentation/translations/pt_BR/process/changes.rst + create mode 100644 Documentation/translations/pt_BR/process/howto.rst +Merging v4l-dvb/next (f505e978d1a04 docs: media: document media multi-committers rules and process) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/driver-api/media/index.rst | 1 + + .../driver-api/media/maintainer-entry-profile.rst | 463 ++++++++++++++++++--- + .../driver-api/media/media-committers.rst | 203 +++++++++ + Documentation/process/maintainer-pgp-guide.rst | 2 + + MAINTAINERS | 3 +- + 5 files changed, 609 insertions(+), 63 deletions(-) + create mode 100644 Documentation/driver-api/media/media-committers.rst +Merging v4l-dvb-next/master (adc218676eef2 Linux 6.12) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (af08929c57ceb Merge branch 'pm-misc' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/acpi/acpica/acpredef.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (4ca3c45eb30b9 cpupower: fix swapped power/energy unit labels) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/utils/powercap-info.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging devfreq/devfreq-next (73b32f1304a47 PM / devfreq: Remove unneeded casting for HZ_PER_KHZ) +$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/devfreq.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging pmdomain/next (7ad7f43e568b8 pmdomain: de-constify fields struct dev_pm_domain_attach_data) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Merge made by the 'ort' strategy. + .../bindings/power/mediatek,mt8196-gpufreq.yaml | 13 + + .../bindings/power/mediatek,power-controller.yaml | 1 + + drivers/pmdomain/core.c | 59 ++- + drivers/pmdomain/imx/imx93-blk-ctrl.c | 77 ++-- + drivers/pmdomain/imx/scu-pd.c | 1 + + .../pmdomain/marvell/pxa1908-power-controller.c | 39 +- + drivers/pmdomain/mediatek/mt8189-pm-domains.h | 485 +++++++++++++++++++++ + drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c | 59 +++ + drivers/pmdomain/mediatek/mtk-pm-domains.c | 44 +- + drivers/pmdomain/mediatek/mtk-pm-domains.h | 5 + + drivers/pmdomain/mediatek/mtk-scpsys.c | 10 + + drivers/pmdomain/qcom/rpmpd.c | 2 +- + drivers/pmdomain/ti/omap_prm.c | 1 + + drivers/pmdomain/ti/ti_sci_pm_domains.c | 5 +- + include/dt-bindings/power/marvell,pxa1908-power.h | 1 + + include/dt-bindings/power/mediatek,mt8189-power.h | 38 ++ + include/dt-bindings/power/mt7622-power.h | 1 + + include/linux/pm_domain.h | 5 +- + 18 files changed, 776 insertions(+), 70 deletions(-) + create mode 100644 drivers/pmdomain/mediatek/mt8189-pm-domains.h + create mode 100644 include/dt-bindings/power/mediatek,mt8189-power.h +Merging opp/opp/linux-next (3d2398f44a2d4 OPP: Move break out of scoped_guard in dev_pm_opp_xlate_required_opp()) +$ git merge -m Merge branch 'opp/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Merge made by the 'ort' strategy. + drivers/opp/core.c | 2 +- + drivers/opp/debugfs.c | 20 +++++++++++--------- + 2 files changed, 12 insertions(+), 10 deletions(-) +Merging thermal/thermal/linux-next (0061030929e2d thermal: renesas: rzg3e: add support for RZ/T2H and RZ/N2H) +$ git merge -m Merge branch 'thermal/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (58409f0d4dd3f RDMA/mlx4: Remove unused create_flags field from CQ structure) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/hw/efa/efa_verbs.c +Auto-merging drivers/infiniband/hw/mthca/mthca_provider.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/Makefile | 6 +- + drivers/infiniband/core/cq.c | 3 + + drivers/infiniband/core/device.c | 2 +- + drivers/infiniband/core/iter.c | 43 ++++ + drivers/infiniband/core/umem.c | 2 +- + drivers/infiniband/core/uverbs_cmd.c | 9 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 38 ++-- + drivers/infiniband/core/verbs.c | 49 +---- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 +- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/efa/efa.h | 6 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 23 ++- + drivers/infiniband/hw/efa/efa_com_cmd.c | 55 +++-- + drivers/infiniband/hw/efa/efa_com_cmd.h | 3 +- + drivers/infiniband/hw/efa/efa_main.c | 3 +- + drivers/infiniband/hw/efa/efa_verbs.c | 51 ++--- + drivers/infiniband/hw/erdma/erdma_verbs.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 2 +- + drivers/infiniband/hw/ionic/ionic_ibdev.h | 2 +- + drivers/infiniband/hw/irdma/main.h | 2 +- + drivers/infiniband/hw/mana/mana_ib.h | 2 +- + drivers/infiniband/hw/mlx4/cq.c | 263 +++++++++++++----------- + drivers/infiniband/hw/mlx4/main.c | 1 + + drivers/infiniband/hw/mlx4/mlx4_ib.h | 5 +- + drivers/infiniband/hw/mlx4/mr.c | 1 + + drivers/infiniband/hw/mlx5/cq.c | 159 +++++++++----- + drivers/infiniband/hw/mlx5/main.c | 1 + + drivers/infiniband/hw/mlx5/mem.c | 1 + + drivers/infiniband/hw/mlx5/mlx5_ib.h | 5 +- + drivers/infiniband/hw/mlx5/qp.c | 2 +- + drivers/infiniband/hw/mlx5/umr.c | 1 + + drivers/infiniband/hw/mthca/mthca_provider.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 56 +++-- + drivers/infiniband/sw/rxe/rxe_verbs.h | 1 + + include/rdma/ib_cache.h | 4 +- + include/rdma/ib_umem.h | 42 +--- + include/rdma/ib_verbs.h | 52 +---- + include/rdma/iter.h | 88 ++++++++ + include/rdma/iw_cm.h | 14 +- + include/rdma/restrack.h | 4 +- + include/uapi/rdma/efa-abi.h | 5 +- + 44 files changed, 606 insertions(+), 414 deletions(-) + create mode 100644 drivers/infiniband/core/iter.c + create mode 100644 include/rdma/iter.h +Merging net-next/main (fd6dad4e1ae29 netmem: remove the pp fields from net_iov) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +Auto-merging include/net/netmem.h +CONFLICT (content): Merge conflict in include/net/netmem.h +Auto-merging net/ipv4/tcp_input.c +Auto-merging tools/testing/selftests/net/Makefile +Recorded preimage for 'include/net/netmem.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/net/netmem.h'. +[master c0bed4aece3a2] Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/networking/ethtool-netlink.rst | 12 +- + Documentation/networking/ip-sysctl.rst | 24 +- + drivers/net/bonding/bond_main.c | 4 +- + drivers/net/bonding/bond_netlink.c | 9 + + drivers/net/ethernet/airoha/airoha_eth.c | 2 +- + drivers/net/ethernet/airoha/airoha_eth.h | 2 +- + drivers/net/ethernet/airoha/airoha_ppe.c | 2 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 55 ++- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 3 + + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 7 + + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 80 ++++ + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 18 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 20 +- + drivers/net/ethernet/cadence/macb_main.c | 51 ++- + drivers/net/ethernet/cisco/enic/enic.h | 39 ++ + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 155 +++++++- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 4 +- + drivers/net/ethernet/freescale/ucc_geth.c | 3 +- + drivers/net/ethernet/ibm/ibmveth.c | 4 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 9 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 413 +++++++++++++-------- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 45 ++- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/pool.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 59 ++- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 194 +++++++--- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 36 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 8 + + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 11 +- + .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 3 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 135 ++++--- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 49 +-- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 17 +- + drivers/net/ppp/pppoe.c | 81 +--- + drivers/net/ppp/pppox.c | 3 - + include/linux/if_pppox.h | 6 - + include/linux/stmmac.h | 3 +- + include/net/bonding.h | 10 +- + include/net/inet6_connection_sock.h | 4 +- + include/net/inet_connection_sock.h | 3 +- + include/net/ip6_checksum.h | 2 - + include/net/ip_vs.h | 39 +- + include/net/netfilter/nf_tables.h | 32 -- + include/net/netfilter/nft_fib.h | 2 - + include/net/netfilter/nft_meta.h | 3 - + include/net/netmem.h | 39 +- + include/net/sock.h | 1 - + include/net/tcp.h | 12 +- + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/if_pppox.h | 14 +- + net/bridge/netfilter/nft_meta_bridge.c | 20 - + net/bridge/netfilter/nft_reject_bridge.c | 1 - + net/core/sock.c | 8 +- + net/ipv4/icmp.c | 4 +- + net/ipv4/inet_connection_sock.c | 4 +- + net/ipv4/netfilter/nft_dup_ipv4.c | 1 - + net/ipv4/netfilter/nft_fib_ipv4.c | 2 - + net/ipv4/netfilter/nft_reject_ipv4.c | 1 - + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 19 - + net/ipv4/tcp_output.c | 29 +- + net/ipv6/inet6_connection_sock.c | 19 +- + net/ipv6/ip6_checksum.c | 47 --- + net/ipv6/netfilter/nft_dup_ipv6.c | 1 - + net/ipv6/netfilter/nft_fib_ipv6.c | 2 - + net/ipv6/netfilter/nft_reject_ipv6.c | 1 - + net/ipv6/tcp_ipv6.c | 22 +- + net/ipv6/udp.c | 46 +++ + net/l2tp/l2tp_eth.c | 5 +- + net/mptcp/subflow.c | 1 - + net/netfilter/ipvs/ip_vs_conn.c | 64 ++-- + net/netfilter/ipvs/ip_vs_core.c | 2 +- + net/netfilter/ipvs/ip_vs_ctl.c | 368 +++++++----------- + net/netfilter/ipvs/ip_vs_est.c | 18 +- + net/netfilter/ipvs/ip_vs_xmit.c | 12 +- + net/netfilter/nf_tables_api.c | 78 ---- + net/netfilter/nft_bitwise.c | 104 ------ + net/netfilter/nft_byteorder.c | 11 - + net/netfilter/nft_cmp.c | 3 - + net/netfilter/nft_compat.c | 10 - + net/netfilter/nft_connlimit.c | 1 - + net/netfilter/nft_counter.c | 1 - + net/netfilter/nft_ct.c | 46 --- + net/netfilter/nft_dup_netdev.c | 1 - + net/netfilter/nft_dynset.c | 1 - + net/netfilter/nft_exthdr.c | 34 -- + net/netfilter/nft_fib.c | 42 --- + net/netfilter/nft_fib_inet.c | 1 - + net/netfilter/nft_fib_netdev.c | 1 - + net/netfilter/nft_flow_offload.c | 1 - + net/netfilter/nft_fwd_netdev.c | 2 - + net/netfilter/nft_hash.c | 36 -- + net/netfilter/nft_immediate.c | 12 - + net/netfilter/nft_last.c | 1 - + net/netfilter/nft_limit.c | 2 - + net/netfilter/nft_log.c | 1 - + net/netfilter/nft_lookup.c | 12 - + net/netfilter/nft_masq.c | 3 - + net/netfilter/nft_meta.c | 45 --- + net/netfilter/nft_nat.c | 2 - + net/netfilter/nft_numgen.c | 22 -- + net/netfilter/nft_objref.c | 2 - + net/netfilter/nft_osf.c | 25 -- + net/netfilter/nft_payload.c | 47 --- + net/netfilter/nft_queue.c | 2 - + net/netfilter/nft_quota.c | 1 - + net/netfilter/nft_range.c | 1 - + net/netfilter/nft_redir.c | 3 - + net/netfilter/nft_reject_inet.c | 1 - + net/netfilter/nft_reject_netdev.c | 1 - + net/netfilter/nft_rt.c | 1 - + net/netfilter/nft_set_rbtree.c | 23 +- + net/netfilter/nft_socket.c | 26 -- + net/netfilter/nft_synproxy.c | 1 - + net/netfilter/nft_tproxy.c | 1 - + net/netfilter/nft_tunnel.c | 26 -- + net/netfilter/nft_xfrm.c | 27 -- + net/rds/send.c | 2 +- + net/tls/tls_device_fallback.c | 3 - + .../selftests/drivers/net/hw/lib/py/__init__.py | 5 +- + tools/testing/selftests/drivers/net/hw/rss_ctx.py | 18 +- + tools/testing/selftests/drivers/net/hw/tso.py | 7 +- + .../selftests/drivers/net/lib/py/__init__.py | 4 +- + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/ip6_tunnel.sh | 44 +++ + tools/testing/selftests/net/lib/py/__init__.py | 5 +- + tools/testing/selftests/net/lib/py/utils.py | 68 +++- + tools/testing/selftests/tc-testing/tdc_helper.py | 4 +- + 136 files changed, 1542 insertions(+), 1776 deletions(-) + create mode 100755 tools/testing/selftests/net/ip6_tunnel.sh +$ git am -3 ../patches/0001-net-mlx5e-Fix-up-merge.patch +Applying: net/mlx5e: Fix up merge +Using index info to reconstruct a base tree... +M drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging bpf-next/for-next (f620af11c27b8 xsk: avoid double checking against rx queue being full) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging tools/testing/selftests/bpf/prog_tests/task_local_data.h +Merge made by the 'ort' strategy. + arch/s390/net/bpf_jit_comp.c | 23 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 18 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 12 +- + include/linux/bpf_verifier.h | 9 +- + kernel/bpf/core.c | 4 +- + kernel/bpf/log.c | 10 +- + kernel/bpf/verifier.c | 381 +++++------ + net/xdp/xsk.c | 14 +- + net/xdp/xsk_queue.h | 16 +- + tools/testing/selftests/bpf/bpf_experimental.h | 7 + + tools/testing/selftests/bpf/prog_tests/align.c | 712 --------------------- + .../selftests/bpf/prog_tests/bpf_insn_array.c | 2 +- + .../testing/selftests/bpf/prog_tests/linked_list.c | 4 +- + tools/testing/selftests/bpf/prog_tests/rbtree.c | 6 + + .../selftests/bpf/prog_tests/task_local_data.h | 2 +- + .../selftests/bpf/prog_tests/task_local_storage.c | 16 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + tools/testing/selftests/bpf/progs/bpf_misc.h | 4 + + .../selftests/bpf/progs/exceptions_assert.c | 2 +- + tools/testing/selftests/bpf/progs/iters.c | 6 +- + .../selftests/bpf/progs/mem_rdonly_untrusted.c | 2 +- + .../selftests/bpf/progs/rbtree_search_kptr.c | 290 +++++++++ + tools/testing/selftests/bpf/progs/tailcall3.c | 5 +- + .../selftests/bpf/progs/task_local_data.bpf.h | 2 +- + tools/testing/selftests/bpf/progs/verifier_align.c | 581 +++++++++++++++++ + .../testing/selftests/bpf/progs/verifier_bounds.c | 2 +- + .../bpf/progs/verifier_direct_packet_access.c | 4 +- + tools/testing/selftests/bpf/progs/verifier_gotox.c | 4 +- + .../bpf/progs/verifier_helper_packet_access.c | 2 +- + .../bpf/progs/verifier_helper_value_access.c | 4 +- + .../testing/selftests/bpf/progs/verifier_int_ptr.c | 2 +- + .../selftests/bpf/progs/verifier_meta_access.c | 2 +- + .../selftests/bpf/progs/verifier_spill_fill.c | 8 +- + .../selftests/bpf/progs/verifier_stack_ptr.c | 4 +- + .../selftests/bpf/progs/verifier_value_ptr_arith.c | 10 +- + .../bpf/progs/verifier_xdp_direct_packet_access.c | 64 +- + tools/testing/selftests/bpf/uprobe_multi.c | 19 +- + tools/testing/selftests/bpf/uprobe_multi.ld | 4 +- + tools/testing/selftests/bpf/verifier/calls.c | 2 +- + 39 files changed, 1219 insertions(+), 1042 deletions(-) + delete mode 100644 tools/testing/selftests/bpf/prog_tests/align.c + create mode 100644 tools/testing/selftests/bpf/progs/rbtree_search_kptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_align.c +Merging ipsec-next/master (d2adf01780b89 net: freescale: ucc_geth: call of_node_put once) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (49e41f3ea3f75 net/mlx5: Add IFC bits for extended ETS rate limit bandwidth value) +$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (c7f5c6fb0f2b1 Merge branch 'add-selftests-helper-to-get-n-unique-ports') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (c7f5c6fb0f2b1 Merge branch 'add-selftests-helper-to-get-n-unique-ports') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (85e59519f724e Bluetooth: SMP: make SM/PER/KDU/BI-04-C happy) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/btintel_pcie.c +Auto-merging drivers/bluetooth/btmtk.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging drivers/bluetooth/hci_qca.c +CONFLICT (content): Merge conflict in drivers/bluetooth/hci_qca.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/iso.c +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging net/bluetooth/sco.c +Auto-merging net/bluetooth/smp.c +Resolved 'drivers/bluetooth/hci_qca.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a19b661f51f80] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/btbcm.c | 11 ++++----- + drivers/bluetooth/btintel_pcie.c | 6 +++-- + drivers/bluetooth/btmtk.c | 23 ++++++++++++++++-- + drivers/bluetooth/btmtk.h | 2 ++ + drivers/bluetooth/btmtksdio.c | 42 +++++++++++++++++++++++---------- + drivers/bluetooth/btqca.c | 37 +++++++++++++++-------------- + drivers/bluetooth/btusb.c | 16 ++++++++++++- + drivers/bluetooth/hci_qca.c | 51 +++++++++++++++++++++------------------- + include/linux/mmc/sdio_ids.h | 1 + + net/bluetooth/hci_core.c | 4 ++-- + net/bluetooth/l2cap_core.c | 11 ++++++--- + net/bluetooth/smp.c | 2 +- + 12 files changed, 134 insertions(+), 72 deletions(-) +Merging wireless-next/for-next (0314e382cf029 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging ath-next/for-next (ff49eba595df5 wifi: ath11k: fix memory leaks in beacon template setup) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Auto-merging drivers/net/wireless/ath/ath11k/mac.c +Auto-merging drivers/net/wireless/ath/ath12k/core.c +Auto-merging drivers/net/wireless/ath/ath12k/mac.c +Auto-merging drivers/net/wireless/ath/ath12k/qmi.c +Auto-merging drivers/net/wireless/ath/ath12k/wmi.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath11k/mac.c | 28 ++++--- + drivers/net/wireless/ath/ath12k/Makefile | 1 + + drivers/net/wireless/ath/ath12k/core.c | 13 ++++ + drivers/net/wireless/ath/ath12k/core.h | 3 + + drivers/net/wireless/ath/ath12k/mac.c | 4 + + drivers/net/wireless/ath/ath12k/qmi.c | 2 +- + drivers/net/wireless/ath/ath12k/thermal.c | 124 ++++++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath12k/thermal.h | 40 ++++++++++ + drivers/net/wireless/ath/ath12k/wmi.c | 57 +++++++------- + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + 10 files changed, 230 insertions(+), 44 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath12k/thermal.c + create mode 100644 drivers/net/wireless/ath/ath12k/thermal.h +Merging iwlwifi-next/next (66af8ac52d10e wifi: iwlwifi: rename struct iwl_mcc_allowed_ap_type_cmd::offset_map) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Already up to date. +Merging wpan-next/master (1dd9291eb9037 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + net/ieee802154/core.c | 49 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) +Merging wpan-staging/staging (1dd9291eb9037 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'staging' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (43db6366fc2de mtd: Add driver for concatenating devices) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + .../bindings/mtd/partitions/partition.yaml | 20 ++ + drivers/mtd/Kconfig | 9 + + drivers/mtd/Makefile | 1 + + drivers/mtd/mtd_virt_concat.c | 363 +++++++++++++++++++++ + drivers/mtd/mtdconcat.c | 12 - + drivers/mtd/mtdcore.c | 21 ++ + drivers/mtd/mtdpart.c | 6 + + include/linux/mtd/concat.h | 63 +++- + 8 files changed, 482 insertions(+), 13 deletions(-) + create mode 100644 drivers/mtd/mtd_virt_concat.c +Merging nand/nand/next (d9a2a92b42098 mtd: rawnand: cafe: Use generic power management) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mtd/mxc-nand.yaml | 7 ++++++- + drivers/mtd/nand/ecc-realtek.c | 18 ++++++++++-------- + drivers/mtd/nand/raw/cafe_nand.c | 7 +++++-- + include/linux/mtd/spinand.h | 5 +++-- + 4 files changed, 24 insertions(+), 13 deletions(-) +Merging spi-nor/spi-nor/next (ed26bd40df11e mailmap: update Pratyush Yadav's email address) +$ git merge -m Merge branch 'spi-nor/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (0ce90934c0a6b crypto: img-hash - Use unregister_ahashes in img_{un}register_algs) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging libcrypto/libcrypto-next (5366a35e2ec6c wifi: mac80211: Use AES-CMAC library in aes_s2v()) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Auto-merging crypto/Kconfig +Merge made by the 'ort' strategy. + arch/arm64/crypto/Kconfig | 2 +- + arch/arm64/crypto/Makefile | 4 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 4 - + arch/arm64/crypto/aes-glue.c | 261 +-------------------- + arch/arm64/crypto/aes-neonbs-glue.c | 15 +- + crypto/Kconfig | 2 + + crypto/aes.c | 183 ++++++++++++++- + crypto/testmgr.c | 10 +- + drivers/crypto/starfive/jh7110-aes.c | 2 +- + include/crypto/aes-cbc-macs.h | 154 ++++++++++++ + include/crypto/aes.h | 66 ++++++ + lib/crypto/Kconfig | 10 + + lib/crypto/Makefile | 4 +- + lib/crypto/aes.c | 231 +++++++++++++++++- + {arch/arm64/crypto => lib/crypto/arm64}/aes-ce.S | 3 +- + .../arm64/crypto => lib/crypto/arm64}/aes-modes.S | 25 +- + {arch/arm64/crypto => lib/crypto/arm64}/aes-neon.S | 2 +- + lib/crypto/arm64/aes.h | 76 +++++- + lib/crypto/fips.h | 5 + + lib/crypto/tests/Kconfig | 10 + + lib/crypto/tests/Makefile | 1 + + lib/crypto/tests/aes-cmac-testvecs.h | 181 ++++++++++++++ + lib/crypto/tests/aes_cbc_macs_kunit.c | 228 ++++++++++++++++++ + net/mac80211/Kconfig | 2 +- + net/mac80211/aes_cmac.c | 65 +---- + net/mac80211/aes_cmac.h | 12 +- + net/mac80211/fils_aead.c | 48 ++-- + net/mac80211/key.c | 11 +- + net/mac80211/key.h | 3 +- + net/mac80211/wpa.c | 13 +- + scripts/crypto/gen-fips-testvecs.py | 10 + + scripts/crypto/gen-hash-testvecs.py | 31 ++- + 32 files changed, 1254 insertions(+), 420 deletions(-) + create mode 100644 include/crypto/aes-cbc-macs.h + rename {arch/arm64/crypto => lib/crypto/arm64}/aes-ce.S (96%) + rename {arch/arm64/crypto => lib/crypto/arm64}/aes-modes.S (98%) + rename {arch/arm64/crypto => lib/crypto/arm64}/aes-neon.S (99%) + create mode 100644 lib/crypto/tests/aes-cmac-testvecs.h + create mode 100644 lib/crypto/tests/aes_cbc_macs_kunit.c +Merging drm/drm-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Already up to date. +Merging drm-exynos/for-linux-next (3a8660878839f Linux 6.18-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (bbe814bcb961e drm/panel-edp: Change BOE NV140WUM-N64 timings) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-dp.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c +Auto-merging drivers/infiniband/core/umem_dmabuf.c +Auto-merging drivers/infiniband/core/uverbs_std_types_dmabuf.c +Auto-merging include/uapi/drm/drm_fourcc.h +Merge made by the 'ort' strategy. + .../bindings/display/bridge/analogix,anx7625.yaml | 98 +- + .../bindings/display/bridge/fsl,ldb.yaml | 18 + + .../bindings/display/bridge/lontium,lt9611.yaml | 15 +- + .../display/bridge/thead,th1520-dw-hdmi.yaml | 120 ++ + .../bindings/display/panel/panel-edp-legacy.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 - + .../bindings/display/rockchip/rockchip,dw-dp.yaml | 27 +- + .../devicetree/bindings/display/tilcdc/panel.txt | 1 + + .../bindings/display/tilcdc/ti,am33xx-tilcdc.yaml | 100 ++ + .../devicetree/bindings/display/tilcdc/tilcdc.txt | 82 -- + .../bindings/display/verisilicon,dc.yaml | 122 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/drm-mm.rst | 10 +- + MAINTAINERS | 18 +- + drivers/accel/ivpu/vpu_boot_api.h | 211 ++-- + drivers/dma-buf/Kconfig | 12 - + drivers/dma-buf/dma-buf.c | 69 +- + drivers/dma-buf/dma-fence-array.c | 19 +- + drivers/dma-buf/dma-fence-chain.c | 16 +- + drivers/dma-buf/dma-fence.c | 168 ++- + drivers/dma-buf/st-dma-fence.c | 50 +- + drivers/dma-buf/sw_sync.c | 14 +- + drivers/dma-buf/sync_debug.h | 2 +- + drivers/firmware/google/Kconfig | 5 +- + drivers/firmware/google/cbmem.c | 1 + + drivers/firmware/google/coreboot_table.c | 13 +- + drivers/firmware/google/coreboot_table.h | 59 +- + drivers/firmware/google/framebuffer-coreboot.c | 126 +- + drivers/firmware/google/memconsole-coreboot.c | 1 + + drivers/firmware/google/vpd.c | 1 + + drivers/gpu/Kconfig | 13 + + drivers/gpu/Makefile | 4 +- + drivers/gpu/buddy.c | 1323 ++++++++++++++++++++ + drivers/gpu/drm/Kconfig | 8 +- + drivers/gpu/drm/Kconfig.debug | 1 - + drivers/gpu/drm/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 79 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 20 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 27 +- + .../drm/arm/display/komeda/komeda_framebuffer.c | 6 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 2 + + .../drm/arm/display/komeda/komeda_private_obj.c | 208 ++- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 81 ++ + drivers/gpu/drm/bridge/Kconfig | 10 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/analogix/Kconfig | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 161 +-- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 4 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 223 +++- + drivers/gpu/drm/bridge/analogix/anx7625.h | 34 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 7 + + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 50 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 46 +- + drivers/gpu/drm/bridge/synopsys/dw-dp.c | 12 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 224 ++-- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 3 + + drivers/gpu/drm/bridge/tda998x_drv.c | 263 ++-- + drivers/gpu/drm/bridge/th1520-dw-hdmi.c | 173 +++ + drivers/gpu/drm/display/drm_bridge_connector.c | 18 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 37 +- + drivers/gpu/drm/display/drm_dp_tunnel.c | 25 +- + drivers/gpu/drm/drm_atomic.c | 32 +- + drivers/gpu/drm/drm_atomic_helper.c | 6 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 23 + + drivers/gpu/drm/drm_bridge.c | 31 +- + drivers/gpu/drm/drm_buddy.c | 1272 +------------------ + drivers/gpu/drm/drm_colorop.c | 49 +- + drivers/gpu/drm/drm_connector.c | 33 + + drivers/gpu/drm/drm_crtc.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 15 - + drivers/gpu/drm/drm_gem.c | 45 +- + drivers/gpu/drm/drm_mode_config.c | 6 + + drivers/gpu/drm/drm_probe_helper.c | 2 +- + drivers/gpu/drm/drm_self_refresh_helper.c | 2 +- + drivers/gpu/drm/drm_writeback.c | 2 +- + .../gpu/drm/i915/display/intel_color_pipeline.c | 175 ++- + drivers/gpu/drm/i915/display/intel_colorop.c | 6 + + drivers/gpu/drm/i915/display/intel_colorop.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 2 +- + drivers/gpu/drm/i915/i915_active.c | 19 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 10 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 55 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.h | 4 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 4 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 20 +- + drivers/gpu/drm/imagination/pvr_ccb.c | 20 +- + drivers/gpu/drm/imagination/pvr_device.h | 10 +- + drivers/gpu/drm/imagination/pvr_power.c | 80 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 28 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 28 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 42 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 41 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 19 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 29 + + drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 + + drivers/gpu/drm/nouveau/nouveau_drm.c | 38 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c | 4 - + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c | 9 +- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c | 7 +- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gr.c | 34 +- + .../drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/gr.h | 19 + + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c | 18 +- + drivers/gpu/drm/panel/Kconfig | 1 + + .../gpu/drm/panel/panel-boe-th101mb31ig002-28a.c | 7 +- + drivers/gpu/drm/panel/panel-edp.c | 37 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 105 +- + drivers/gpu/drm/panel/panel-simple.c | 25 - + drivers/gpu/drm/panthor/Makefile | 2 + + drivers/gpu/drm/panthor/panthor_device.h | 107 +- + drivers/gpu/drm/panthor/panthor_fw.c | 16 +- + drivers/gpu/drm/panthor/panthor_gpu.c | 30 +- + drivers/gpu/drm/panthor/panthor_gpu.h | 2 + + drivers/gpu/drm/panthor/panthor_hw.c | 62 + + drivers/gpu/drm/panthor/panthor_hw.h | 8 + + drivers/gpu/drm/panthor/panthor_mmu.c | 47 +- + drivers/gpu/drm/panthor/panthor_pwr.c | 2 +- + drivers/gpu/drm/panthor/panthor_trace.h | 86 ++ + drivers/gpu/drm/qxl/qxl_release.c | 5 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 35 +- + drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 27 +- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 8 +- + drivers/gpu/drm/scheduler/sched_fence.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 3 + + drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- + drivers/gpu/drm/sun4i/sunxi_engine.h | 7 +- + drivers/gpu/drm/sysfb/Kconfig | 16 + + drivers/gpu/drm/sysfb/Makefile | 1 + + drivers/gpu/drm/sysfb/corebootdrm.c | 434 +++++++ + drivers/gpu/drm/sysfb/drm_sysfb.c | 24 + + drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 8 +- + drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c | 30 - + drivers/gpu/drm/sysfb/efidrm.c | 8 +- + drivers/gpu/drm/sysfb/vesadrm.c | 8 +- + drivers/gpu/drm/tests/Makefile | 1 - + drivers/gpu/drm/tests/drm_exec_test.c | 2 - + drivers/gpu/drm/tests/drm_mm_test.c | 2 - + drivers/gpu/drm/tilcdc/Kconfig | 18 + + drivers/gpu/drm/tilcdc/Makefile | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 192 +-- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 496 +++----- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 99 +- + drivers/gpu/drm/tilcdc/tilcdc_encoder.c | 69 + + .../tilcdc/{tilcdc_external.h => tilcdc_encoder.h} | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 179 --- + drivers/gpu/drm/tilcdc/tilcdc_panel.h | 15 - + drivers/gpu/drm/tilcdc/tilcdc_panel_legacy.c | 185 +++ + drivers/gpu/drm/tilcdc/tilcdc_panel_legacy.dtso | 29 + + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 35 +- + drivers/gpu/drm/tilcdc/tilcdc_regs.h | 8 +- + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 4 +- + drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 18 +- + drivers/gpu/drm/ttm/tests/ttm_mock_manager.h | 4 +- + drivers/gpu/drm/v3d/v3d_drv.h | 5 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 57 +- + drivers/gpu/drm/vc4/vc4_drv.h | 5 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +- + drivers/gpu/drm/vc4/vc4_kms.c | 69 +- + drivers/gpu/drm/vc4/vc4_perfmon.c | 51 +- + drivers/gpu/drm/verisilicon/Kconfig | 16 + + drivers/gpu/drm/verisilicon/Makefile | 5 + + drivers/gpu/drm/verisilicon/vs_bridge.c | 371 ++++++ + drivers/gpu/drm/verisilicon/vs_bridge.h | 39 + + drivers/gpu/drm/verisilicon/vs_bridge_regs.h | 54 + + drivers/gpu/drm/verisilicon/vs_crtc.c | 191 +++ + drivers/gpu/drm/verisilicon/vs_crtc.h | 31 + + drivers/gpu/drm/verisilicon/vs_crtc_regs.h | 60 + + drivers/gpu/drm/verisilicon/vs_dc.c | 207 +++ + drivers/gpu/drm/verisilicon/vs_dc.h | 38 + + drivers/gpu/drm/verisilicon/vs_dc_top_regs.h | 27 + + drivers/gpu/drm/verisilicon/vs_drm.c | 182 +++ + drivers/gpu/drm/verisilicon/vs_drm.h | 28 + + drivers/gpu/drm/verisilicon/vs_hwdb.c | 150 +++ + drivers/gpu/drm/verisilicon/vs_hwdb.h | 29 + + drivers/gpu/drm/verisilicon/vs_plane.c | 124 ++ + drivers/gpu/drm/verisilicon/vs_plane.h | 72 ++ + drivers/gpu/drm/verisilicon/vs_primary_plane.c | 173 +++ + .../gpu/drm/verisilicon/vs_primary_plane_regs.h | 53 + + drivers/gpu/drm/virtio/virtgpu_prime.c | 4 +- + drivers/gpu/drm/vkms/vkms_colorop.c | 16 +- + drivers/gpu/drm/vkms/vkms_drv.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 3 +- + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 7 +- + drivers/gpu/drm/xe/xe_bo.c | 2 +- + drivers/gpu/drm/xe/xe_dma_buf.c | 14 +- + drivers/gpu/drm/xe/xe_hw_fence.c | 3 +- + drivers/gpu/drm/xe/xe_res_cursor.h | 34 +- + drivers/gpu/drm/xe/xe_sched_job.c | 4 +- + drivers/gpu/drm/xe/xe_svm.c | 12 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 71 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 4 +- + drivers/gpu/tests/Makefile | 4 + + .../drm_buddy_test.c => tests/gpu_buddy_test.c} | 416 +++--- + .../{drm/lib/drm_random.c => tests/gpu_random.c} | 18 +- + .../{drm/lib/drm_random.h => tests/gpu_random.h} | 18 +- + drivers/infiniband/core/ib_core_uverbs.c | 2 +- + drivers/infiniband/core/umem_dmabuf.c | 10 - + drivers/infiniband/core/uverbs_std_types_dmabuf.c | 2 +- + drivers/infiniband/hw/mlx5/mr.c | 2 +- + drivers/iommu/iommufd/pages.c | 11 +- + drivers/iommu/iommufd/selftest.c | 2 +- + drivers/vfio/pci/vfio_pci_dmabuf.c | 80 +- + drivers/video/Kconfig | 1 + + include/drm/bridge/dw_dp.h | 7 + + include/drm/drm_atomic.h | 21 +- + include/drm/drm_atomic_state_helper.h | 3 + + include/drm/drm_buddy.h | 163 +-- + include/drm/drm_colorop.h | 32 +- + include/drm/drm_connector.h | 1 + + include/drm/drm_fb_helper.h | 105 -- + include/drm/drm_mode_config.h | 4 + + include/linux/coreboot.h | 90 ++ + include/linux/dma-buf.h | 17 +- + include/linux/dma-fence-array.h | 1 - + include/linux/dma-fence-chain.h | 1 - + include/linux/dma-fence.h | 97 +- + include/linux/gpu_buddy.h | 239 ++++ + include/trace/events/dma_fence.h | 35 +- + include/uapi/drm/drm_fourcc.h | 16 + + include/uapi/drm/drm_mode.h | 4 + + include/uapi/drm/nouveau_drm.h | 66 + + 235 files changed, 8641 insertions(+), 4366 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/thead,th1520-dw-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/display/tilcdc/ti,am33xx-tilcdc.yaml + delete mode 100644 Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt + create mode 100644 Documentation/devicetree/bindings/display/verisilicon,dc.yaml + create mode 100644 drivers/gpu/Kconfig + create mode 100644 drivers/gpu/buddy.c + create mode 100644 drivers/gpu/drm/bridge/th1520-dw-hdmi.c + create mode 100644 drivers/gpu/drm/panthor/panthor_trace.h + create mode 100644 drivers/gpu/drm/sysfb/corebootdrm.c + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_encoder.c + rename drivers/gpu/drm/tilcdc/{tilcdc_external.h => tilcdc_encoder.h} (51%) + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_external.c + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_panel.h + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_panel_legacy.c + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_panel_legacy.dtso + create mode 100644 drivers/gpu/drm/verisilicon/Kconfig + create mode 100644 drivers/gpu/drm/verisilicon/Makefile + create mode 100644 drivers/gpu/drm/verisilicon/vs_bridge.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_bridge.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_bridge_regs.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc_regs.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_dc_top_regs.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_drm.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_drm.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_hwdb.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_hwdb.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_primary_plane.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_primary_plane_regs.h + create mode 100644 drivers/gpu/tests/Makefile + rename drivers/gpu/{drm/tests/drm_buddy_test.c => tests/gpu_buddy_test.c} (67%) + rename drivers/gpu/{drm/lib/drm_random.c => tests/gpu_random.c} (59%) + rename drivers/gpu/{drm/lib/drm_random.h => tests/gpu_random.h} (53%) + create mode 100644 include/linux/coreboot.h + create mode 100644 include/linux/gpu_buddy.h +Merging amdgpu/drm-next (9973e64bd6ee7 drm/amd: Disable MES LR compute W/A) + 270258ba320be ("drm/amdgpu: Unlock a mutex before destroying it") + 2c333ea579de6 ("drm/amdgpu/userq: Do not allow userspace to trivially triger kernel warnings") + 68951e9c3e6bb ("drm/amdgpu/userq: Fix reference leak in amdgpu_userq_wait_ioctl") + 6fa01b4335978 ("drm/amdgpu: Fix locking bugs in error paths") + 9973e64bd6ee7 ("drm/amd: Disable MES LR compute W/A") + b42dae2ebc5c8 ("drm/amd/display: Use GFP_ATOMIC in dc_create_stream_for_sink") + bb71362182e59 ("drm/amdgpu: Fix error handling in slot reset") + f0f23c315b38c ("drm/amdgpu/vcn5: Add SMU dpm interface type") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c'. +[master 9cc68ffe09868] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 20 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 116 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 49 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 161 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 206 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 18 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 24 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 28 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 31 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 33 + + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 33 + + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 2 - + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 31 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 54 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 39 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 35 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 33 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 31 +- + drivers/gpu/drm/amd/amdgpu/vce_v1_0.c | 33 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 1 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 221 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 3 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 46 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 124 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 23 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 14 +- + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 64 +- + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 166 - + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 1152 + + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.h | 79 + + .../drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.c | 431 + + .../drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.h | 190 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 157 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 60 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 + + drivers/gpu/drm/amd/display/dc/dc.h | 17 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 73 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 6 +- + drivers/gpu/drm/amd/display/dc/dccg/Makefile | 11 +- + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h | 15 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 278 + + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h | 263 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 60 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 131 - + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 9 - + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 966 - + drivers/gpu/drm/amd/display/dc/dio/Makefile | 11 +- + .../display/dc/dio/dcn10/dcn10_stream_encoder.h | 10 +- + .../display/dc/dio/dcn42/dcn42_dio_link_encoder.c | 205 + + .../display/dc/dio/dcn42/dcn42_dio_link_encoder.h | 140 + + .../dc/dio/dcn42/dcn42_dio_stream_encoder.c | 522 + + .../dc/dio/dcn42/dcn42_dio_stream_encoder.h | 206 + + .../dc/dml2_0/dml21/dml21_translation_helper.c | 8 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.c | 227 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.h | 1 + + .../dml2_0/dml21/inc/dml_top_soc_parameter_types.h | 2 + + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.h | 1 + + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 10 +- + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 5 +- + .../gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c | 338 + + .../gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.h | 469 + + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 13 +- + .../amd/display/dc/gpio/dcn42/hw_factory_dcn42.c | 254 + + .../amd/display/dc/gpio/dcn42/hw_factory_dcn42.h | 31 + + .../amd/display/dc/gpio/dcn42/hw_translate_dcn42.c | 205 + + .../amd/display/dc/gpio/dcn42/hw_translate_dcn42.h | 36 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 4 + + drivers/gpu/drm/amd/display/dc/hpo/Makefile | 11 +- + .../dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.h | 10 +- + .../dc/hpo/dcn42/dcn42_hpo_dp_link_encoder.c | 93 + + .../dc/hpo/dcn42/dcn42_hpo_dp_link_encoder.h | 17 + + drivers/gpu/drm/amd/display/dc/hubbub/Makefile | 10 +- + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 6 +- + .../drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c | 539 + + .../drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.h | 268 + + drivers/gpu/drm/amd/display/dc/hubp/Makefile | 10 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 8 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c | 643 + + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h | 79 + + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 12 +- + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 13 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 66 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 23 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 1476 + + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h | 53 + + .../gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c | 167 + + .../gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.h | 11 + + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 23 +- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 24 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 63 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 20 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 4 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dcn42/irq_service_dcn42.c | 412 + + .../amd/display/dc/irq/dcn42/irq_service_dcn42.h | 15 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 58 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 634 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 29 +- + .../display/dc/link/protocols/link_dp_capability.c | 2 + + .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 8 +- + drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile | 10 +- + .../amd/display/dc/mmhubbub/dcn42/dcn42_mmhubbub.c | 25 + + .../amd/display/dc/mmhubbub/dcn42/dcn42_mmhubbub.h | 13 + + drivers/gpu/drm/amd/display/dc/mpc/Makefile | 10 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 13 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 10 +- + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c | 1121 + + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h | 1006 + + drivers/gpu/drm/amd/display/dc/optc/Makefile | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 20 +- + .../gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.c | 198 + + .../gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.h | 211 + + drivers/gpu/drm/amd/display/dc/pg/Makefile | 10 +- + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c | 648 + + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.h | 175 + + drivers/gpu/drm/amd/display/dc/resource/Makefile | 18 + + .../amd/display/dc/resource/dce60/dce60_resource.c | 2 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 2337 + + .../amd/display/dc/resource/dcn42/dcn42_resource.h | 588 + + .../display/dc/resource/dcn42/dcn42_resource_fpu.c | 47 + + .../dcn42/dcn42_resource_fpu.h} | 17 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 5 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 54 + + drivers/gpu/drm/amd/display/dmub/src/Makefile | 3 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c | 752 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.h | 171 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 64 +- + .../drm/amd/display/include/bios_parser_types.h | 2 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 1 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../amd/include/asic_reg/dcn/dcn_4_2_0_offset.h | 17872 +++++ + .../amd/include/asic_reg/dcn/dcn_4_2_0_sh_mask.h | 67277 +++++++++++++++++++ + .../amd/include/asic_reg/dpcs/dpcs_4_0_0_offset.h | 142 + + .../amd/include/asic_reg/dpcs/dpcs_4_0_0_sh_mask.h | 688 + + drivers/gpu/drm/amd/include/atomfirmware.h | 1 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 2 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c | 169 +- + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.h | 14 +- + drivers/gpu/drm/amd/ras/rascore/ras_cmd.h | 29 + + 179 files changed, 104280 insertions(+), 3034 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn42/hw_factory_dcn42.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn42/hw_factory_dcn42.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn42/hw_translate_dcn42.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn42/hw_translate_dcn42.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/dcn42/dcn42_hpo_dp_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/dcn42/dcn42_hpo_dp_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn42/irq_service_dcn42.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn42/irq_service_dcn42.h + create mode 100644 drivers/gpu/drm/amd/display/dc/mmhubbub/dcn42/dcn42_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/mmhubbub/dcn42/dcn42_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource_fpu.c + rename drivers/gpu/drm/amd/display/dc/{clk_mgr/dce60/dce60_clk_mgr.h => resource/dcn42/dcn42_resource_fpu.h} (78%) + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_0_0_sh_mask.h +Merging drm-intel/for-linux-next (40d2f5820951d drm/i915/backlight: Remove try_vesa_interface) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_alpm.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 1 - + drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 - + drivers/gpu/drm/i915/display/hsw_ips.c | 10 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 1 - + drivers/gpu/drm/i915/display/i9xx_wm.c | 2 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 7 - + drivers/gpu/drm/i915/display/intel_alpm.c | 144 ++-- + drivers/gpu/drm/i915/display/intel_alpm.h | 9 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 1 - + drivers/gpu/drm/i915/display/intel_bios.c | 31 +- + drivers/gpu/drm/i915/display/intel_bw.c | 24 +- + drivers/gpu/drm/i915/display/intel_casf.c | 7 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 56 +- + drivers/gpu/drm/i915/display/intel_crt.c | 18 +- + drivers/gpu/drm/i915/display/intel_crt_regs.h | 2 - + drivers/gpu/drm/i915/display/intel_crtc.c | 4 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 737 +++++++++++---------- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 5 +- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 9 +- + drivers/gpu/drm/i915/display/intel_de.h | 17 +- + drivers/gpu/drm/i915/display/intel_display.c | 144 +++- + drivers/gpu/drm/i915/display/intel_display.h | 27 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 2 +- + .../gpu/drm/i915/display/intel_display_device.c | 7 +- + .../gpu/drm/i915/display/intel_display_device.h | 1 + + .../gpu/drm/i915/display/intel_display_driver.c | 18 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 7 +- + .../gpu/drm/i915/display/intel_display_limits.h | 26 + + drivers/gpu/drm/i915/display/intel_display_power.c | 5 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 13 - + .../drm/i915/display/intel_display_power_well.c | 72 +- + .../drm/i915/display/intel_display_power_well.h | 2 - + drivers/gpu/drm/i915/display/intel_display_regs.h | 270 +++++++- + drivers/gpu/drm/i915/display/intel_display_rps.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 11 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 16 +- + drivers/gpu/drm/i915/display/intel_display_wa.h | 1 + + drivers/gpu/drm/i915/display/intel_dmc.c | 1 - + drivers/gpu/drm/i915/display/intel_dp.c | 575 ++++++++++------ + drivers/gpu/drm/i915/display/intel_dp.h | 19 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 19 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 210 ++++-- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 96 ++- + drivers/gpu/drm/i915/display/intel_dpll.c | 8 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 1 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 11 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 - + drivers/gpu/drm/i915/display/intel_dpt.c | 328 ++------- + drivers/gpu/drm/i915/display/intel_dpt.h | 22 +- + drivers/gpu/drm/i915/display/intel_dpt_common.c | 35 - + drivers/gpu/drm/i915/display/intel_dpt_common.h | 13 - + drivers/gpu/drm/i915/display/intel_dram.c | 9 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 107 ++- + drivers/gpu/drm/i915/display/intel_dsb_buffer.h | 22 - + drivers/gpu/drm/i915/display/intel_fb.c | 21 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 15 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 38 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 1 + + drivers/gpu/drm/i915/display/intel_fdi.c | 1 - + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 1 - + drivers/gpu/drm/i915/display/intel_gmbus.c | 1 - + drivers/gpu/drm/i915/display/intel_hdcp.c | 16 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 19 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 1 - + drivers/gpu/drm/i915/display/intel_lt_phy.c | 245 +++---- + drivers/gpu/drm/i915/display/intel_lt_phy.h | 5 +- + drivers/gpu/drm/i915/display/intel_lt_phy_regs.h | 8 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 1 - + drivers/gpu/drm/i915/display/intel_oprom_regs.h | 15 + + drivers/gpu/drm/i915/display/intel_overlay.c | 7 +- + drivers/gpu/drm/i915/display/intel_parent.c | 50 ++ + drivers/gpu/drm/i915/display/intel_parent.h | 16 + + drivers/gpu/drm/i915/display/intel_pch_display.c | 1 - + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 1 - + drivers/gpu/drm/i915/display/intel_pps.c | 1 - + drivers/gpu/drm/i915/display/intel_psr.c | 37 +- + drivers/gpu/drm/i915/display/intel_psr.h | 1 + + drivers/gpu/drm/i915/display/intel_rom.c | 3 +- + drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c | 2 - + drivers/gpu/drm/i915/display/intel_tc.c | 1 - + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 1 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 73 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 9 + + drivers/gpu/drm/i915/display/intel_vga.c | 314 ++++++--- + drivers/gpu/drm/i915/display/intel_vga.h | 5 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 41 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 1 + + drivers/gpu/drm/i915/display/intel_vrr_regs.h | 1 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 1 - + drivers/gpu/drm/i915/display/skl_watermark.c | 23 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 - + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 + + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 + + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 2 + + drivers/gpu/drm/i915/gt/intel_llc.c | 2 + + drivers/gpu/drm/i915/gt/intel_rc6.c | 2 + + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 + + drivers/gpu/drm/i915/gt/intel_rps.c | 1 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 1 - + drivers/gpu/drm/i915/gvt/handlers.c | 38 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 1 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_dpt.c | 277 ++++++++ + drivers/gpu/drm/i915/i915_dpt.h | 20 + + drivers/gpu/drm/i915/i915_driver.c | 20 +- + .../intel_dsb_buffer.c => i915_dsb_buffer.c} | 28 +- + drivers/gpu/drm/i915/i915_dsb_buffer.h | 9 + + drivers/gpu/drm/i915/i915_gpu_error.c | 6 - + drivers/gpu/drm/i915/i915_gpu_error.h | 1 - + drivers/gpu/drm/i915/i915_hwmon.c | 2 + + drivers/gpu/drm/i915/i915_initial_plane.c | 3 +- + drivers/gpu/drm/i915/i915_irq.c | 1 + + drivers/gpu/drm/i915/i915_reg.h | 463 ------------- + drivers/gpu/drm/i915/intel_clock_gating.c | 4 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 10 +- + drivers/gpu/drm/i915/intel_pcode.c | 17 +- + drivers/gpu/drm/i915/intel_pcode.h | 9 +- + drivers/gpu/drm/i915/vlv_suspend.c | 1 + + drivers/gpu/drm/xe/Makefile | 3 +- + .../gpu/drm/xe/compat-i915-headers/intel_pcode.h | 11 - + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 8 + + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 27 +- + drivers/gpu/drm/xe/display/xe_display.c | 4 + + drivers/gpu/drm/xe/display/xe_display_pcode.c | 38 ++ + drivers/gpu/drm/xe/display/xe_display_pcode.h | 9 + + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 28 +- + drivers/gpu/drm/xe/display/xe_dsb_buffer.h | 9 + + drivers/gpu/drm/xe/display/xe_fb_pin.c | 20 - + drivers/gpu/drm/xe/display/xe_initial_plane.c | 13 +- + drivers/gpu/drm/xe/xe_mmio.c | 9 + + drivers/gpu/drm/xe/xe_mmio.h | 1 + + drivers/gpu/drm/xe/xe_pcode.c | 30 - + drivers/gpu/drm/xe/xe_pcode.h | 8 - + include/drm/intel/display_parent_interface.h | 35 + + include/drm/intel/i915_drm.h | 82 +-- + include/drm/intel/intel_gmd_interrupt_regs.h | 92 +++ + include/drm/intel/intel_gmd_misc_regs.h | 21 + + include/drm/intel/intel_pcode_regs.h | 108 +++ + include/video/vga.h | 1 + + 148 files changed, 3390 insertions(+), 2278 deletions(-) + delete mode 100644 drivers/gpu/drm/i915/display/intel_dpt_common.c + delete mode 100644 drivers/gpu/drm/i915/display/intel_dpt_common.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_dsb_buffer.h + create mode 100644 drivers/gpu/drm/i915/display/intel_oprom_regs.h + create mode 100644 drivers/gpu/drm/i915/i915_dpt.c + create mode 100644 drivers/gpu/drm/i915/i915_dpt.h + rename drivers/gpu/drm/i915/{display/intel_dsb_buffer.c => i915_dsb_buffer.c} (63%) + create mode 100644 drivers/gpu/drm/i915/i915_dsb_buffer.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h + create mode 100644 drivers/gpu/drm/xe/display/xe_display_pcode.c + create mode 100644 drivers/gpu/drm/xe/display/xe_display_pcode.h + create mode 100644 drivers/gpu/drm/xe/display/xe_dsb_buffer.h + create mode 100644 include/drm/intel/intel_gmd_interrupt_regs.h + create mode 100644 include/drm/intel/intel_gmd_misc_regs.h + create mode 100644 include/drm/intel/intel_pcode_regs.h +Merging drm-msm/msm-next (50c4a49f7292b drm/msm/a8xx: Add UBWC v6 support) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (50c4a49f7292b drm/msm/a8xx: Add UBWC v6 support) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging drm-xe/drm-xe-next (a235e7d009833 drm/xe/configfs: Free ctx_restore_mid_bb in release) + 6c2e331c915ba ("drm/xe/wa: Steer RMW of MCR registers while building default LRC") + a5d5634cde48a ("drm/xe/sync: Fix user fence leak on alloc failure") + f939bdd9207a5 ("drm/xe/sync: Cleanup partially initialized sync on parse failure") +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/Makefile +Auto-merging drivers/gpu/drm/drm_gpusvm.c +Auto-merging drivers/gpu/drm/drm_pagemap.c +Auto-merging drivers/gpu/drm/drm_suballoc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_suballoc.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_device.c +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c +Auto-merging drivers/gpu/drm/xe/xe_bb.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_bb.c +Auto-merging drivers/gpu/drm/xe/xe_bo.c +Auto-merging drivers/gpu/drm/xe/xe_configfs.c +Auto-merging drivers/gpu/drm/xe/xe_configfs.h +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_exec.c +Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c +Auto-merging drivers/gpu/drm/xe/xe_exec_queue_types.h +Auto-merging drivers/gpu/drm/xe/xe_execlist.c +Auto-merging drivers/gpu/drm/xe/xe_ggtt.c +Auto-merging drivers/gpu/drm/xe/xe_gt.c +Auto-merging drivers/gpu/drm/xe/xe_gt_ccs_mode.c +Auto-merging drivers/gpu/drm/xe/xe_guc.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ct.c +Auto-merging drivers/gpu/drm/xe/xe_guc_pc.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_hw_engine.c +Auto-merging drivers/gpu/drm/xe/xe_lmtt.c +Auto-merging drivers/gpu/drm/xe/xe_lrc.c +Auto-merging drivers/gpu/drm/xe/xe_migrate.c +Auto-merging drivers/gpu/drm/xe/xe_mmio.c +Auto-merging drivers/gpu/drm/xe/xe_mmio.h +Auto-merging drivers/gpu/drm/xe/xe_nvm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_nvm.c +Auto-merging drivers/gpu/drm/xe/xe_oa.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_pci_types.h +Auto-merging drivers/gpu/drm/xe/xe_query.c +Auto-merging drivers/gpu/drm/xe/xe_reg_sr.c +Auto-merging drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c +Auto-merging drivers/gpu/drm/xe/xe_svm.c +Auto-merging drivers/gpu/drm/xe/xe_sync.c +Auto-merging drivers/gpu/drm/xe/xe_tile_sysfs.c +Auto-merging drivers/gpu/drm/xe/xe_tlb_inval.c +Auto-merging drivers/gpu/drm/xe/xe_tlb_inval_job.c +Auto-merging drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/gpu/drm/xe/xe_vm_madvise.c +Auto-merging drivers/gpu/drm/xe/xe_wa.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_wa.c +Auto-merging mm/filemap.c +Auto-merging mm/memory.c +Auto-merging mm/migrate.c +Auto-merging mm/migrate_device.c +CONFLICT (content): Merge conflict in mm/migrate_device.c +Resolved 'drivers/gpu/drm/drm_suballoc.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_bb.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_nvm.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_ttm_vram_mgr.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_vm.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_wa.c' using previous resolution. +Resolved 'mm/migrate_device.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7aa59aba2d479] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-xe-sriov | 31 ++ + Documentation/gpu/xe/xe_firmware.rst | 3 + + drivers/gpu/drm/drm_gpusvm.c | 7 +- + drivers/gpu/drm/drm_pagemap.c | 14 +- + drivers/gpu/drm/drm_suballoc.c | 106 ++++-- + .../gpu/drm/i915/display/intel_display_device.c | 1 + + drivers/gpu/drm/xe/Makefile | 1 + + drivers/gpu/drm/xe/display/xe_fb_pin.c | 5 +- + .../gpu/drm/xe/instructions/xe_gfxpipe_commands.h | 10 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 24 +- + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 8 + + .../gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c | 98 +++++- + drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 6 +- + drivers/gpu/drm/xe/tests/xe_guc_g2g_test.c | 61 +++- + drivers/gpu/drm/xe/tests/xe_pci_test.c | 8 + + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 3 +- + drivers/gpu/drm/xe/xe_bb.c | 59 +++- + drivers/gpu/drm/xe/xe_bb.h | 6 +- + drivers/gpu/drm/xe/xe_bo.c | 4 +- + drivers/gpu/drm/xe/xe_configfs.c | 65 +++- + drivers/gpu/drm/xe/xe_configfs.h | 16 +- + drivers/gpu/drm/xe/xe_defaults.h | 26 ++ + drivers/gpu/drm/xe/xe_devcoredump.c | 2 +- + drivers/gpu/drm/xe/xe_device.c | 55 ++- + drivers/gpu/drm/xe/xe_device.h | 16 +- + drivers/gpu/drm/xe/xe_device_types.h | 188 +--------- + drivers/gpu/drm/xe/xe_exec_queue.c | 8 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 14 +- + drivers/gpu/drm/xe/xe_execlist.c | 9 +- + drivers/gpu/drm/xe/xe_force_wake.c | 46 ++- + drivers/gpu/drm/xe/xe_force_wake.h | 11 + + drivers/gpu/drm/xe/xe_ggtt.c | 375 +++++++++----------- + drivers/gpu/drm/xe/xe_ggtt.h | 14 +- + drivers/gpu/drm/xe/xe_ggtt_types.h | 60 +--- + drivers/gpu/drm/xe/xe_gt.c | 13 +- + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 42 ++- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 26 ++ + drivers/gpu/drm/xe/xe_gt_idle.c | 25 ++ + drivers/gpu/drm/xe/xe_gt_mcr.c | 30 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 237 ++++++++++--- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 4 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 2 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 2 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 35 +- + drivers/gpu/drm/xe/xe_gt_stats.c | 64 +++- + drivers/gpu/drm/xe/xe_gt_stats.h | 6 + + drivers/gpu/drm/xe/xe_gt_stats_types.h | 20 ++ + drivers/gpu/drm/xe/xe_gt_topology.c | 39 +-- + drivers/gpu/drm/xe/xe_gt_types.h | 22 +- + drivers/gpu/drm/xe/xe_guc.c | 83 ++++- + drivers/gpu/drm/xe/xe_guc_ct.c | 119 ++++--- + drivers/gpu/drm/xe/xe_guc_ct_types.h | 4 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 5 +- + drivers/gpu/drm/xe/xe_guc_log.h | 6 +- + drivers/gpu/drm/xe/xe_guc_pagefault.c | 18 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 118 +++---- + drivers/gpu/drm/xe/xe_guc_pc.h | 6 +- + drivers/gpu/drm/xe/xe_guc_rc.c | 131 +++++++ + drivers/gpu/drm/xe/xe_guc_rc.h | 16 + + drivers/gpu/drm/xe/xe_guc_submit.c | 176 +++++++--- + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 242 ++++++++++--- + drivers/gpu/drm/xe/xe_hw_engine.c | 6 +- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 3 +- + drivers/gpu/drm/xe/xe_i2c.c | 2 +- + drivers/gpu/drm/xe/xe_lmtt.c | 17 + + drivers/gpu/drm/xe/xe_lmtt.h | 1 + + drivers/gpu/drm/xe/xe_lrc.c | 171 +++++++-- + drivers/gpu/drm/xe/xe_lrc.h | 4 + + drivers/gpu/drm/xe/xe_lrc_types.h | 6 + + drivers/gpu/drm/xe/xe_migrate.c | 119 ++++--- + drivers/gpu/drm/xe/xe_mmio.h | 7 +- + drivers/gpu/drm/xe/xe_mmio_types.h | 64 ++++ + drivers/gpu/drm/xe/xe_mocs.c | 1 + + drivers/gpu/drm/xe/xe_module.c | 44 +-- + drivers/gpu/drm/xe/xe_nvm.c | 12 +- + drivers/gpu/drm/xe/xe_oa.c | 24 +- + drivers/gpu/drm/xe/xe_oa_types.h | 3 - + drivers/gpu/drm/xe/xe_pagefault.c | 31 +- + drivers/gpu/drm/xe/xe_pagefault_types.h | 20 +- + drivers/gpu/drm/xe/xe_pat.c | 149 ++++---- + drivers/gpu/drm/xe/xe_pci.c | 38 ++ + drivers/gpu/drm/xe/xe_pci_types.h | 3 + + drivers/gpu/drm/xe/xe_platform_types.h | 1 + + drivers/gpu/drm/xe/xe_query.c | 3 - + drivers/gpu/drm/xe/xe_reg_sr.c | 72 +++- + drivers/gpu/drm/xe/xe_reg_sr.h | 7 + + drivers/gpu/drm/xe/xe_reg_whitelist.c | 12 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 9 + + drivers/gpu/drm/xe/xe_rtp.c | 8 +- + drivers/gpu/drm/xe/xe_rtp.h | 3 +- + drivers/gpu/drm/xe/xe_sa.c | 36 ++ + drivers/gpu/drm/xe/xe_sa.h | 2 + + drivers/gpu/drm/xe/xe_sleep.h | 57 +++ + drivers/gpu/drm/xe/xe_soc_remapper.c | 1 + + drivers/gpu/drm/xe/xe_sriov.c | 2 +- + drivers/gpu/drm/xe/xe_sriov.h | 7 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 10 +- + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 3 +- + drivers/gpu/drm/xe/xe_sriov_pf_provision.c | 119 ++++++- + drivers/gpu/drm/xe/xe_sriov_pf_provision.h | 4 + + drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 31 +- + drivers/gpu/drm/xe/xe_sriov_pf_types.h | 3 + + drivers/gpu/drm/xe/xe_tile.h | 4 +- + drivers/gpu/drm/xe/xe_tile_sriov_vf.c | 198 +---------- + drivers/gpu/drm/xe/xe_tile_sriov_vf.h | 3 - + drivers/gpu/drm/xe/xe_tile_sysfs.c | 2 +- + drivers/gpu/drm/xe/xe_tile_types.h | 141 ++++++++ + drivers/gpu/drm/xe/xe_tlb_inval.c | 33 ++ + drivers/gpu/drm/xe/xe_tlb_inval.h | 2 + + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 16 +- + drivers/gpu/drm/xe/xe_tuning.c | 31 +- + drivers/gpu/drm/xe/xe_uc.c | 10 +- + drivers/gpu/drm/xe/xe_uc.h | 1 - + drivers/gpu/drm/xe/xe_vm.c | 88 ++++- + drivers/gpu/drm/xe/xe_vm.h | 10 + + drivers/gpu/drm/xe/xe_vm_types.h | 17 + + drivers/gpu/drm/xe/xe_vram_freq.c | 2 +- + drivers/gpu/drm/xe/xe_wa.c | 390 ++++++++------------- + drivers/gpu/drm/xe/xe_wa_oob.rules | 39 +-- + drivers/gpu/drm/xe/xe_wopcm.c | 15 +- + include/drm/drm_suballoc.h | 6 + + include/drm/intel/pciids.h | 12 + + include/linux/migrate.h | 10 +- + include/uapi/drm/xe_drm.h | 14 +- + mm/filemap.c | 15 +- + mm/memory.c | 3 +- + mm/migrate.c | 8 +- + 127 files changed, 3293 insertions(+), 1743 deletions(-) + create mode 100644 drivers/gpu/drm/xe/xe_defaults.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_rc.c + create mode 100644 drivers/gpu/drm/xe/xe_guc_rc.h + create mode 100644 drivers/gpu/drm/xe/xe_mmio_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sleep.h + create mode 100644 drivers/gpu/drm/xe/xe_tile_types.h +$ git am -3 ../patches/0001-drm-xe-Fix-up-merge-issue.patch +Applying: drm: xe: Fix up merge issue +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 961d495f220f8] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git + Date: Fri Feb 27 13:56:10 2026 +0000 +Merging etnaviv/etnaviv/next (6bde14ba5f7ef drm/etnaviv: add optional reset support) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (17d5abba81b8b fbdev: defio: Move pageref array to struct fb_deferred_io_state) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/core/fb_defio.c | 266 ++++++++++++++++++++++++++---------- + include/linux/fb.h | 9 +- + 2 files changed, 195 insertions(+), 80 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-drm-hyperv-Remove-reference-to-hyperv_fb-.patch +Applying: fix up for "drm/hyperv: Remove reference to hyperv_fb driver" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/hyperv/Kconfig +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 895fba91140f5] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Fri Feb 27 13:56:14 2026 +0000 +Merging regmap/for-next (37983fad7f3ef regmap: define cleanup helper for regmap_field) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regcache.c | 33 +++++++++++++++++++-------------- + include/linux/regmap.h | 15 +++++++++------ + 2 files changed, 28 insertions(+), 20 deletions(-) +Merging sound/for-next (71c1978ab6d2c ASoC: SDCA: Fix comments for sdca_irq_request()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging sound-asoc/for-next (4ca9ef39c4079 Merge remote-tracking branch 'asoc/for-7.1' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/awinic,aw88395.yaml | 4 + + drivers/firmware/cirrus/test/cs_dsp_test_bin.c | 4 + + .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 3 + + .../cirrus/test/cs_dsp_test_control_cache.c | 5 + + .../cirrus/test/cs_dsp_test_control_parse.c | 5 + + .../firmware/cirrus/test/cs_dsp_test_control_rw.c | 5 + + drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c | 7 + + .../firmware/cirrus/test/cs_dsp_test_wmfw_error.c | 7 + + include/sound/simple_card_utils.h | 6 + + include/sound/soc.h | 4 +- + include/sound/soc_sdw_utils.h | 2 + + sound/hda/codecs/side-codecs/Kconfig | 1 + + sound/soc/amd/Kconfig | 10 - + sound/soc/amd/Makefile | 1 - + sound/soc/amd/acp-rt5645.c | 21 +- + sound/soc/amd/include/acp_2_2_d.h | 18 +- + sound/soc/amd/include/acp_2_2_enum.h | 18 +- + sound/soc/amd/include/acp_2_2_sh_mask.h | 18 +- + sound/soc/amd/rpl/Makefile | 5 - + sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 --------------------- + sound/soc/amd/rpl/rpl_acp6x.h | 36 ---- + sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 --- + sound/soc/amd/yc/acp6x-mach.c | 7 + + sound/soc/amd/yc/pci-acp6x.c | 12 ++ + sound/soc/apple/Kconfig | 1 + + sound/soc/apple/Makefile | 1 + + sound/soc/codecs/aw88261.c | 13 +- + sound/soc/codecs/cs-amp-lib-test.c | 1 - + sound/soc/codecs/cs4270.c | 6 +- + sound/soc/codecs/cs42xx8-i2c.c | 5 +- + sound/soc/codecs/cs42xx8.c | 5 +- + sound/soc/codecs/cs42xx8.h | 5 +- + sound/soc/codecs/rt5575.c | 1 - + sound/soc/codecs/rt5677-spi.c | 7 + + sound/soc/codecs/rt5677.c | 40 +++- + sound/soc/codecs/rt5677.h | 2 +- + sound/soc/codecs/sta529.c | 5 +- + sound/soc/codecs/tas2552.c | 10 +- + sound/soc/dwc/dwc-i2s.c | 5 +- + sound/soc/dwc/dwc-pcm.c | 5 +- + sound/soc/dwc/local.h | 5 +- + sound/soc/fsl/efika-audio-fabric.c | 5 +- + sound/soc/generic/simple-card-utils.c | 41 +++- + sound/soc/intel/catpt/Makefile | 1 + + sound/soc/intel/keembay/Makefile | 1 + + sound/soc/sdca/sdca_asoc.c | 114 +++++++++-- + sound/soc/sdca/sdca_class.c | 1 + + sound/soc/sdca/sdca_fdl.c | 5 - + sound/soc/sdca/sdca_functions.c | 6 +- + sound/soc/sdw_utils/Makefile | 1 + + sound/soc/sdw_utils/soc_sdw_cs47l47.c | 80 ++++++++ + sound/soc/sdw_utils/soc_sdw_utils.c | 36 ++++ + sound/soc/soc-compress.c | 4 +- + sound/soc/soc-ops.c | 64 +----- + sound/soc/soc-pcm.c | 4 +- + sound/soc/spear/spdif_in.c | 5 +- + sound/soc/spear/spdif_out.c | 5 +- + sound/soc/spear/spear_pcm.c | 5 +- + sound/soc/starfive/Makefile | 1 + + sound/soc/ti/davinci-mcasp.c | 2 + + sound/usb/qcom/Makefile | 1 + + sound/x86/intel_hdmi_audio.h | 22 +- + 62 files changed, 425 insertions(+), 552 deletions(-) + delete mode 100644 sound/soc/amd/rpl/Makefile + delete mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c + delete mode 100644 sound/soc/amd/rpl/rpl_acp6x.h + delete mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h + create mode 100644 sound/soc/sdw_utils/soc_sdw_cs47l47.c +Merging modules/modules-next (f9d69d5e7bde2 module: Fix kernel panic when a symbol st_shndx is out of bounds) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Merge made by the 'ort' strategy. + kernel/module/Kconfig | 23 +++++++++++++---------- + kernel/module/main.c | 13 +++++++------ + 2 files changed, 20 insertions(+), 16 deletions(-) +Merging input/next (4410a3f14c305 HID: i2c-hid: elan: Add parade-tc3408 timing) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/input.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/parade,tc3408.yaml | 68 ++++++ + drivers/hid/i2c-hid/i2c-hid-of-elan.c | 8 + + drivers/input/input.c | 23 +- + drivers/input/keyboard/cros_ec_keyb.c | 259 ++++++++++++++++----- + drivers/input/misc/adxl34x-i2c.c | 5 +- + drivers/input/misc/drv260x.c | 50 +++- + drivers/input/serio/libps2.c | 12 +- + drivers/input/touchscreen/st1232.c | 67 +++++- + include/linux/input.h | 4 + + 9 files changed, 420 insertions(+), 76 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/parade,tc3408.yaml +Merging block/for-next (745c6406acc98 Merge branch 'for-7.1/block' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Merge made by the 'ort' strategy. + block/blk-settings.c | 12 +- + block/opal_proto.h | 4 + + block/sed-opal.c | 399 +++++++++++++++-- + block/t10-pi.c | 857 ++++++++++++++++++++----------------- + drivers/block/drbd/drbd_actlog.c | 53 +-- + drivers/block/drbd/drbd_interval.h | 5 +- + drivers/block/drbd/drbd_main.c | 14 +- + drivers/block/drbd/drbd_receiver.c | 4 +- + drivers/block/drbd/drbd_req.c | 3 +- + drivers/block/ublk_drv.c | 2 +- + drivers/block/zloop.c | 31 +- + drivers/nvme/host/core.c | 1 + + include/linux/blk-integrity.h | 1 + + include/linux/blkdev.h | 2 +- + include/linux/sed-opal.h | 4 + + include/uapi/linux/io_uring.h | 96 +---- + include/uapi/linux/io_uring/zcrx.h | 108 +++++ + include/uapi/linux/sed-opal.h | 29 ++ + io_uring/cmd_net.c | 36 +- + io_uring/net.c | 139 ++---- + io_uring/net.h | 1 - + io_uring/opdef.c | 2 +- + io_uring/query.c | 4 +- + io_uring/timeout.c | 4 +- + io_uring/zcrx.c | 4 +- + io_uring/zcrx.h | 3 + + 26 files changed, 1135 insertions(+), 683 deletions(-) + create mode 100644 include/uapi/linux/io_uring/zcrx.h +$ git am -3 ../patches/0001-Merge-fixup-for-Rust-error.patch +Applying: Merge fixup for Rust error +Using index info to reconstruct a base tree... +M drivers/block/rnull/configfs.rs +Falling back to patching base and 3-way merge... +Auto-merging drivers/block/rnull/configfs.rs +No changes -- Patch already applied. +$ git am -3 ../patches/0001-Revert-block-remove-bio_last_bvec_all.patch +Applying: Revert "block: remove bio_last_bvec_all" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/block/biovecs.rst +M include/linux/bio.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master abafe869a4c84] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Fri Feb 27 14:08:53 2026 +0000 +Merging device-mapper/for-next (218b16992a37e dm mpath: make pg_init_delay_msecs settable) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (46a9d97069cab ata: libata-eh: avoid unnecessary calls to ata_scsi_port_error_handler()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-eh.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/baikal,bt1-ahci.yaml | 115 -------------- + drivers/ata/Kconfig | 1 - + drivers/ata/ahci_dwc.c | 55 ------- + drivers/ata/libata-core.c | 9 +- + drivers/ata/libata-eh.c | 28 ++-- + drivers/ata/libata-sata.c | 14 +- + drivers/ata/libata-scsi.c | 174 ++++++++++----------- + include/linux/libata.h | 4 +- + 8 files changed, 119 insertions(+), 281 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml +Merging pcmcia/pcmcia-next (4a81f78caa53e pcmcia: Add error handling for add_interval() in do_validate_mem()) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (6a4a4c1cc0012 mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Auto-merging include/linux/mmc/sdio_ids.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 5 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 2 +- + .../devicetree/bindings/mmc/brcm,iproc-sdhci.yaml | 5 + + .../devicetree/bindings/mmc/bst,c1200-sdhci.yaml | 70 ++ + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 2 - + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 3 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 1 + + .../devicetree/bindings/mmc/spacemit,sdhci.yaml | 14 +- + MAINTAINERS | 2 + + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 4 +- + arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 4 +- + drivers/mmc/core/card.h | 11 + + drivers/mmc/core/mmc.c | 12 + + drivers/mmc/core/queue.c | 9 +- + drivers/mmc/core/quirks.h | 12 + + drivers/mmc/host/Kconfig | 16 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 12 +- + drivers/mmc/host/cavium-octeon.c | 5 +- + drivers/mmc/host/cavium.c | 4 +- + drivers/mmc/host/dw_mmc-bluefield.c | 2 +- + drivers/mmc/host/dw_mmc-exynos.c | 9 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 6 +- + drivers/mmc/host/dw_mmc-hi3798mv200.c | 17 +- + drivers/mmc/host/dw_mmc-k3.c | 51 +- + drivers/mmc/host/dw_mmc-pci.c | 37 +- + drivers/mmc/host/dw_mmc-pltfm.c | 19 +- + drivers/mmc/host/dw_mmc-pltfm.h | 2 +- + drivers/mmc/host/dw_mmc-rockchip.c | 9 +- + drivers/mmc/host/dw_mmc-starfive.c | 5 +- + drivers/mmc/host/dw_mmc.c | 779 ++++++++------------- + drivers/mmc/host/dw_mmc.h | 146 +--- + drivers/mmc/host/jz4740_mmc.c | 2 +- + drivers/mmc/host/loongson2-mmc.c | 1 - + drivers/mmc/host/mtk-sd.c | 32 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 18 + + drivers/mmc/host/sdhci-msm.c | 77 ++ + drivers/mmc/host/sdhci-of-arasan.c | 15 + + drivers/mmc/host/sdhci-of-aspeed.c | 5 +- + drivers/mmc/host/sdhci-of-bst.c | 521 ++++++++++++++ + drivers/mmc/host/sdhci-of-k1.c | 39 +- + drivers/mmc/host/sdhci-pic32.c | 5 +- + drivers/mmc/host/sdhci-pltfm.c | 13 - + drivers/mmc/host/sdhci-uhs2.c | 13 +- + drivers/mmc/host/sdhci.c | 23 +- + include/linux/mmc/card.h | 2 + + include/linux/mmc/sdio_ids.h | 3 + + 47 files changed, 1272 insertions(+), 773 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/bst,c1200-sdhci.yaml + create mode 100644 drivers/mmc/host/sdhci-of-bst.c +Merging mfd/for-mfd-next (845776177cf3b dt-bindings: mfd: da9055: Fix dead link to codec binding) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (83333aa97441b backlight: qcom-wled: Change PM8950 WLED configurations) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (ea07847b38e22 Merge remote-tracking branch 'regulator/for-7.1' into regulator-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/spacemit,p1.yaml | 49 +++++++++- + .../bindings/regulator/cpcap-regulator.txt | 35 ------- + .../regulator/motorola,cpcap-regulator.yaml | 47 +++++++++ + drivers/regulator/cpcap-regulator.c | 105 +++++++++++++++++++++ + drivers/regulator/pf0900-regulator.c | 2 +- + drivers/regulator/spacemit-p1.c | 25 ++--- + 6 files changed, 214 insertions(+), 49 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/cpcap-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/motorola,cpcap-regulator.yaml +Merging security/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (397f9c2d778d3 ima: fallback to using i_version to detect file change) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging MAINTAINERS +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/kernel/ipl.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/powerpc/kernel/ima_arch.c | 5 --- + arch/powerpc/kernel/secure_boot.c | 6 +++ + arch/s390/Kconfig | 1 - + arch/s390/kernel/Makefile | 1 - + arch/s390/kernel/ima_arch.c | 14 ------- + arch/s390/kernel/ipl.c | 5 +++ + arch/x86/include/asm/efi.h | 4 +- + arch/x86/platform/efi/efi.c | 2 +- + include/linux/evm.h | 8 ++++ + include/linux/ima.h | 7 +--- + include/linux/secure_boot.h | 19 +++++++++ + security/integrity/Makefile | 3 +- + security/integrity/efi_secureboot.c | 56 +++++++++++++++++++++++++++ + security/integrity/evm/evm_main.c | 56 ++++++++++++++++++++++----- + security/integrity/ima/ima_api.c | 13 +++++-- + security/integrity/ima/ima_appraise.c | 7 +++- + security/integrity/ima/ima_efi.c | 47 +--------------------- + security/integrity/ima/ima_main.c | 42 +++++++++++++++----- + security/integrity/integrity.h | 1 + + security/integrity/platform_certs/load_uefi.c | 2 +- + security/integrity/secure_boot.c | 16 ++++++++ + 22 files changed, 215 insertions(+), 101 deletions(-) + delete mode 100644 arch/s390/kernel/ima_arch.c + create mode 100644 include/linux/secure_boot.h + create mode 100644 security/integrity/efi_secureboot.c + create mode 100644 security/integrity/secure_boot.c +Merging selinux/next (8dc51459ef702 selinux: annotate intentional data race in inode_doinit_with_dentry()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/hooks.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging smack/next (33d589ed60ae4 smack: /smack/doi: accept previously used values) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (dc96fb256daa1 net: add "struct dst_entry" debugging) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Auto-merging include/net/sock.h +Auto-merging net/core/dev.c +Auto-merging net/socket.c +Merge made by the 'ort' strategy. + fs/hfs/super.c | 2 +- + include/linux/netdevice.h | 15 ++++ + include/net/dst.h | 28 ++++++- + include/net/sock.h | 10 ++- + kernel/softirq.c | 4 + + kernel/workqueue.c | 4 + + net/bridge/br_nf_core.c | 3 + + net/core/dev.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++ + net/core/dst.c | 57 ++++++++++++++ + net/core/lock_debug.c | 1 + + net/socket.c | 32 ++++++-- + 11 files changed, 332 insertions(+), 12 deletions(-) +Merging tpmdd/next (d79526b89571a Merge tag 'spi-fix-v7.0-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (450517fa5aae9 dt-bindings: watchdog: qcom-wdt: Document Glymur watchdog) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (ad09563660460 Merge branches 'fixes', 'arm/smmu/updates', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Already up to date. +Merging audit/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (be4b91d9aae51 docs: dt: unittest: update to current unittest filenames) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 290 +++++++++++---------- + .../bindings/arm/freescale/fsl,imx51-m4if.yaml | 1 + + Documentation/devicetree/of_unittest.rst | 20 +- + .../translations/zh_CN/devicetree/of_unittest.rst | 21 +- + scripts/checkpatch.pl | 2 +- + 5 files changed, 171 insertions(+), 163 deletions(-) +Merging dt-krzk/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (75df94d05fc03 mailbox: sprd: mask interrupts that are not handled) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (7ec4dc64e4445 Merge remote-tracking branch 'spi/for-7.1' into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../bindings/spi/renesas,rzv2h-rspi.yaml | 16 ++++- + drivers/spi/spi-atcspi200.c | 1 - + drivers/spi/spi-cs42l43.c | 4 +- + drivers/spi/spi-omap2-mcspi.c | 17 ++++-- + drivers/spi/spi-pxa2xx.c | 11 ++-- + drivers/spi/spi-stm32-ospi.c | 5 -- + drivers/spi/spi-stm32.c | 10 ++-- + drivers/spi/spi-tegra210-quad.c | 19 +++++- + drivers/spi/spi.c | 69 ++++++++++++++++++++-- + include/linux/spi/spi.h | 1 + + 10 files changed, 117 insertions(+), 36 deletions(-) +Merging tip/master (ab300bb01a8ca Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging MAINTAINERS +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/mips/pic32/Kconfig | 1 - + arch/x86/include/asm/tdx_global_metadata.h | 7 + + arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 22 ++ + drivers/irqchip/Kconfig | 5 +- + drivers/irqchip/irq-msi-lib.c | 3 + + drivers/irqchip/irq-pic32-evic.c | 8 +- + include/linux/jiffies.h | 6 +- + include/linux/mutex.h | 9 +- + include/linux/sched/topology.h | 1 + + include/uapi/linux/sched.h | 3 + + kernel/locking/mutex.c | 4 +- + kernel/sched/core.c | 4 +- + kernel/sched/deadline.c | 23 +- + kernel/sched/debug.c | 14 +- + kernel/sched/ext.c | 4 +- + kernel/sched/fair.c | 327 +++++++++++++++++---- + kernel/sched/features.h | 3 + + kernel/sched/rt.c | 7 +- + kernel/sched/sched.h | 5 +- + kernel/sched/syscalls.c | 16 +- + kernel/sched/topology.c | 3 + + kernel/time/.kunitconfig | 2 + + lib/Kconfig.debug | 1 + + lib/debugobjects.c | 19 +- + .../selftests/futex/functional/futex_requeue.c | 49 +-- + 26 files changed, 413 insertions(+), 134 deletions(-) + create mode 100644 kernel/time/.kunitconfig +Merging clockevents/timers/drivers/next (a83f9c04be4e8 clocksource/drivers/mips-gic-timer: Move GIC timer to request_percpu_irq()) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (148f30165b4bd Merge ras/edac-drivers into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging ftrace/for-next (3156e85dfa08d Merge tools/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +$ git am -3 ../patches/0001-ftrace-Fix-semantic-conflict-with-mm-tree.patch +Applying: ftrace: Fix semantic conflict with mm tree +Using index info to reconstruct a base tree... +M kernel/trace/trace_printk.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/trace/trace_printk.c +No changes -- Patch already applied. +Merging rcu/next (ed062c41dfda2 Merge branch 'rcu-nocb.20260123a') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Already up to date. +Merging paulmck/non-rcu/next (7f8fcc6f09fb7 memory-barriers.txt: Sort wait_event* and wait_on_bit* list alphabetically) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Already up to date. +Merging kvm/next (b1195183ed42f Merge tag 'kvm-s390-next-7.0-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (6316366129d28 Merge branch kvm-arm64/misc-6.20 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (e3372ffb5f9e2 KVM: s390: Increase permitted SE header size to 1 MiB) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (9448598b22c50 Linux 6.19-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (376e2f8cca281 irqchip/riscv-imsic: Adjust the number of available guest irq files) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (183bb0ce8c77b Merge branch 'generic') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/loongarch/kvm/vcpu.c +Auto-merging arch/loongarch/kvm/vm.c +Auto-merging arch/riscv/kvm/vm.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/linux/kvm_host.h +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/locking.rst | 2 + + arch/arm64/kvm/guest.c | 4 +- + arch/loongarch/kvm/vcpu.c | 2 +- + arch/loongarch/kvm/vm.c | 2 +- + arch/mips/kvm/mips.c | 4 +- + arch/powerpc/kvm/book3s.c | 4 +- + arch/powerpc/kvm/booke.c | 4 +- + arch/riscv/kvm/vcpu.c | 2 +- + arch/riscv/kvm/vm.c | 2 +- + arch/s390/kvm/kvm-s390.c | 4 +- + arch/x86/kvm/x86.c | 4 +- + include/linux/kvm_host.h | 83 ++++++++++++++++---------------------- + include/uapi/linux/kvm.h | 8 ++++ + virt/kvm/binary_stats.c | 2 +- + virt/kvm/kvm_main.c | 20 ++++----- + 15 files changed, 72 insertions(+), 75 deletions(-) +$ git am -3 ../patches/0001-KVM-selftests-Fix-up-semantic-changes.patch +Applying: KVM: selftests: Fix up semantic changes +Using index info to reconstruct a base tree... +M tools/testing/selftests/kvm/lib/kvm_util.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging xen-tip/linux-next (5043d7ed39dfd x86/xen: Fix Xen PV guest boot) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (9cb8b0f289560 workqueue: replace BUG_ON with panic in panic_on_wq_watchdog) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging sched-ext/for-next (d19e1ccdec559 Merge branch 'for-7.0-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging kernel/sched/ext.c +Merge made by the 'ort' strategy. + Documentation/scheduler/sched-ext.rst | 78 ++++- + include/linux/sched/ext.h | 7 +- + kernel/sched/ext.c | 160 +++++++-- + kernel/sched/ext_idle.c | 4 +- + kernel/sched/ext_internal.h | 9 +- + tools/sched_ext/Kconfig | 61 ++++ + tools/sched_ext/README.md | 6 - + tools/sched_ext/include/scx/enum_defs.autogen.h | 1 + + tools/sched_ext/include/scx/enums.autogen.bpf.h | 2 + + tools/sched_ext/include/scx/enums.autogen.h | 1 + + tools/sched_ext/scx_central.c | 2 +- + tools/sched_ext/scx_sdt.c | 2 +- + tools/testing/selftests/sched_ext/Makefile | 1 + + tools/testing/selftests/sched_ext/dequeue.bpf.c | 389 +++++++++++++++++++++ + tools/testing/selftests/sched_ext/dequeue.c | 274 +++++++++++++++ + .../selftests/sched_ext/init_enable_count.c | 3 +- + tools/testing/selftests/sched_ext/rt_stall.c | 1 - + tools/testing/selftests/sched_ext/runner.c | 3 + + 18 files changed, 955 insertions(+), 49 deletions(-) + create mode 100644 tools/sched_ext/Kconfig + create mode 100644 tools/testing/selftests/sched_ext/dequeue.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/dequeue.c +Merging drivers-x86/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +$ git am -3 ../patches/0001-hid-Fix-up-mismerge.patch +Applying: hid: Fix up mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hid/hid-asus.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 386fb1c1af227] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git + Date: Fri Feb 27 14:10:07 2026 +0000 +Merging chrome-platform/for-next (286386820d524 platform/chrome: lightbar: Optimize command size) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_lightbar.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging chrome-platform-firmware/for-firmware-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (b2c87f5e98cd8 dt-bindings: leds: Convert ti,lm3697 to DT schema) +$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Already up to date. +Merging ipmi/for-next (cae66f1a1dcd2 ipmi:si: Fix check for a misbehaving BMC) +$ git merge -m Merge branch 'for-next' of https://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (bb375c251ab40 dt-bindings: usb: st,st-ohci-300x: convert to DT schema) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 2 + + .../devicetree/bindings/usb/nxp,imx-dwc3.yaml | 123 ++++++ + Documentation/devicetree/bindings/usb/ohci-st.txt | 36 -- + Documentation/devicetree/bindings/usb/omap-usb.txt | 80 ---- + .../devicetree/bindings/usb/st,st-ohci-300x.yaml | 85 ++++ + Documentation/devicetree/bindings/usb/ti,dwc3.yaml | 100 +++++ + .../devicetree/bindings/usb/ti,omap4-musb.yaml | 120 ++++++ + drivers/usb/dwc3/Kconfig | 12 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 9 +- + drivers/usb/dwc3/core.h | 3 + + drivers/usb/dwc3/dwc3-imx.c | 442 +++++++++++++++++++++ + drivers/usb/dwc3/glue.h | 3 + + 13 files changed, 898 insertions(+), 118 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/nxp,imx-dwc3.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/ohci-st.txt + delete mode 100644 Documentation/devicetree/bindings/usb/omap-usb.txt + create mode 100644 Documentation/devicetree/bindings/usb/st,st-ohci-300x.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,omap4-musb.yaml + create mode 100644 drivers/usb/dwc3/dwc3-imx.c +$ git am -3 ../patches/0001-fix-up-for-usb-gadget-u_ether-add-gether_opts-for-co.patch +Applying: fix up for "usb: gadget: u_ether: add gether_opts for config caching" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/gadget/function/u_ether_configfs.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 007fab8f97150] Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git + Date: Fri Feb 27 14:10:15 2026 +0000 +Merging thunderbolt/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +$ git am -3 ../patches/0001-bus-mhi-Fix-up-interaction-with-net-next-tree.patch +Applying: bus: mhi: Fix up interaction with net-next tree +Using index info to reconstruct a base tree... +M drivers/net/wireless/ath/ath12k/wifi7/mhi.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging coresight/next (87c266bb30dc0 MAINTAINERS: Change e-mail address for reviewer) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 4 +- + drivers/hwtracing/coresight/coresight-catu.c | 4 +- + drivers/hwtracing/coresight/coresight-core.c | 216 +++++++++++++-------- + drivers/hwtracing/coresight/coresight-ctcu-core.c | 5 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 43 ++-- + drivers/hwtracing/coresight/coresight-cti.h | 2 - + drivers/hwtracing/coresight/coresight-dummy.c | 7 +- + drivers/hwtracing/coresight/coresight-etb10.c | 4 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 5 +- + drivers/hwtracing/coresight/coresight-funnel.c | 4 +- + drivers/hwtracing/coresight/coresight-platform.c | 2 +- + drivers/hwtracing/coresight/coresight-priv.h | 3 +- + drivers/hwtracing/coresight/coresight-replicator.c | 4 +- + drivers/hwtracing/coresight/coresight-stm.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 12 +- + drivers/hwtracing/coresight/coresight-tnoc.c | 4 +- + drivers/hwtracing/coresight/coresight-tpda.c | 4 +- + drivers/hwtracing/coresight/coresight-tpdm.c | 4 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 4 +- + drivers/hwtracing/coresight/ultrasoc-smb.c | 4 +- + include/linux/coresight.h | 14 +- + 22 files changed, 175 insertions(+), 179 deletions(-) +Merging fastrpc/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (ae801944cbfb7 fpga: dfl: fix typo in header file) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (0e841d1d56137 interconnect: qcom: msm8974: drop duplicated RPM_BUS_{MASTER,SLAVE}_REQ defines) +$ git merge -m Merge branch 'icc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (70a9ae59c5b1f iio: adc: at91_adc: change at91_ts_sample to return void) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/proximity/hx9023s.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/adi,ad4030.yaml | 2 + + .../devicetree/bindings/iio/adc/adi,ad4080.yaml | 3 + + .../devicetree/bindings/iio/adc/adi,ad7380.yaml | 23 ++ + .../bindings/iio/amplifiers/adi,ad8366.yaml | 97 ++++++ + .../devicetree/bindings/iio/dac/ti,dac7612.yaml | 2 +- + .../bindings/iio/light/vishay,vcnl4000.yaml | 17 +- + .../bindings/iio/proximity/tyhx,hx9023s.yaml | 4 + + MAINTAINERS | 9 + + drivers/iio/accel/sca3000.c | 127 ++++--- + drivers/iio/adc/ad4030.c | 12 +- + drivers/iio/adc/ad4062.c | 12 +- + drivers/iio/adc/ad4080.c | 45 +++ + drivers/iio/adc/ad7192.c | 3 - + drivers/iio/adc/ad7266.c | 6 +- + drivers/iio/adc/ad7380.c | 51 ++- + drivers/iio/adc/ad9467.c | 94 +++-- + drivers/iio/adc/ade9000.c | 7 +- + drivers/iio/adc/adi-axi-adc.c | 5 + + drivers/iio/adc/at91_adc.c | 8 +- + drivers/iio/adc/nxp-sar-adc.c | 3 +- + drivers/iio/adc/pac1934.c | 2 +- + drivers/iio/adc/sd_adc_modulator.c | 1 + + drivers/iio/amplifiers/Kconfig | 6 + + drivers/iio/amplifiers/ad8366.c | 387 +++++++++++---------- + drivers/iio/buffer/kfifo_buf.c | 41 +-- + drivers/iio/dac/adi-axi-dac.c | 2 + + drivers/iio/dac/max5522.c | 22 +- + drivers/iio/filter/admv8818.c | 4 +- + drivers/iio/frequency/adf4350.c | 2 +- + drivers/iio/industrialio-backend.c | 16 + + drivers/iio/industrialio-trigger.c | 33 +- + drivers/iio/light/vcnl4000.c | 41 +++ + drivers/iio/light/zopt2201.c | 47 +-- + drivers/iio/magnetometer/bmc150_magn.c | 33 +- + drivers/iio/magnetometer/si7210.c | 21 +- + drivers/iio/proximity/hx9023s.c | 5 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +- + include/linux/iio/backend.h | 24 ++ + 38 files changed, 767 insertions(+), 454 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/amplifiers/adi,ad8366.yaml +Merging phy-next/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (4b8fc2b17272d soundwire: intel_auxdevice: Add CS47L47 to wake_capable_list) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + drivers/soundwire/intel_auxdevice.c | 1 + + drivers/soundwire/slave.c | 3 +++ + include/linux/soundwire/sdw.h | 18 +++++++++--------- + 3 files changed, 13 insertions(+), 9 deletions(-) +Merging extcon/extcon-next (24c76540a08b7 extcon: usbc-tusb320: Make typec-power-opmode optional) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 3 ++ + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-intel-int3496.c | 4 +- + drivers/extcon/extcon-ptn5150.c | 56 ++++++++++++++++++++++ + drivers/extcon/extcon-usbc-tusb320.c | 24 +++++----- + drivers/extcon/extcon.c | 4 +- + 6 files changed, 75 insertions(+), 17 deletions(-) +Merging gnss/gnss-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (96ca4caf9066f vfio/fsl-mc: add myself as maintainer) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (2f0dad8baae20 Merge branch 'staging-linus' into branch 'staging-next') +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/axis-fifo/axis-fifo.c | 59 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 2 +- + drivers/staging/fbtft/fb_hx8340bn.c | 8 - + drivers/staging/fbtft/fb_hx8353d.c | 13 - + drivers/staging/fbtft/fb_hx8357d.c | 14 - + drivers/staging/fbtft/fb_ili9163.c | 2 +- + drivers/staging/fbtft/fb_ili9340.c | 12 - + drivers/staging/fbtft/fb_ili9341.c | 12 - + drivers/staging/fbtft/fb_ili9481.c | 12 - + drivers/staging/fbtft/fb_ili9486.c | 12 - + drivers/staging/fbtft/fb_s6d02a1.c | 12 - + drivers/staging/fbtft/fb_st7735r.c | 12 - + drivers/staging/fbtft/fb_tinylcd.c | 14 +- + drivers/staging/fbtft/fbtft-core.c | 13 +- + drivers/staging/greybus/Kconfig | 2 +- + drivers/staging/greybus/audio_manager.c | 12 - + drivers/staging/greybus/audio_manager.h | 7 - + drivers/staging/greybus/audio_manager_module.c | 13 +- + drivers/staging/greybus/pwm.c | 2 +- + drivers/staging/greybus/sdio.c | 4 +- + drivers/staging/most/dim2/dim2.c | 76 +- + drivers/staging/most/dim2/hal.c | 3 +- + drivers/staging/most/net/net.c | 1 - + drivers/staging/nvec/nvec.c | 21 +- + drivers/staging/octeon/ethernet-rx.c | 2 +- + drivers/staging/octeon/octeon-stubs.h | 1614 ++++++++++---------- + drivers/staging/rtl8723bs/core/rtw_ap.c | 18 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 103 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 123 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 7 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 13 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 15 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 35 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 88 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 34 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 2 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 36 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 6 +- + drivers/staging/rtl8723bs/hal/odm.h | 7 - + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 4 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 8 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 12 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 12 +- + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 60 - + drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 4 - + drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 30 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 27 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 8 +- + drivers/staging/sm750fb/ddk750_mode.c | 2 +- + drivers/staging/sm750fb/ddk750_swi2c.c | 2 +- + drivers/staging/sm750fb/sm750.c | 88 +- + drivers/staging/sm750fb/sm750_hw.c | 26 +- + 60 files changed, 1211 insertions(+), 1547 deletions(-) +Merging counter-next/counter-next (ad415677b7e3b MAINTAINERS: Update Intel Quadrature Encoder Peripheral maintainer) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (59b723cd2adba Linux 6.12-rc6) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (c8e9b1d9febc8 dmaengine: fsl-edma: fix all kernel-doc warnings) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/dw-edma/dw-edma-core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 1 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 3 + + drivers/dma/dmaengine.c | 50 ++++---- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 42 ++++--- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + + drivers/dma/dw-edma/dw-edma-core.c | 127 ++++++++++++++++++++- + drivers/dma/dw-edma/dw-edma-core.h | 17 +++ + drivers/dma/dw-edma/dw-edma-v0-core.c | 21 ++++ + drivers/dma/dw-edma/dw-hdma-v0-core.c | 7 ++ + drivers/dma/fsl-edma-common.c | 3 +- + include/linux/dma/edma.h | 6 + + include/linux/platform_data/dma-mcf-edma.h | 5 +- + 12 files changed, 237 insertions(+), 46 deletions(-) +Merging cgroup/for-next (085f067389d12 cgroup/cpuset: fix null-ptr-deref in rebuild_sched_domains_cpuslocked) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/time/timer_migration.c +Merge made by the 'ort' strategy. + kernel/cgroup/cgroup.c | 1 + + kernel/cgroup/cpuset.c | 222 ++++++++++++++------- + kernel/sched/isolation.c | 4 +- + kernel/time/timer_migration.c | 4 +- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 224 +++++++++++----------- + 5 files changed, 266 insertions(+), 189 deletions(-) +Merging scsi/for-next (2f38fd99c0004 scsi: ufs: core: Fix shift out of bounds when MAXQ=32) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (23187576db340 scsi: megaraid_sas: Protect more code with instance->reset_mutex) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts +Auto-merging arch/arm64/boot/dts/qcom/hamoa.dtsi +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/scsi/lpfc/lpfc_sli4.h +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/qcom,sc7180-ufshc.yaml | 38 +++--- + arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts | 18 +++ + arch/arm64/boot/dts/qcom/hamoa.dtsi | 122 ++++++++++++++++++- + arch/arm64/boot/dts/qcom/milos-fairphone-fp6.dts | 18 +++ + arch/arm64/boot/dts/qcom/milos.dtsi | 129 ++++++++++++++++++++- + drivers/scsi/BusLogic.c | 4 +- + drivers/scsi/fnic/fdls_disc.c | 4 +- + drivers/scsi/fnic/fip.c | 2 +- + drivers/scsi/fnic/fnic.h | 7 +- + drivers/scsi/fnic/fnic_fcs.c | 112 ++++++++++++++---- + drivers/scsi/fnic/fnic_fdls.h | 2 +- + drivers/scsi/fnic/fnic_main.c | 28 ++++- + drivers/scsi/fnic/fnic_scsi.c | 70 +---------- + drivers/scsi/lpfc/lpfc_crtn.h | 3 +- + drivers/scsi/lpfc/lpfc_ct.c | 13 ++- + drivers/scsi/lpfc/lpfc_disc.h | 5 +- + drivers/scsi/lpfc/lpfc_els.c | 30 +++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 29 ++--- + drivers/scsi/lpfc/lpfc_init.c | 6 +- + drivers/scsi/lpfc/lpfc_nvme.c | 50 +++++++- + drivers/scsi/lpfc/lpfc_scsi.c | 10 +- + drivers/scsi/lpfc/lpfc_sli.c | 85 +++++++------- + drivers/scsi/lpfc/lpfc_sli4.h | 5 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 15 ++- + drivers/ufs/core/ufs-mcq.c | 9 +- + drivers/ufs/core/ufshcd.c | 5 +- + 27 files changed, 608 insertions(+), 217 deletions(-) +Merging vhost/linux-next (ebcff9dacaf2c vduse: avoid adding implicit padding) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (75a617cd8cd5e Merge branches 'rproc-fixes' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 13 +- + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 10 +- + drivers/remoteproc/imx_rproc.c | 8 +- + drivers/remoteproc/mtk_scp.c | 39 ++++ + drivers/remoteproc/qcom_q6v5_mss.c | 237 ++++++++++++++++++++- + drivers/remoteproc/qcom_wcnss.c | 2 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 2 +- + 7 files changed, 297 insertions(+), 14 deletions(-) +Merging gpio-brgl/gpio/for-next (c7f92042d3f3d selftests: gpio: Add gpio-cdev-uaf tests) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + drivers/gpio/gpio-bd9571mwv.c | 2 +- + drivers/gpio/gpio-brcmstb.c | 125 +++++++---- + drivers/gpio/gpio-cgbc.c | 4 +- + drivers/gpio/gpio-da9055.c | 2 +- + drivers/gpio/gpio-lp873x.c | 2 +- + drivers/gpio/gpio-mmio.c | 4 +- + drivers/gpio/gpio-stp-xway.c | 2 +- + drivers/gpio/gpio-tegra186.c | 23 +- + drivers/gpio/gpio-tps65086.c | 2 +- + drivers/gpio/gpio-ts4800.c | 10 - + drivers/gpio/gpio-viperboard.c | 2 +- + drivers/gpio/gpiolib-cdev.c | 161 +++++--------- + drivers/gpio/gpiolib-cdev.h | 2 +- + drivers/gpio/gpiolib-sysfs.c | 32 +-- + drivers/gpio/gpiolib-sysfs.h | 8 +- + drivers/gpio/gpiolib.c | 177 ++++++++-------- + drivers/gpio/gpiolib.h | 3 +- + include/linux/gpio/consumer.h | 2 + + include/linux/gpio/defs.h | 9 + + include/linux/gpio/driver.h | 5 +- + include/linux/gpio/generic.h | 8 +- + tools/testing/selftests/gpio/Makefile | 5 +- + tools/testing/selftests/gpio/gpio-cdev-uaf.c | 292 ++++++++++++++++++++++++++ + tools/testing/selftests/gpio/gpio-cdev-uaf.sh | 63 ++++++ + 24 files changed, 650 insertions(+), 295 deletions(-) + create mode 100644 include/linux/gpio/defs.h + create mode 100644 tools/testing/selftests/gpio/gpio-cdev-uaf.c + create mode 100755 tools/testing/selftests/gpio/gpio-cdev-uaf.sh +Merging gpio-intel/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (5d9eaad9439d6 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/fsl,imx27-iomuxc.yaml | 126 ++ + .../bindings/pinctrl/fsl,imx27-pinctrl.txt | 121 -- + .../bindings/pinctrl/fsl,imx35-pinctrl.yaml | 1 + + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 105 +- + .../bindings/pinctrl/qcom,eliza-tlmm.yaml | 138 ++ + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 8 +- + .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 + + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 5 +- + drivers/pinctrl/cix/pinctrl-sky1.c | 3 +- + drivers/pinctrl/devicetree.c | 2 +- + drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 3 +- + drivers/pinctrl/pinconf-generic.c | 43 +- + drivers/pinctrl/pinctrl-amdisp.c | 2 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 97 +- + drivers/pinctrl/pinctrl-equilibrium.c | 31 +- + drivers/pinctrl/pinctrl-pic32.c | 42 +- + drivers/pinctrl/pinctrl-rockchip.c | 325 +++- + drivers/pinctrl/pinctrl-rockchip.h | 1 + + drivers/pinctrl/pinctrl-single.c | 1 + + drivers/pinctrl/qcom/Kconfig.msm | 10 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-eliza.c | 1548 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-glymur.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qcs615.c | 1 + + drivers/pinctrl/qcom/pinctrl-sdm660-lpass-lpi.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 51 + + 27 files changed, 2430 insertions(+), 244 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx27-iomuxc.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,eliza-tlmm.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-eliza.c +Merging pinctrl-intel/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (d192fa0d19843 pinctrl: renesas: rzt2h: Fix device node leak in rzt2h_gpio_register()) +$ git merge -m Merge branch 'renesas-pinctrl' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pinctrl-rzt2h.c | 1 + + 1 file changed, 1 insertion(+) +Merging pinctrl-samsung/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/pwm/for-next (9321f9d27fbaf pwm: Remove redundant check in pwm_ops_check()) +$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Already up to date. +Merging ktest/for-next (d3042cbe84a06 ktest.pl: Fix uninitialized var in config-bisect.pl) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (6d6ad32e22f02 selftests/pidfd: fix typo in comment) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'test' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (db0c35ca36526 kunit: add bash completion) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (51ab33fc0a8be Merge tag 'livepatching-for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Already up to date. +Merging rtc/rtc-next (969c3cca0f3b8 rtc: ds1390: fix number of bytes read from RTC) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (a9ba6733c7f10 nvdimm: virtio_pmem: serialize flush requests) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (7b3302c687cae ntb_hw_amd: Fix incorrect debug message in link disable path) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging seccomp/for-next/seccomp (7d0a66e4bb908 Linux 6.18) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging slimbus/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (bfab89e362066 Merge branches 'nvmem-fixes' and 'nvmem-for-6.20' into nvmem-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging drivers/nvmem/core.c +Merge made by the 'ort' strategy. + drivers/nvmem/zynqmp_nvmem.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging xarray/main (863810caeb3cf XArray: Add CONFIG_DEBUG_XARRAY) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging lib/Kconfig.debug +Auto-merging lib/idr.c +Merge made by the 'ort' strategy. + include/linux/xarray.h | 63 ++++++++++++++++++++---------------- + lib/Kconfig.debug | 8 +++++ + lib/idr.c | 1 - + lib/test_xarray.c | 10 ++++-- + lib/xarray.c | 11 ++++--- + tools/testing/radix-tree/xarray.c | 2 +- + tools/testing/shared/xarray-shared.h | 2 +- + 7 files changed, 59 insertions(+), 38 deletions(-) +Merging hyperv/hyperv-next (158ebb578cd5f mshv: Handle insufficient root memory hypervisor statuses) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (fdbdd0ccb30af kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (91a0b0dce3507 bus: mhi: ep: Use bus callbacks for .probe() and .remove()) +$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-net-qrtr-Drop-the-MHI-auto_queue-feature-.patch +Applying: fix up for "net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels" +Using index info to reconstruct a base tree... +M drivers/net/wireless/ath/ath12k/wifi7/mhi.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging memblock/for-next (f56ccc32468ee mm/memtest: add underflow detection for size calculation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (63fbf275fa9f1 Merge branch 'for-7.0/cxl-prm-translation' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (65d1f5507ed2c zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (948a013a54c47 efi: Align unaccepted memory range to page boundary) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (bcfee135d5847 utf8: Remove unused utf8_normalize) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/unicode/utf8-core.c +Merge made by the 'ort' strategy. + fs/unicode/utf8-core.c | 22 ---------------------- + include/linux/unicode.h | 3 --- + 2 files changed, 25 deletions(-) +Merging slab/slab/for-next (9042e77a5c29d mm/slab: constify sysfs attributes) +$ git merge -m Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + mm/slub.c | 24 ++++++++---------------- + 1 file changed, 8 insertions(+), 16 deletions(-) +Merging random/master (bb9ff576fdff4 virt: vmgenid: remap memory as decrypted) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/virt/vmgenid.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging landlock/next (8ff74a72b8af3 landlock: Clean up interrupted thread logic in TSYNC) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging security/landlock/tsync.c +Merge made by the 'ort' strategy. + samples/landlock/sandboxer.c | 5 +-- + security/landlock/tsync.c | 85 ++++++++++++++++++++++++++++++++++---------- + 2 files changed, 70 insertions(+), 20 deletions(-) +Merging sysctl/sysctl-next (d174174c6776a sysctl: replace SYSCTL_INT_CONV_CUSTOM macro with functions) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (46a03ea50b5f3 fs/tests: exec: drop duplicate bprm_stack_limits test vectors) +$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (057581cd67327 bitmap: Add test for out-of-boundary modifications for scatter & gather) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Merge made by the 'ort' strategy. + lib/test_bitmap.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +Merging hte/for-next (92dfd92f74769 hte: tegra194: remove Kconfig dependency on Tegra194 SoC) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Merge made by the 'ort' strategy. + drivers/hte/Kconfig | 6 +++--- + drivers/hte/hte.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging kspp/for-next/kspp (b76fb1fc995ee kcsan: test: Adjust "expect" allocation type for kmalloc_obj) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Merge made by the 'ort' strategy. +Merging nolibc/for-next (c8ece5c818477 tools/nolibc/printf: Change variables 'c' to 'ch' and 'tmpbuf[]' to 'outbuf[]') +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Merge made by the 'ort' strategy. + tools/include/nolibc/arch-arm.h | 14 +-- + tools/include/nolibc/arch-arm64.h | 14 +-- + tools/include/nolibc/arch-loongarch.h | 14 +-- + tools/include/nolibc/arch-m68k.h | 14 +-- + tools/include/nolibc/arch-mips.h | 18 +-- + tools/include/nolibc/arch-powerpc.h | 14 +-- + tools/include/nolibc/arch-riscv.h | 14 +-- + tools/include/nolibc/arch-s390.h | 20 ++-- + tools/include/nolibc/arch-sh.h | 14 +-- + tools/include/nolibc/arch-sparc.h | 18 +-- + tools/include/nolibc/arch-x86.h | 68 +++++------ + tools/include/nolibc/fcntl.h | 4 +- + tools/include/nolibc/nolibc.h | 6 +- + tools/include/nolibc/poll.h | 4 +- + tools/include/nolibc/sched.h | 4 +- + tools/include/nolibc/stackprotector.h | 8 +- + tools/include/nolibc/stdio.h | 38 +++--- + tools/include/nolibc/stdlib.h | 173 +++++++++++++-------------- + tools/include/nolibc/sys.h | 110 ++++++++--------- + tools/include/nolibc/sys/ioctl.h | 2 +- + tools/include/nolibc/sys/mman.h | 8 +- + tools/include/nolibc/sys/mount.h | 2 +- + tools/include/nolibc/sys/prctl.h | 2 +- + tools/include/nolibc/sys/ptrace.h | 2 +- + tools/include/nolibc/sys/random.h | 2 +- + tools/include/nolibc/sys/reboot.h | 2 +- + tools/include/nolibc/sys/resource.h | 2 +- + tools/include/nolibc/sys/select.h | 6 +- + tools/include/nolibc/sys/stat.h | 2 +- + tools/include/nolibc/sys/syscall.h | 2 +- + tools/include/nolibc/sys/timerfd.h | 10 +- + tools/include/nolibc/sys/uio.h | 4 +- + tools/include/nolibc/sys/utsname.h | 2 +- + tools/include/nolibc/sys/wait.h | 2 +- + tools/include/nolibc/time.h | 28 ++--- + tools/include/nolibc/unistd.h | 2 +- + tools/testing/selftests/nolibc/nolibc-test.c | 16 ++- + 37 files changed, 338 insertions(+), 327 deletions(-) +Merging iommufd/for-next (f8f9c1f4d0c7a Linux 6.19-rc3) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging turbostat/next (ef0e60083f768 tools/power turbostat: Fix AMD RAPL regression) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Already up to date. +Merging pwrseq/pwrseq/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Already up to date. +Merging capabilities-next/caps-next (0715881360074 ipc: don't audit capability check in ipc_permissions()) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +$ git am -3 ../patches/0001-sign-file-Fix-up-merge-issue.patch +Applying: sign-file: Fix up merge issue +Using index info to reconstruct a base tree... +M scripts/sign-file.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging ipe/next (7d0a66e4bb908 Linux 6.18) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Already up to date. +Merging kcsan/next (dcb6fa37fd7bc Linux 6.18-rc3) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging keys-next/keys-next (965e9a2cf23b0 pkcs7: Change a pr_warn() to pr_warn_once()) +$ git merge -m Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys-next/keys-next +Already up to date. +Merging fwctl/for-next (f8f9c1f4d0c7a Linux 6.19-rc3) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (43185067c6fd5 configfs-tsm-report: tdx_guest: Increase Quote buffer size to 128KB) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (6c177775dcc5e Merge branch 'next/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Merge made by the 'ort' strategy. +Merging kthread/for-next (fa39ec4f89f26 doc: Add housekeeping documentation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Already up to date. +Merging drm-rust/drm-rust-next (4a49fe23e357b gpu: nova-core: use core library's CStr instead of kernel one) +$ git merge -m Merge branch 'drm-rust-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/drm-rust-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/tyr/driver.rs | 60 ++++++++++-------- + drivers/gpu/drm/tyr/file.rs | 16 +++-- + drivers/gpu/drm/tyr/gem.rs | 13 ++-- + drivers/gpu/drm/tyr/gpu.rs | 56 +++++++++-------- + drivers/gpu/drm/tyr/regs.rs | 16 +++-- + drivers/gpu/nova-core/driver.rs | 17 ++++- + drivers/gpu/nova-core/firmware.rs | 5 +- + drivers/gpu/nova-core/firmware/booter.rs | 20 ++++-- + drivers/gpu/nova-core/firmware/fwsec.rs | 64 +++++++++++-------- + drivers/gpu/nova-core/firmware/riscv.rs | 6 +- + drivers/gpu/nova-core/gpu.rs | 4 +- + drivers/gpu/nova-core/gsp/boot.rs | 32 +++------- + drivers/gpu/nova-core/gsp/cmdq.rs | 85 ++++++++++++++++--------- + drivers/gpu/nova-core/gsp/fw.rs | 104 +++---------------------------- + drivers/gpu/nova-core/gsp/fw/commands.rs | 5 +- + drivers/gpu/nova-core/gsp/sequencer.rs | 18 +++--- + drivers/gpu/nova-core/nova_core.rs | 2 +- + rust/kernel/drm/device.rs | 26 ++++++-- + rust/kernel/drm/driver.rs | 10 +-- + rust/kernel/drm/file.rs | 8 ++- + rust/kernel/drm/gem/mod.rs | 23 +++++-- + 21 files changed, 298 insertions(+), 292 deletions(-) +Merging drm-nova/nova-next (93296e9d9528f gpu: nova-core: vbios: store reference to Device where relevant) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..18a7821bef47 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20260227 -- 2.51.0