diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-08-09 12:24:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-08-09 12:24:42 +1000 |
| commit | 6c8f479764ebe2848589de3249743ea552ed2495 (patch) | |
| tree | 65590d7995653905a88bce5726ed5173f53a50b1 | |
| parent | fd4977579380b3571c7f55858f5650f023dff102 (diff) | |
Add linux-next specific files for 20220809linaro-local/ci/tcwg_kernel/gnu-master-arm-next-allyesconfig
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 358 | ||||
| -rw-r--r-- | Next/Trees | 360 | ||||
| -rw-r--r-- | Next/merge.log | 3034 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3753 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e52212b141ca --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,358 @@ +Name SHA1 +---- ---- +origin 5d5d353bed32dc3ea52e2619e0d1c60b17133b91 +fixes 4a57a8400075bc5287c5c877702c68aeae2a033d +mm-hotfixes b2f4c6e295317a2fe8ec73a50131cf29171fe37f +kbuild-current 32346491ddf24599decca06190ebca03ff9de7f8 +arc-current 952deecb065e23784fd6fcab3020de397d51d296 +arm-current ec85bd369fd2bfaed6f45dd678706429d4f75b48 +arm64-fixes 410982303772993a86bb7a9cfa7ece34522b2636 +arm-soc-fixes 879bcfc4e5369c39f3199e13a188424d4fae8aa4 +drivers-memory-fixes 1332661e09304b7b8e84e5edc11811ba08d12abe +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current b508128bb0d1e243beb56cca5d819bcbb5c269b1 +powerpc-fixes 3d7cb6b04c3f3115719235cc6866b10326de34cd +s390-fixes 918e75f77af7d2e049bb70469ec0a2c12782d96a +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net f574f7f839fc1753467b52417591cf2668825a92 +bpf 19f68ed6dc90c93daf7e54d3350ea67fead7cbbf +ipsec 6aa811acdb76facca0b705f4e4c1d948ccb6af8b +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +wireless f01272ee3856e62e8a0f8211e8edf1876a6f5e38 +rdma-fixes cc0315564d6eec91c716d314b743321be24c70b3 +sound-current f83bb2592482fe94c6eea07a8121763c80f36ce5 +sound-asoc-fixes f16e5a31c0a9c3196c6809302f9b5254f307b4d9 +regmap-fixes 3f05010f243be06478a9b11cfce0ce994f5a0890 +regulator-fixes b0de7fa706506bf0591037908376351beda8c5d6 +spi-fixes 4188e495dd660f21ab4fc316ae313d22f089820e +pci-current f2906aa863381afb0015a9eb7fefad885d4e5a56 +driver-core.current 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +tty.current ff6992735ade75aae3e35d16b17da1008d753d28 +usb.current 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes ff6992735ade75aae3e35d16b17da1008d753d28 +phy f2906aa863381afb0015a9eb7fefad885d4e5a56 +staging.current 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +iio-fixes b3e6b165f59fe4d84c2a790027d5442393f1871b +counter-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +char-misc.current 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +soundwire-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +thunderbolt-fixes 3d7cb6b04c3f3115719235cc6866b10326de34cd +input-current 8bb5e7f4dcd9b9ef22a3ea25c9066a8a968f12dd +crypto-current af5d35b83f642399c719ea9a8599a13b8a0c4167 +vfio-fixes afe4e376ac5d568367b447ca90c12858d0935b86 +kselftest-fixes 9b4d5c01eb234f66a15a746b1c73e10209edb199 +modules-fixes e69a66147d49506062cd837f3b230ee3e98102ab +dmaengine-fixes 607a48c78e6b427b0b684d24e61c19e846ad65d6 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes 0fddf9ad06fd9f439f137139861556671673e31c +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 3bcc2c1eade4e95ee494c30684d0157fba27c824 +reset-fixes a57f68ddc8865d59a19783080cc52fb4a11dc209 +mips-fixes 88084a3df1672e131ddc1b4e39eeacfd39864acf +at91-fixes ef0324b6415db6742bd632dc0dfbb8fbc111473b +omap-fixes 2eb502f496f7764027b7958d4e74356fed918059 +kvm-fixes cf5029d5dd7cb0aaa53250fa9e389abd231606b3 +kvms390-fixes cf5029d5dd7cb0aaa53250fa9e389abd231606b3 +hwmon-fixes da519304c1ad381d3fd31d45025c14c908147bc9 +nvdimm-fixes 17d9c15c9b9e7fb285f7ac5367dfb5f00ff575e3 +cxl-fixes e35f5718903b093be4b1d3833aa8a32f864a3ef1 +btrfs-fixes af39011ec0c74dc93226fdff7a8fb2774e87e982 +vfs-fixes c3497fd009ef2c59eea60d21c3ac22de3585ed7d +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 5ad26161a371e4aa2d2553286f0cac580987a493 +samsung-krzk-fixes c4c79525042a4a7df96b73477feaf232fe44ae81 +pinctrl-samsung-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +devicetree-fixes 0b9431c8221cfe73d06f6b9cd37b813fa52be8ce +dt-krzk-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +scsi-fixes f5c2976e0cb0f6236013bfb479868531b04f61d4 +drm-fixes 3d7cb6b04c3f3115719235cc6866b10326de34cd +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 3d7cb6b04c3f3115719235cc6866b10326de34cd +mmc-fixes 51189eb9ddc88851edc42f539a0f9862fd0630c2 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes a111daf0c53ae91e71fd2bfe7497862d14132e3e +hyperv-fixes 49d6a3c062a1026a5ba957c46f3603c372288ab6 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 88bd24d73d5bfa1b7b97a9221ff320fc44ef401a +risc-v-mc-fixes efa310ba00716d7a872bdc5fa1f5545edc9efd69 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +spdx 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +gpio-brgl-fixes e0dccc3b76fb35bb257b4118367a883073d7390e +gpio-intel-fixes b93a8b2c5161696e732185311d309e0aaf0575be +pinctrl-intel-fixes ba79c5e45eecb9e009eca7f5da224f6e42bd4fcb +erofs-fixes 8b1ac84dcf2cf0fc86f29e92e5c63c4862de6e55 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes f2906aa863381afb0015a9eb7fefad885d4e5a56 +ubifs-fixes c3c07fc25f37c157fde041b3a0c3dfcb1590cbce +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes 1197eb5906a5464dbaea24cac296dfc38499cc00 +irqchip-fixes fda7409a8fcfa457814f8186f2861a9f00008e75 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +broadcom-fixes a26f045984e7ff9e26e1352f823c9f115dc946d4 +perf-current bb83c99d3d0aa2f51ba0b2abd7115002620118e6 +efi-fixes aa6d1ed107eba26f49933216cffe797253914132 +zstd-fixes 88a309465b3f05a100c3b81966982c0f9f5d23a6 +battery-fixes 093d27bb6f2d1963f927ef59c9a2d37059175426 +drm-misc-fixes 91b3c8dbe898df158fd2a84675f3a284ff6666f7 +kbuild 672fb6740cbfde34f4d367ffa3c939b608a927e1 +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf bb8bc52e75785af94b9ba079277547d50d018a52 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 5c850d31880e00f063fa2a3746ba212c4bcc510f +asm-generic 82dc270146a82edd67228be94b0fe302a6f78395 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 3eaecd0677e1b0e0ea01b424da804687e09c1e38 +arm64 892f7237b3ffb090f1b1f1e55fe7c50664405aed +arm-perf aaaee7b55c9e58410abcef6e3e2fd80e4135d02e +arm-soc 87a5b37a8f02f7ebfb783d2aafde16978d84e3e3 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 147c83586707d7b33c0e147b572fe53b0267165a +aspeed bfcbea2c93e56bc5a0d7db6528fcce8243433c12 +at91 38b729bf1ee6ae5426cdc0a0239e892ba4020c84 +broadcom ade0d6ecf54aad2c34cd37a267c8e999de973d41 +drivers-memory 1b33eb4acdc8f839ffb7ded4c2432c26f1554482 +imx-mxs 37960df982d09ae119dc7664008cafd34a3c107d +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 5281655db0e1f6a5898c4c26815eb816eead2699 +mvebu bc50bfd4f018244540e749d2e0c364490f131ed5 +omap ad2fe4582c483bfd5609662b8e876066fa912697 +qcom 58b9ca29ff61577061f39aa60e6f40ca4c08e71f +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas b5468cb7909f0068dd977e1f63ea39132098dbb7 +reset d985db83622679fc496ed824088e066528b3a872 +rockchip 2e1170c71ec0c0fb785ce76fca7c682e930af2b8 +samsung-krzk 5642cb8ce0f10369d110a384f1e2be56d9f49e00 +scmi 3d7cb6b04c3f3115719235cc6866b10326de34cd +stm32 4b43ff02d2a4b809a2e8cfa628a54f9e39a87381 +sunxi 3a83b092dd598344f4e721eadd32306ec16d8d3a +tee db30e53bf897670e11fdfa199a3ca7079db20fd2 +tegra 393c6c3a6152aab9bacf37727a4a6309982194ff +ti 62b9e4033c13da9e70b35073168fcdfc4e164dfc +xilinx b2a88c212e652e94f1e4b635910972ac57ba4e97 +clk 08fc500fe3d4b1f0603fb97ad353f246a3d52d2d +clk-imx c196175acdd3ab06114bde2955971bc7282f2b85 +clk-renesas 0e704f6c42dc64f081d0b1738d06b2dee9524f27 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509 +loongarch 77ddc4aab5268cd2e39fb169104aae1ee4d8ae63 +m68k b508128bb0d1e243beb56cca5d819bcbb5c269b1 +m68knommu 472e68df4a5eacdbe4fd07cffef1b5ffdd95516b +microblaze 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +mips 74de14fe05dd6b151d73cb0c73c8ec874cbdcde6 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 52e0ea900202d23843daee8f7089817e81dd3dd7 +parisc-hd 3d7cb6b04c3f3115719235cc6866b10326de34cd +powerpc 4cfa6ff24a9744ba484521c38bea613134fbfcb3 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v ba6cfef057e1c594c456627aad81c2343fdb5d13 +risc-v-mc 88d319c6abaeb37f0e2323275eaf57a8388e0265 +s390 53897c8b7f8243870f35b60de16375e4d7edd1cb +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml af3e16101cee95efaa72095fe06c15ec0b8eb195 +xtensa 0847d167d0f9bdc8f61e5e5d32831fa8fdcd150f +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +fscrypt 218d921b581eadf312c8ef0e09113b111f104eeb +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 26291c54e111ff6ba87a164d85d4a4e134b7315c +btrfs 6130a25681d482a7f3ecfb8f74f5b6d63fcf0ae1 +ceph a8af0d682ae0c9cf62dd0ad6afdb1480951d6a10 +cifs 0d168a58fca34806b575c7cba87afb11208acb54 +configfs 84ec758fb2daa236026506868c8796b0500c047d +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs ecce9212d0fd7a2d4a4998f0c4623a66887e14c8 +exfat df13a3477635414f243d53344bb4b510385e994d +ext3 5b02b6900c8d7f258f5ec5b0410a0168336f9b8a +ext4 d95efb14c0b81b684deb32ba10cdb78b4178ae5b +f2fs 01fc4b9a6ed8eacb64e5609bab7ac963e1c7e486 +fsverity 8da572c52a9be6d006bae290339c629fc6501910 +fuse 247861c325c2e4f5ad3c2f9a77ab9d85d15cbcfc +gfs2 446279168e030fd0ed68e2bba336bef8bb3da352 +jfs e471e5942c006532a013eefde239ce1e783ac2d9 +ksmbd 8f0541186e9ad1b62accc9519cc2b7a7240272a7 +nfs 2135e5d56278ffdb1c2e6d325dc6b87f669b9dac +nfs-anna 4f40a5b5544618b096d1611a18219dd91fd57f80 +nfsd 9905ce116c9bda409331ce3de4d505d891d48709 +ntfs3 451e45a0e6df21e63acfd493feb5194f4697ce11 +orangefs 40a74870b2d1d3d44e13b3b73c6571dd34f5614d +overlayfs 4f1196288dfb6fc63e28e585392f2df3b8a63388 +ubifs 8c03a1c21d72210f81cb369cc528e3fde4b45411 +v9fs aa7aeee169480e98cf41d83c01290a37e569be6d +xfs d62113303d691bcd8d0675ae4ac63e7769afc56c +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap 478af190cb6c501efaa8de2b9c9418ece2e4d0bd +djw-vfs 49df34221804cfd6384135b28b03c9461a31d024 +file-locks 9de1f9c8ca5100a02a2e271bdbde36202e251b4b +vfs 82c4fd03ef0545e8f68f3db0d1d245dca2e1eb3f +printk a7e796c88820a83d8e1911a076cf8e533d640c6b +pci c4f36c3ab065065a87d641ca2fd5d5c4eb2bfa82 +pstore 2c09d1443b9b8b6e25bfb2acf51ad442cf9b314e +hid a60885b6a97b5dc9340dd9310a57b5682c2daf2d +i2c 0c42dacaa60770270d61a4d95d46641864a5dfc8 +i3c f2906aa863381afb0015a9eb7fefad885d4e5a56 +dmi d2139dfca361a1f5bfc4d4a23455b1a409a69cd4 +hwmon-staging da519304c1ad381d3fd31d45025c14c908147bc9 +jc_docs 339170d8d3da5685762619080263abb78700ab4c +v4l-dvb 485ade76c95ac5ccaa52fee9d712471c9211b989 +v4l-dvb-next 485ade76c95ac5ccaa52fee9d712471c9211b989 +pm 9851f9cb75d0cfdfcfa1a4586432eb4712491bfc +cpufreq-arm 33fe1cb20cf44af9c12048b2bfdebae0408cd4aa +cpupower f2906aa863381afb0015a9eb7fefad885d4e5a56 +devfreq 53f853d55e312a639eaa910154248ce06eb754ac +opp 1d95af02f23031c2e1cca7607c514b86ce85bc6e +thermal ad86429b42b4e80aa7f7654970e13f45dbde7d3e +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 958589892218e43ec83d5562438e0c1cc44a4716 +rdma 6b822d408b58c3c4f26dae93245c6b7d8b39e0f9 +net-next f86d1fbbe7858884d6754534a0afbb74fc30bc26 +bpf-next f86d1fbbe7858884d6754534a0afbb74fc30bc26 +ipsec-next 5e25c25aa2c08fb9a79476e029c0b1e3dcd70566 +mlx5-next b0bb369ee451323968b31392a86398f15a2ba183 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth aac59090a068139550f9b73d46d1116e31cdd2d1 +wireless-next 35610745d71df567297bb40c5e4263cda38dddd5 +mtd 7ec4cdb321738d44ae5d405e7b6ac73dfbf99caa +nand e16eceea863b417fd328588b1be1a79de0bc937f +spi-nor f8cd9f632f4415b1e8838bdca8ab42cfb37a6584 +crypto af5d35b83f642399c719ea9a8599a13b8a0c4167 +drm 5493ee1919eae4f49d62276cf5986b7f7c7aa8f6 +drm-misc 6f2c8d5f16594a13295d153245e0bb8166db7ac9 +amdgpu 64f991590ff4410041a70ee7ec2db079bc953929 +drm-intel 9d50bff40e3e366886ec37299fc317edf84be0c9 +drm-tegra 135f4c551d51065ee2d0677bf5344a89767e9d9b +drm-msm cb77085b1f0a86ef9dfba86b5f3ed6c3340c2ea3 +drm-msm-lumag 1ff1da40d6fc9b0125e1c0fcceb09f1d3bca9f05 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 2829a9fcb738f742baad9d15de4c6eac84bcfd08 +fbdev ff6992735ade75aae3e35d16b17da1008d753d28 +regmap 739f872e48d47c97fa17a86a7b3356771b75240c +sound f83bb2592482fe94c6eea07a8121763c80f36ce5 +sound-asoc f16e5a31c0a9c3196c6809302f9b5254f307b4d9 +modules 554694ba120b87e39cf732ed632e6a0c52fafb7c +input 938db76cf8c8d2bd7c56aca74bef68d443e76954 +block ece775e9aa8232963cc1bddf5cc91285db6233af +device-mapper 12907efde6ad984f2d76cc1a7dbaae132384d8a5 +libata b3b2bec9646eb1d3f43c85f6d0d2211d6f8af42b +pcmcia 2ef4bb24ff39ae4af89b80bcc5d516f55368e8ae +mmc 527f36f5efa45b6a897190cabf982e2d207887da +mfd ae4ccaed3a063652ec5b81efec2ad57a4ee506e5 +backlight fe201f6fa4cf96749b0a6b6a61b33b6a82de4e49 +battery c9d8468158adca6dffd2ff5b1befd35f75568b10 +regulator b0de7fa706506bf0591037908376351beda8c5d6 +security ed56f4b5173efba00e3dcd736c18bce43255cf7a +apparmor 79eb2711c919e6db10ed2b8fb22ab605121e80ea +integrity 1d212f9037b035e638d53834bfe8d3094ca1d04c +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux ef54ccb61616d8293bc68220d88a8e74271141b5 +smack b50503990d8889a73bc412fd976ef00951cdb2b5 +tomoyo 05fe531eb3f1cdc535d46071c7e2067cdc2c3f3c +tpmdd 863ed94c589fcd1984f4e3080f069d30508044bb +watchdog 2d27e52841092e5831dd41f313028c668d816eb0 +iommu c10100a416c16b598bf5155e759307b34dac0d7d +audit 546093206ba16623c18e344630dbfdd71a4327e0 +devicetree 7e7a24c3c6c98abc4425abd1dbf2a71b42dfafcf +dt-krzk 12f158808510b7810bda1fadd3e88ddc9e768db4 +mailbox 8a8dc2b9596e6088522d30bc79306b834c681943 +spi 4188e495dd660f21ab4fc316ae313d22f089820e +tip 0dc2dd2cb4add7cd6075249c4067b4a7f5af8e7f +clockevents c19e18637d895e851817b99c65beea74ab7af113 +edac 5e2805d5379619c4a2e3ae4994e73b36439f4bad +irqchip 2bd1753e8c431fc7475c04ac8d14a4e9930f47f6 +ftrace 07a451dae367ba0191b03a18e963d17052c5ed73 +rcu 21714867a12ab022e5082ccafb2c61f149abffae +kvm 90752dcef2e3d6c5db0d3cd3809d282918a6eef4 +kvm-arm 0982c8d859f8f7022b9fd44d421c7ec721bb41f9 +kvms390 f5ecfee94493475783074e86ded10a0499d779fc +xen-tip 251e90e7e346a23742b90e2c4db19d322e071d99 +percpu a111daf0c53ae91e71fd2bfe7497862d14132e3e +workqueues 46a4d679ef88285ea17c3e1e4fed330be2044f21 +drivers-x86 3d46d78480757e6d403c3bc2b32d2b05ecbed543 +chrome-platform afef1e1a0223623d063a6df51dbc342c9517b948 +hsi 43c14f8d18a7ab26e8f0e960bfd8f4d0a9c57c4d +leds 38ba0bb291aacd92d8eaa4a1aa8b63ce4286e797 +ipmi 4aebcc9059d890bf2f438cfa169dad856123fc9c +driver-core 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +usb 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +thunderbolt 34b9715b7caee2e2b7d74bb4230f2be2c2765c0a +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 688ee1d1785c1359f9040f615dd8e6054962bce2 +tty 0fec518018cc5ceffa706370b6e3acbbb1e3c798 +char-misc 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +coresight 4d45bc82df667ad9e9cb8361830e54fc1264e993 +fpga ee794221a6f66d054beb1cbc151d8de4083e634e +icc 009c963eefa058384052d32d5b06fbc738195bdb +iio 180c6cb6b9b79c55b79e8414f4c0208f2463af7d +phy-next 08680588d340eaad2d5028d6f24a055a118d4e7e +soundwire 3f4a70268d54c41117bc4e1bed0ba4be756735a8 +extcon 3a06ed80265fa62eecaf519d92f1633e4f9510c7 +gnss c0c725d7350ec8b8453257676a440bb4b2df2422 +vfio 099fd2c2020751737d9288f923d562e0e05977eb +staging 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +mux 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +dmaengine a1873f837f9e5c1001462a635af1b0bab31aa9fd +cgroup 3109920b3d95ebee86198757328eefe51f458b06 +scsi 0f8c3a1df9364f8ba94a392fa98cef5e1ccab16b +scsi-mkp c6380f9924270d51cc233cfd592b279be3881e6d +vhost 6a9720576cd00d30722c5f755bd17d4cfa9df636 +rpmsg 3d9688c734a7b5addca0578ac51bd9662e6f0673 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl c4f0d16daa6d1c5d862d063379c03310387095d5 +gpio-intel b65bb2c148913c4020d06c9798e5e1bc18105f4f +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 5b045200b53a9b95f87409b5c13f43adb6f1da6c +pinctrl-intel 25097de7b2369625994793b788fa6ed4cad664cd +pinctrl-renesas 36611d28f5130d8bb9aa36ec64d4ebcd736e8dba +pinctrl-samsung c98ebe065e07dc6c6c82bcbfd2a0351a7bde68da +pwm 8933d30c5f468d6cc1e4bf9bb535149da35f202e +userns a0b88362d2c797aeb96c42fe94c7518b78ac84e7 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest b1d34b1375f97fb1e67959d863e0e335bf3d2069 +livepatching df44b1ee72f4fa345d6749048878ed7ac1f785e8 +rtc 03c4cd6f89e074a51e289eb9129ac646f0f2bd29 +nvdimm 53fc59511fc4c567342b2ef3f7b99a086430e0b4 +at24 3123109284176b1532874591f7c81f3837bbdc17 +ntb 025963f08f3ade15c340fc09d07c4d69b3377bd7 +seccomp 3ce4b78f73e8e00fb86bad67ee7f6fe12019707e +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 04823dd2af87341ddf58e9903874e8db6e212670 +slimbus 4ad3deabeea21f9fda6a49de10fd417c4199ffaf +nvmem 432ee5a3cfcf8676448b0e11f1e800fc49c008d0 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv d180e0a1be6cea2b7436fadbd1c96aecdf3c46c7 +auxdisplay 13de23494f387315c6cfab6fe78fbed7d1b25586 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm ca7fd6cff3b8df436f3e46b8fc80e6989700c8da +kunit f2906aa863381afb0015a9eb7fefad885d4e5a56 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +kunit-next 4c392516accfe51a1aaf80ed163517646f8f0476 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi bb3c64f6a017d4410010329d12fb36c633985425 +memblock 04d9490986d1e04a38db88276115e6b3c9ec3faa +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +cxl 1cd8a2537eb07751d405ab7e2223f20338a90506 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 88a309465b3f05a100c3b81966982c0f9f5d23a6 +efi df3c9072ef90b19ee317afbef185b65537c701cf +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 3041808b522031dccfbd898e520109569f039860 +random 4e23eeebb2e57f5a28b36221aa776b5a1122dde5 +landlock b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 +rust 07a3263c2554af5f8c7670aeb757e808006c1736 +sysctl 374a723c7448bbea22846884ba336ed83b085aab +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve c6e8e36c6ae4b11bed5643317afb66b6c3cadba8 +bitmap 36d4b36b69590fed99356a4426c940a253a93800 +hte 85ff37e302efdf173cff6d1a310c2f7f38f1d069 +kspp 27603a606fda0806d7c08914bc976931aa42020e +kspp-gustavo 94dfc73e7cf4a31da66b8843f0b9283ddd6b8381 +mm-stable 360614c01f81f48a89d8b13f8fa69c3ae0a1f5c7 +mm-nonmm-stable b99695580bfc1f91364023c673681ddb88e375dc +mm 11378c6a99ac33cbcebdb1a0fa709b57feb94ced diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..f87221ba337e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,360 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-fixes git https://gitlab.com/vilhelmgray/counter.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +risc-v-mc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +risc-v-mc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#dt-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#hte/for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..9ec602edf8d3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3034 @@ +$ date -R +Tue, 09 Aug 2022 08:47:28 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 3bc1bc0b59d0 Merge tag '5.20-rc-smb3-client-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 +Merging origin/master (5d5d353bed32 Merge tag 'rproc-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 3bc1bc0b59d0..5d5d353bed32 +Fast-forward (no commit created; -m option ignored) + Documentation/ABI/testing/sysfs-fs-f2fs | 30 + + Documentation/admin-guide/kernel-parameters.txt | 17 +- + Documentation/core-api/mm-api.rst | 8 +- + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 1 + + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 7 + + .../bindings/leds/cznic,turris-omnia-leds.yaml | 2 + + .../devicetree/bindings/leds/leds-bcm63138.yaml | 95 ++ + .../bindings/leds/leds-class-multicolor.yaml | 32 +- + .../devicetree/bindings/leds/leds-lp50xx.yaml | 10 +- + .../bindings/leds/leds-pwm-multicolor.yaml | 15 +- + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 2 + + .../devicetree/bindings/mailbox/fsl,mu.yaml | 6 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 46 +- + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 1 + + .../devicetree/bindings/opp/opp-v2-base.yaml | 10 + + .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 15 + + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 2 + + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 74 +- + .../bindings/remoteproc/qcom,glink-edge.yaml | 72 + + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 88 +- + .../bindings/remoteproc/qcom,qcs404-cdsp-pil.yaml | 1 - + .../bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 245 +++ + .../bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 266 ++++ + .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 21 +- + .../bindings/remoteproc/qcom,sdm845-adsp-pil.yaml | 1 - + .../bindings/remoteproc/qcom,smd-edge.yaml | 85 ++ + .../bindings/remoteproc/ti,pru-rproc.yaml | 5 +- + Documentation/devicetree/bindings/serial/8250.yaml | 1 + + .../devicetree/bindings/serial/mediatek,uart.yaml | 120 ++ + .../devicetree/bindings/serial/mtk-uart.txt | 59 - + .../devicetree/bindings/serial/renesas,hscif.yaml | 1 + + .../devicetree/bindings/serial/rs485.yaml | 4 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 2 + + .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 50 +- + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + .../bindings/watchdog/realtek,otto-wdt.yaml | 1 + + Documentation/driver-api/serial/driver.rst | 482 +----- + Documentation/driver-api/serial/serial-rs485.rst | 38 +- + Documentation/filesystems/f2fs.rst | 5 + + Documentation/filesystems/fuse.rst | 29 +- + MAINTAINERS | 7 +- + arch/alpha/include/asm/bitops.h | 32 +- + arch/arm/include/asm/bitops.h | 18 +- + arch/hexagon/include/asm/bitops.h | 24 +- + arch/ia64/include/asm/bitops.h | 42 +- + arch/ia64/include/asm/processor.h | 2 +- + arch/m68k/include/asm/bitops.h | 49 +- + arch/mips/ath79/early_printk.c | 17 +- + arch/powerpc/include/asm/archrandom.h | 9 +- + arch/powerpc/kernel/setup-common.c | 8 + + arch/s390/include/asm/bitops.h | 61 +- + arch/sh/include/asm/bitops-op32.h | 34 +- + arch/sparc/include/asm/bitops_32.h | 18 +- + arch/sparc/lib/atomic32.c | 12 +- + arch/x86/include/asm/bitops.h | 22 +- + arch/x86/platform/olpc/olpc-xo1-sci.c | 2 +- + drivers/accessibility/braille/braille_console.c | 2 +- + drivers/accessibility/speakup/main.c | 2 +- + drivers/accessibility/speakup/serialio.h | 3 +- + drivers/cpufreq/cpufreq-dt.c | 19 +- + drivers/cpufreq/cpufreq.c | 6 +- + drivers/cpufreq/imx-cpufreq-dt.c | 12 +- + drivers/cpufreq/mediatek-cpufreq.c | 1 + + drivers/cpufreq/qcom-cpufreq-hw.c | 14 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 109 +- + drivers/cpufreq/sti-cpufreq.c | 27 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 31 +- + drivers/cpufreq/tegra194-cpufreq.c | 4 +- + drivers/cpufreq/tegra20-cpufreq.c | 12 +- + drivers/cpufreq/ti-cpufreq.c | 42 +- + drivers/cpuidle/cpuidle.c | 6 +- + drivers/devfreq/exynos-bus.c | 21 +- + drivers/devfreq/tegra30-devfreq.c | 22 +- + drivers/gpu/drm/lima/lima_devfreq.c | 12 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 15 +- + drivers/hv/connection.c | 11 + + drivers/hv/hv_balloon.c | 135 +- + drivers/hv/hyperv_vmbus.h | 7 + + drivers/hv/vmbus_drv.c | 27 +- + drivers/hwspinlock/omap_hwspinlock.c | 6 +- + drivers/hwspinlock/qcom_hwspinlock.c | 28 +- + drivers/iommu/intel/dmar.c | 2 +- + drivers/leds/Kconfig | 10 +- + drivers/leds/blink/Kconfig | 14 + + drivers/leds/blink/Makefile | 1 + + drivers/leds/blink/leds-bcm63138.c | 307 ++++ + drivers/leds/leds-is31fl319x.c | 529 ++++--- + drivers/leds/leds-turris-omnia.c | 4 +- + drivers/leds/rgb/leds-pwm-multicolor.c | 8 +- + drivers/mailbox/imx-mailbox.c | 40 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 11 - + drivers/media/platform/qcom/venus/pm_helpers.c | 10 +- + drivers/memory/tegra/tegra124-emc.c | 11 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- + drivers/of/fdt.c | 4 +- + drivers/opp/core.c | 1577 ++++++++++---------- + drivers/opp/cpu.c | 12 +- + drivers/opp/debugfs.c | 27 +- + drivers/opp/of.c | 150 +- + drivers/opp/opp.h | 56 +- + drivers/opp/ti-opp-supply.c | 77 +- + drivers/remoteproc/imx_rproc.c | 7 +- + drivers/remoteproc/keystone_remoteproc.c | 3 +- + drivers/remoteproc/mtk_scp.c | 23 +- + drivers/remoteproc/omap_remoteproc.c | 6 +- + drivers/remoteproc/pru_rproc.c | 1 + + drivers/remoteproc/qcom_common.c | 4 +- + drivers/remoteproc/qcom_q6v5.c | 4 + + drivers/remoteproc/qcom_q6v5_adsp.c | 3 +- + drivers/remoteproc/qcom_q6v5_mss.c | 54 +- + drivers/remoteproc/qcom_q6v5_pas.c | 105 +- + drivers/remoteproc/qcom_sysmon.c | 16 +- + drivers/remoteproc/qcom_wcnss.c | 10 +- + drivers/remoteproc/remoteproc_core.c | 24 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 + + drivers/rpmsg/mtk_rpmsg.c | 2 + + drivers/rpmsg/qcom_glink_native.c | 10 +- + drivers/rpmsg/qcom_glink_ssr.c | 2 +- + drivers/rpmsg/qcom_smd.c | 9 +- + drivers/rpmsg/rpmsg_char.c | 7 +- + drivers/rpmsg/rpmsg_core.c | 3 +- + drivers/rpmsg/rpmsg_internal.h | 4 +- + drivers/soc/tegra/common.c | 49 +- + drivers/soc/tegra/pmc.c | 4 +- + drivers/thermal/Kconfig | 4 +- + drivers/thermal/intel/intel_tcc_cooling.c | 2 + + drivers/thermal/thermal_sysfs.c | 10 +- + drivers/tty/amiserial.c | 20 +- + drivers/tty/mips_ejtag_fdc.c | 4 +- + drivers/tty/n_gsm.c | 757 +++++++--- + drivers/tty/n_tty.c | 92 +- + drivers/tty/serial/8250/8250.h | 24 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 7 +- + drivers/tty/serial/8250/8250_bcm7271.c | 24 +- + drivers/tty/serial/8250/8250_core.c | 8 +- + drivers/tty/serial/8250/8250_dw.c | 68 +- + drivers/tty/serial/8250/8250_dwlib.c | 152 +- + drivers/tty/serial/8250/8250_early.c | 4 +- + drivers/tty/serial/8250/8250_exar.c | 25 +- + drivers/tty/serial/8250/8250_fintek.c | 31 +- + drivers/tty/serial/8250/8250_fsl.c | 4 +- + drivers/tty/serial/8250/8250_ingenic.c | 2 +- + drivers/tty/serial/8250/8250_lpc18xx.c | 28 +- + drivers/tty/serial/8250/8250_lpss.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 1 + + drivers/tty/serial/8250/8250_omap.c | 7 +- + drivers/tty/serial/8250/8250_pci.c | 135 +- + drivers/tty/serial/8250/8250_pericom.c | 2 +- + drivers/tty/serial/8250/8250_port.c | 157 +- + drivers/tty/serial/8250/Kconfig | 1 + + drivers/tty/serial/Kconfig | 18 +- + drivers/tty/serial/Makefile | 1 - + drivers/tty/serial/amba-pl011.c | 15 +- + drivers/tty/serial/ar933x_uart.c | 27 +- + drivers/tty/serial/atmel_serial.c | 103 +- + drivers/tty/serial/earlycon.c | 3 + + drivers/tty/serial/fsl_lpuart.c | 67 +- + drivers/tty/serial/imx.c | 21 +- + drivers/tty/serial/kgdboc.c | 2 +- + drivers/tty/serial/max310x.c | 272 +++- + drivers/tty/serial/mcf.c | 10 +- + drivers/tty/serial/meson_uart.c | 2 +- + drivers/tty/serial/msm_serial.c | 550 +++---- + drivers/tty/serial/mux.c | 6 - + drivers/tty/serial/mvebu-uart.c | 11 + + drivers/tty/serial/omap-serial.c | 18 +- + drivers/tty/serial/owl-uart.c | 2 +- + drivers/tty/serial/pch_uart.c | 7 +- + drivers/tty/serial/pic32_uart.c | 4 +- + drivers/tty/serial/pmac_zilog.c | 1 - + drivers/tty/serial/pxa.c | 5 +- + drivers/tty/serial/qcom_geni_serial.c | 88 +- + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/samsung_tty.c | 90 +- + drivers/tty/serial/sc16is7xx.c | 10 +- + drivers/tty/serial/serial-tegra.c | 5 +- + drivers/tty/serial/serial_core.c | 452 ++++-- + drivers/tty/serial/serial_mctrl_gpio.c | 48 + + drivers/tty/serial/sifive.c | 10 - + drivers/tty/serial/st-asc.c | 1 - + drivers/tty/serial/stm32-usart.c | 79 +- + drivers/tty/serial/stm32-usart.h | 68 - + drivers/tty/serial/sunsu.c | 4 +- + drivers/tty/serial/ucc_uart.c | 2 + + drivers/tty/serial/vr41xx_siu.c | 934 ------------ + drivers/tty/tty_buffer.c | 59 +- + drivers/tty/tty_io.c | 2 +- + drivers/tty/tty_ioctl.c | 4 + + drivers/tty/tty_port.c | 21 + + drivers/tty/vt/Makefile | 2 +- + drivers/tty/vt/consolemap.c | 684 +++++---- + drivers/tty/vt/defkeymap.c_shipped | 6 +- + drivers/tty/vt/selection.c | 3 +- + drivers/tty/vt/vt.c | 16 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 2 +- + drivers/video/console/vgacon.c | 12 +- + drivers/video/fbdev/core/fbcon.c | 8 +- + drivers/watchdog/armada_37xx_wdt.c | 2 + + drivers/watchdog/bcm7038_wdt.c | 8 +- + drivers/watchdog/booke_wdt.c | 2 +- + drivers/watchdog/dw_wdt.c | 8 +- + drivers/watchdog/f71808e_wdt.c | 4 +- + drivers/watchdog/max77620_wdt.c | 4 +- + drivers/watchdog/mtk_wdt.c | 10 +- + drivers/watchdog/pc87413_wdt.c | 2 +- + drivers/watchdog/pm8916_wdt.c | 41 +- + drivers/watchdog/realtek_otto_wdt.c | 1 + + drivers/watchdog/s3c2410_wdt.c | 9 +- + drivers/watchdog/sama5d4_wdt.c | 8 +- + drivers/watchdog/sp5100_tco.c | 1 + + drivers/watchdog/sp805_wdt.c | 5 + + drivers/watchdog/st_lpc_wdt.c | 9 +- + drivers/watchdog/tegra_wdt.c | 14 +- + drivers/watchdog/wdat_wdt.c | 7 +- + fs/attr.c | 2 + + fs/exfat/exfat_fs.h | 19 +- + fs/exfat/fatent.c | 2 +- + fs/exfat/file.c | 82 +- + fs/exfat/inode.c | 41 +- + fs/exfat/misc.c | 17 - + fs/exfat/namei.c | 22 +- + fs/exfat/nls.c | 4 +- + fs/exfat/super.c | 4 +- + fs/f2fs/compress.c | 229 ++- + fs/f2fs/data.c | 82 +- + fs/f2fs/debug.c | 2 +- + fs/f2fs/f2fs.h | 102 +- + fs/f2fs/file.c | 79 +- + fs/f2fs/gc.c | 11 +- + fs/f2fs/gc.h | 21 +- + fs/f2fs/inode.c | 3 +- + fs/f2fs/node.c | 14 +- + fs/f2fs/segment.c | 79 +- + fs/f2fs/segment.h | 11 +- + fs/f2fs/super.c | 90 +- + fs/f2fs/sysfs.c | 56 + + fs/fuse/control.c | 4 +- + fs/fuse/dax.c | 2 +- + fs/fuse/dir.c | 16 +- + fs/fuse/file.c | 39 +- + fs/fuse/inode.c | 16 +- + fs/fuse/ioctl.c | 15 +- + fs/fuse/virtio_fs.c | 9 +- + fs/overlayfs/export.c | 2 +- + fs/overlayfs/inode.c | 4 +- + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 6 + + fs/overlayfs/super.c | 13 +- + fs/super.c | 33 +- + include/asm-generic/bitops/generic-non-atomic.h | 161 ++ + .../asm-generic/bitops/instrumented-non-atomic.h | 35 +- + include/asm-generic/bitops/non-atomic.h | 121 +- + .../bitops/non-instrumented-non-atomic.h | 16 + + include/linux/bitmap.h | 37 +- + include/linux/bitops.h | 50 + + include/linux/console_struct.h | 6 +- + include/linux/consolemap.h | 60 +- + include/linux/cpumask.h | 122 +- + include/linux/dma-map-ops.h | 3 + + include/linux/fs.h | 2 + + include/linux/gfp.h | 348 +---- + include/linux/gfp_types.h | 348 +++++ + include/linux/mailbox/mtk-cmdq-mailbox.h | 10 - + include/linux/nodemask.h | 24 +- + include/linux/pm_opp.h | 322 ++-- + include/linux/serial.h | 15 +- + include/linux/serial_8250.h | 7 +- + include/linux/serial_core.h | 364 ++++- + include/linux/serial_s3c.h | 2 +- + include/linux/tty_buffer.h | 1 + + include/linux/tty_ldisc.h | 14 + + include/linux/tty_port.h | 2 + + include/trace/events/power.h | 22 + + include/uapi/asm-generic/termbits-common.h | 1 + + include/uapi/linux/f2fs.h | 2 +- + include/uapi/linux/serial.h | 20 +- + include/uapi/linux/serial_core.h | 4 - + include/uapi/linux/serial_reg.h | 4 +- + init/Kconfig | 293 +--- + kernel/dma/coherent.c | 10 +- + kernel/module/Kconfig | 293 ++++ + kernel/module/decompress.c | 8 +- + kernel/module/internal.h | 2 +- + kernel/module/kallsyms.c | 41 +- + kernel/module/main.c | 43 +- + kernel/module/procfs.c | 2 +- + kernel/sysctl.c | 20 +- + lib/Makefile | 2 +- + lib/bitmap.c | 11 +- + lib/cpumask.c | 97 +- + lib/nodemask.c | 8 - + lib/test_bitmap.c | 68 + + scripts/coccinelle/api/alloc/zalloc-simple.cocci | 2 +- + scripts/coccinelle/api/atomic_as_refcounter.cocci | 2 +- + scripts/coccinelle/api/check_bq27xxx_data.cocci | 2 +- + scripts/coccinelle/api/d_find_alias.cocci | 2 +- + scripts/coccinelle/api/err_cast.cocci | 2 +- + scripts/coccinelle/api/kstrdup.cocci | 2 +- + scripts/coccinelle/api/memdup.cocci | 2 +- + scripts/coccinelle/api/memdup_user.cocci | 2 +- + scripts/coccinelle/api/pm_runtime.cocci | 2 +- + scripts/coccinelle/api/resource_size.cocci | 2 +- + scripts/coccinelle/free/clk_put.cocci | 2 +- + scripts/coccinelle/free/devm_free.cocci | 2 +- + scripts/coccinelle/free/ifnulldev_put.cocci | 55 + + scripts/coccinelle/free/iounmap.cocci | 2 +- + scripts/coccinelle/free/kfree.cocci | 2 +- + scripts/coccinelle/free/kfreeaddr.cocci | 2 +- + scripts/coccinelle/free/pci_free_consistent.cocci | 2 +- + .../iterators/device_node_continue.cocci | 2 +- + scripts/coccinelle/iterators/for_each_child.cocci | 2 +- + scripts/coccinelle/iterators/itnull.cocci | 2 +- + .../coccinelle/iterators/list_entry_update.cocci | 2 +- + scripts/coccinelle/iterators/use_after_iter.cocci | 2 +- + scripts/coccinelle/locks/call_kern.cocci | 2 +- + scripts/coccinelle/locks/double_lock.cocci | 2 +- + scripts/coccinelle/locks/flags.cocci | 2 +- + scripts/coccinelle/locks/mini_lock.cocci | 2 +- + scripts/coccinelle/misc/boolreturn.cocci | 59 - + scripts/coccinelle/misc/cstptr.cocci | 2 +- + scripts/coccinelle/misc/doubleinit.cocci | 2 +- + scripts/coccinelle/misc/ifcol.cocci | 2 +- + scripts/coccinelle/misc/newline_in_nl_msg.cocci | 2 +- + scripts/coccinelle/misc/noderef.cocci | 2 +- + scripts/coccinelle/misc/orplus.cocci | 2 +- + scripts/coccinelle/misc/returnvar.cocci | 2 +- + scripts/coccinelle/misc/semicolon.cocci | 2 +- + .../misc/{ifaddr.cocci => test_addr.cocci} | 6 +- + scripts/coccinelle/misc/warn.cocci | 2 +- + scripts/coccinelle/null/badzero.cocci | 2 +- + scripts/coccinelle/null/deref_null.cocci | 2 +- + scripts/coccinelle/null/eno.cocci | 2 +- + scripts/coccinelle/null/kmerr.cocci | 2 +- + scripts/coccinelle/tests/doublebitand.cocci | 2 +- + scripts/coccinelle/tests/doubletest.cocci | 2 +- + scripts/coccinelle/tests/odd_ptr_err.cocci | 2 +- + .../tests/unsigned_lesser_than_zero.cocci | 2 +- + scripts/module.lds.S | 2 + + tools/include/asm-generic/bitops/non-atomic.h | 34 +- + tools/include/linux/bitmap.h | 12 +- + tools/include/linux/bitops.h | 16 + + tools/lib/bitmap.c | 6 +- + tools/thermal/tmon/sysfs.c | 24 +- + 345 files changed, 9252 insertions(+), 6755 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm63138.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,glink-edge.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7180-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7280-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,smd-edge.yaml + create mode 100644 Documentation/devicetree/bindings/serial/mediatek,uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/mtk-uart.txt + create mode 100644 drivers/leds/blink/leds-bcm63138.c + delete mode 100644 drivers/tty/serial/vr41xx_siu.c + create mode 100644 include/asm-generic/bitops/generic-non-atomic.h + create mode 100644 include/asm-generic/bitops/non-instrumented-non-atomic.h + create mode 100644 include/linux/gfp_types.h + create mode 100644 kernel/module/Kconfig + create mode 100644 scripts/coccinelle/free/ifnulldev_put.cocci + delete mode 100644 scripts/coccinelle/misc/boolreturn.cocci + rename scripts/coccinelle/misc/{ifaddr.cocci => test_addr.cocci} (87%) +Merging fixes/fixes (4a57a8400075 vf/remap: return the amount of bytes actually deduplicated) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (b2f4c6e29531 mm/smaps: don't access young/dirty bit if pte unpresent) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging .mailmap +Auto-merging fs/proc/task_mmu.c +Auto-merging mm/hugetlb.c +Auto-merging mm/page-writeback.c +Auto-merging mm/shmem.c +Auto-merging mm/vmscan.c +Merge made by the 'ort' strategy. + .mailmap | 2 ++ + fs/fs-writeback.c | 12 ++++++------ + fs/proc/task_mmu.c | 7 ++++--- + mm/backing-dev.c | 10 +++++----- + mm/hugetlb.c | 2 +- + mm/page-writeback.c | 6 +++++- + mm/shmem.c | 1 + + mm/vmscan.c | 10 ++++------ + 8 files changed, 28 insertions(+), 22 deletions(-) +Merging kbuild-current/fixes (32346491ddf2 Linux 5.19-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Auto-merging arch/arc/kernel/smp.c +Merge made by the 'ort' strategy. + arch/arc/boot/dts/axc003.dtsi | 4 ++-- + arch/arc/boot/dts/axc003_idu.dtsi | 4 ++-- + arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++-- + arch/arc/boot/dts/hsdk.dts | 4 ++-- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- + arch/arc/include/asm/bitops.h | 4 ++-- + arch/arc/include/asm/entry-compact.h | 2 +- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/cache.c | 4 ++-- + 9 files changed, 15 insertions(+), 15 deletions(-) +Merging arm-current/fixes (ec85bd369fd2 ARM: findbit: fix overflowing offset) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (410982303772 arm64: hugetlb: Restore TLB invalidation for BBM on contiguous ptes) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (879bcfc4e536 Merge tag 'asahi-soc-maintainers-5.20' of https://github.com/AsahiLinux/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (1332661e0930 memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings) +$ 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 tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (918e75f77af7 s390/archrandom: prevent CPACF trng invocations in interrupt context) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (f574f7f839fc net: bpf: Use the protocol's set_rcvlowat behavior if there is one) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/networking/bonding.rst | 9 - + MAINTAINERS | 2 +- + drivers/net/bonding/bond_main.c | 35 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 1 - + drivers/net/ethernet/broadcom/genet/bcmmii.c | 3 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 6 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 15 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 19 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 1 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 + + drivers/net/ethernet/wangxun/Kconfig | 6 +- + drivers/net/phy/phy_device.c | 6 + + drivers/net/tap.c | 20 +- + drivers/net/veth.c | 4 - + drivers/net/virtio_net.c | 5 +- + include/net/bonding.h | 13 +- + net/ax25/ax25_timer.c | 4 +- + net/core/filter.c | 5 +- + net/ipv6/seg6_local.c | 10 +- + net/mptcp/protocol.c | 47 ++- + net/mptcp/protocol.h | 13 +- + net/mptcp/subflow.c | 3 +- + net/netfilter/Kconfig | 3 +- + net/netfilter/nf_tables_core.c | 21 +- + net/sched/sch_generic.c | 8 +- + tools/testing/selftests/net/.gitignore | 3 +- + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 26 +- + tools/testing/selftests/net/tap.c | 434 +++++++++++++++++++++ + .../selftests/netfilter/nft_trans_stress.sh | 81 +++- + 31 files changed, 683 insertions(+), 127 deletions(-) + create mode 100644 tools/testing/selftests/net/tap.c +Merging bpf/master (19f68ed6dc90 bpf, arm64: Allocate program buffer using kvcalloc instead of kcalloc) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + Documentation/bpf/bpf_design_QA.rst | 25 ++++++ + arch/arm64/net/bpf_jit_comp.c | 4 +- + include/linux/bpfptr.h | 8 +- + include/net/mptcp.h | 4 + + kernel/bpf/syscall.c | 7 +- + kernel/bpf/trampoline.c | 5 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 95 ++++++++++++++++++++++ + 7 files changed, 139 insertions(+), 9 deletions(-) +Merging ipsec/master (6aa811acdb76 xfrm: clone missing x->lastused in xfrm_do_migrate) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Auto-merging include/uapi/linux/xfrm.h +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'ort' strategy. + include/uapi/linux/xfrm.h | 2 +- + net/xfrm/xfrm_input.c | 1 - + net/xfrm/xfrm_output.c | 1 - + net/xfrm/xfrm_policy.c | 1 + + net/xfrm/xfrm_state.c | 1 + + 5 files changed, 3 insertions(+), 3 deletions(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/for-next (f01272ee3856 wifi: wilc1000: fix spurious inline in wilc_handle_disconnect()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/microchip/wilc1000/hif.c | 2 +- + drivers/net/wireless/microchip/wilc1000/hif.h | 3 ++- + net/wireless/sme.c | 8 +++++--- + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging rdma-fixes/for-rc (cc0315564d6e RDMA/irdma: Fix sleep from invalid context BUG) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (f83bb2592482 ALSA: hda/conexant: Add quirk for LENOVO 20149 Notebook model) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/patch_conexant.c | 11 ++++++++++- + sound/pci/hda/patch_realtek.c | 11 +++++++++++ + sound/pci/ice1712/quartet.c | 2 +- + 3 files changed, 22 insertions(+), 2 deletions(-) +Merging sound-asoc-fixes/for-linus (f16e5a31c0a9 Merge remote-tracking branch 'asoc/for-5.19' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Auto-merging sound/soc/sh/rcar/ssiu.c +Merge made by the 'ort' strategy. + sound/soc/amd/yc/acp6x-mach.c | 28 ++++++++++++++++++++++++++++ + sound/soc/intel/avs/pcm.c | 4 ++-- + sound/soc/intel/boards/sof_es8336.c | 4 +++- + sound/soc/sh/rz-ssi.c | 26 +++++++++++++++----------- + sound/soc/soc-pcm.c | 3 +++ + sound/soc/sof/debug.c | 6 +++--- + sound/soc/sof/intel/hda.c | 2 +- + sound/soc/sof/ipc3-topology.c | 2 +- + 8 files changed, 56 insertions(+), 19 deletions(-) +Merging regmap-fixes/for-linus (3f05010f243b regmap-irq: Fix offset/index mismatch in read_sub_irq_data()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (b0de7fa70650 regulator: pca9450: Remove restrictions for regulator-name) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/regulator/nxp,pca9450-regulator.yaml | 11 ----------- + 1 file changed, 11 deletions(-) +Merging spi-fixes/for-linus (4188e495dd66 Merge remote-tracking branch 'spi/for-5.19' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi-bcm2835.c +Auto-merging drivers/spi/spi.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/spi/spi.c | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (ff6992735ade Linux 5.19-rc7) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (ff6992735ade Linux 5.19-rc7) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (b3e6b165f59f iio: adc: mcp3911: use correct formula for AD conversion) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/mcp3911.c | 30 ++++++++++++++++++++++++------ + drivers/iio/light/cm3605.c | 6 ++++-- + 2 files changed, 28 insertions(+), 8 deletions(-) +Merging counter-fixes/fixes-togreg (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes-togreg' of https://gitlab.com/vilhelmgray/counter.git counter-fixes/fixes-togreg +Already up to date. +Merging char-misc.current/char-misc-linus (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (8bb5e7f4dcd9 Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Auto-merging drivers/input/touchscreen/wm97xx-core.c +Auto-merging include/uapi/linux/input.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/adc-joystick.yaml | 2 +- + .../devicetree/bindings/input/adc-keys.txt | 67 - + .../devicetree/bindings/input/adc-keys.yaml | 103 ++ + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 5 +- + .../devicetree/bindings/input/ariel-pwrbutton.yaml | 1 + + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 41 +- + .../bindings/input/fsl,mpr121-touchkey.yaml | 4 +- + .../devicetree/bindings/input/gpio-keys.yaml | 167 ++- + Documentation/devicetree/bindings/input/input.yaml | 24 +- + .../devicetree/bindings/input/iqs269a.yaml | 17 +- + .../devicetree/bindings/input/iqs626a.yaml | 13 +- + .../devicetree/bindings/input/iqs62x-keys.yaml | 9 +- + .../devicetree/bindings/input/max77650-onkey.yaml | 8 +- + .../bindings/input/microchip,cap11xx.yaml | 2 +- + .../bindings/input/touchscreen/edt-ft5x06.yaml | 8 + + drivers/input/input-core-private.h | 16 + + drivers/input/input-mt.c | 48 +- + drivers/input/input.c | 149 +-- + drivers/input/joystick/adc-joystick.c | 15 +- + drivers/input/joystick/sensehat-joystick.c | 4 +- + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/adp5588-keys.c | 206 ++-- + drivers/input/keyboard/cros_ec_keyb.c | 89 +- + drivers/input/keyboard/mt6779-keypad.c | 18 +- + drivers/input/keyboard/mtk-pmic-keys.c | 98 +- + drivers/input/keyboard/omap4-keypad.c | 26 +- + drivers/input/misc/iqs7222.c | 178 ++- + drivers/input/mouse/cyapa_gen6.c | 2 +- + drivers/input/mouse/gpio_mouse.c | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 1282 ++++++++++++-------- + drivers/input/touchscreen/edt-ft5x06.c | 96 +- + drivers/input/touchscreen/exc3000.c | 7 +- + drivers/input/touchscreen/goodix.c | 22 +- + drivers/input/touchscreen/zinitix.c | 112 +- + 34 files changed, 1709 insertions(+), 1134 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/adc-keys.txt + create mode 100644 Documentation/devicetree/bindings/input/adc-keys.yaml + create mode 100644 drivers/input/input-core-private.h +Merging crypto-current/master (af5d35b83f64 crypto: tcrypt - Remove the static variable initialisations to NULL) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (afe4e376ac5d vfio: Move IOMMU_CAP_CACHE_COHERENCY test to after we know we have a group) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (9b4d5c01eb23 selftests: make use of GUP_TEST_FILE macro) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (e69a66147d49 module: kallsyms: Ensure preemption in add_kallsyms() with PREEMPT_RT) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (607a48c78e6b dt-bindings: dma: allwinner,sun50i-a64-dma: Fix min/max typo) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://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 (0fddf9ad06fd mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (3bcc2c1eade4 media: rkvdec: Disable H.264 error detection) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Auto-merging drivers/media/i2c/Kconfig +Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c +Auto-merging drivers/staging/media/rkvdec/rkvdec-h264.c +Merge made by the 'ort' strategy. + drivers/media/dvb-core/dvb_vb2.c | 11 +++++++++ + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 9 +++----- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 ++ + drivers/media/v4l2-core/v4l2-ioctl.c | 26 ++++++++++------------ + drivers/staging/media/rkvdec/rkvdec-h264.c | 4 ++-- + 5 files changed, 30 insertions(+), 22 deletions(-) +Merging reset-fixes/reset/fixes (a57f68ddc886 reset: Fix devm bulk optional exclusive control getter) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (88084a3df167 Linux 5.19-rc5) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (ef0324b6415d ARM: dts: lan966x: fix sys_clk frequency) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2eb502f496f7 ARM: dts: am33xx: Fix MMCHS0 dma properties) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/am33xx-l4.dtsi | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging kvm-fixes/master (cf5029d5dd7c KVM: x86: Protect the unused bits in MSR exiting flags) +$ 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 (cf5029d5dd7c KVM: x86: Protect the unused bits in MSR exiting flags) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (da519304c1ad hwmon: (lm90) Fix error return value from detect function) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/lm90.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (17d9c15c9b9e fsdax: Fix infinite loop in dax_iomap_rw()) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Auto-merging drivers/nvdimm/pmem.c +Auto-merging fs/dax.c +Merge made by the 'ort' strategy. + drivers/nvdimm/namespace_devs.c | 2 - + drivers/nvdimm/pmem.c | 6 +-- + fs/dax.c | 3 ++ + tools/testing/nvdimm/test/ndtest.c | 77 -------------------------------------- + 4 files changed, 6 insertions(+), 82 deletions(-) +Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (af39011ec0c7 Merge branch 'misc-5.19' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/tree-log.c +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (c3497fd009ef fix short copy handling in copy_mc_pipe_to_iter()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (5ad26161a371 ACPI: video: Fix acpi_video_handles_brightness_key_presses()) +$ git merge -m Merge branch 'fixes' of git://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 (c4c79525042a ARM: exynos: Fix refcount leak in exynos_map_pmu) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (0b9431c8221c dt-bindings: display: arm,malidp: remove bogus RQOS property) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (f5c2976e0cb0 scsi: ufs: core: Fix a race condition related to device management) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (51189eb9ddc8 mmc: sdhci-omap: Fix a lockdep warning for PM runtime init) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'ort' strategy. +Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (49d6a3c062a1 x86/Hyper-V: Add SEV negotiate protocol support in Isolation VM) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (88bd24d73d5b riscv: compat: vdso: Fix vdso_install target) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging risc-v-mc-fixes/dt-fixes (efa310ba0071 riscv: dts: microchip: hook up the mpfs' l2cache) +$ git merge -m Merge branch 'dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc-fixes/dt-fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'spdx-linus' of git://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 (e0dccc3b76fb Linux 5.19-rc8) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (b93a8b2c5161 gpio: dln2: make irq_chip immutable) +$ git merge -m Merge branch 'fixes' of git://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 (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (1197eb5906a5 lockd: fix nlm_close_files) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (fda7409a8fcf irqchip/loongson-pch-pic: Move find_pch_pic() into CONFIG_ACPI) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Merge made by the 'ort' strategy. + arch/loongarch/include/asm/irq.h | 1 - + drivers/iommu/hyperv-iommu.c | 4 +--- + drivers/irqchip/irq-loongson-eiointc.c | 10 ++++++--- + drivers/irqchip/irq-loongson-pch-pic.c | 38 +++++++++++++++++----------------- + 4 files changed, 27 insertions(+), 26 deletions(-) +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (a26f045984e7 Merge branch 'devicetree/fixes' into fixes) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Merge made by the 'ort' strategy. +Merging perf-current/perf/urgent (bb83c99d3d0a Merge tag 'perf-tools-fixes-for-v5.19-2022-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (aa6d1ed107eb efi/x86: libstub: Fix typo in __efi64_argmap* name) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + include/linux/zstd_lib.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging battery-fixes/fixes (093d27bb6f2d power: supply: core: Fix boundary conditions in interpolation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (91b3c8dbe898 drm/meson: Fix refcount bugs in meson_vpu_has_available_connectors()) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 -- + drivers/gpu/drm/meson/meson_drv.c | 5 ++++- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 22 ++++++++++++++++++++++ + 3 files changed, 26 insertions(+), 3 deletions(-) +Merging kbuild/for-next (672fb6740cbf modpost: remove .symbol_white_list field entirely) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging init/Kconfig +Auto-merging scripts/mod/modpost.c +Merge made by the 'ort' strategy. + Documentation/kbuild/kconfig-language.rst | 2 +- + MAINTAINERS | 1 - + Makefile | 18 +- + arch/arc/configs/axs101_defconfig | 1 - + arch/arc/configs/axs103_defconfig | 1 - + arch/arc/configs/axs103_smp_defconfig | 1 - + arch/arc/configs/haps_hs_defconfig | 1 - + arch/arc/configs/haps_hs_smp_defconfig | 1 - + arch/arc/configs/hsdk_defconfig | 1 - + arch/arc/configs/nsim_700_defconfig | 1 - + arch/arc/configs/nsimosci_defconfig | 1 - + arch/arc/configs/nsimosci_hs_defconfig | 1 - + arch/arc/configs/nsimosci_hs_smp_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + arch/arc/configs/vdk_hs38_defconfig | 1 - + arch/arc/configs/vdk_hs38_smp_defconfig | 1 - + certs/Makefile | 14 +- + certs/blacklist_hashes.c | 1 - + certs/blacklist_nohashes.c | 6 - + {scripts => certs}/check-blacklist-hashes.awk | 0 + init/Kconfig | 16 +- + scripts/Kconfig.include | 2 +- + scripts/Makefile.build | 5 +- + scripts/Makefile.compiler | 2 +- + scripts/Makefile.extrawarn | 1 - + scripts/Makefile.modinst | 3 + + scripts/Makefile.package | 4 +- + scripts/checkstack.pl | 4 + + .../dummy-plugin-dir/include/plugin-version.h | 0 + scripts/dummy-tools/gcc | 8 +- + scripts/headers_install.sh | 2 - + scripts/kconfig/qconf-cfg.sh | 1 + + scripts/mod/file2alias.c | 4 +- + scripts/mod/modpost.c | 281 ++++----------------- + scripts/mod/modpost.h | 33 ++- + scripts/package/mkspec | 3 + + 36 files changed, 111 insertions(+), 313 deletions(-) + delete mode 100644 certs/blacklist_nohashes.c + rename {scripts => certs}/check-blacklist-hashes.awk (100%) + create mode 100644 scripts/dummy-tools/dummy-plugin-dir/include/plugin-version.h +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ 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/core (bb8bc52e7578 perf stat: Refactor __run_perf_stat() common code) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ 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/for-next (5c850d31880e swiotlb: fix passing local variable to debugfs_create_ulong()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (82dc270146a8 Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging include/asm-generic/io.h +Auto-merging tools/include/uapi/asm-generic/fcntl.h +Merge made by the 'ort' strategy. +Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (3eaecd0677e1 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (892f7237b3ff arm64: Delay initialisation of cpuinfo_arm64::reg_{zcr,smcr}) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING) +$ git merge -m Merge branch 'for-next/perf' of git://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 (87a5b37a8f02 Merge branch 'arm/late' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/boot/dts/at91-sam9x60ek.dts +Auto-merging arch/arm/boot/dts/at91-sama5d2_icp.dts +Auto-merging arch/arm/boot/dts/imx6ull-colibri.dtsi +Auto-merging arch/arm/boot/dts/imx7d-smegw01.dts +Auto-merging arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi +Auto-merging arch/arm/boot/dts/lan966x.dtsi +Auto-merging arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi +Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi +Auto-merging arch/arm/boot/dts/sama5d2.dtsi +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/mxs_defconfig +Auto-merging arch/arm/mach-davinci/Kconfig +Auto-merging arch/arm/mach-dove/Kconfig +Auto-merging arch/arm/mach-orion5x/Kconfig +Auto-merging arch/arm/mach-s3c/Kconfig.s3c24xx +Auto-merging arch/arm/mach-s3c/Kconfig.s3c64xx +CONFLICT (content): Merge conflict in arch/arm/mach-s3c/Kconfig.s3c64xx +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/reset/Makefile +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 246 +++++++++++++++++++++++++++++++++ + 1 file changed, 246 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (147c83586707 Merge branch 'v5.20/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging aspeed/for-next (bfcbea2c93e5 ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. +Merging at91/at91-next (38b729bf1ee6 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi +Auto-merging arch/arm/boot/dts/lan966x.dtsi +Auto-merging arch/arm/boot/dts/sama5d2.dtsi +Merge made by the 'ort' strategy. + drivers/clk/at91/dt-compat.c | 108 +++++++++++++++++++++++++++++++++---------- + 1 file changed, 84 insertions(+), 24 deletions(-) +Merging broadcom/next (ade0d6ecf54a Merge branch 'drivers/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/bcm4908/bcm4908-asus-gt-ac5300.dts +Auto-merging arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi +Auto-merging drivers/soc/bcm/brcmstb/pm/pm-arm.c +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm5301x.dtsi | 12 ++++ + .../broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 48 +++++++++++++ + arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 83 ++++++++++++++++++++++ + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 16 ++++- + 4 files changed, 157 insertions(+), 2 deletions(-) +Merging drivers-memory/for-next (1b33eb4acdc8 Merge branch 'for-v5.20/mem-ctrl-next-late' into for-next) +$ 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 +Auto-merging drivers/memory/mtk-smi.c +Merge made by the 'ort' strategy. + drivers/memory/dfl-emif.c | 62 ++++++++++++++++++++++++++++++++++++++++++---- + drivers/memory/of_memory.c | 2 ++ + drivers/memory/pl353-smc.c | 1 + + 3 files changed, 60 insertions(+), 5 deletions(-) +Merging imx-mxs/for-next (37960df982d0 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/boot/dts/imx6qdl-colibri.dtsi +Auto-merging arch/arm/boot/dts/imx6qdl.dtsi +Auto-merging arch/arm/boot/dts/imx6ull-colibri.dtsi +Auto-merging arch/arm/boot/dts/imx7d-smegw01.dts +Auto-merging arch/arm/boot/dts/imx7s.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp.dtsi +Auto-merging drivers/soc/imx/imx8m-blk-ctrl.c +Merge made by the 'ort' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (5281655db0e1 Merge branch 'v5.19-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (bc50bfd4f018 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (ad2fe4582c48 Merge branches 'omap-for-v5.20/omap1', 'omap-for-v5.20/ti-sysc' and 'omap-for-v5.20/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging arch/arm/mach-omap1/Kconfig +Auto-merging arch/arm/mach-omap1/timer.c +Merge made by the 'ort' strategy. + arch/arm/mach-omap1/Kconfig | 22 +++++++++++----------- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/omap4-common.c | 1 + + drivers/bus/ti-sysc.c | 3 +++ + 4 files changed, 16 insertions(+), 12 deletions(-) +Merging qcom/for-next (58b9ca29ff61 Merge branches 'arm64-for-5.20', 'arm64-defconfig-for-5.20', 'clk-for-5.20', 'dts-for-5.20', 'dts-fixes-for-5.19' and 'drivers-for-5.20' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi +Merge made by the 'ort' strategy. +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts +Merge made by the 'ort' strategy. +Merging renesas/next (b5468cb7909f Merge branches 'renesas-arm-dt-for-v5.20' and 'renesas-dt-bindings-for-v5.20' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") +$ 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 (2e1170c71ec0 Merge branch 'v5.20-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +Merge made by the 'ort' strategy. +Merging samsung-krzk/for-next (5642cb8ce0f1 Merge branch 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging arch/arm64/boot/dts/exynos/exynos7885.dtsi +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (4b43ff02d2a4 ARM: dts: stm32: Add ST MIPID02 bindings to AV96) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32mp131.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging sunxi/sunxi/for-next (3a83b092dd59 Merge branch 'sunxi/dt-for-5.20' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging drivers/tee/tee_shm.c +Merge made by the 'ort' strategy. +Merging tegra/for-next (393c6c3a6152 Merge branch for-5.20/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + drivers/soc/tegra/Kconfig | 11 +- + drivers/soc/tegra/Makefile | 1 + + drivers/soc/tegra/cbb/Makefile | 9 + + drivers/soc/tegra/cbb/tegra-cbb.c | 190 +++ + drivers/soc/tegra/cbb/tegra194-cbb.c | 2365 ++++++++++++++++++++++++++++++++ + drivers/soc/tegra/cbb/tegra234-cbb.c | 1114 +++++++++++++++ + drivers/soc/tegra/fuse/fuse-tegra.c | 16 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 36 +- + include/soc/tegra/fuse.h | 7 + + include/soc/tegra/tegra-cbb.h | 47 + + 10 files changed, 3791 insertions(+), 5 deletions(-) + create mode 100644 drivers/soc/tegra/cbb/Makefile + create mode 100644 drivers/soc/tegra/cbb/tegra-cbb.c + create mode 100644 drivers/soc/tegra/cbb/tegra194-cbb.c + create mode 100644 drivers/soc/tegra/cbb/tegra234-cbb.c + create mode 100644 include/soc/tegra/tegra-cbb.h +Merging ti/ti-next (62b9e4033c13 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging clk/clk-next (08fc500fe3d4 Merge branch 'clk-allwinner' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (c196175acdd3 clk: imx: clk-fracn-gppll: Add more freq config for video pll) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (0e704f6c42dc clk: renesas: rcar-gen4: Fix initconst confusion for cpg_pll_config) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (45fef4c4b9c9 csky: abiv1: Fixup compile error) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (77ddc4aab526 LoongArch: Add efistub booting support) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/include/asm/irq.h +Auto-merging arch/loongarch/include/asm/stacktrace.h +Auto-merging arch/loongarch/include/asm/uaccess.h +Auto-merging arch/loongarch/kernel/asm-offsets.c +Auto-merging arch/loongarch/kernel/head.S +Auto-merging arch/loongarch/kernel/switch.S +Auto-merging drivers/acpi/bus.c +Auto-merging drivers/firmware/efi/Kconfig +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/irqchip/irq-gic-v3.c +Auto-merging include/linux/acpi.h +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 22 ++++ + arch/loongarch/Kconfig.debug | 29 ++++ + arch/loongarch/Makefile | 7 + + arch/loongarch/boot/Makefile | 4 + + arch/loongarch/include/asm/dma.h | 11 ++ + arch/loongarch/include/asm/inst.h | 52 ++++++++ + arch/loongarch/include/asm/irq.h | 8 -- + arch/loongarch/include/asm/page.h | 2 - + arch/loongarch/include/asm/pci.h | 25 ++++ + arch/loongarch/include/asm/processor.h | 9 ++ + arch/loongarch/include/asm/stacktrace.h | 20 +++ + arch/loongarch/include/asm/switch_to.h | 14 +- + arch/loongarch/include/asm/uaccess.h | 4 +- + arch/loongarch/include/asm/unwind.h | 42 ++++++ + arch/loongarch/include/asm/vdso.h | 1 + + arch/loongarch/include/asm/vdso/vdso.h | 15 ++- + arch/loongarch/kernel/Makefile | 4 + + arch/loongarch/kernel/acpi.c | 18 +++ + arch/loongarch/kernel/asm-offsets.c | 2 + + arch/loongarch/kernel/efi-header.S | 101 ++++++++++++++ + arch/loongarch/kernel/efi.c | 126 +++++++++++++++++- + arch/loongarch/kernel/head.S | 26 ++++ + arch/loongarch/kernel/image-vars.h | 29 ++++ + arch/loongarch/kernel/process.c | 90 ++++++++++++- + arch/loongarch/kernel/stacktrace.c | 78 +++++++++++ + arch/loongarch/kernel/switch.S | 2 + + arch/loongarch/kernel/time.c | 2 +- + arch/loongarch/kernel/traps.c | 24 ++-- + arch/loongarch/kernel/unwind_guess.c | 67 ++++++++++ + arch/loongarch/kernel/unwind_prologue.c | 176 +++++++++++++++++++++++++ + arch/loongarch/kernel/vdso.c | 25 ++-- + arch/loongarch/kernel/vmlinux.lds.S | 1 + + arch/loongarch/pci/acpi.c | 175 ++++++++++++++++++++++++ + arch/loongarch/pci/pci.c | 101 ++++++++++++++ + arch/loongarch/vdso/Makefile | 2 +- + arch/loongarch/vdso/vdso.lds.S | 1 + + arch/loongarch/vdso/vgetcpu.c | 43 ++++++ + drivers/firmware/efi/Kconfig | 2 +- + drivers/firmware/efi/libstub/Makefile | 10 ++ + drivers/firmware/efi/libstub/efi-stub-helper.c | 2 +- + drivers/firmware/efi/libstub/efi-stub.c | 4 +- + drivers/firmware/efi/libstub/loongarch-stub.c | 90 +++++++++++++ + include/linux/efi.h | 1 + + include/linux/pe.h | 2 + + 44 files changed, 1422 insertions(+), 47 deletions(-) + create mode 100644 arch/loongarch/include/asm/dma.h + create mode 100644 arch/loongarch/include/asm/pci.h + create mode 100644 arch/loongarch/include/asm/unwind.h + create mode 100644 arch/loongarch/kernel/efi-header.S + create mode 100644 arch/loongarch/kernel/image-vars.h + create mode 100644 arch/loongarch/kernel/stacktrace.c + create mode 100644 arch/loongarch/kernel/unwind_guess.c + create mode 100644 arch/loongarch/kernel/unwind_prologue.c + create mode 100644 arch/loongarch/pci/acpi.c + create mode 100644 arch/loongarch/pci/pci.c + create mode 100644 arch/loongarch/vdso/vgetcpu.c + create mode 100644 drivers/firmware/efi/libstub/loongarch-stub.c +Merging m68k/for-next (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (472e68df4a5e m68k: Fix syntax errors in comments) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/coldfire/device.c | 6 +++--- + arch/m68k/coldfire/intc-2.c | 2 +- + arch/m68k/coldfire/m523x.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ 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 (74de14fe05dd MIPS: tlbex: Explicitly compare _PAGE_NO_EXEC against 0) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (52e0ea900202 openrisc: io: Define iounmap argument as volatile) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (3d7cb6b04c3f Linux 5.19) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (4cfa6ff24a97 powerpc/64e: Fix kexec build error) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (ba6cfef057e1 riscv: enable Docker requirements in defconfig) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging risc-v-mc/dt-for-next (88d319c6abae riscv: dts: microchip: Add mpfs' topology information) +$ git merge -m Merge branch 'dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git risc-v-mc/dt-for-next +Already up to date. +Merging s390/for-next (53897c8b7f82 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/kernel/setup.c +Auto-merging drivers/s390/crypto/ap_bus.c +Merge made by the 'ort' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (af3e16101cee um: include sys/types.h for size_t) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (0847d167d0f9 xtensa: enable ARCH_HAS_GCOV_PROFILE_ALL) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging MAINTAINERS +Auto-merging fs/inode.c +Auto-merging fs/namei.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/ceph/file.c | 4 --- + fs/inode.c | 34 ++++++++++++++++++++--- + fs/namei.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++-------- + fs/ocfs2/namei.c | 1 + + include/linux/fs.h | 2 ++ + 5 files changed, 102 insertions(+), 19 deletions(-) +Merging fscrypt/master (218d921b581e fscrypt: add new helper functions for test_dummy_encryption) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (26291c54e111 Linux 5.17-rc2) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (6130a25681d4 Merge branch 'for-next-next-v5.20-20220804' into for-next-20220804) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/super.c +Merge made by the 'ort' strategy. + fs/btrfs/block-group.c | 4 +- + fs/btrfs/ctree.c | 3 + + fs/btrfs/ctree.h | 100 +++++++++++++++++++++++-- + fs/btrfs/disk-io.c | 109 +++++++-------------------- + fs/btrfs/disk-io.h | 10 --- + fs/btrfs/extent-tree.c | 18 ++++- + fs/btrfs/extent_io.c | 11 ++- + fs/btrfs/file-item.c | 21 +++--- + fs/btrfs/file.c | 5 +- + fs/btrfs/free-space-cache.c | 16 ++++ + fs/btrfs/inode.c | 16 +++- + fs/btrfs/locking.c | 91 ++++++++++++++++++++++ + fs/btrfs/locking.h | 14 ++++ + fs/btrfs/ordered-data.c | 21 ++++++ + fs/btrfs/relocation.c | 9 ++- + fs/btrfs/scrub.c | 69 +++++++++++------ + fs/btrfs/super.c | 2 + + fs/btrfs/sysfs.c | 56 +++++--------- + fs/btrfs/transaction.c | 105 ++++++++++++++++++++++---- + fs/btrfs/tree-checker.c | 25 ++++++- + fs/btrfs/tree-log.c | 179 +++++--------------------------------------- + fs/btrfs/volumes.c | 3 + + fs/btrfs/volumes.h | 2 + + 23 files changed, 533 insertions(+), 356 deletions(-) +Merging ceph/master (a8af0d682ae0 libceph: clean up ceph_osdc_start_request prototype) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging drivers/block/rbd.c +Auto-merging fs/ceph/file.c +Auto-merging fs/crypto/fscrypt_private.h +Auto-merging fs/crypto/policy.c +Auto-merging fs/dcache.c +Auto-merging fs/inode.c +Auto-merging include/linux/dcache.h +Merge made by the 'ort' strategy. + drivers/block/rbd.c | 6 +- + fs/ceph/addr.c | 59 ++++++-------- + fs/ceph/caps.c | 38 ++++----- + fs/ceph/dir.c | 79 ++++++++++++++++--- + fs/ceph/file.c | 123 ++++++++++++------------------ + fs/ceph/inode.c | 13 +++- + fs/ceph/mds_client.c | 165 ++++++++++++++++++++++++++++++++++++++-- + fs/ceph/mds_client.h | 13 ++-- + fs/ceph/mdsmap.c | 22 +++++- + fs/ceph/super.c | 19 +++-- + fs/ceph/super.h | 31 ++++++-- + fs/ceph/xattr.c | 12 ++- + fs/crypto/fname.c | 36 +++++++-- + fs/crypto/fscrypt_private.h | 9 +-- + fs/crypto/hooks.c | 6 +- + fs/crypto/policy.c | 35 +++++++-- + fs/dcache.c | 15 +++- + fs/inode.c | 10 ++- + include/linux/ceph/ceph_fs.h | 8 +- + include/linux/ceph/mdsmap.h | 1 + + include/linux/ceph/osd_client.h | 5 +- + include/linux/dcache.h | 2 + + include/linux/fscrypt.h | 5 ++ + include/linux/mmdebug.h | 10 +++ + net/ceph/osd_client.c | 15 ++-- + net/ceph/osdmap.c | 32 ++++++-- + net/ceph/pagelist.c | 2 +- + 27 files changed, 538 insertions(+), 233 deletions(-) +Merging cifs/for-next (0d168a58fca3 cifs: update internal module number) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Already up to date. +Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (ecce9212d0fd erofs: update ctx->pos for every emitted dirent) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (df13a3477635 MAINTAINERS: Add Namjae's exfat git tree) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (5b02b6900c8d Pull fsnotify typo fix.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (d95efb14c0b8 ext4: add ioctls to get/set the ext4 superblock uuid) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (01fc4b9a6ed8 f2fs: use onstack pages instead of pvec) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/fsverity (8da572c52a9b fs-verity: mention btrfs support) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (247861c325c2 fuse: retire block-device-based superblock on force unmount) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (446279168e03 Merge part of branch 'for-next.instantiate' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (8f0541186e9a ksmbd: fix heap-based overflow in set_ntacl_dacl()) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging MAINTAINERS +Auto-merging fs/ksmbd/vfs.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/ksmbd/auth.c | 56 ++++++++++--------- + fs/ksmbd/auth.h | 11 ++-- + fs/ksmbd/connection.c | 9 +-- + fs/ksmbd/connection.h | 10 +--- + fs/ksmbd/mgmt/share_config.c | 14 ----- + fs/ksmbd/mgmt/share_config.h | 2 - + fs/ksmbd/mgmt/tree_connect.c | 5 +- + fs/ksmbd/mgmt/tree_connect.h | 4 +- + fs/ksmbd/mgmt/user_session.c | 95 +++++++++++++++++-------------- + fs/ksmbd/mgmt/user_session.h | 13 ++--- + fs/ksmbd/oplock.c | 46 +++++++++------ + fs/ksmbd/server.c | 8 ++- + fs/ksmbd/smb2misc.c | 12 ++-- + fs/ksmbd/smb2pdu.c | 112 ++++++++++++++++++++++++------------- + fs/ksmbd/smb_common.h | 2 +- + fs/ksmbd/smbacl.c | 130 +++++++++++++++++++++++++++++-------------- + fs/ksmbd/smbacl.h | 2 +- + fs/ksmbd/vfs.c | 8 ++- + fs/ksmbd/vfs_cache.c | 2 +- + 20 files changed, 322 insertions(+), 220 deletions(-) +Merging nfs/linux-next (2135e5d56278 NFSv4/pnfs: Fix a use-after-free bug in open) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/write.c +Auto-merging net/sunrpc/auth.c +Auto-merging net/sunrpc/backchannel_rqst.c +Merge made by the 'ort' strategy. + fs/nfs/blocklayout/dev.c | 42 ++---- + fs/nfs/client.c | 13 +- + fs/nfs/dir.c | 8 +- + fs/nfs/direct.c | 50 +++----- + fs/nfs/file.c | 2 - + fs/nfs/filelayout/filelayout.c | 2 + + fs/nfs/flexfilelayout/flexfilelayout.c | 4 + + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 +- + fs/nfs/fs_context.c | 26 ++-- + fs/nfs/internal.h | 51 ++++++++ + fs/nfs/nfs3client.c | 1 - + fs/nfs/nfs42xdr.c | 170 ++++++++++++------------ + fs/nfs/nfs4client.c | 4 +- + fs/nfs/nfs4idmap.c | 46 +++---- + fs/nfs/nfs4proc.c | 32 +++-- + fs/nfs/nfstrace.h | 128 ++++++++++++++++++ + fs/nfs/write.c | 50 +++++--- + include/linux/nfs_xdr.h | 1 + + include/linux/sunrpc/clnt.h | 5 + + include/linux/sunrpc/sched.h | 4 +- + include/linux/sunrpc/xdr.h | 7 +- + include/linux/sunrpc/xprt.h | 6 +- + include/linux/sunrpc/xprtmultipath.h | 7 +- + include/trace/events/sunrpc.h | 20 +++ + net/sunrpc/auth.c | 2 +- + net/sunrpc/auth_gss/auth_gss.c | 11 +- + net/sunrpc/backchannel_rqst.c | 14 ++ + net/sunrpc/clnt.c | 207 ++++++++++++++++++++++++++---- + net/sunrpc/sched.c | 1 + + net/sunrpc/sysfs.c | 28 +--- + net/sunrpc/xdr.c | 168 +++++++++++++++--------- + net/sunrpc/xprt.c | 59 +++++++-- + net/sunrpc/xprtmultipath.c | 111 +++++++++++++--- + net/sunrpc/xprtrdma/transport.c | 6 +- + net/sunrpc/xprtsock.c | 18 +-- + 35 files changed, 919 insertions(+), 391 deletions(-) +Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking()) +$ 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/for-next (9905ce116c9b NFSD: fix use-after-free on source server when doing inter-server copy) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging fs/nfsd/filecache.c +Auto-merging include/linux/sunrpc/xdr.h +Auto-merging include/trace/events/sunrpc.h +Merge made by the 'ort' strategy. + Documentation/fault-injection/fault-injection.rst | 7 + + fs/lockd/svc4proc.c | 12 +- + fs/lockd/svclock.c | 10 +- + fs/lockd/svcproc.c | 5 +- + fs/lockd/xdr4.c | 19 +- + fs/nfsd/acl.h | 6 +- + fs/nfsd/filecache.c | 749 +++++++++++++--------- + fs/nfsd/filecache.h | 11 +- + fs/nfsd/netns.h | 3 + + fs/nfsd/nfs2acl.c | 6 +- + fs/nfsd/nfs3acl.c | 4 +- + fs/nfsd/nfs3proc.c | 35 +- + fs/nfsd/nfs4acl.c | 46 +- + fs/nfsd/nfs4callback.c | 37 +- + fs/nfsd/nfs4proc.c | 330 +++++----- + fs/nfsd/nfs4state.c | 136 +++- + fs/nfsd/nfs4xdr.c | 123 ++-- + fs/nfsd/nfsctl.c | 21 +- + fs/nfsd/nfsd.h | 6 + + fs/nfsd/nfsfh.c | 27 +- + fs/nfsd/nfsfh.h | 58 +- + fs/nfsd/nfsproc.c | 27 +- + fs/nfsd/state.h | 1 - + fs/nfsd/trace.h | 327 ++++++++-- + fs/nfsd/vfs.c | 256 ++++---- + fs/nfsd/vfs.h | 33 +- + fs/nfsd/xdr4.h | 60 +- + include/linux/lockd/lockd.h | 1 + + include/linux/lockd/xdr.h | 2 + + include/linux/nfs_ssc.h | 2 +- + include/linux/sunrpc/xdr.h | 4 +- + include/trace/events/sunrpc.h | 14 +- + net/sunrpc/svc_xprt.c | 2 +- + 33 files changed, 1434 insertions(+), 946 deletions(-) +Merging ntfs3/master (451e45a0e6df fs/ntfs3: Make ni_ins_new_attr return error) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/fsntfs.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 557 ++++++++++++++++++++++++++++++++++++++++++++--------- + fs/ntfs3/bitmap.c | 7 +- + fs/ntfs3/file.c | 110 ++++++----- + fs/ntfs3/frecord.c | 128 ++++++++---- + fs/ntfs3/fslog.c | 4 +- + fs/ntfs3/fsntfs.c | 92 +++++---- + fs/ntfs3/index.c | 33 ++-- + fs/ntfs3/inode.c | 19 +- + fs/ntfs3/namei.c | 6 +- + fs/ntfs3/ntfs_fs.h | 16 +- + fs/ntfs3/record.c | 27 +-- + fs/ntfs3/run.c | 108 +++++++++-- + fs/ntfs3/super.c | 17 +- + fs/ntfs3/xattr.c | 33 ++-- + 14 files changed, 834 insertions(+), 323 deletions(-) +Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (4f1196288dfb ovl: fix spelling mistakes) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (aa7aeee16948 net/9p: Initialize the iounit field during fid creation) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (d62113303d69 xfs: Fix false ENOSPC when performing direct write on a delalloc extent in cow fork) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/xfs/xfs_reflink.c +Merge made by the 'ort' strategy. + fs/xfs/xfs_file.c | 22 +++--- + fs/xfs/xfs_log.c | 12 +++- + fs/xfs/xfs_qm.c | 5 ++ + fs/xfs/xfs_reflink.c | 198 ++++++++++++++++++++++++++++++++++++++++++--------- + 4 files changed, 192 insertions(+), 45 deletions(-) +Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (478af190cb6c iomap: remove iomap_writepage) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/iomap.h +Merge made by the 'ort' strategy. + fs/gfs2/aops.c | 26 -------------------------- + fs/gfs2/log.c | 5 ++--- + fs/iomap/buffered-io.c | 15 --------------- + fs/zonefs/super.c | 8 -------- + include/linux/iomap.h | 3 --- + 5 files changed, 2 insertions(+), 55 deletions(-) +Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (9de1f9c8ca51 Merge tag 'irq-core-2022-08-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging vfs/for-next (82c4fd03ef05 Merge branches 'work.misc' and 'work.iov_iter' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging arch/s390/include/asm/uaccess.h +Auto-merging block/bio.c +CONFLICT (content): Merge conflict in block/bio.c +Auto-merging block/fops.c +Auto-merging block/fops.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/ceph/file.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/misc.c +Auto-merging fs/direct-io.c +Auto-merging fs/fuse/file.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/io_uring.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/nfs/direct.c +Auto-merging fs/read_write.c +Auto-merging fs/splice.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/uio.h +Auto-merging lib/iov_iter.c +Auto-merging lib/iov_iter.c +Auto-merging mm/shmem.c +Auto-merging net/9p/client.c +CONFLICT (content): Merge conflict in net/9p/client.c +Auto-merging net/9p/trans_virtio.c +Auto-merging net/core/datagram.c +Auto-merging net/core/skmsg.c +Auto-merging net/tls/tls_sw.c +Resolved 'block/bio.c' using previous resolution. +Resolved 'net/9p/client.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2ecee2e3d5ef] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + block/bio.c | 25 +- + block/blk-map.c | 7 +- + block/fops.c | 6 +- + crypto/af_alg.c | 3 +- + crypto/algif_hash.c | 5 +- + drivers/vhost/scsi.c | 4 +- + fs/ceph/addr.c | 2 +- + fs/ceph/file.c | 5 +- + fs/cifs/file.c | 8 +- + fs/cifs/misc.c | 3 +- + fs/direct-io.c | 5 +- + fs/fuse/dev.c | 7 +- + fs/fuse/file.c | 5 +- + fs/gfs2/file.c | 2 +- + fs/hugetlbfs/inode.c | 31 +- + fs/iomap/direct-io.c | 2 +- + fs/nfs/direct.c | 8 +- + fs/proc_namespace.c | 2 +- + fs/read_write.c | 6 +- + fs/splice.c | 54 ++- + include/linux/pipe_fs_i.h | 20 -- + include/linux/uio.h | 35 +- + lib/iov_iter.c | 826 +++++++++++++++++++++------------------------- + mm/shmem.c | 2 +- + net/9p/client.c | 39 ++- + net/9p/protocol.c | 3 +- + net/9p/trans_virtio.c | 3 +- + net/core/datagram.c | 3 +- + net/core/skmsg.c | 3 +- + net/rds/message.c | 3 +- + net/tls/tls_sw.c | 4 +- + 31 files changed, 509 insertions(+), 622 deletions(-) +Merging printk/for-next (a7e796c88820 Merge branch 'for-5.20' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (c4f36c3ab065 Merge branch 'pci/header-cleanup-immutable') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (2c09d1443b9b pstore/zone: cleanup "rcnt" type) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (a60885b6a97b Merge branch 'for-5.20/uclogic' into for-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Already up to date. +Merging i2c/i2c/for-next (0c42dacaa607 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/busses/i2c-cadence.c +Auto-merging drivers/i2c/busses/i2c-mlxcpld.c +Auto-merging drivers/i2c/busses/i2c-npcm7xx.c +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (d2139dfca361 firmware: dmi: Use the proper accessor for the version field) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Merge made by the 'ort' strategy. + drivers/firmware/dmi_scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (da519304c1ad hwmon: (lm90) Fix error return value from detect function) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (339170d8d3da docs: efi-stub: Fix paths for x86 / arm stubs) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (485ade76c95a media: hantro: Remove dedicated control documentation) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (485ade76c95a media: hantro: Remove dedicated control documentation) +$ 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 (9851f9cb75d0 Merge branches 'thermal-tools', 'thermal-core' and 'thermal-intel' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging include/linux/acpi.h +Merge made by the 'ort' strategy. + drivers/acpi/property.c | 465 ++++++++++++++++++++++++++++++++---------------- + include/acpi/acpi_bus.h | 3 +- + include/linux/acpi.h | 2 +- + 3 files changed, 318 insertions(+), 152 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (33fe1cb20cf4 cpufreq: tegra194: Staticize struct tegra_cpufreq_soc instances) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (53f853d55e31 PM / devfreq: tegra30: Add error message for devm_devfreq_add_device()) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (1d95af02f230 venus: pm_helpers: Fix warning in OPP during probe) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (ad86429b42b4 thermal/of: Remove old OF code) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Auto-merging drivers/regulator/max8973-regulator.c +Auto-merging drivers/thermal/hisi_thermal.c +Auto-merging drivers/thermal/rcar_gen3_thermal.c +Auto-merging drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/thermal_sysfs.c +Merge made by the 'ort' strategy. + drivers/ata/ahci_imx.c | 15 +- + drivers/hwmon/hwmon.c | 14 +- + drivers/hwmon/pmbus/pmbus_core.c | 10 +- + drivers/hwmon/scpi-hwmon.c | 14 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 14 +- + drivers/input/touchscreen/sun4i-ts.c | 10 +- + drivers/regulator/max8973-regulator.c | 10 +- + drivers/thermal/amlogic_thermal.c | 16 +- + drivers/thermal/armada_thermal.c | 12 +- + drivers/thermal/broadcom/bcm2711_thermal.c | 14 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 14 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 20 +- + drivers/thermal/broadcom/ns-thermal.c | 50 +- + drivers/thermal/broadcom/sr-thermal.c | 16 +- + drivers/thermal/db8500_thermal.c | 8 +- + drivers/thermal/hisi_thermal.c | 14 +- + drivers/thermal/imx8mm_thermal.c | 14 +- + drivers/thermal/imx_sc_thermal.c | 14 +- + drivers/thermal/k3_bandgap.c | 12 +- + drivers/thermal/k3_j72xx_bandgap.c | 12 +- + drivers/thermal/max77620_thermal.c | 8 +- + drivers/thermal/mtk_thermal.c | 10 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 19 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 12 +- + drivers/thermal/qcom/tsens.c | 16 +- + drivers/thermal/qoriq_thermal.c | 12 +- + drivers/thermal/rcar_gen3_thermal.c | 16 +- + drivers/thermal/rcar_thermal.c | 13 +- + drivers/thermal/rockchip_thermal.c | 14 +- + drivers/thermal/rzg2l_thermal.c | 10 +- + drivers/thermal/samsung/exynos_tmu.c | 24 +- + drivers/thermal/sprd_thermal.c | 18 +- + drivers/thermal/st/stm_thermal.c | 18 +- + drivers/thermal/sun8i_thermal.c | 14 +- + drivers/thermal/tegra/soctherm.c | 21 +- + drivers/thermal/tegra/tegra-bpmp-thermal.c | 19 +- + drivers/thermal/tegra/tegra30-tsensor.c | 12 +- + drivers/thermal/thermal-generic-adc.c | 10 +- + drivers/thermal/thermal_core.c | 6 - + drivers/thermal/thermal_core.h | 2 - + drivers/thermal/thermal_mmio.c | 17 +- + drivers/thermal/thermal_of.c | 1140 +++++++------------- + drivers/thermal/thermal_sysfs.c | 5 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 16 +- + drivers/thermal/uniphier_thermal.c | 10 +- + include/linux/thermal.h | 85 +- + 46 files changed, 708 insertions(+), 1142 deletions(-) +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (958589892218 fs: dlm: move kref_put assert for lkb structs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (6b822d408b58 RDMA/ib_srpt: Unify checking rdma_cm_id condition in srpt_cm_req_recv()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/master (f86d1fbbe785 Merge tag 'net-next-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Already up to date. +Merging bpf-next/for-next (f86d1fbbe785 Merge tag 'net-next-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (5e25c25aa2c0 xfrm: improve wording of comment above XFRM_OFFLOAD flags) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (b0bb369ee451 net/mlx5: fs, allow flow table creation with a UID) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (aac59090a068 Bluetooth: ISO: Fix not using the correct QoS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btusb.c | 3 +++ + net/bluetooth/aosp.c | 15 ++++++++++++--- + net/bluetooth/hci_conn.c | 11 ++--------- + net/bluetooth/hci_event.c | 7 +++++-- + net/bluetooth/iso.c | 35 +++++++++++++++++++++++------------ + net/bluetooth/l2cap_core.c | 4 ++-- + net/bluetooth/mgmt.c | 7 ++++--- + net/bluetooth/msft.c | 15 ++++++++++++--- + 8 files changed, 63 insertions(+), 34 deletions(-) +Merging wireless-next/for-next (35610745d71d Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging mtd/mtd/next (7ec4cdb32173 mtd: core: check partition before dereference) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (e16eceea863b mtd: rawnand: arasan: Fix clock rate in NV-DDR) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (f8cd9f632f44 mtd: spi-nor: fix spi_nor_spimem_setup_op() call in spi_nor_erase_{sector,chip}()) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (af5d35b83f64 crypto: tcrypt - Remove the static variable initialisations to NULL) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (5493ee1919ea Merge tag 'amd-drm-next-5.20-2022-07-29' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (6f2c8d5f1659 drm/amdgpu: Fix for drm buddy memory corruption) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (64f991590ff4 drm/amd/display: Fix a compilation failure on PowerPC caused by FPU code) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Already up to date. +Merging drm-intel/for-linux-next (9d50bff40e3e drm/i915: pass a pointer for tlb seqno at vma_invalidate_tlb()) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/gem/i915_gem_object.c | 16 ++--- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 25 +++++--- + drivers/gpu/drm/i915/gt/intel_gt.c | 77 ++++++++++++++++++------ + drivers/gpu/drm/i915/gt/intel_gt.h | 12 +++- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 3 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 18 +++++- + drivers/gpu/drm/i915/gt/intel_migrate.c | 23 ++++++- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 8 ++- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 ++ + drivers/gpu/drm/i915/i915_drv.h | 4 +- + drivers/gpu/drm/i915/i915_vma.c | 33 +++++++--- + drivers/gpu/drm/i915/i915_vma.h | 1 + + drivers/gpu/drm/i915/i915_vma_resource.c | 5 +- + drivers/gpu/drm/i915/i915_vma_resource.h | 6 +- + 15 files changed, 183 insertions(+), 55 deletions(-) +Merging drm-tegra/for-next (135f4c551d51 drm/tegra: vic: Use devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (cb77085b1f0a drm/msm/dpu: Fix for non-visible planes) +$ 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 (1ff1da40d6fc Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi', 'msm-next-lumag-mdp5' and 'msm-next-lumag-mdp4' into msm-next-lumag) +$ 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 imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary) +$ 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 (ff6992735ade Linux 5.19-rc7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (739f872e48d4 regmap: permit to set reg_update_bits with bulk implementation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (f83bb2592482 ALSA: hda/conexant: Add quirk for LENOVO 20149 Notebook model) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging sound-asoc/for-next (f16e5a31c0a9 Merge remote-tracking branch 'asoc/for-5.19' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (554694ba120b module: Replace kmap() with kmap_local_page()) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (938db76cf8c8 Input: elan_i2c - convert to use dev_groups) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + drivers/input/mouse/elan_i2c_core.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) +Merging block/for-next (ece775e9aa82 Merge branch 'for-5.20/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging device-mapper/for-next (12907efde6ad dm verity: have verify_wq use WQ_HIGHPRI if "try_verify_in_tasklet") +$ git merge -m Merge branch 'for-next' of git://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 (b3b2bec9646e ata: sata_mv: Fixes expected number of resources now IRQs are gone) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (527f36f5efa4 mmc: mediatek: add support for SDIO eint wakup IRQ) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (ae4ccaed3a06 dt-bindings: mfd: stm32-timers: Move fixed string node names under 'properties') +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (fe201f6fa4cf MAINTAINERS: Use Lee Jones' kernel.org address for Backlight submissions) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (c9d8468158ad power: supply: olpc_battery: Hold the reference returned by of_find_compatible_node) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging Documentation/devicetree/bindings/power/supply/bq24190.yaml +Auto-merging Documentation/devicetree/bindings/power/supply/summit,smb347-charger.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/power/supply/ab8500_fg.c +Auto-merging drivers/power/supply/power_supply_core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/atmel-sysregs.txt | 15 - + .../bindings/power/reset/msm-poweroff.txt | 17 - + .../bindings/power/reset/qcom,pshold.yaml | 35 ++ + .../devicetree/bindings/power/supply/bq24190.yaml | 2 +- + .../bindings/power/supply/qcom,pm8941-charger.yaml | 9 +- + .../power/supply/summit,smb347-charger.yaml | 2 +- + .../bindings/reset/atmel,at91sam9260-reset.yaml | 68 +++ + MAINTAINERS | 5 + + drivers/power/reset/Kconfig | 6 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/at91-reset.c | 184 +++++++- + drivers/power/reset/pwr-mlxbf.c | 97 ++++ + drivers/power/supply/ab8500-chargalg.h | 4 - + drivers/power/supply/ab8500_btemp.c | 1 - + drivers/power/supply/ab8500_chargalg.c | 70 ++- + drivers/power/supply/ab8500_charger.c | 48 +- + drivers/power/supply/ab8500_fg.c | 3 +- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/cros_peripheral_charger.c | 2 +- + drivers/power/supply/goldfish_battery.c | 4 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/max77976_charger.c | 4 +- + drivers/power/supply/olpc_battery.c | 5 +- + drivers/power/supply/pm2301_charger.h | 492 --------------------- + drivers/power/supply/power_supply_core.c | 4 +- + include/dt-bindings/reset/sama7g5-reset.h | 10 + + 26 files changed, 462 insertions(+), 630 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/power/reset/msm-poweroff.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pshold.yaml + create mode 100644 Documentation/devicetree/bindings/reset/atmel,at91sam9260-reset.yaml + create mode 100644 drivers/power/reset/pwr-mlxbf.c + delete mode 100644 drivers/power/supply/pm2301_charger.h + create mode 100644 include/dt-bindings/reset/sama7g5-reset.h +Merging regulator/for-next (b0de7fa70650 regulator: pca9450: Remove restrictions for regulator-name) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next (ed56f4b5173e MAINTAINERS: update the LSM maintainer info) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (79eb2711c919 apparmor: correct config reference to intended one) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging MAINTAINERS +Auto-merging security/apparmor/policy_unpack_test.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +- + security/apparmor/Kconfig | 86 +++++++++++++++------- + security/apparmor/apparmorfs.c | 103 +++++++++++++++------------ + security/apparmor/audit.c | 2 +- + security/apparmor/domain.c | 5 +- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 14 ++++ + security/apparmor/include/file.h | 3 + + security/apparmor/include/ipc.h | 18 ----- + security/apparmor/include/label.h | 2 + + security/apparmor/include/lib.h | 5 ++ + security/apparmor/include/path.h | 4 +- + security/apparmor/include/policy.h | 6 +- + security/apparmor/include/policy_ns.h | 1 + + security/apparmor/include/policy_unpack.h | 2 + + security/apparmor/include/secid.h | 5 +- + security/apparmor/include/task.h | 18 +++++ + security/apparmor/ipc.c | 110 ---------------------------- + security/apparmor/label.c | 29 ++++---- + security/apparmor/lib.c | 27 +++++-- + security/apparmor/lsm.c | 38 +++++----- + security/apparmor/mount.c | 13 ++-- + security/apparmor/net.c | 3 +- + security/apparmor/policy.c | 35 +++++---- + security/apparmor/policy_ns.c | 53 ++++++++++---- + security/apparmor/policy_unpack.c | 53 +++++++++----- + security/apparmor/policy_unpack_test.c | 16 ++--- + security/apparmor/procattr.c | 2 +- + security/apparmor/secid.c | 56 ++++++--------- + security/apparmor/task.c | 114 ++++++++++++++++++++++++++++++ + 30 files changed, 491 insertions(+), 340 deletions(-) +Merging integrity/next-integrity (1d212f9037b0 Merge remote-tracking branch 'linux-integrity/kexec-keyrings' into next-integrity) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (ef54ccb61616 selinux: selinux_add_opt() callers free memory) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. +Merging tomoyo/master (05fe531eb3f1 kernel/hung_task: show backtrace of tasks with locks held) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Auto-merging kernel/hung_task.c +Merge made by the 'ort' strategy. + kernel/hung_task.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) +Merging tpmdd/next (863ed94c589f tpm: Add check for Failure mode for TPM2 modules) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (2d27e5284109 watchdog: armada_37xx_wdt: check the return value of devm_ioremap() in armada_37xx_wdt_probe()) +$ 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 (c10100a416c1 Merge branches 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (546093206ba1 audit: make is_audit_feature_set() static) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (7e7a24c3c6c9 dt-bindings: mtd: microchip,mchp48l640: use spi-peripheral-props.yaml) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (12f158808510 dt-bindings: arm: aspeed: add Aspeed Evaluation boards) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/mailbox-for-next (8a8dc2b9596e mailbox: imx: clear pending interrupts) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (4188e495dd66 Merge remote-tracking branch 'spi/for-5.19' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (0dc2dd2cb4ad Merge branch into tip/master: 'WIP/fixes') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Merge made by the 'ort' strategy. + arch/x86/boot/bitops.h | 4 +- + arch/x86/include/asm/acrn.h | 14 ++++++ + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/aperture_64.c | 2 +- + arch/x86/kernel/cpu/acrn.c | 3 ++ + arch/x86/kvm/vmx/nested.c | 2 +- + arch/x86/mm/pat/set_memory.c | 4 +- + arch/x86/platform/efi/efi.c | 2 +- + kernel/locking/spinlock.c | 56 +++++++++++----------- + kernel/sched/core.c | 13 +---- + kernel/sched/core_sched.c | 2 +- + kernel/sched/cpudeadline.c | 2 +- + kernel/sched/deadline.c | 28 +++++------ + kernel/sched/fair.c | 26 ++++++---- + kernel/sched/rt.c | 4 +- + kernel/sched/sched.h | 35 ++++++++------ + .../functional/futex_requeue_pi_signal_restart.c | 2 +- + 17 files changed, 108 insertions(+), 93 deletions(-) +Merging clockevents/timers/drivers/next (c19e18637d89 clocksource/drivers/sun4i: Remove unnecessary (void*) conversions) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/timer-ti-dm.c +Merge made by the 'ort' strategy. +Merging edac/edac-for-next (5e2805d53796 EDAC/ghes: Set the DIMM label unconditionally) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Already up to date. +Merging irqchip/irq/irqchip-next (2bd1753e8c43 Merge branch irq/misc-5.20 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (07a451dae367 Merge branch 'trace/for-next-core' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (21714867a12a Merge branch 'lkmm-dev.2022.06.20a' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Merge made by the 'ort' strategy. + .../litmus-tests/locking/DCL-broken.litmus | 55 ++++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++++ + .../litmus-tests/locking/RM-broken.litmus | 42 +++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +++ + tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +++- + tools/memory-model/scripts/hwfnseg.sh | 20 ++ + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++++++-- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 +++ + 21 files changed, 915 insertions(+), 88 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh +Merging kvm/next (90752dcef2e3 KVM: x86: do not report preemption if the steal time cache is stale) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'ort' strategy. + arch/x86/kvm/x86.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging kvm-arm/next (0982c8d859f8 Merge branch kvm-arm64/nvhe-stacktrace into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (f5ecfee94493 KVM: s390: resetting the Topology-Change-Report) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging xen-tip/linux-next (251e90e7e346 xen: don't require virtio with grants for non-PV guests) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (46a4d679ef88 workqueue: Avoid a false warning in unbind_workers()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (3d46d7848075 platform/x86/intel/vsec: Fix wrong type for local status variables) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (afef1e1a0223 platform/chrome: cros_kunit_util: add default value for `msg->result`) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 1 - + drivers/hsi/controllers/omap_ssi_core.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (38ba0bb291aa leds: is31fl319x: use simple i2c probe function) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging ipmi/for-next (4aebcc9059d8 dt-binding: ipmi: add fallback to npcm845 compatible) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 5 +++-- + drivers/char/ipmi/Kconfig | 6 +++--- + drivers/char/ipmi/ipmi_msghandler.c | 2 +- + 3 files changed, 7 insertions(+), 6 deletions(-) +Merging driver-core/driver-core-next (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (34b9715b7cae thunderbolt: Fix typo in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (688ee1d1785c USB: serial: fix tty-port initialized comments) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (0fec518018cc tty: serial: qcom-geni-serial: Fix %lu -> %u in print statements) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (4d45bc82df66 coresight: etm4x: avoid build failure with unrolled loops) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (ee794221a6f6 fpga: fpga-mgr: Fix spelling mistake "bitsream" -> "bitstream") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (009c963eefa0 Merge branch 'icc-rpm' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (180c6cb6b9b7 dt-bindings: iio: adc: Add compatible for MT8188) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (08680588d340 dt-bindings: phy: mediatek: tphy: add compatible for mt8188) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (3f4a70268d54 soundwire: qcom: Enable software clock gating requirement flag) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (3a06ed80265f extcon: Add EXTCON_DISP_CVBS and EXTCON_DISP_EDP) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Merge made by the 'ort' strategy. + drivers/gnss/core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging vfio/next (099fd2c20207 vfio/pci: fix the wrong word) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) +$ 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 (a1873f837f9e dmaengine: mediatek: mtk-hsdma: Fix typo 'the the' in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (3109920b3d95 Merge branch 'for-5.20' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging include/linux/cgroup-defs.h +Auto-merging init/Kconfig +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'ort' strategy. +Merging scsi/for-next (0f8c3a1df936 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/pm8001/pm8001_hwi.c +Auto-merging drivers/scsi/pm8001/pm8001_init.c +Auto-merging drivers/scsi/pm8001/pm80xx_hwi.c +Auto-merging drivers/target/target_core_file.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/target/target_core_sbc.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/host/ufshcd-pltfrm.c +CONFLICT (content): Merge conflict in drivers/ufs/host/ufshcd-pltfrm.c +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (c6380f992427 scsi: pm8001: Fix typo 'the the' in comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/hosts.c +Auto-merging drivers/scsi/pm8001/pm8001_hwi.c +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging include/scsi/scsi_device.h +Auto-merging include/scsi/scsi_host.h +Merge made by the 'ort' strategy. + drivers/s390/scsi/zfcp_fc.c | 29 ++++++++++++++++++-------- + drivers/s390/scsi/zfcp_fc.h | 6 ++++-- + drivers/s390/scsi/zfcp_fsf.c | 4 ++-- + drivers/scsi/FlashPoint.c | 4 ++-- + drivers/scsi/hosts.c | 18 +++++++++++----- + drivers/scsi/lpfc/lpfc_init.c | 2 ++ + drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 +-- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/scsi.c | 9 +++++--- + drivers/scsi/scsi_scan.c | 9 ++++++++ + drivers/scsi/scsi_sysfs.c | 29 +++++++++++++++----------- + drivers/target/target_core_alua.c | 3 +-- + drivers/target/target_core_device.c | 32 ++++++++++------------------- + drivers/target/target_core_pr.c | 28 ++++++++----------------- + drivers/target/target_core_stat.c | 10 ++++----- + drivers/target/target_core_xcopy.c | 2 +- + drivers/ufs/core/ufshcd.c | 7 ++----- + drivers/ufs/host/ufshcd-pci.c | 17 +++++++++++---- + include/scsi/scsi_device.h | 2 ++ + include/scsi/scsi_host.h | 3 +++ + include/target/target_core_base.h | 4 ++-- + 21 files changed, 124 insertions(+), 99 deletions(-) +Merging vhost/linux-next (6a9720576cd0 virtio: VIRTIO_HARDEN_NOTIFICATION is broken) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/remoteproc/remoteproc_core.c +Auto-merging drivers/virtio/Kconfig +Auto-merging include/uapi/linux/vhost_types.h +Merge made by the 'ort' strategy. + drivers/nvdimm/virtio_pmem.c | 9 +++- + drivers/remoteproc/remoteproc_core.c | 4 +- + drivers/remoteproc/remoteproc_virtio.c | 10 ++--- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 21 +++++++++ + drivers/vdpa/vdpa_sim/vdpa_sim.h | 1 + + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 3 ++ + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 3 ++ + drivers/vhost/vdpa.c | 35 ++++++++++++++- + drivers/vhost/vringh.c | 78 ++++++++++++++++++++++++---------- + drivers/virtio/Kconfig | 3 +- + drivers/virtio/virtio_ring.c | 7 ++- + include/linux/remoteproc.h | 4 +- + include/linux/vdpa.h | 4 ++ + include/uapi/linux/vhost.h | 14 ++++++ + include/uapi/linux/vhost_types.h | 2 + + 15 files changed, 160 insertions(+), 38 deletions(-) +Merging rpmsg/for-next (3d9688c734a7 Merge branches 'rproc-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. +Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (c4f0d16daa6d dt-bindings: gpio: fsl-imx-gpio: Add i.MXRT compatibles) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (b65bb2c14891 gpio: pch: Change PCI device macros) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (5b045200b53a dt-bindings: pinctrl: qcom,pmic-gpio: add PM8226 constraints) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi +Auto-merging arch/arm/boot/dts/sun8i-a23-a33.dtsi +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/pinctrl/freescale/pinctrl-imx93.c +Auto-merging drivers/pinctrl/intel/pinctrl-intel.c +Auto-merging drivers/pinctrl/pinctrl-ocelot.c +Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +Auto-merging drivers/pinctrl/renesas/pinctrl-rzg2l.c +Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Merge made by the 'ort' strategy. + .../bindings/gpio/x-powers,axp209-gpio.yaml | 6 + + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 16 +- + .../bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 2 +- + .../bindings/pinctrl/pinctrl-mt8186.yaml | 31 +- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 64 +- + .../bindings/pinctrl/pinctrl-mt8195.yaml | 41 +- + .../bindings/pinctrl/qcom,msm8909-tlmm.yaml | 152 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 4 + + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 5 + + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 158 + + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 1 + + .../bindings/pinctrl/renesas,rzv2m-pinctrl.yaml | 170 + + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 4 +- + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 5 +- + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 + + MAINTAINERS | 1 + + arch/arm/boot/dts/imxrt1170-pinfunc.h | 1561 +++++++ + arch/arm/boot/dts/sun6i-a31.dtsi | 1 - + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 - + arch/arm/boot/dts/sun9i-a80.dtsi | 1 - + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/aspeed/pinmux-aspeed.h | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 21 +- + drivers/pinctrl/core.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx93.c | 1 + + drivers/pinctrl/intel/Kconfig | 8 + + drivers/pinctrl/intel/Makefile | 1 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 18 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 16 +- + drivers/pinctrl/intel/pinctrl-intel.c | 14 +- + drivers/pinctrl/intel/pinctrl-intel.h | 25 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 10 +- + drivers/pinctrl/intel/pinctrl-merrifield.c | 14 +- + drivers/pinctrl/intel/pinctrl-meteorlake.c | 417 ++ + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 296 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 10 + + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- + drivers/pinctrl/pinctrl-amd.c | 242 +- + drivers/pinctrl/pinctrl-amd.h | 1376 ++++++- + drivers/pinctrl/pinctrl-at91-pio4.c | 7 +- + drivers/pinctrl/pinctrl-at91.c | 10 +- + drivers/pinctrl/pinctrl-axp209.c | 14 +- + drivers/pinctrl/pinctrl-ingenic.c | 64 +- + drivers/pinctrl/pinctrl-ocelot.c | 4 +- + drivers/pinctrl/pinctrl-starfive.c | 5 + + drivers/pinctrl/pinctrl-zynqmp.c | 11 + + drivers/pinctrl/qcom/Kconfig | 19 +- + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 1 - + drivers/pinctrl/qcom/pinctrl-msm8909.c | 956 +++++ + drivers/pinctrl/qcom/pinctrl-msm8916.c | 4 +- + drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 1 - + drivers/pinctrl/qcom/pinctrl-sm6375.c | 1544 +++++++ + drivers/pinctrl/qcom/pinctrl-sm8250.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 3 + + drivers/pinctrl/renesas/Kconfig | 18 + + drivers/pinctrl/renesas/Makefile | 2 + + drivers/pinctrl/renesas/core.c | 6 + + drivers/pinctrl/renesas/pfc-r8a779f0.c | 2 - + drivers/pinctrl/renesas/pfc-r8a779g0.c | 4262 ++++++++++++++++++++ + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 + + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 1119 +++++ + drivers/pinctrl/renesas/sh_pfc.h | 9 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 6 +- + drivers/pinctrl/samsung/pinctrl-exynos.h | 3 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 4 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 8 + + drivers/pinctrl/sunxi/Kconfig | 8 +- + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun20i-d1.c | 840 ++++ + drivers/pinctrl/sunxi/pinctrl-sun50i-a100-r.c | 1 + + drivers/pinctrl/sunxi/pinctrl-sun50i-a100.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 22 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 25 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 156 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 109 +- + include/dt-bindings/pinctrl/r7s9210-pinctrl.h | 2 +- + include/dt-bindings/pinctrl/rzg2l-pinctrl.h | 2 +- + include/dt-bindings/pinctrl/rzv2m-pinctrl.h | 23 + + include/linux/firmware/xlnx-zynqmp.h | 5 + + include/linux/pinctrl/pinctrl.h | 20 + + 88 files changed, 13354 insertions(+), 667 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8909-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm6375-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rzv2m-pinctrl.yaml + create mode 100644 arch/arm/boot/dts/imxrt1170-pinfunc.h + create mode 100644 drivers/pinctrl/intel/pinctrl-meteorlake.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8909.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm6375.c + create mode 100644 drivers/pinctrl/renesas/pfc-r8a779g0.c + create mode 100644 drivers/pinctrl/renesas/pinctrl-rzv2m.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun20i-d1.c + create mode 100644 include/dt-bindings/pinctrl/rzv2m-pinctrl.h +Merging pinctrl-intel/for-next (25097de7b236 pinctrl: intel: Add Intel Meteor Lake pin controller support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (36611d28f513 pinctrl: renesas: r8a779g0: Add missing MODSELx for AVBx) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (c98ebe065e07 pinctrl: samsung: do not use bindings header with constants) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. +Merging pwm/for-next (8933d30c5f46 pwm: lpc18xx: Fix period handling) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (a0b88362d2c7 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, and retire_mq_sysctls-for-v5.19 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging fs/coredump.c +Auto-merging fs/exec.c +Auto-merging fs/proc/array.c +Auto-merging ipc/mqueue.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + fs/coredump.c | 2 +- + fs/exec.c | 2 +- + fs/proc/array.c | 2 +- + include/linux/sched/signal.h | 1 + + include/linux/user_namespace.h | 35 ++++++++++++++++++++++------------- + ipc/mqueue.c | 1 + + kernel/exit.c | 20 +++++++++++++++++++- + kernel/fork.c | 14 ++++++++------ + kernel/kthread.c | 1 + + kernel/signal.c | 3 ++- + kernel/sys.c | 2 +- + kernel/ucount.c | 34 +++++++++++++++------------------- + kernel/user_namespace.c | 10 +++++----- + 13 files changed, 78 insertions(+), 49 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (b1d34b1375f9 selftests/landlock: fix broken include of linux/landlock.h) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/landlock/Makefile | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging livepatching/for-next (df44b1ee72f4 Merge branch 'for-5.20/selftests-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (03c4cd6f89e0 rtc: spear: set range max) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ea3c6a8220bf] Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/rtc/microcrystal,rv3032.yaml | 1 + + .../devicetree/bindings/rtc/nuvoton,nct3018y.yaml | 45 ++ + .../devicetree/bindings/rtc/nxp,pcf85063.txt | 32 - + .../devicetree/bindings/rtc/nxp,pcf85063.yaml | 92 +++ + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/rtc-mt6397.txt | 2 + + .../devicetree/bindings/rtc/ti,k3-rtc.yaml | 62 ++ + .../devicetree/bindings/rtc/xlnx,zynqmp-rtc.yaml | 12 +- + MAINTAINERS | 3 + + drivers/rtc/Kconfig | 41 +- + drivers/rtc/Makefile | 4 +- + drivers/rtc/class.c | 6 +- + drivers/rtc/dev.c | 8 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 5 +- + drivers/rtc/rtc-ab-eoz9.c | 5 +- + drivers/rtc/rtc-bq32k.c | 5 +- + drivers/rtc/rtc-cmos.c | 3 - + drivers/rtc/rtc-core.h | 5 - + drivers/rtc/rtc-cros-ec.c | 4 +- + drivers/rtc/rtc-ds1374.c | 5 +- + drivers/rtc/rtc-ds1672.c | 5 +- + drivers/rtc/rtc-ds3232.c | 5 +- + drivers/rtc/rtc-em3027.c | 5 +- + drivers/rtc/rtc-fm3130.c | 5 +- + drivers/rtc/rtc-hym8563.c | 5 +- + drivers/rtc/rtc-isl12022.c | 5 +- + drivers/rtc/rtc-isl1208.c | 10 +- + drivers/rtc/rtc-max6900.c | 5 +- + drivers/rtc/rtc-mc146818-lib.c | 8 +- + drivers/rtc/rtc-mpfs.c | 323 ++++++++++ + drivers/rtc/rtc-nct3018y.c | 553 +++++++++++++++++ + drivers/rtc/rtc-pcf8523.c | 5 +- + drivers/rtc/rtc-pcf85363.c | 5 +- + drivers/rtc/rtc-pcf8563.c | 5 +- + drivers/rtc/rtc-pcf8583.c | 5 +- + drivers/rtc/rtc-rv3029c2.c | 5 +- + drivers/rtc/rtc-rv8803.c | 98 ++- + drivers/rtc/rtc-rx6110.c | 5 +- + drivers/rtc/rtc-rx8025.c | 22 +- + drivers/rtc/rtc-rx8581.c | 5 +- + drivers/rtc/rtc-s35390a.c | 5 +- + drivers/rtc/rtc-sd3078.c | 5 +- + drivers/rtc/rtc-spear.c | 2 +- + drivers/rtc/rtc-sun6i.c | 2 + + drivers/rtc/rtc-ti-k3.c | 680 +++++++++++++++++++++ + drivers/rtc/rtc-vr41xx.c | 363 ----------- + drivers/rtc/rtc-x1205.c | 5 +- + drivers/rtc/rtc-zynqmp.c | 115 +++- + 48 files changed, 2063 insertions(+), 540 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf85063.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf85063.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/ti,k3-rtc.yaml + create mode 100644 drivers/rtc/rtc-mpfs.c + create mode 100644 drivers/rtc/rtc-nct3018y.c + create mode 100644 drivers/rtc/rtc-ti-k3.c + delete mode 100644 drivers/rtc/rtc-vr41xx.c +Merging nvdimm/libnvdimm-for-next (53fc59511fc4 nvdimm/namespace: drop unneeded temporary variable in size_store()) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Auto-merging drivers/nvdimm/namespace_devs.c +Merge made by the 'ort' strategy. + drivers/nvdimm/namespace_devs.c | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) +Merging at24/at24/for-next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (025963f08f3a PCI: endpoint: pci-epf-vntb: fix error handle in epf_ntb_mw_bar_init()) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/pci/controller/dwc/pcie-designware-ep.c +Merge made by the 'ort' strategy. + Documentation/PCI/endpoint/index.rst | 2 + + Documentation/PCI/endpoint/pci-vntb-function.rst | 129 ++ + Documentation/PCI/endpoint/pci-vntb-howto.rst | 161 +++ + drivers/ntb/hw/epf/ntb_hw_epf.c | 48 +- + drivers/ntb/hw/idt/ntb_hw_idt.c | 6 +- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 12 +- + drivers/ntb/hw/intel/ntb_hw_gen4.c | 2 +- + drivers/ntb/hw/intel/ntb_hw_intel.h | 7 + + drivers/ntb/test/ntb_perf.c | 828 ++++++++++++- + drivers/ntb/test/ntb_tool.c | 8 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 10 +- + drivers/pci/endpoint/functions/Kconfig | 12 + + drivers/pci/endpoint/functions/Makefile | 1 + + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1435 ++++++++++++++++++++++ + 14 files changed, 2620 insertions(+), 41 deletions(-) + create mode 100644 Documentation/PCI/endpoint/pci-vntb-function.rst + create mode 100644 Documentation/PCI/endpoint/pci-vntb-howto.rst + create mode 100644 drivers/pci/endpoint/functions/pci-epf-vntb.c +Merging seccomp/for-next/seccomp (3ce4b78f73e8 selftests/seccomp: Fix compile warning when CC=clang) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (04823dd2af87 fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Auto-merging drivers/hwmon/occ/p9_sbe.c +Merge made by the 'ort' strategy. + drivers/fsi/fsi-core.c | 8 ++++---- + drivers/fsi/fsi-master-ast-cf.c | 2 ++ + drivers/fsi/fsi-master.h | 2 +- + drivers/fsi/fsi-occ.c | 25 ++++++++++++++++++++----- + drivers/fsi/fsi-sbefifo.c | 15 +++++++++------ + drivers/hwmon/occ/p9_sbe.c | 15 ++++++++++----- + 6 files changed, 46 insertions(+), 21 deletions(-) +Merging slimbus/for-next (4ad3deabeea2 slimbus: messaging: fix typos in comments) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. +Merging nvmem/for-next (432ee5a3cfcf nvmem: mtk-efuse: Simplify with devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (d180e0a1be6c Drivers: hv: Create debugfs file with hyper-v balloon usage information) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (ca7fd6cff3b8 RDMA/erdma: Add driver to kernel build environment) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging kunit/test (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (4c392516accf Documentation: KUnit: Fix example with compilation error) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (bb3c64f6a017 bus: mhi: host: Fix up null pointer access in mhi_irq_handler) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/host/main.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) +Merging memblock/for-next (04d9490986d1 memblock test: Modify the obsolete description in README) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging mm/memblock.c +Merge made by the 'ort' strategy. + mm/memblock.c | 11 + + tools/testing/memblock/Makefile | 3 +- + tools/testing/memblock/README | 17 +- + tools/testing/memblock/TODO | 14 +- + tools/testing/memblock/internal.h | 11 + + tools/testing/memblock/linux/memory_hotplug.h | 8 +- + tools/testing/memblock/main.c | 2 + + tools/testing/memblock/scripts/Makefile.include | 10 +- + tools/testing/memblock/tests/alloc_api.c | 225 ++++++++++----- + tools/testing/memblock/tests/alloc_helpers_api.c | 129 ++++++--- + tools/testing/memblock/tests/alloc_nid_api.c | 351 +++++++++++++++-------- + tools/testing/memblock/tests/basic_api.c | 337 +++++++++++++++------- + tools/testing/memblock/tests/common.c | 118 ++++++++ + tools/testing/memblock/tests/common.h | 54 ++++ + 14 files changed, 920 insertions(+), 370 deletions(-) +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging cxl/next (1cd8a2537eb0 cxl/hdm: Fix skip allocations vs multiple pmem allocations) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging arch/powerpc/mm/mem.c +Auto-merging drivers/pci/Kconfig +Auto-merging drivers/pci/probe.c +Auto-merging include/linux/pci_ids.h +Auto-merging mm/Kconfig +Merge made by the 'ort' strategy. + .clang-format | 1 + + Documentation/ABI/testing/sysfs-bus-cxl | 305 +++- + Documentation/driver-api/cxl/memory-devices.rst | 8 + + arch/powerpc/mm/mem.c | 1 + + drivers/cxl/Kconfig | 9 + + drivers/cxl/acpi.c | 243 ++- + drivers/cxl/core/Makefile | 1 + + drivers/cxl/core/core.h | 51 +- + drivers/cxl/core/hdm.c | 691 ++++++++- + drivers/cxl/core/mbox.c | 95 +- + drivers/cxl/core/memdev.c | 4 +- + drivers/cxl/core/pci.c | 181 ++- + drivers/cxl/core/pmem.c | 4 +- + drivers/cxl/core/port.c | 738 ++++++--- + drivers/cxl/core/region.c | 1896 +++++++++++++++++++++++ + drivers/cxl/cxl.h | 312 +++- + drivers/cxl/cxlmem.h | 42 +- + drivers/cxl/cxlpci.h | 1 + + drivers/cxl/mem.c | 49 +- + drivers/cxl/pci.c | 46 +- + drivers/cxl/pmem.c | 259 +++- + drivers/cxl/port.c | 53 + + drivers/nvdimm/region_devs.c | 28 +- + drivers/pci/Kconfig | 3 + + drivers/pci/Makefile | 1 + + drivers/pci/doe.c | 536 +++++++ + drivers/pci/probe.c | 2 +- + include/linux/ioport.h | 3 + + include/linux/libnvdimm.h | 5 + + include/linux/pci-doe.h | 77 + + include/linux/pci_ids.h | 1 + + include/linux/sysfs.h | 16 + + include/uapi/linux/pci_regs.h | 29 +- + kernel/resource.c | 185 ++- + mm/Kconfig | 5 + + tools/testing/cxl/Kbuild | 1 + + tools/testing/cxl/test/cxl.c | 131 +- + tools/testing/cxl/test/mem.c | 53 +- + tools/testing/cxl/test/mock.c | 8 +- + 39 files changed, 5498 insertions(+), 576 deletions(-) + create mode 100644 drivers/cxl/core/region.c + create mode 100644 drivers/pci/doe.c + create mode 100644 include/linux/pci-doe.h +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (df3c9072ef90 Merge branch 'efivars-cleanup' into efi/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (3041808b5220 mm/slab_common: move generic bulk alloc/free functions to SLOB) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Already up to date. +Merging random/master (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (b13baccc3850 Linux 5.19-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (07a3263c2554 init/Kconfig: Specify the interpreter for rust_is_available.sh) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/doc-guide/kernel-doc.rst +Auto-merging Documentation/index.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging arch/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging init/Kconfig +Auto-merging kernel/kallsyms.c +Auto-merging lib/Kconfig.debug +Auto-merging scripts/Kconfig.include +Auto-merging scripts/Makefile.build +Auto-merging scripts/checkpatch.pl +Auto-merging tools/lib/perf/include/perf/event.h +Resolved 'Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0d32fd4a4320] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 6 + + .rustfmt.toml | 12 + + Documentation/core-api/printk-formats.rst | 10 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/makefiles.rst | 50 +- + Documentation/process/changes.rst | 41 + + Documentation/rust/arch-support.rst | 19 + + Documentation/rust/coding-guidelines.rst | 216 ++ + Documentation/rust/general-information.rst | 79 + + Documentation/rust/index.rst | 22 + + Documentation/rust/quick-start.rst | 232 ++ + MAINTAINERS | 18 + + Makefile | 171 +- + arch/Kconfig | 6 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 10 + + include/linux/compiler_types.h | 6 +- + include/linux/kallsyms.h | 2 +- + init/Kconfig | 52 +- + kernel/configs/rust.config | 1 + + kernel/kallsyms.c | 26 +- + kernel/livepatch/core.c | 4 +- + lib/Kconfig.debug | 34 + + lib/vsprintf.c | 13 + + rust/.gitignore | 8 + + rust/Makefile | 381 ++++ + rust/alloc/README.md | 33 + + rust/alloc/alloc.rs | 440 ++++ + rust/alloc/borrow.rs | 498 ++++ + rust/alloc/boxed.rs | 2028 +++++++++++++++++ + rust/alloc/collections/mod.rs | 156 ++ + rust/alloc/lib.rs | 244 ++ + rust/alloc/raw_vec.rs | 527 +++++ + rust/alloc/slice.rs | 1204 ++++++++++ + rust/alloc/vec/drain.rs | 186 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 366 +++ + rust/alloc/vec/is_zero.rs | 120 + + rust/alloc/vec/mod.rs | 3140 ++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/bindgen_parameters | 21 + + rust/bindings/bindings_helper.h | 13 + + rust/bindings/lib.rs | 53 + + rust/compiler_builtins.rs | 63 + + rust/exports.c | 21 + + rust/helpers.c | 51 + + rust/kernel/allocator.rs | 64 + + rust/kernel/error.rs | 59 + + rust/kernel/lib.rs | 78 + + rust/kernel/prelude.rs | 20 + + rust/kernel/print.rs | 198 ++ + rust/kernel/str.rs | 72 + + rust/macros/helpers.rs | 51 + + rust/macros/lib.rs | 72 + + rust/macros/module.rs | 282 +++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 30 + + samples/rust/Makefile | 5 + + samples/rust/hostprogs/.gitignore | 3 + + samples/rust/hostprogs/Makefile | 5 + + samples/rust/hostprogs/a.rs | 7 + + samples/rust/hostprogs/b.rs | 5 + + samples/rust/hostprogs/single.rs | 12 + + samples/rust/rust_minimal.rs | 38 + + scripts/.gitignore | 1 + + scripts/Kconfig.include | 6 +- + scripts/Makefile | 3 + + scripts/Makefile.build | 60 + + scripts/Makefile.debug | 10 + + scripts/Makefile.host | 34 +- + scripts/Makefile.lib | 12 + + scripts/Makefile.modfinal | 8 +- + scripts/cc-version.sh | 12 +- + scripts/checkpatch.pl | 12 +- + scripts/decode_stacktrace.sh | 14 + + scripts/generate_rust_analyzer.py | 135 ++ + scripts/generate_rust_target.rs | 182 ++ + scripts/is_rust_module.sh | 16 + + scripts/kallsyms.c | 47 +- + scripts/kconfig/confdata.c | 75 + + scripts/min-tool-version.sh | 6 + + scripts/rust_is_available.sh | 160 ++ + scripts/rust_is_available_bindgen_libclang.h | 2 + + tools/include/linux/kallsyms.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 89 files changed, 12553 insertions(+), 51 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/coding-guidelines.rst + create mode 100644 Documentation/rust/general-information.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 kernel/configs/rust.config + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/bindings/bindings_helper.h + create mode 100644 rust/bindings/lib.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/hostprogs/.gitignore + create mode 100644 samples/rust/hostprogs/Makefile + create mode 100644 samples/rust/hostprogs/a.rs + create mode 100644 samples/rust/hostprogs/b.rs + create mode 100644 samples/rust/hostprogs/single.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100644 scripts/generate_rust_target.rs + create mode 100755 scripts/is_rust_module.sh + create mode 100755 scripts/rust_is_available.sh + create mode 100644 scripts/rust_is_available_bindgen_libclang.h +Merging sysctl/sysctl-next (374a723c7448 kernel/sysctl.c: Remove trailing white space) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging block/fops.c +Auto-merging block/partitions/core.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/node.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/mpage.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/write.c +Auto-merging fs/ntfs/aops.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/squashfs/file.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/compaction.c +Auto-merging mm/ksm.c +Auto-merging mm/migrate.c +Auto-merging mm/migrate_device.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/swap_state.c +Auto-merging mm/util.c +Auto-merging mm/zsmalloc.c +Merge made by the 'ort' strategy. + fs/btrfs/disk-io.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) +Merging execve/for-next/execve (c6e8e36c6ae4 exec: Call kmap_local_page() in copy_string_kernel()) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (36d4b36b6959 lib/nodemask: inline next_node_in() and node_random()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/hte/for-next (85ff37e302ef gpiolib: cdev: Fix kernel doc for struct line) +$ git merge -m Merge branch 'hte/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git hte/hte/for-next +Already up to date. +Merging kspp/for-next/kspp (27603a606fda dm: verity-loadpin: Drop use of dm_table_get_num_targets()) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging kspp-gustavo/for-next/kspp (94dfc73e7cf4 treewide: uapi: Replace zero-length arrays with flexible-array members) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging mm-stable/mm-stable (360614c01f81 tools/testing/selftests/vm/hmm-tests.c: fix build) +$ git merge -m Merge branch 'mm-stable' of git://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 (b99695580bfc scripts/gdb: ensure the absolute path is generated on initial source) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (11378c6a99ac Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging .mailmap +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/gfp.h +CONFLICT (content): Merge conflict in include/linux/gfp.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/huge_mm.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/sysctl.h +Auto-merging init/main.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/test_printf.c +Auto-merging mm/gup.c +Auto-merging mm/huge_memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/hugetlb.c +Auto-merging mm/internal.h +Auto-merging mm/kfence/core.c +Auto-merging mm/ksm.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memory.c +Auto-merging mm/memory.c +Auto-merging mm/memremap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page_alloc.c +Auto-merging mm/rmap.c +Auto-merging mm/shmem.c +Auto-merging mm/sparse-vmemmap.c +Auto-merging mm/sparse-vmemmap.c +Auto-merging mm/vmscan.c +Resolved 'include/linux/gfp.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9c941fa23093] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 4 +- + Documentation/admin-guide/mm/memory-hotplug.rst | 4 +- + Documentation/admin-guide/sysctl/vm.rst | 3 +- + Documentation/filesystems/proc.rst | 22 +- + Documentation/mm/balance.rst | 2 +- + Documentation/mm/highmem.rst | 31 +- + Documentation/mm/vmemmap_dedup.rst | 72 ++- + arch/alpha/include/uapi/asm/mman.h | 2 + + arch/arm64/mm/flush.c | 13 +- + arch/mips/include/uapi/asm/mman.h | 2 + + arch/parisc/include/uapi/asm/mman.h | 2 + + arch/x86/mm/hugetlbpage.c | 8 +- + arch/xtensa/include/uapi/asm/mman.h | 2 + + drivers/dma-buf/dma-buf.c | 1 - + drivers/iommu/tegra-smmu.c | 4 +- + fs/Kconfig | 12 +- + fs/libfs.c | 9 + + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/proc/fd.c | 18 +- + fs/proc/task_mmu.c | 2 +- + include/linux/fs.h | 1 + + include/linux/highmem.h | 7 +- + include/linux/huge_mm.h | 23 +- + include/linux/hugetlb.h | 24 +- + include/linux/mm.h | 9 +- + include/linux/page-flags.h | 32 +- + include/linux/swapops.h | 9 + + include/linux/sysctl.h | 4 + + include/ras/ras_event.h | 1 - + include/trace/events/huge_memory.h | 1 + + include/trace/events/mmflags.h | 1 - + include/uapi/asm-generic/mman-common.h | 2 + + init/main.c | 25 +- + lib/debugobjects.c | 10 + + lib/test_printf.c | 8 +- + mm/huge_memory.c | 32 +- + mm/hugetlb.c | 73 ++- + mm/hugetlb_vmemmap.c | 589 +++++++++++++----- + mm/hugetlb_vmemmap.h | 45 +- + mm/internal.h | 4 +- + mm/khugepaged.c | 768 ++++++++++++++---------- + mm/ksm.c | 10 + + mm/madvise.c | 9 +- + mm/memory-failure.c | 179 +++++- + mm/memory.c | 4 +- + mm/page_alloc.c | 45 +- + mm/page_ext.c | 6 +- + mm/rmap.c | 15 +- + mm/sparse-vmemmap.c | 399 ------------ + tools/include/linux/gfp.h | 3 +- + tools/include/uapi/asm-generic/mman-common.h | 2 + + tools/perf/builtin-kmem.c | 1 - + tools/testing/selftests/vm/khugepaged.c | 563 +++++++++-------- + 58 files changed, 1803 insertions(+), 1400 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-headers-deps-mm-Split-linux-gfp_types.h-o.patch +Applying: fix up for "headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h>" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/gfp_types.h +$ git add -A . +$ git commit -v -a --amend +[master fd4977579380] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Tue Aug 9 11:23:42 2022 +1000 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..e8dd3aca5c21 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20220809 |