diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-09-20 16:33:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-09-20 16:33:16 +1000 |
| commit | 1f77990c4b7960a82d599567c586ceb8289f71ed (patch) | |
| tree | 0e3e87d9d6e36d627dd0c8d68f78b6088c706189 | |
| parent | e486a496dcf2eaadad2a8fe70edcfba09d5a0db7 (diff) | |
| download | linux-next-20210920.tar.gz linux-next-20210920.tar.xz | |
Add linux-next specific files for 20210920next-20210920
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 339 | ||||
| -rw-r--r-- | Next/Trees | 340 | ||||
| -rw-r--r-- | Next/merge.log | 4870 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5550 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..fea55dca0e02 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,339 @@ +Name SHA1 +---- ---- +origin 20621d2f27a0163b81dc2b74fd4c0b3e6aa5fa12 +fixes 3ca706c189db861b2ca2019a0901b94050ca49d8 +kbuild-current 0664684e1ebd7875e120d0cecd525bac4805f8ed +arc-current 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm-current 463dbba4d189750c2f576449d0bbb11c5413712e +arm64-fixes 9fcb2e93f41c07a400885325e7dbdfceba6efaec +arm-soc-fixes 3f1c260ffddb7ea51d54c37343c6d500a10317eb +drivers-memory-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +m68k-current a7b68ed15d1fd72c1e451d5eb6edebee2a624b90 +powerpc-fixes c006a06508db4841d256d82f42da392d6391f3d9 +s390-fixes f5711f9df9242446feccf2bdb6fdc06a72ca1010 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net e30cd812dffadc58241ae378e48728e6a161becd +bpf bc23f724481759d0fac61dfb5ce979af2190bbe0 +ipsec 047a749d231e4faccaf5f473cf73dc5732425f81 +netfilter 310e2d43c3ad429c1fba4b175806cf1f55ed73a6 +ipvs 69e73dbfda14fbfe748d3812da1244cce2928dcb +wireless-drivers b6a46b4f6e4b35868e33930acaa7c50bf6cab821 +mac80211 7366c23ff492ad260776a3ee1aaabba9fc773a8b +rdma-fixes 1b789bd4dbd48a92f5427d9c37a72a8f6ca17754 +sound-current 94d508fa3186d0cbc63765aa94d5cf3bd847694c +sound-asoc-fixes 31078df33b25c8a8e25b4f65d80c4df34573ba47 +regmap-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +regulator-fixes 6101f606d8bfb432b3b15d1449b03b28e4faf939 +spi-fixes 26b1f08a690460a4803f31045babda2764b223c9 +pci-current e042a4533fc346a655de7f1b8ac1fa01a2ed96e5 +driver-core.current 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +tty.current 7049d853cfb928f50b6041cb4a5c6d6c1d8dd201 +usb.current da546d6b748e570aa6e44acaa515cfc43baeaa0d +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 7bb057134d609b9c038a00b6876cf0d37d0118ce +usb-chipidea-fixes 98a1373a2de9efa6a8f82cf82d63b106fd93ad68 +phy 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +staging.current 92dc0b1f46e12cfabd28d709bb34f7a39431b44f +iio-fixes 8167c9a375ccceed19048ad9d68cb2d02ed276e0 +char-misc.current 25a1433216489de4abc889910f744e952cb6dbae +soundwire-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +thunderbolt-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +input-current 0c5483a5778fa9910538453b5a9f1a6ed49e95ad +crypto-current 6ae51ffe5e768d9e25a7f4298e2e7a058472bcc3 +vfio-fixes dc51ff91cf2d1e9a2d941da483602f71d4a51472 +kselftest-fixes f5013d412a43662b63f3d5f3a804d63213acd471 +modules-fixes 055f23b74b20f2824ce33047b4cf2e2aa856bf3b +dmaengine-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes f60f5741002b9fde748cff65fd09bd6222c5db0c +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes f0c15b360fb65ee39849afe987c16eb3d0175d0d +reset-fixes ed104ca4bd9c405b41e968ad4ece51f6462e90b6 +mips-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +at91-fixes 4348cc10da6377a86940beb20ad357933b8f91bb +omap-fixes e879f855e590b40fe3c79f2fbd8f65ca3c724120 +kvm-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f +kvms390-fixes cd4220d23bf3f43cf720e82bdee681f383433ae2 +hwmon-fixes e6fab7af6ba1bc77c78713a83876f60ca7a4a064 +nvdimm-fixes 32b2397c1e56f33b0b1881def965bb89bd12f448 +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 45940091a3c1c76952d91e1269f52c1cb021c822 +vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 3c3c8e88c8712bfe06cd10d7ca77a94a33610cd6 +samsung-krzk-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pinctrl-samsung-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +devicetree-fixes 55c21d57eafb7b379bb7b3e93baf9ca2695895b0 +scsi-fixes 1a0db7744e453844aa2db3f2959aea4a378025ea +drm-fixes 109f7ea9aedce437b4b7737ab60bfea65d9dbdd3 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 7889367d7795b3b1766e33ac1ae8a5fbc292108b +mmc-fixes b81bede4d138ce62f7342e27bf55ac93c8071818 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hyperv-fixes dfb5c1e12c28e35e4d4e5bc8022b0e9d585b89a7 +soc-fsl-fixes c1e64c0aec8cb0499e61af7ea086b59abba97945 +risc-v-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes e9a9970bf520c99e530d8f1fa5b5c22671fad4ef +spdx 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +gpio-brgl-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +gpio-intel-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pinctrl-intel-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +erofs-fixes 0852b6ca941ef3ff75076e85738877bd3271e1cd +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 024591f9a6e0164ec23301784d1e6d8f6cacbe59 +cel-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f +irqchip-fixes 0ddc5e55e6f1da1286fb2646f4248bf7da31a601 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 219d720e6df71c2607d7120d6b9281614863e5b1 +drm-misc-fixes 6b457230bfa136f83a6b4d6f03d104f27a584823 +kspp-gustavo 8881af30b4211dbbe141d6e0ee2251d45c538dc7 +kbuild 860091ee86e6f4b269c8a744f110ecdd97d3f3fd +perf 8228e9361e2a7447eaed87499123e85871c8bc18 +compiler-attributes b83a908498d68fafca931e1276e145b339cac5fb +dma-mapping 59583f747664046aaae5588d56d5954fab66cce8 +asm-generic 7962c2eddbfe7cce879acb06f9b4f205789e57b7 +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 1c9b5911f53bf7af53eb66a97dd4c51742e6a7e5 +arm64 85f58eb1889826b9745737718723a80b639e0fbd +arm-perf fd264b310579efc14436b2ec86defa5d4c31332e +arm-soc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic eeb44922aa8337c590a3269e13297f9d1f1be331 +aspeed 0f32f00af3443b9199790d340942273fd8ce436f +at91 1eaab16dfac26d4a244cbda2f93c16ba37eaf457 +drivers-memory 6fc5f1adf5a11422d748aa71e43e7c979208b8f2 +imx-mxs 2cb411d8967664aa09ecffd781cb2181b7a40e77 +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 69862ae4e37890fa4313d55ad51dcd5927457e7e +mvebu 930af8dda7509ce6c79cb44401b79f876599faac +omap 7911f95d1713e1e7e0a2b3ee4c1624ad9cc85847 +qcom 8482d1c0bb620d311df0245dfe08831e00d8642c +raspberrypi 9f5289ec6f1cb1580b17d666abee2b65886129b5 +renesas cbbd8f16ae1c24d6f82712bf5ef798a8a62b0233 +reset 09f3824342f665d222fb7ac17c91f8334779630b +rockchip d46148623f264317ef86e6bba32316ff6c3aae38 +samsung-krzk 2721363c0d64d7a98541711ae96b079520518904 +scmi 34eae8520c886bca0ca43c2cbe3ddf1a24cc2e04 +stm32 1e6bc5987a5252948e3411e5a2dbb434fd1ea107 +sunxi bb289f4c0b2bb10c7ecd51b6799cd9d1b9c409aa +tegra cc701ccede61227107787cf8373cee12d89b6cbb +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 500e6dfbb465531150ac6e2ff0856dd357ddc8a4 +xilinx 35a7430dad4dd83fe295917b8232595f437bb208 +clk 1cbc04ffedcc902f199a5d8b4860a106447ad745 +clk-imx 1f4b035e603bb73c30bbbd81d9bca528924d41e9 +clk-renesas 8ac4aedcf7b39baad81fdaf130025a8350fe93c5 +clk-samsung 1d26eaeec37a91ff4575f6fead889818c5895304 +csky 90dc8c0e664efcb14e2f133309d84bfdcb0b3d24 +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k a7b68ed15d1fd72c1e451d5eb6edebee2a624b90 +m68knommu 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +microblaze 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +mips 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 1955d843efc3b5cf3ab4878986a87ad4972ff4e1 +parisc-hd d4d016caa4b85b9aa98d7ec8c84e928621a614bc +powerpc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b +risc-v 6f55ab36bef505b449723300a5a445ddc76a94d7 +s390 9ec953c0a7e10212c7cf3f69348a6cc8bc912551 +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 2346402756756e55b2e6574fba50b00d1db5b292 +xtensa 7b7cec477fc3cd42ce565dfc3e53f144504fc95c +pidfd f4dd02cd86310749b53061767382cd9c9d2e2cf4 +fscrypt 38ef66b05cfa3560323344a0b3e09e583f1eb974 +fscache 20ec197bfa13c5b799fc9527790ea7b5374fc8f2 +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs e51480e6f4f84e235b4a6138239af3456813f544 +ceph 4b0b8836ebba254088b96911ee60706018a3247f +cifs 35866f3f779aef5e7ba84e4d1023fe2e2a0e219e +cifsd 6d56262c3d224699b29b9bb6b4ace8bab7d692c2 +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 1266b4a7ecb679587dc4d098abe56ea53313d569 +exfat 50be9417e23af5a8ac860d998e1e3f06b8fd79d7 +ext3 ed518dd035fa07633912f259b90a256f4780395e +ext4 948ca5f30e1df0c11eb5b0f410b9ceb97fa77ad9 +f2fs c02599f210d90c76e42e2eb544511a47cceb60c9 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 7a41554fdfb0d787b51d5e879255390f2ac5e13d +gfs2 11603f0011d0ee6f8d15e5ef7800ec69a92b1ca3 +jfs 5d299f44d7658f4423e33a0b9915bc8d81687511 +nfs 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nfs-anna 8cfb9015280d49f9d92d5b0f88cedf5f0856c0fd +nfsd e22ce8eb631bdc47a4a4ea7ecf4e4ba499db4f93 +cel 02579b2ff8b0becfb51d85a975908ac4ab15fba8 +ntfs3 6e3331ee34461be37f50912295a2e924a673dbc6 +orangefs 0fdec1b3c9fbb5e856a40db5993c9eaf91c74a83 +overlayfs 332f606b32b6291a944c8cf23b91f53a6e676525 +ubifs a801fcfeef96702fa3f9b22ad56c5eb1989d9221 +v9fs 9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe +xfs f38a032b165d812b0ba8378a5cd237c0888ff65f +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 03b8df8d43ecc3c5724e6bfb80bc0b9ea2aa2612 +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks 90f7d7a0d0d68623b5f7df5621a8d54d9518fcc4 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk 9980c4251f8ddfcf0617ed5724e4df5bd1f69c85 +pci 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e +hid 8ca10560f40216c75b8d6c5eb58910b95b36d30c +i2c 294b29f15469e90893c2b72a738a962ee02a12eb +i3c 41a0430dd5ca65afdecf10fb0b8b56966a1c5d04 +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging cd0b8e410937d43a7b2c2e04cd39b5e48ed252fc +jc_docs 242f4c77b1c8cebfdfa0ad5b40e2e4ae0316e57d +v4l-dvb 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +v4l-dvb-next 0a24c52d78e06d4e6e7cf1f8fe6012f89e93c985 +pm 755793be08684af07acb35e002aefa8d09c74d3f +cpufreq-arm 4855e26bcf4d28956f3e33231b961610a0d4a72d +cpupower 79a0dc5530a91694b1e85ef7219893397d85e5bb +devfreq 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +opp 94274f20f6bf5eb0099bbf7e133aac1f5cd087e8 +thermal fc26023f88167bc90e05f5fa56768eeadab4f5f0 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm ecd95673142ef80169a6c003b569b8a86d1e6329 +swiotlb f3c4b1341e8320e63f197a554fc5a25686a11d22 +rdma 1b789bd4dbd48a92f5427d9c37a72a8f6ca17754 +net-next 14e94f9445a9e91d460f5d4b519f8892c3fb14bb +bpf-next e57f52b42d1f51adb263a8bf3d453f2210cbc87a +ipsec-next 9e9fb7655ed585da8f468e29221f0ba194a5f613 +mlx5-next 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +netfilter-next 13bb8429ca985497bfba3a4afa6cd470d15fed10 +ipvs-next 13bb8429ca985497bfba3a4afa6cd470d15fed10 +wireless-drivers-next 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +bluetooth 81be03e026dc0c16dc1c64e088b2a53b73caa895 +mac80211-next 339133f6c318612f9a4556c300753beda27abc01 +mtd b72841e4dcd54de486fca2e4ffa00b8defc1eecc +nand 46a0dc10fb32bec3e765e51bf71fbc070dc77ca3 +spi-nor 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +crypto a2d3cbc80d2527b435154ff0f89b56ef4b84370f +drm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +drm-misc 9fcb4a8ff2aad6158f3056c857c2b2252eae312d +amdgpu d12d06294907da3685deb5e1658b2624e500a13c +drm-intel 641dd82ffa9daad38f630d9f4a36e4875fd4e0c6 +drm-tegra c3dbfb9c49eef7d07904e5fd5e158dd6688bbab3 +drm-msm cb0927ab80d224c9074f53d1a55b087d12ec5a85 +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +sound 94d508fa3186d0cbc63765aa94d5cf3bd847694c +sound-asoc eb4ec51579e8ff0f30ee0eeb39cf8a3e3e46cdea +modules ced75a2f5da71de5775fda44250e27d7b8024355 +input e2afe95a87a268bcdca2fb489d9c8a485e3aca85 +block 32ac44a96a8ec16a7808372ad988005f129e45e3 +device-mapper d3703ef331297b6daa97f5228cbe2a657d0cfd21 +libata 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc 4ed8431c42bae01a515141beeed49288cf48f443 +mfd cdff1eda69326fb46de10c5454212b3efcf4bb41 +backlight 79fad92f2e596f5a8dd085788a24f540263ef887 +battery c9398455b046fc7a44b6dd53d9d6fe4b11c21700 +regulator ea6ad72324f8089c7a7b8f32c0252d89bb601cbf +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity 836f7b6ca082b7031d2687b3493eefd104ddc060 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +smack 0817534ff9ea809fac1322c5c8c574be8483ea57 +tomoyo 7d2a07b769330c34b4deabeed939325c77a7ec2f +tpmdd f985911b7bc75d5c98ed24d8aaa8b94c590f7c6a +watchdog 41e73feb1024929e75eaf2f7cd93f35a3feb331b +iommu b58886bf14da3dab2a54e4fa10f16a03007993ec +audit d680c6b49c5edb532e3e5a134d9f48f000a691e1 +devicetree bb667205406c6faa955e0fef6eee879b0d386381 +mailbox 85dfdbfc13ea9614a2168ce4a7d2cd089d84cb64 +spi 9e36a96ee3da527992d0217963c52f6314b2f47c +tip 7fc58d76a2ce364607f0783b5f6a1516ece1a73a +clockevents f196ae282070d798c9144771db65577910d58566 +edac 4646da896a44d6795b37857d290853efd64821dd +irqchip 6e3b473ee06445d4eae2f8b1e143db70ed66f519 +ftrace 5dfe50b05588010f347cb2f436434bf22b7a84ed +rcu 9c2eed2c4c24c95d53f68aa55e7eceb3935aac4c +kvm 109bbba5066b42431399b40e947243f049d8dc8d +kvm-arm 419025b3b4190ee867ef4fc48fb3bd7da2e67a0c +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 a3e03bc1368c1bc16e19b001fc96dc7430573cc8 +xen-tip d859ed25b24289c87a97889653596f8088367e16 +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +drivers-x86 1f88e0a22f7cef04e2ef7eeb5252b061e5842d6b +chrome-platform 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +hsi e73f0f0ee7541171d89f2e2491130c7771ba58d3 +leds 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +ipmi 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +driver-core 820879ee1865f7010ec3a949322f643f008c9feb +usb ae8709b296d80c7f45aa1f35c0e7659ad69edce1 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty b55c8aa6b1abfc0fb0beede48627ac4d13b5ddc7 +char-misc d06246ebd7738bbfc581b887bc24a102450a323f +extcon 1a4bedc5305b2728151c445b7516157688522e0a +phy-next 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +soundwire 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +thunderbolt 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +vfio ea870730d83fc13a5fa2bd0e175176d7ac8a400a +staging 65e31407caea9d361a4e7d657b86ccf321eb62c7 +iio 5b8d4d8c912c3f6c31edc853a41cd54aae90b1c4 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 8bf5d31c4f06d806ae24a3ba998a2f4eaccfa7c1 +dmaengine 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +cgroup c0002d11d79900f8aa5c8375336434940d6afedf +scsi 1a0db7744e453844aa2db3f2959aea4a378025ea +scsi-mkp 7e642ca0375b95072ab6240c8eb9f0b4f013fb24 +vhost be9c6bad9b46451ba5bb8d366c51e2475f374981 +rpmsg 99fdaca991f7b35a72c7ac31dcd11656742abece +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 3ea046564039b7f20b3974adbea9271af64a4295 +gpio-intel 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pinctrl 788ac97efa9405174e9417ecf2ca4d90d298b73f +pinctrl-intel 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pinctrl-renesas 075667cc6c29ddc1a96af6d1f63fb673ef09b7cf +pinctrl-samsung 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pwm 3f2b16734914fa7c53ef7f8a10a63828890dbd37 +userns a3be01837fc9f2c0f9f7356adec7222c0e199af8 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nvdimm bdd3c50d83bf7f6acc869b48d02670d19030ae03 +at24 7629254054820bead6e18f8c3ae65c2bb01a5ae2 +ntb f96cb827ce49627543b4aabe8d54d8ea9740ae4e +seccomp b4d8a58f8dcfcc890f296696cadb76e77be44b5f +kspp 0c91d23b67832bbf09a70a5c8632f2ff595e709b +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 0f79ce970e79ffb771733f9634d5918d0eb3e30a +fsi 9ab1428dfe2c66b51e0b41337cd0164da0ab6080 +slimbus 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nvmem 536267aafb8aeaa8c5bc4c44105ecf7a6b95c27b +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 9d68cd9120e4e3af38f843e165631c323b86b4e4 +auxdisplay 24ebc044c72ee6e88dc902a0041bac672f012537 +kgdb f8416aa29185468e0d914ba4b2a330fd53ee263f +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +kunit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +cfi ff1176468d368232b684f75e82563369208bc371 +kunit-next 3b29021ddd10cfb6b2565c623595bd3b02036f33 +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 813272ed5238b37c81e448b302048e8008570121 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 5d3986cf8ed63ff8d86270e578649e71143112d6 +cxl 2b922a9d064f8e86b53b04f5819917b7a04142ed +folio 1a90e9dae32ce26de43c1c5eddb3ecce27f2a640 +linus e4e737bb5c170df6135a127739a9e6148ee3da82 +akpm-current 7f0fbfc0a77be012f7090fedd96a68ec28263d24 +akpm 9e72aed1f82dfa946512b2b4c48e9d2b6d13e4f7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..3247977d1eb6 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,340 @@ +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 +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 +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-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +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 +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +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 +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/jeyu/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 +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 +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/mdf/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 +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +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 +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 +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-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 +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-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 +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#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 +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 +cifsd git https://github.com/smfrench/smb3-kernel.git#cifsd-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 +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.linux-nfs.org/~bfields/linux.git#nfsd-next +cel 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 +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-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 +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +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 git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/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/jeyu/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/jmorris/linux-security.git#next-testing +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 +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#auto-latest +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 +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-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 +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 +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-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 +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +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 +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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 +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-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/andersson/remoteproc.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 +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 +coresight git git://git.linaro.org/kernel/coresight.git#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 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-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 +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +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 +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..1a3932157a98 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4870 @@ +$ date -R +Mon, 20 Sep 2021 08:23:04 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at bdb575f87217 Merge tag 'drm-fixes-2021-09-17' of git://anongit.freedesktop.org/drm/drm +Merging origin/master (20621d2f27a0 Merge tag 'x86_urgent_for_v5.15_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating bdb575f87217..20621d2f27a0 +Fast-forward (no commit created; -m option ignored) + Documentation/devicetree/bindings/arm/tegra.yaml | 2 +- + .../bindings/display/mediatek/mediatek,disp.txt | 2 +- + .../bindings/ufs/samsung,exynos-ufs.yaml | 89 +++++++++ + Documentation/networking/dsa/sja1105.rst | 2 +- + MAINTAINERS | 3 +- + arch/alpha/Kconfig | 3 +- + arch/alpha/include/asm/asm-prototypes.h | 1 + + arch/alpha/include/asm/jensen.h | 8 +- + arch/alpha/kernel/sys_jensen.c | 10 +- + arch/alpha/lib/Makefile | 1 + + arch/alpha/{math-emu/qrnnd.S => lib/udiv-qrnnd.S} | 2 + + arch/alpha/math-emu/Makefile | 2 +- + arch/alpha/math-emu/math.c | 2 - + arch/arm64/kernel/fpsimd.c | 2 +- + arch/arm64/kernel/process.c | 3 +- + arch/parisc/lib/iomap.c | 4 +- + arch/powerpc/kernel/interrupt.c | 43 ++++ + arch/powerpc/kernel/interrupt_64.S | 41 ---- + arch/powerpc/kernel/mce.c | 17 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 36 +++- + arch/powerpc/sysdev/xics/xics-common.c | 4 +- + arch/s390/Kconfig | 10 - + arch/s390/Makefile | 7 - + arch/s390/configs/debug_defconfig | 8 +- + arch/s390/configs/defconfig | 5 +- + arch/s390/pci/pci_mmio.c | 4 +- + arch/sh/boot/Makefile | 16 +- + arch/sparc/kernel/ioport.c | 4 +- + arch/x86/Kconfig | 5 + + arch/x86/Makefile_32.cpu | 12 +- + arch/x86/kernel/cpu/mce/core.c | 43 +++- + arch/x86/mm/init_64.c | 6 +- + arch/x86/mm/pat/memtype.c | 7 +- + arch/x86/xen/enlighten_pv.c | 7 + + arch/x86/xen/mmu_pv.c | 7 +- + block/blk-cgroup.c | 18 +- + block/blk-integrity.c | 9 +- + block/blk-mq-tag.c | 2 +- + drivers/base/power/trace.c | 10 + + drivers/cpufreq/cpufreq_governor_attr_set.c | 2 +- + drivers/cpufreq/intel_pstate.c | 22 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 84 +++----- + drivers/net/hamradio/dmascc.c | 6 +- + drivers/nvme/host/core.c | 17 +- + drivers/nvme/host/multipath.c | 7 +- + drivers/nvme/host/rdma.c | 16 +- + drivers/nvme/host/tcp.c | 20 +- + drivers/nvme/target/configfs.c | 2 +- + drivers/of/device.c | 6 +- + drivers/of/property.c | 2 - + drivers/pci/pci-acpi.c | 2 +- + drivers/pci/quirks.c | 9 +- + drivers/pci/vpd.c | 36 +++- + drivers/s390/char/sclp_early.c | 3 +- + drivers/s390/crypto/ap_bus.c | 3 +- + drivers/s390/crypto/ap_queue.c | 4 +- + drivers/spi/spi-tegra20-slink.c | 4 +- + drivers/video/fbdev/Kconfig | 4 +- + drivers/xen/Kconfig | 2 +- + drivers/xen/balloon.c | 62 ++++-- + drivers/xen/swiotlb-xen.c | 37 ++-- + fs/io-wq.c | 27 ++- + fs/io_uring.c | 221 ++++++++++++++------- + include/asm-generic/iomap.h | 10 - + include/asm-generic/pci_iomap.h | 3 + + include/linux/sched.h | 1 + + include/linux/uio.h | 21 +- + include/uapi/linux/io_uring.h | 8 +- + kernel/dma/debug.c | 3 +- + kernel/dma/mapping.c | 3 +- + kernel/events/core.c | 2 +- + kernel/locking/rwbase_rt.c | 65 ++++-- + lib/iov_iter.c | 36 ++++ + scripts/Makefile.clang | 5 + + scripts/Makefile.modpost | 2 +- + scripts/checkkconfigsymbols.py | 11 +- + scripts/clang-tools/gen_compile_commands.py | 1 + + tools/lib/perf/evsel.c | 64 +++--- + tools/perf/builtin-script.c | 24 ++- + tools/perf/ui/browser.c | 33 ++- + tools/perf/ui/browser.h | 2 +- + tools/perf/ui/browsers/annotate.c | 24 ++- + tools/perf/util/bpf-event.c | 3 + + tools/perf/util/machine.c | 1 + + .../testing/selftests/powerpc/tm/tm-syscall-asm.S | 37 +++- + tools/testing/selftests/powerpc/tm/tm-syscall.c | 36 +++- + 86 files changed, 955 insertions(+), 495 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml + rename arch/alpha/{math-emu/qrnnd.S => lib/udiv-qrnnd.S} (98%) +Merging fixes/fixes (3ca706c189db drm/ttm: fix type mismatch error on sparc64) +$ 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 kbuild-current/fixes (0664684e1ebd kbuild: Add -Werror=ignored-optimization-argument to CLANG_FLAGS) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (463dbba4d189 ARM: 9104/2: Fix Keystone 2 kernel mapping regression) +$ 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 (9fcb2e93f41c arm64: Mark __stack_chk_guard as __ro_after_init) +$ 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 (3f1c260ffddb MAINTAINERS: Add myself as MStar/Sigmastar Armv7 SoC maintainers) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/configs/multi_v7_defconfig | 3 +++ + 2 files changed, 4 insertions(+) +Merging drivers-memory-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (a7b68ed15d1f m68k: mvme: Remove overdue #warnings in RTC handling) +$ 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 (c006a06508db powerpc/xics: Set the IRQ chip data for the ICS native backend) +$ 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 (f5711f9df924 s390: remove WARN_DYNAMIC_STACK) +$ 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 (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ 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 (e30cd812dffa selftests: net: af_unix: Fix makefile to use TEST_GEN_PROGS) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'recursive' strategy. + drivers/net/dsa/b53/b53_mdio.c | 21 ++++- + drivers/net/dsa/b53/b53_mmap.c | 13 +++ + drivers/net/dsa/b53/b53_priv.h | 5 + + drivers/net/dsa/b53/b53_spi.c | 13 +++ + drivers/net/dsa/b53/b53_srab.c | 21 ++++- + drivers/net/dsa/bcm_sf2.c | 14 ++- + drivers/net/dsa/dsa_loop.c | 22 ++++- + drivers/net/dsa/hirschmann/hellcreek.c | 16 ++++ + drivers/net/dsa/lan9303-core.c | 6 ++ + drivers/net/dsa/lan9303.h | 1 + + drivers/net/dsa/lan9303_i2c.c | 24 ++++- + drivers/net/dsa/lan9303_mdio.c | 15 +++ + drivers/net/dsa/lantiq_gswip.c | 18 ++++ + drivers/net/dsa/microchip/ksz8795_spi.c | 11 ++- + drivers/net/dsa/microchip/ksz8863_smi.c | 13 +++ + drivers/net/dsa/microchip/ksz9477_i2c.c | 14 ++- + drivers/net/dsa/microchip/ksz9477_spi.c | 8 +- + drivers/net/dsa/mt7530.c | 18 ++++ + drivers/net/dsa/mv88e6060.c | 18 ++++ + drivers/net/dsa/mv88e6xxx/chip.c | 38 +++++++- + drivers/net/dsa/mv88e6xxx/devlink.c | 73 ++------------- + drivers/net/dsa/mv88e6xxx/devlink.h | 6 +- + drivers/net/dsa/ocelot/felix.c | 2 +- + drivers/net/dsa/ocelot/felix.h | 2 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 22 ++++- + drivers/net/dsa/ocelot/seville_vsc9953.c | 20 +++- + drivers/net/dsa/qca/ar9331.c | 18 ++++ + drivers/net/dsa/qca8k.c | 18 ++++ + drivers/net/dsa/realtek-smi-core.c | 20 +++- + drivers/net/dsa/sja1105/sja1105_clocking.c | 2 +- + drivers/net/dsa/sja1105/sja1105_devlink.c | 2 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 2 +- + drivers/net/dsa/sja1105/sja1105_main.c | 21 ++++- + drivers/net/dsa/sja1105/sja1105_mdio.c | 2 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 2 +- + drivers/net/dsa/sja1105/sja1105_static_config.c | 2 +- + drivers/net/dsa/sja1105/sja1105_static_config.h | 2 +- + drivers/net/dsa/sja1105/sja1105_vl.c | 2 +- + drivers/net/dsa/sja1105/sja1105_vl.h | 2 +- + drivers/net/dsa/vitesse-vsc73xx-core.c | 6 ++ + drivers/net/dsa/vitesse-vsc73xx-platform.c | 22 ++++- + drivers/net/dsa/vitesse-vsc73xx-spi.c | 22 ++++- + drivers/net/dsa/vitesse-vsc73xx.h | 1 + + drivers/net/dsa/xrs700x/xrs700x.c | 6 ++ + drivers/net/dsa/xrs700x/xrs700x.h | 1 + + drivers/net/dsa/xrs700x/xrs700x_i2c.c | 18 ++++ + drivers/net/dsa/xrs700x/xrs700x_mdio.c | 18 ++++ + drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 + + drivers/net/ethernet/freescale/enetc/enetc.c | 7 +- + drivers/net/ethernet/freescale/enetc/enetc_ierb.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc_ierb.h | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 1 - + drivers/net/ethernet/intel/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 47 ++++++---- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 - + drivers/net/ethernet/mscc/ocelot.c | 10 -- + drivers/net/ethernet/mscc/ocelot_devlink.c | 2 +- + drivers/net/ethernet/mscc/ocelot_mrp.c | 2 +- + drivers/net/ethernet/mscc/ocelot_net.c | 2 +- + drivers/net/pcs/pcs-xpcs-nxp.c | 2 +- + drivers/net/phy/mdio_device.c | 11 +++ + drivers/net/usb/hso.c | 12 +-- + drivers/net/virtio_net.c | 4 + + drivers/net/xen-netback/netback.c | 2 +- + include/linux/dsa/ocelot.h | 2 +- + include/linux/mdio.h | 3 + + include/linux/packing.h | 2 +- + include/net/dsa.h | 9 ++ + include/net/sock.h | 1 + + lib/packing.c | 2 +- + net/core/sock.c | 37 +++++--- + net/dsa/dsa2.c | 101 ++++++++++++++++++++- + net/dsa/tag_ocelot.c | 2 +- + net/dsa/tag_ocelot_8021q.c | 2 +- + .../drivers/net/ocelot/tc_flower_chains.sh | 2 +- + tools/testing/selftests/net/af_unix/Makefile | 5 +- + .../testing/selftests/net/af_unix/test_unix_oob.c | 5 +- + 77 files changed, 721 insertions(+), 185 deletions(-) +Merging bpf/master (bc23f7244817 bpf/tests: Add tail call limit test with external function call) +$ 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 'recursive' strategy. + arch/mips/net/bpf_jit.c | 57 +- + arch/x86/net/bpf_jit_comp.c | 53 +- + include/linux/bpf.h | 3 +- + kernel/bpf/bpf_struct_ops.c | 7 +- + lib/test_bpf.c | 14182 ++++++++++++++++++++++++++---------------- + 5 files changed, 8823 insertions(+), 5479 deletions(-) +Merging ipsec/master (047a749d231e Merge branch 'xfrm: fix uapi for the default policy') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'recursive' strategy. + include/uapi/linux/xfrm.h | 15 ++++++----- + net/xfrm/xfrm_user.c | 62 ++++++++++++++++++++++++++++++++++++--------- + security/selinux/nlmsgtab.c | 4 ++- + 3 files changed, 62 insertions(+), 19 deletions(-) +Merging netfilter/master (310e2d43c3ad netfilter: ip6_tables: zero-initialize fragment offset) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Merge made by the 'recursive' strategy. + net/ipv6/netfilter/ip6_tables.c | 1 + + net/netfilter/ipset/ip_set_hash_gen.h | 4 ++-- + net/netfilter/ipvs/ip_vs_conn.c | 4 ++++ + 3 files changed, 7 insertions(+), 2 deletions(-) +Merging ipvs/master (69e73dbfda14 ipvs: check that ip_vs_conn_tab_bits is between 8 and 20) +$ 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-drivers/master (b6a46b4f6e4b iwlwifi: mvm: d3: missing unlock in iwl_mvm_wowlan_program_keys()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 5 +++-- + drivers/net/wireless/intel/iwlwifi/mvm/time-event.c | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging mac80211/master (7366c23ff492 ptp: dp83640: don't define PAGE0) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (1b789bd4dbd4 IB/qib: Fix clang confusion of NULL pointer comparison) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/qib/qib_sysfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound-current/for-linus (94d508fa3186 ALSA: hda/cs8409: Setup Dolphin Headset Mic as Phantom Jack) +$ 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 'recursive' strategy. + sound/firewire/oxfw/oxfw.c | 13 +++-- + sound/pci/hda/hda_intel.c | 12 +++- + sound/pci/hda/patch_cs8409.c | 3 + + sound/pci/hda/patch_realtek.c | 129 ++++++++++++++++++++++++++++++++++++++++++ + sound/pci/pcxhr/pcxhr_core.c | 2 +- + sound/usb/card.c | 18 ++---- + sound/usb/mixer.c | 26 ++------- + sound/usb/mixer.h | 3 +- + sound/usb/mixer_quirks.c | 2 +- + 9 files changed, 160 insertions(+), 48 deletions(-) +Merging sound-asoc-fixes/for-linus (31078df33b25 Merge remote-tracking branch 'asoc/for-5.15' 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 MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + sound/soc/fsl/fsl_esai.c | 16 ++++++++++------ + sound/soc/fsl/fsl_micfil.c | 15 ++++++++++----- + sound/soc/fsl/fsl_sai.c | 14 +++++++++----- + sound/soc/fsl/fsl_spdif.c | 14 +++++++++----- + sound/soc/fsl/fsl_xcvr.c | 15 ++++++++++----- + sound/soc/intel/boards/sof_sdw.c | 5 +++++ + sound/soc/mediatek/Kconfig | 3 +++ + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 19 +++++++++++-------- + .../soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 7 +++---- + sound/soc/sof/core.c | 4 +--- + sound/soc/sof/imx/imx8.c | 9 ++++++++- + sound/soc/sof/imx/imx8m.c | 9 ++++++++- + sound/soc/sof/loader.c | 8 +++++--- + sound/soc/sof/trace.c | 1 - + sound/soc/sof/xtensa/core.c | 4 ++-- + 16 files changed, 96 insertions(+), 50 deletions(-) +Merging regmap-fixes/for-linus (6880fa6c5660 Linux 5.15-rc1) +$ 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 (6101f606d8bf Merge remote-tracking branch 'regulator/for-5.15' into regulator-linus) +$ 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 'recursive' strategy. + drivers/regulator/max14577-regulator.c | 2 -- + drivers/regulator/qcom-rpmh-regulator.c | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging spi-fixes/for-linus (26b1f08a6904 Merge remote-tracking branch 'spi/for-5.15' 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 drivers/spi/spi-tegra20-slink.c +CONFLICT (content): Merge conflict in drivers/spi/spi-tegra20-slink.c +Recorded preimage for 'drivers/spi/spi-tegra20-slink.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/spi/spi-tegra20-slink.c'. +[master ba3c246cf361] Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git +$ git diff -M --stat --summary HEAD^.. + drivers/spi/spi-rockchip.c | 6 ++++++ + drivers/spi/spi-tegra20-slink.c | 9 ++++----- + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging pci-current/for-linus (e042a4533fc3 MAINTAINERS: Add Nirmal Patel as VMD maintainer) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 (7049d853cfb9 tty: unexport tty_ldisc_release) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/8250/8250_omap.c | 2 +- + drivers/tty/serial/mvebu-uart.c | 2 +- + drivers/tty/synclink_gt.c | 44 ++++++++++++++++++------------------- + drivers/tty/tty_ldisc.c | 1 - + 4 files changed, 24 insertions(+), 25 deletions(-) +Merging usb.current/usb-linus (da546d6b748e arm64: dts: qcom: ipq8074: remove USB tx-fifo-resize property) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 - + drivers/usb/cdns3/cdns3-gadget.c | 14 +++ + drivers/usb/class/cdc-acm.c | 7 +- + drivers/usb/class/cdc-acm.h | 2 + + drivers/usb/core/hcd.c | 68 ++++++++---- + drivers/usb/dwc2/gadget.c | 193 +++++++++++++++++++--------------- + drivers/usb/dwc2/hcd.c | 4 + + drivers/usb/dwc3/core.c | 30 +++--- + drivers/usb/gadget/function/f_uac2.c | 19 +++- + drivers/usb/gadget/function/u_audio.c | 13 ++- + drivers/usb/gadget/udc/r8a66597-udc.c | 2 +- + drivers/usb/host/bcma-hcd.c | 5 +- + drivers/usb/host/ehci-hcd.c | 75 +++++-------- + drivers/usb/host/xhci.c | 1 + + include/linux/usb/hcd.h | 2 + + tools/usb/testusb.c | 14 +-- + 16 files changed, 258 insertions(+), 193 deletions(-) +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 (7bb057134d60 USB: serial: option: add Telit LN920 compositions) +$ 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 +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging usb-chipidea-fixes/for-usb-fixes (98a1373a2de9 usb: cdns3: fix race condition before setting doorbell) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Merge made by the 'recursive' strategy. +Merging phy/fixes (6880fa6c5660 Linux 5.15-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 (92dc0b1f46e1 staging: greybus: uart: fix tty use after free) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/greybus/uart.c | 62 ++++++++++++++++++++++-------------------- + 1 file changed, 32 insertions(+), 30 deletions(-) +Merging iio-fixes/fixes-togreg (8167c9a375cc iio: ssp_sensors: add more range checking in ssp_parse_dataframe()) +$ 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 'recursive' strategy. + drivers/iio/accel/fxls8962af-core.c | 2 +- + drivers/iio/adc/ad7192.c | 1 + + drivers/iio/adc/ad7780.c | 2 +- + drivers/iio/adc/ad7793.c | 2 +- + drivers/iio/adc/aspeed_adc.c | 1 + + drivers/iio/adc/max1027.c | 3 +-- + drivers/iio/adc/rzg2l_adc.c | 6 ++++-- + drivers/iio/adc/ti-adc128s052.c | 6 ++++++ + drivers/iio/common/ssp_sensors/ssp_spi.c | 11 +++++++++-- + drivers/iio/dac/ti-dac5571.c | 1 + + 10 files changed, 26 insertions(+), 9 deletions(-) +Merging char-misc.current/char-misc-linus (25a143321648 mcb: fix error handling in mcb_alloc_bus()) +$ 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 +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 58 ++++++++++++++++++++------ + drivers/android/binder_internal.h | 2 + + drivers/hwtracing/coresight/coresight-syscfg.c | 1 + + drivers/mcb/mcb-core.c | 12 +++--- + drivers/misc/genwqe/card_base.c | 2 +- + include/linux/nvmem-consumer.h | 14 +++++++ + include/uapi/linux/android/binder.h | 7 ++++ + 7 files changed, 77 insertions(+), 19 deletions(-) +Merging soundwire-fixes/fixes (6880fa6c5660 Linux 5.15-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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 (0c5483a5778f Input: analog - always use ktime functions) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (6ae51ffe5e76 crypto: sha512 - remove imaginary and mystifying clearing of variables) +$ 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 (dc51ff91cf2d vfio/platform: fix module_put call in error flow) +$ 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 (f5013d412a43 selftests: kvm: fix get_run_delay() ignoring fscanf() return warn) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/kvm/include/test_util.h | 3 +++ + tools/testing/selftests/kvm/lib/test_util.c | 22 +++++++++++++++++++++- + tools/testing/selftests/kvm/steal_time.c | 16 ---------------- + .../selftests/kvm/x86_64/mmio_warning_test.c | 3 ++- + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 15 --------------- + tools/testing/selftests/lib.mk | 1 + + 6 files changed, 27 insertions(+), 33 deletions(-) +Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) +$ 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 (f60f5741002b mtd: rawnand: qcom: Update code word value for raw read) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/qcom_nandc.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +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 (f0c15b360fb6 media: ir_toy: prevent device from hanging during transmit) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/platform/s5p-jpeg/jpeg-core.c | 18 +++++++-------- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 28 +++++++++++------------ + drivers/media/rc/ir_toy.c | 21 ++++++++++++++++- + drivers/staging/media/hantro/hantro_drv.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 2 +- + 5 files changed, 45 insertions(+), 26 deletions(-) +Merging reset-fixes/reset/fixes (ed104ca4bd9c reset: reset-zynqmp: Fixed the argument data type) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 (4348cc10da63 ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - + arch/arm/boot/dts/at91-sama7g5ek.dts | 9 ++ + arch/arm/boot/dts/sama7g5.dtsi | 39 +++++++++ + arch/arm/mach-at91/pm.c | 130 ++++++++++++++++++++++++---- + 4 files changed, 162 insertions(+), 17 deletions(-) +Merging omap-fixes/fixes (e879f855e590 bus: ti-sysc: Add break in switch statement in sysc_init_soc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Auto-merging drivers/bus/ti-sysc.c +Merge made by the 'recursive' strategy. + drivers/bus/ti-sysc.c | 1 + + 1 file changed, 1 insertion(+) +Merging kvm-fixes/master (7d2a07b76933 Linux 5.14) +$ 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 (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test) +$ 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 (e6fab7af6ba1 hwmon: (mlxreg-fan) Return non-zero value when fan current state is enforced from sysfs) +$ 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 'recursive' strategy. + Documentation/hwmon/k10temp.rst | 17 ----------------- + drivers/hwmon/k10temp.c | 6 ------ + drivers/hwmon/mlxreg-fan.c | 12 +++++++++--- + 3 files changed, 9 insertions(+), 26 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (32b2397c1e56 libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ 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 (45940091a3c1 Merge branch 'misc-5.15' 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 +Merge made by the 'recursive' strategy. + fs/btrfs/file-item.c | 13 ++++++++++++- + fs/btrfs/space-info.c | 5 +++-- + fs/btrfs/verity.c | 6 ++++-- + fs/btrfs/volumes.c | 13 +++++++++++++ + 4 files changed, 32 insertions(+), 5 deletions(-) +Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/stat.c +Merge made by the 'recursive' strategy. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ 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 (3c3c8e88c871 platform/x86: amd-pmc: Increase the response register timeout) +$ 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 +Merge made by the 'recursive' strategy. + drivers/platform/x86/amd-pmc.c | 2 +- + drivers/platform/x86/intel/punit_ipc.c | 3 +- + drivers/platform/x86/lg-laptop.c | 2 +- + drivers/platform/x86/touchscreen_dmi.c | 54 +++++++++++++++++++++++++++++++--- + 4 files changed, 53 insertions(+), 8 deletions(-) +Merging samsung-krzk-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) +$ 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 (6880fa6c5660 Linux 5.15-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 (55c21d57eafb dt-bindings: arm: Fix Toradex compatible typo) +$ 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 scsi-fixes/fixes (1a0db7744e45 scsi: bsg: Fix device unregistration) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 --- + block/bsg.c | 23 +++++---- + drivers/scsi/elx/efct/efct_lio.c | 4 +- + drivers/scsi/elx/libefc/efc_device.c | 7 ++- + drivers/scsi/elx/libefc/efc_fabric.c | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 8 ++-- + drivers/scsi/lpfc/lpfc_hw4.h | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 20 ++++---- + drivers/scsi/lpfc/lpfc_nvme.c | 2 - + drivers/scsi/lpfc/lpfc_scsi.c | 9 +--- + drivers/scsi/lpfc/lpfc_sli.c | 5 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 7 ++- + drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +- + drivers/scsi/ncr53c8xx.c | 23 --------- + drivers/scsi/scsi_transport_iscsi.c | 8 ++-- + drivers/scsi/sd.c | 14 ++++-- + drivers/scsi/sd_zbc.c | 6 +-- + drivers/scsi/sr_ioctl.c | 2 +- + drivers/scsi/st.c | 1 + + drivers/scsi/ufs/ufshcd-pci.c | 78 +++++++++++++++++++++++++++++++ + drivers/scsi/ufs/ufshcd.c | 3 +- + drivers/scsi/ufs/ufshcd.h | 1 + + drivers/scsi/ufs/ufshpb.c | 8 ++-- + drivers/target/target_core_configfs.c | 32 ++++++++----- + 26 files changed, 171 insertions(+), 111 deletions(-) +Merging drm-fixes/drm-fixes (109f7ea9aedc Merge tag 'amd-drm-fixes-5.15-2021-09-16' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ 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 (7889367d7795 drm/i915: Enable -Wsometimes-uninitialized) +$ 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 (b81bede4d138 mmc: renesas_sdhi: fix regression with hard reset on old SDHIs) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/dw_mmc.c | 15 ++++++++++++--- + drivers/mmc/host/renesas_sdhi_core.c | 2 ++ + 2 files changed, 14 insertions(+), 3 deletions(-) +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 'recursive' strategy. +Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1) +$ 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 (dfb5c1e12c28 x86/hyperv: remove on-stack cpumask from hv_send_ipi_mask_allbutself) +$ 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 (c1e64c0aec8c soc: fsl: qe: fix static checker warning) +$ 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 (7d2a07b76933 Linux 5.14) +$ 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 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 (e9a9970bf520 fpga: dfl: Avoid reads to AFU CSRs during enumeration) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/fpga/dfl.c | 14 ++++++++------ + drivers/fpga/machxo2-spi.c | 6 +++++- + 2 files changed, 13 insertions(+), 7 deletions(-) +Merging spdx/spdx-linus (6880fa6c5660 Linux 5.15-rc1) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster) +$ 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 (6880fa6c5660 Linux 5.15-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 (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ 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 (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM) +$ 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 (7d2a07b76933 Linux 5.14) +$ 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 (0ddc5e55e6f1 Documentation: Fix irq-domain.rst build warning) +$ 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 'recursive' strategy. + Documentation/core-api/irq/irq-domain.rst | 5 +++-- + 1 file changed, 3 insertions(+), 2 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 perf-current/perf/urgent (219d720e6df7 perf bpf: Ignore deprecation warning when using libbpf's btf__get_from_id()) +$ 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 drm-misc-fixes/for-linux-next-fixes (6b457230bfa1 drm/nouveau/ga102-: support ttm buffer moves via copy engine) +$ 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/vc4/vc4_hdmi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c +Recorded preimage for 'drivers/gpu/drm/vc4/vc4_hdmi.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/vc4/vc4_hdmi.c'. +[master 091ae9ec4caa] Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/kmb/kmb_drv.c | 8 +- + drivers/gpu/drm/kmb/kmb_drv.h | 5 + + drivers/gpu/drm/kmb/kmb_plane.c | 81 +++++- + drivers/gpu/drm/kmb/kmb_plane.h | 5 +- + drivers/gpu/drm/kmb/kmb_regs.h | 3 + + drivers/gpu/drm/nouveau/dispnv50/head.c | 2 +- + drivers/gpu/drm/nouveau/include/nvif/class.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 1 + + drivers/gpu/drm/nouveau/nouveau_chan.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 4 + + drivers/gpu/drm/nouveau/nv84_fence.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c | 308 +++++++++++++++++++++ + drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c | 7 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 7 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 4 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 97 ++++--- + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 173 ++++++++---- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 6 + + 22 files changed, 600 insertions(+), 127 deletions(-) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c +Merging kspp-gustavo/for-next/kspp (8881af30b421 Makefile: Enable -Wimplicit-fallthrough for Clang) +$ 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 +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 8 ++++++++ + arch/mips/alchemy/devboards/db1550.c | 1 + + arch/mips/kernel/uprobes.c | 1 + + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 3 +-- + drivers/pcmcia/db1xxx_ss.c | 1 + + 5 files changed, 12 insertions(+), 2 deletions(-) +Merging kbuild/for-next (860091ee86e6 riscv: move the (z)install rules to arch/riscv/Makefile) +$ 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 scripts/checkkconfigsymbols.py +Auto-merging arch/arm64/lib/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 +- + arch/arm64/lib/Makefile | 2 ++ + arch/nds32/Makefile | 2 ++ + arch/nios2/Makefile | 3 ++- + arch/nios2/boot/Makefile | 3 --- + arch/powerpc/lib/Makefile | 2 ++ + crypto/Makefile | 2 ++ + lib/raid6/Makefile | 4 +++ + scripts/Makefile.build | 63 +++++++++++++++++++++++++++-------------------- + scripts/Makefile.lib | 11 --------- + 10 files changed, 51 insertions(+), 43 deletions(-) +Merging perf/perf/core (8228e9361e2a perf parse-events: Avoid enum forward declaration.) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Merge made by the 'recursive' strategy. + tools/perf/arch/x86/annotate/instructions.c | 28 +++++++++++++++++++++++++++- + tools/perf/util/annotate.c | 1 - + tools/perf/util/bpf_counter.c | 8 ++++---- + tools/perf/util/bpf_counter_cgroup.c | 8 ++++---- + tools/perf/util/parse-events.c | 2 +- + tools/perf/util/parse-events.h | 3 +-- + 6 files changed, 37 insertions(+), 13 deletions(-) +Merging compiler-attributes/compiler-attributes (b83a908498d6 compiler_attributes.h: move __compiletime_{error|warning}) +$ 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 (59583f747664 sparc32: page align size in arch_dma_alloc) +$ 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 (7962c2eddbfe arch: remove unused function syscall_set_arguments()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'recursive' strategy. + arch/arm/include/asm/syscall.h | 10 ---------- + arch/arm64/include/asm/syscall.h | 10 ---------- + arch/csky/include/asm/syscall.h | 9 --------- + arch/ia64/include/asm/syscall.h | 17 ++--------------- + arch/ia64/kernel/ptrace.c | 31 ++++++++++++------------------- + arch/microblaze/include/asm/syscall.h | 33 --------------------------------- + arch/nds32/include/asm/syscall.h | 22 ---------------------- + arch/nios2/include/asm/syscall.h | 11 ----------- + arch/openrisc/include/asm/syscall.h | 7 ------- + arch/powerpc/include/asm/syscall.h | 10 ---------- + arch/riscv/include/asm/syscall.h | 9 --------- + arch/s390/include/asm/syscall.h | 12 ------------ + arch/sh/include/asm/syscall_32.h | 12 ------------ + arch/sparc/include/asm/syscall.h | 10 ---------- + arch/um/include/asm/syscall-generic.h | 14 -------------- + arch/x86/include/asm/syscall.h | 33 --------------------------------- + arch/xtensa/include/asm/syscall.h | 11 ----------- + include/asm-generic/syscall.h | 16 ---------------- + 18 files changed, 14 insertions(+), 263 deletions(-) +Merging arc/for-next (6880fa6c5660 Linux 5.15-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 (1c9b5911f53b Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (85f58eb18898 arm64: kdump: Skip kmemleak scan reserved memory for kdump) +$ 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 (fd264b310579 arm64/perf: Replace '0xf' instances with ID_AA64DFR0_PMUVER_IMP_DEF) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +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 'recursive' strategy. +Merging amlogic/for-next (eeb44922aa83 Merge branch 'v5.16/dt64' 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 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/amlogic/Makefile | 3 + + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 362 ++++++++++++++++++ + .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 405 +++++++++++++++++++++ + .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 241 ++++++++++++ + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 61 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 4 + + drivers/soc/amlogic/meson-canvas.c | 4 +- + drivers/soc/amlogic/meson-clk-measure.c | 4 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 1 + + 11 files changed, 1084 insertions(+), 6 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts +Merging aspeed/for-next (0f32f00af344 Merge branches 'dt-for-v5.15', 'soc-for-v5.15' and 'defconfig-for-v5.15' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging at91/at91-next (1eaab16dfac2 Merge branch 'at91-soc' 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 Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.yaml | 12 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/at91-lmu5000.dts | 147 +++++++++++++++ + arch/arm/boot/dts/at91-q5xr5.dts | 199 +++++++++++++++++++++ + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 12 +- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 23 ++- + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 70 ++++++++ + arch/arm/boot/dts/at91-sama7g5ek.dts | 8 + + arch/arm/boot/dts/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/sama7g5.dtsi | 16 ++ + arch/arm/mach-at91/Kconfig | 13 ++ + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/lan966x.c | 25 +++ + 14 files changed, 530 insertions(+), 4 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-lmu5000.dts + create mode 100644 arch/arm/boot/dts/at91-q5xr5.dts + create mode 100644 arch/arm/mach-at91/lan966x.c +Merging drivers-memory/for-next (6fc5f1adf5a1 memory: tegra210-emc: replace DEFINE_SIMPLE_ATTRIBUTE with DEFINE_DEBUGFS_ATTRIBUTE) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'recursive' strategy. + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 2 +- + drivers/memory/tegra/tegra210-emc-core.c | 4 ++-- + drivers/memory/tegra/tegra30-emc.c | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging imx-mxs/for-next (2cb411d89676 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 +Already up to date. +Merge made by the 'recursive' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (69862ae4e378 Merge branch 'v5.14-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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (930af8dda750 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging omap/for-next (7911f95d1713 Merge branch 'fixes' 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 drivers/bus/ti-sysc.c +Merge made by the 'recursive' strategy. +Merging qcom/for-next (8482d1c0bb62 Merge branches 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' 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 arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 3 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 12 + + .../devicetree/bindings/firmware/qcom,scm.txt | 1 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-apq8026-lge-lenok.dts | 237 +++++++++++++++++++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 7 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 263 ++++++++++++++++++++- + arch/arm/boot/dts/qcom-pm8226.dtsi | 27 +++ + arch/arm/mach-qcom/platsmp.c | 71 ++++++ + arch/arm64/boot/dts/qcom/msm8998.dtsi | 5 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 4 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 166 +++---------- + drivers/soc/qcom/llcc-qcom.c | 16 ++ + drivers/soc/qcom/rpmhpd.c | 16 ++ + drivers/soc/qcom/socinfo.c | 2 +- + include/dt-bindings/power/qcom-rpmpd.h | 8 + + 19 files changed, 691 insertions(+), 156 deletions(-) + create mode 100644 arch/arm/boot/dts/qcom-apq8026-lge-lenok.dts + create mode 100644 arch/arm/boot/dts/qcom-pm8226.dtsi +Merging raspberrypi/for-next (9f5289ec6f1c ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address) +$ 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/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/bcm2835.yaml | 1 + + .../bindings/display/brcm,bcm2835-dsi0.yaml | 3 + + .../bindings/display/brcm,bcm2835-hdmi.yaml | 3 + + .../bindings/display/brcm,bcm2835-v3d.yaml | 3 + + .../bindings/display/brcm,bcm2835-vec.yaml | 3 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 49 +++----- + arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts | 138 +++++++++++++++++++++ + arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi | 113 +++++++++++++++++ + arch/arm/boot/dts/bcm2711.dtsi | 12 +- + arch/arm/boot/dts/bcm2835-common.dtsi | 8 ++ + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 31 ++--- + arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 36 ++---- + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 36 ++---- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 36 ++---- + arch/arm/boot/dts/bcm283x-rpi-wifi-bt.dtsi | 34 +++++ + arch/arm/boot/dts/bcm283x.dtsi | 8 -- + arch/arm64/boot/dts/broadcom/Makefile | 1 + + .../arm64/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts | 2 + + 19 files changed, 366 insertions(+), 152 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts + create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-wifi-bt.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts +Merging renesas/next (cbbd8f16ae1c Merge branches 'renesas-arm-dt-for-v5.16', 'renesas-drivers-for-v5.16' and 'renesas-dt-bindings-for-v5.16' 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 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 61 ++ + arch/arm64/boot/dts/renesas/Makefile | 24 + + arch/arm64/boot/dts/renesas/draak.dtsi | 683 ++++++++++++++++++ + arch/arm64/boot/dts/renesas/ebisu.dtsi | 799 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 11 + + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 788 +------------------- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 671 +---------------- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 109 +++ + .../boot/dts/renesas/r8a779m0-salvator-xs.dts | 53 ++ + arch/arm64/boot/dts/renesas/r8a779m0-ulcb-kf.dts | 19 + + arch/arm64/boot/dts/renesas/r8a779m0-ulcb.dts | 53 ++ + arch/arm64/boot/dts/renesas/r8a779m0.dtsi | 12 + + .../boot/dts/renesas/r8a779m2-salvator-xs.dts | 46 ++ + arch/arm64/boot/dts/renesas/r8a779m2-ulcb-kf.dts | 18 + + arch/arm64/boot/dts/renesas/r8a779m2-ulcb.dts | 45 ++ + arch/arm64/boot/dts/renesas/r8a779m2.dtsi | 12 + + .../boot/dts/renesas/r8a779m4-salvator-xs.dts | 36 + + arch/arm64/boot/dts/renesas/r8a779m4-ulcb-kf.dts | 19 + + arch/arm64/boot/dts/renesas/r8a779m4-ulcb.dts | 36 + + arch/arm64/boot/dts/renesas/r8a779m4.dtsi | 12 + + .../boot/dts/renesas/r8a779m5-salvator-xs.dts | 36 + + arch/arm64/boot/dts/renesas/r8a779m5-ulcb-kf.dts | 19 + + arch/arm64/boot/dts/renesas/r8a779m5-ulcb.dts | 36 + + arch/arm64/boot/dts/renesas/r8a779m5.dtsi | 12 + + arch/arm64/boot/dts/renesas/r8a779m6-ebisu.dts | 18 + + arch/arm64/boot/dts/renesas/r8a779m6.dtsi | 12 + + arch/arm64/boot/dts/renesas/r8a779m7-draak.dts | 19 + + arch/arm64/boot/dts/renesas/r8a779m7.dtsi | 12 + + .../boot/dts/renesas/r8a779m8-salvator-xs.dts | 53 ++ + arch/arm64/boot/dts/renesas/r8a779m8-ulcb-kf.dts | 19 + + arch/arm64/boot/dts/renesas/r8a779m8-ulcb.dts | 52 ++ + arch/arm64/boot/dts/renesas/r8a779m8.dtsi | 12 + + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 240 +++++++ + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 10 + + drivers/soc/renesas/Kconfig | 7 +- + drivers/soc/renesas/renesas-soc.c | 7 + + 36 files changed, 2612 insertions(+), 1459 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/draak.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ebisu.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m0-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m0-ulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m0-ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m0.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m2-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m2-ulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m2-ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m4-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m4-ulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m4-ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m4.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m5-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m5-ulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m5-ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m5.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m6-ebisu.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m6.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m7-draak.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m7.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m8-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m8-ulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m8-ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m8.dtsi +Merging reset/reset/next (09f3824342f6 reset: simple: remove ZTE details in Kconfig help) +$ 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 (d46148623f26 Merge branch 'v5.15-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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 48 +- + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + arch/arm64/boot/dts/rockchip/Makefile | 6 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 73 ++ + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 37 + + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 3 - + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 16 + + arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 110 +++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 7 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 5 - + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 176 ++++ + .../boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts | 41 + + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 180 ++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 36 + + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 6 +- + .../arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 218 +++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 54 ++ + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 + + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 47 ++ + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 29 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 46 +- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 497 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3566.dtsi | 20 + + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 313 +++++++ + arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi | 9 + + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 644 ++------------ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 931 +++++++++++++++++++++ + 29 files changed, 2973 insertions(+), 599 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk356x.dtsi +Merging samsung-krzk/for-next (2721363c0d64 Merge branch 'next/drivers' 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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos5250.dtsi | 1 - + arch/arm/mach-s3c/irq-s3c24xx.c | 22 ++++++++++++++++++---- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 10 +++++----- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +++--- + drivers/soc/samsung/Kconfig | 1 + + 5 files changed, 27 insertions(+), 13 deletions(-) +Merging scmi/for-linux-next (34eae8520c88 Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ 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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 20 ++++++++++++------- + arch/arm/boot/dts/vexpress-v2m.dtsi | 18 ++++++++++++----- + arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 11 +---------- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 11 +---------- + arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 11 +---------- + arch/arm/boot/dts/vexpress-v2p-ca9.dts | 12 +---------- + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 1 - + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 23 ---------------------- + arch/arm64/boot/dts/arm/juno-base.dtsi | 12 ----------- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 21 +++++++++++++------- + arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 11 ----------- + .../boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 2 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 20 +++++++++++++------ + .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 12 +---------- + drivers/firmware/arm_scmi/Kconfig | 2 +- + 15 files changed, 61 insertions(+), 126 deletions(-) +Merging stm32/stm32-next (1e6bc5987a52 ARM: dts: stm32: Update AV96 adv7513 node per dtbs_check) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (bb289f4c0b2b Merge branches 'sunxi/clk-for-5.16', 'sunxi/core-for-5.16', 'sunxi/drivers-for-5.16', 'sunxi/dt-for-5.16' and 'sunxi/fixes-for-5.15' 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 'recursive' strategy. + .../arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml | 38 +++++++++ + .../arm/sunxi/allwinner,sun9i-a80-prcm.yaml | 33 ++++++++ + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 2 +- + arch/arm/boot/dts/axp209.dtsi | 6 +- + arch/arm/boot/dts/axp22x.dtsi | 6 +- + arch/arm/boot/dts/axp81x.dtsi | 10 +-- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 11 ++- + arch/arm/boot/dts/sun4i-a10.dtsi | 11 ++- + arch/arm/boot/dts/sun5i-a13.dtsi | 15 ++-- + arch/arm/boot/dts/sun6i-a31.dtsi | 44 +++++----- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 17 ++-- + arch/arm/boot/dts/sun7i-a20.dtsi | 34 ++++---- + arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 4 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 4 +- + arch/arm/boot/dts/sun8i-v3-sl631.dtsi | 2 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +- + arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi | 2 +- + arch/arm/mach-sunxi/platsmp.c | 4 +- + arch/arm/mach-sunxi/sunxi.c | 4 +- + arch/arm64/boot/dts/allwinner/axp803.dtsi | 10 +-- + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 6 +- + .../boot/dts/allwinner/sun50i-a64-cpu-opp.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 3 +- + .../boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 +- + drivers/clk/sunxi-ng/Kconfig | 1 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun5i.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 8 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 7 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 2 +- + drivers/clk/sunxi-ng/ccu_common.c | 96 ++++++++++++++++++---- + drivers/clk/sunxi-ng/ccu_common.h | 6 +- + drivers/clk/sunxi-ng/ccu_mux.h | 1 - + drivers/clk/sunxi/clk-mod0.c | 4 +- + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 4 +- + drivers/clk/sunxi/clk-sun6i-apb0.c | 4 +- + drivers/clk/sunxi/clk-sun6i-ar100.c | 4 +- + drivers/clk/sunxi/clk-sun8i-apb0.c | 4 +- + drivers/soc/sunxi/sunxi_sram.c | 4 +- + 63 files changed, 304 insertions(+), 206 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/allwinner,sun9i-a80-prcm.yaml +Merging tegra/for-next (cc701ccede61 Merge branch for-5.15/arm64/dt 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge -m Merge branch 'ti-k3-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git ti-k3/ti-k3-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (500e6dfbb465 arm64: dts: ti: k3-am64-mcu: Add pinctrl) +$ git merge -m Merge branch 'ti-k3-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git ti-k3-new/ti-k3-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging xilinx/for-next (35a7430dad4d arm64: zynqmp: Wire psgtr for zc1751-xm013) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/xilinx.yaml | 1 + + arch/arm64/boot/dts/xilinx/Makefile | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 16 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 16 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts | 18 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 298 +++++++++++++++++- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 342 ++++++++++++++++++++- + .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 49 ++- + .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 24 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 330 +++++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 264 +++++++++++++++- + .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 320 ++++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 3 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 292 +++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 250 ++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 340 +++++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 274 ++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 93 ++++-- + 20 files changed, 2861 insertions(+), 98 deletions(-) + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts +Merging clk/clk-next (1cbc04ffedcc Merge branch 'clk-mtk' 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 +Removing Documentation/devicetree/bindings/clock/fixed-mmio-clock.txt +Merge made by the 'recursive' strategy. + .../arm/mediatek/mediatek,mt8195-clock.yaml | 254 ++++ + .../arm/mediatek/mediatek,mt8195-sys-clock.yaml | 73 ++ + .../devicetree/bindings/clock/arm,syscon-icst.yaml | 5 + + .../devicetree/bindings/clock/fixed-mmio-clock.txt | 24 - + .../bindings/clock/fixed-mmio-clock.yaml | 47 + + .../bindings/clock/qcom,gcc-msm8998.yaml | 26 +- + drivers/clk/clk-composite.c | 1 + + drivers/clk/mediatek/Kconfig | 28 +- + drivers/clk/mediatek/Makefile | 8 + + drivers/clk/mediatek/clk-apmixed.c | 3 + + drivers/clk/mediatek/clk-cpumux.c | 3 + + drivers/clk/mediatek/clk-gate.c | 8 + + drivers/clk/mediatek/clk-mt6779-aud.c | 4 +- + drivers/clk/mediatek/clk-mt6779-cam.c | 4 +- + drivers/clk/mediatek/clk-mt6779-img.c | 4 +- + drivers/clk/mediatek/clk-mt6779-ipe.c | 4 +- + drivers/clk/mediatek/clk-mt6779-mfg.c | 4 +- + drivers/clk/mediatek/clk-mt6779-mm.c | 4 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt6779-venc.c | 4 +- + drivers/clk/mediatek/clk-mt6779.c | 2 + + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 145 +++ + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 92 ++ + drivers/clk/mediatek/clk-mt8195-cam.c | 142 +++ + drivers/clk/mediatek/clk-mt8195-ccu.c | 50 + + drivers/clk/mediatek/clk-mt8195-img.c | 96 ++ + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 68 ++ + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 206 ++++ + drivers/clk/mediatek/clk-mt8195-ipe.c | 51 + + drivers/clk/mediatek/clk-mt8195-mfg.c | 47 + + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 62 + + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 47 + + drivers/clk/mediatek/clk-mt8195-topckgen.c | 1273 ++++++++++++++++++++ + drivers/clk/mediatek/clk-mt8195-vdec.c | 104 ++ + drivers/clk/mediatek/clk-mt8195-vdo0.c | 123 ++ + drivers/clk/mediatek/clk-mt8195-vdo1.c | 140 +++ + drivers/clk/mediatek/clk-mt8195-venc.c | 69 ++ + drivers/clk/mediatek/clk-mt8195-vpp0.c | 110 ++ + drivers/clk/mediatek/clk-mt8195-vpp1.c | 108 ++ + drivers/clk/mediatek/clk-mt8195-wpe.c | 143 +++ + drivers/clk/mediatek/clk-mtk.c | 29 +- + drivers/clk/mediatek/clk-mtk.h | 1 + + drivers/clk/mediatek/clk-mux.c | 6 + + drivers/clk/mediatek/clk-pll.c | 6 +- + drivers/clk/mediatek/reset.c | 2 + + drivers/clk/mvebu/ap-cpu-clk.c | 14 +- + drivers/clk/qcom/a53-pll.c | 4 +- + drivers/clk/qcom/common.c | 8 +- + drivers/clk/qcom/gcc-msm8998.c | 705 ++++++----- + drivers/clk/qcom/gcc-sdm660.c | 80 +- + drivers/clk/qcom/gpucc-msm8998.c | 13 +- + drivers/clk/qcom/gpucc-sdm660.c | 15 +- + drivers/clk/qcom/kpss-xcc.c | 4 +- + drivers/clk/qcom/mmcc-msm8998.c | 183 ++- + drivers/clk/qcom/mmcc-sdm660.c | 72 +- + drivers/clk/versatile/clk-icst.c | 3 +- + include/dt-bindings/clock/mt8195-clk.h | 864 +++++++++++++ + 57 files changed, 5002 insertions(+), 597 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8195-clock.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8195-sys-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/fixed-mmio-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/fixed-mmio-clock.yaml + create mode 100644 drivers/clk/mediatek/clk-mt8195-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-apusys_pll.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-ccu.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-infra_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-ipe.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-peri_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-scp_adsp.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vdo0.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vdo1.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vpp0.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vpp1.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-wpe.c + create mode 100644 include/dt-bindings/clock/mt8195-clk.h +Merging clk-imx/for-next (1f4b035e603b clk: imx: Fix the build break when clk-imx8ulp build as module) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/imx8ulp-cgc-clock.yaml | 43 ++ + .../bindings/clock/imx8ulp-pcc-clock.yaml | 50 ++ + drivers/clk/imx/Kconfig | 6 + + drivers/clk/imx/Makefile | 2 + + drivers/clk/imx/clk-composite-7ulp.c | 88 +++- + drivers/clk/imx/clk-composite-8m.c | 4 +- + drivers/clk/imx/clk-imx7ulp.c | 20 +- + drivers/clk/imx/clk-imx8ulp.c | 569 +++++++++++++++++++++ + drivers/clk/imx/clk-pfdv2.c | 23 +- + drivers/clk/imx/clk-pllv4.c | 35 +- + drivers/clk/imx/clk.h | 455 +++++----------- + include/dt-bindings/clock/imx8ulp-clock.h | 258 ++++++++++ + include/dt-bindings/reset/imx8ulp-pcc-reset.h | 59 +++ + 13 files changed, 1267 insertions(+), 345 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx8ulp-cgc-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imx8ulp-pcc-clock.yaml + create mode 100644 drivers/clk/imx/clk-imx8ulp.c + create mode 100644 include/dt-bindings/clock/imx8ulp-clock.h + create mode 100644 include/dt-bindings/reset/imx8ulp-pcc-reset.h +Merging clk-renesas/renesas-clk (8ac4aedcf7b3 clk: renesas: r8a779a0: Add TPU clock) +$ 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 +Merge made by the 'recursive' strategy. + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 1 + + 1 file changed, 1 insertion(+) +Merging clk-samsung/for-next (1d26eaeec37a clk: samsung: s5pv210-audss: Make use of devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos-audss.c | 4 +--- + drivers/clk/samsung/clk-exynos4412-isp.c | 4 +--- + drivers/clk/samsung/clk-exynos5433.c | 4 +--- + drivers/clk/samsung/clk-s5pv210-audss.c | 4 +--- + 4 files changed, 4 insertions(+), 12 deletions(-) +Merging csky/linux-next (90dc8c0e664e csky: Kconfig: Remove unused selects) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) +$ git merge -m Merge branch 'h8300-next' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Removing arch/h8300/mm/memory.c +Auto-merging arch/h8300/mm/init.c +Auto-merging arch/h8300/kernel/setup.c +Removing arch/h8300/include/asm/segment.h +Auto-merging arch/h8300/Kconfig.cpu +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig | 1 - + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/boot/dts/h8300h_sim.dts | 2 +- + arch/h8300/boot/dts/h8s_sim.dts | 2 +- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/include/asm/processor.h | 1 - + arch/h8300/include/asm/segment.h | 40 -------------------- + arch/h8300/include/asm/thread_info.h | 3 -- + arch/h8300/kernel/entry.S | 1 - + arch/h8300/kernel/head_ram.S | 1 - + arch/h8300/kernel/setup.c | 2 +- + arch/h8300/lib/memset.S | 17 +++++---- + arch/h8300/mm/Makefile | 2 +- + arch/h8300/mm/init.c | 6 --- + arch/h8300/mm/memory.c | 53 -------------------------- + drivers/clocksource/h8300_timer8.c | 20 +++++----- + drivers/irqchip/irq-renesas-h8300h.c | 19 +++++++++- + drivers/irqchip/irq-renesas-h8s.c | 67 +++++++++++++++++++++++++-------- + drivers/net/ethernet/smsc/Kconfig | 1 - + drivers/net/ethernet/smsc/smc91x.c | 10 +++++ + drivers/tty/serial/sh-sci.c | 5 +-- + 24 files changed, 124 insertions(+), 169 deletions(-) + delete mode 100644 arch/h8300/include/asm/segment.h + delete mode 100644 arch/h8300/mm/memory.c +Merging m68k/for-next (a7b68ed15d1f m68k: mvme: Remove overdue #warnings in RTC handling) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git nds32/next +Auto-merging arch/nds32/Makefile +Auto-merging arch/nds32/Kconfig +CONFLICT (content): Merge conflict in arch/nds32/Kconfig +Resolved 'arch/nds32/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 12c2df0496f7] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/nds32/Kbuild | 3 +++ + arch/nds32/Kconfig | 4 +++- + arch/nds32/Makefile | 3 --- + 3 files changed, 6 insertions(+), 4 deletions(-) +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 (1955d843efc3 openrisc/litex: Update defconfig) +$ 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 (d4d016caa4b8 alpha: move __udiv_qrnnd library function to arch/alpha/lib/) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) +$ 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 (6f55ab36bef5 riscv: Move EXCEPTION_TABLE to RO_DATA segment) +$ 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 s390/for-next (9ec953c0a7e1 Merge branch 'fixes' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Auto-merging drivers/sh/maple/maple.c +Auto-merging arch/sh/boot/Makefile +Merge made by the 'recursive' strategy. + arch/sh/boards/mach-landisk/irq.c | 4 ++-- + arch/sh/boot/Makefile | 4 ++-- + arch/sh/boot/compressed/.gitignore | 5 ----- + arch/sh/boot/compressed/Makefile | 32 +++++++++++++------------------- + arch/sh/boot/compressed/ashiftrt.S | 2 ++ + arch/sh/boot/compressed/ashldi3.c | 2 ++ + arch/sh/boot/compressed/ashlsi3.S | 2 ++ + arch/sh/boot/compressed/ashrsi3.S | 2 ++ + arch/sh/boot/compressed/lshrsi3.S | 2 ++ + arch/sh/include/asm/checksum_32.h | 5 +++-- + arch/sh/include/asm/uaccess.h | 4 ++-- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- + arch/sh/kernel/crash_dump.c | 4 ++-- + arch/sh/kernel/traps_32.c | 8 ++++---- + arch/sh/math-emu/math.c | 4 ++-- + arch/sh/mm/nommu.c | 4 ++-- + drivers/sh/maple/maple.c | 5 ++++- + 17 files changed, 49 insertions(+), 45 deletions(-) + create mode 100644 arch/sh/boot/compressed/ashiftrt.S + create mode 100644 arch/sh/boot/compressed/ashldi3.c + create mode 100644 arch/sh/boot/compressed/ashlsi3.S + create mode 100644 arch/sh/boot/compressed/ashrsi3.S + create mode 100644 arch/sh/boot/compressed/lshrsi3.S +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 (234640275675 um: rename set_signals() to um_set_signals()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/include/asm/delay.h | 4 ++-- + arch/um/include/asm/irqflags.h | 4 ++-- + arch/um/include/shared/longjmp.h | 2 +- + arch/um/include/shared/os.h | 4 ++-- + arch/um/kernel/ksyms.c | 2 +- + arch/um/os-Linux/sigio.c | 6 +++--- + arch/um/os-Linux/signal.c | 8 ++++---- + 7 files changed, 15 insertions(+), 15 deletions(-) +Merging xtensa/xtensa-for-next (7b7cec477fc3 xtensa: move core-y in arch/xtensa/Makefile to arch/xtensa/Kbuild) +$ 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 (f4dd02cd8631 Merge branch 'kernel.sys' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging fscrypt/master (38ef66b05cfa fscrypt: document struct fscrypt_operations) +$ 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 (20ec197bfa13 fscache: Use refcount_t for the cookie refcount instead of atomic_t) +$ 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 (7af08140979a Revert "gcov: clang: fix clang-11+ build") +$ 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 (e51480e6f4f8 Merge branch 'for-next-next-v5.15-20210913' into for-next-20210913) +$ 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/volumes.c +Auto-merging fs/btrfs/space-info.c +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 51 ++- + fs/btrfs/block-group.h | 4 + + fs/btrfs/ctree.h | 25 +- + fs/btrfs/disk-io.c | 35 +- + fs/btrfs/extent-tree.c | 265 ++++++++---- + fs/btrfs/extent_io.c | 126 ++++-- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/file.c | 2 +- + fs/btrfs/free-space-cache.c | 18 +- + fs/btrfs/inode.c | 43 +- + fs/btrfs/ioctl.c | 1005 ++++++++++++++++++++----------------------- + fs/btrfs/reflink.c | 2 +- + fs/btrfs/relocation.c | 49 +-- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/send.c | 15 +- + fs/btrfs/space-info.c | 25 +- + fs/btrfs/subpage.c | 190 +++++--- + fs/btrfs/subpage.h | 52 ++- + fs/btrfs/super.c | 28 +- + fs/btrfs/transaction.c | 11 +- + fs/btrfs/tree-log.c | 226 +++++----- + fs/btrfs/volumes.c | 131 +++--- + fs/btrfs/volumes.h | 10 +- + fs/btrfs/zoned.c | 517 ++++++++++++++++++++-- + fs/btrfs/zoned.h | 39 +- + 25 files changed, 1760 insertions(+), 1115 deletions(-) +Merging ceph/master (4b0b8836ebba ceph: fix off by one bugs in unsafe_request_wait()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/caps.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging cifs/for-next (35866f3f779a cifs: Not to defer close on file when lock is set) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cache.c | 2 +- + fs/cifs/cifs_debug.c | 1 - + fs/cifs/cifs_fs_sb.h | 1 - + fs/cifs/cifs_ioctl.h | 1 - + fs/cifs/cifs_spnego.c | 2 +- + fs/cifs/cifs_spnego.h | 2 +- + fs/cifs/cifs_unicode.c | 1 - + fs/cifs/cifsacl.c | 1 - + fs/cifs/cifsacl.h | 1 - + fs/cifs/cifsencrypt.c | 1 - + fs/cifs/cifsfs.c | 1 - + fs/cifs/cifsfs.h | 1 - + fs/cifs/cifsglob.h | 2 +- + fs/cifs/cifspdu.h | 1 - + fs/cifs/cifsproto.h | 4 +++- + fs/cifs/cifssmb.c | 1 - + fs/cifs/connect.c | 13 ++++++++--- + fs/cifs/dir.c | 1 - + fs/cifs/dns_resolve.c | 1 - + fs/cifs/dns_resolve.h | 4 ++-- + fs/cifs/export.c | 1 - + fs/cifs/file.c | 3 ++- + fs/cifs/fscache.c | 2 +- + fs/cifs/fscache.h | 2 +- + fs/cifs/inode.c | 7 +++--- + fs/cifs/ioctl.c | 3 +-- + fs/cifs/link.c | 1 - + fs/cifs/misc.c | 42 +++++++++++++++++++++++++++++++++--- + fs/cifs/netmisc.c | 1 - + fs/cifs/ntlmssp.h | 1 - + fs/cifs/readdir.c | 1 - + fs/cifs/rfc1002pdu.h | 1 - + fs/cifs/sess.c | 1 - + fs/cifs/smb2file.c | 1 - + fs/cifs/smb2glob.h | 1 - + fs/cifs/smb2inode.c | 1 - + fs/cifs/smb2misc.c | 1 - + fs/cifs/smb2pdu.c | 1 - + fs/cifs/smb2pdu.h | 1 - + fs/cifs/smb2proto.h | 1 - + fs/cifs/smb2status.h | 1 - + fs/cifs/smb2transport.c | 1 - + fs/cifs/smberr.h | 1 - + fs/cifs/transport.c | 1 - + fs/cifs/winucase.c | 1 - + fs/cifs/xattr.c | 1 - + fs/smbfs_common/smbfsctl.h | 2 +- + include/uapi/linux/cifs/cifs_mount.h | 1 - + 48 files changed, 67 insertions(+), 57 deletions(-) +Merging cifsd/cifsd-for-next (6d56262c3d22 ksmbd: add validation for FILE_FULL_EA_INFORMATION of smb2_get_info) +$ git merge -m Merge branch 'cifsd-for-next' of https://github.com/smfrench/smb3-kernel.git cifsd/cifsd-for-next +Merge made by the 'recursive' strategy. + fs/ksmbd/misc.c | 76 +++++++++++++++++++++++++++++++++++++++++------ + fs/ksmbd/misc.h | 3 +- + fs/ksmbd/smb2pdu.c | 18 +++++++---- + fs/ksmbd/transport_rdma.c | 1 - + 4 files changed, 81 insertions(+), 17 deletions(-) +Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup()) +$ 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 (1266b4a7ecb6 erofs: fix double free of 'copied') +$ 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 (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block) +$ 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 (ed518dd035fa Pull udf xattr sanity checks.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Already up to date. +Merge made by the 'recursive' strategy. +Merging ext4/dev (948ca5f30e1d ext4: enforce buffer head state assertion in ext4_da_map_blocks) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 3 - + fs/ext4/extents.c | 19 +++++-- + fs/ext4/inline.c | 150 ++++++++++++++++++++++++++++--------------------- + fs/ext4/inode.c | 165 ++++++++++++++++-------------------------------------- + 4 files changed, 147 insertions(+), 190 deletions(-) +Merging f2fs/dev (c02599f210d9 f2fs: avoid attaching SB_ACTIVE flag during mount) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 6 ++---- + fs/f2fs/inode.c | 2 +- + fs/f2fs/namei.c | 2 +- + fs/f2fs/recovery.c | 8 ++------ + 4 files changed, 6 insertions(+), 12 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ 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 (7a41554fdfb0 fuse: move fuse_invalidate_attr() into fuse_update_ctime()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 8 ++++---- + fs/fuse/dir.c | 11 +++-------- + fs/fuse/file.c | 1 - + fs/fuse/ioctl.c | 4 ++-- + fs/fuse/readdir.c | 4 ++-- + fs/fuse/xattr.c | 10 ++++------ + 6 files changed, 15 insertions(+), 23 deletions(-) +Merging gfs2/for-next (11603f0011d0 gfs2: Allow append and immutable bits to coexist) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 10 ++-------- + fs/gfs2/glock.c | 23 ++++++++++++++++------- + fs/gfs2/glock.h | 7 +++++++ + fs/gfs2/glops.c | 16 +++++++++++++--- + fs/gfs2/incore.h | 1 + + fs/gfs2/rgrp.c | 41 +++++++++++++++++++++++++++++------------ + fs/gfs2/rgrp.h | 1 + + 7 files changed, 69 insertions(+), 30 deletions(-) +Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy()) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging nfs/linux-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (e22ce8eb631b Linux 5.14-rc7) +$ git merge -m Merge branch 'nfsd-next' of git://git.linux-nfs.org/~bfields/linux.git nfsd/nfsd-next +Already up to date. +Merging cel/for-next (02579b2ff8b0 nfsd: back channel stuck in SEQ4_STATUS_CB_PATH_DOWN) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel/for-next +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'recursive' strategy. + fs/lockd/svcxdr.h | 13 ++----------- + fs/nfsd/nfs4state.c | 16 +++++++++++++--- + 2 files changed, 15 insertions(+), 14 deletions(-) +Merging ntfs3/master (6e3331ee3446 fs/ntfs3: Use min/max macros instated of ternary operators) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/xattr.c +Auto-merging fs/ntfs3/ntfs_fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/ntfs3.rst | 10 +- + fs/ntfs3/attrib.c | 10 +- + fs/ntfs3/attrlist.c | 3 - + fs/ntfs3/bitfunc.c | 7 +- + fs/ntfs3/bitmap.c | 14 +- + fs/ntfs3/debug.h | 3 + + fs/ntfs3/dir.c | 11 +- + fs/ntfs3/file.c | 5 +- + fs/ntfs3/frecord.c | 10 +- + fs/ntfs3/fslog.c | 4 - + fs/ntfs3/fsntfs.c | 69 +++-- + fs/ntfs3/index.c | 156 ++++------- + fs/ntfs3/inode.c | 14 +- + fs/ntfs3/lib/decompress_common.h | 5 + + fs/ntfs3/lib/lib.h | 6 + + fs/ntfs3/lznt.c | 12 +- + fs/ntfs3/namei.c | 4 - + fs/ntfs3/ntfs.h | 12 +- + fs/ntfs3/ntfs_fs.h | 57 +++- + fs/ntfs3/record.c | 3 - + fs/ntfs3/run.c | 2 - + fs/ntfs3/super.c | 500 +++++++++++++++++++----------------- + fs/ntfs3/upcase.c | 8 +- + fs/ntfs3/xattr.c | 5 +- + 24 files changed, 443 insertions(+), 487 deletions(-) +Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.) +$ 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 (332f606b32b6 ovl: enable RCU'd ->get_acl()) +$ 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 (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) +$ 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 (9c4d94dc9a64 net/9p: increase default msize to 128k) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (f38a032b165d xfs: fix I_DONTCACHE) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. +Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID) +$ 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 (90f7d7a0d0d6 locks: remove LOCK_MAND flock lock support) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/ceph/locks.c | 3 --- + fs/gfs2/file.c | 2 -- + fs/locks.c | 47 +++++++++++++++++++--------------------- + fs/nfs/file.c | 9 -------- + include/uapi/asm-generic/fcntl.h | 4 ++++ + 5 files changed, 26 insertions(+), 39 deletions(-) +Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging printk/for-next (9980c4251f8d printk: use kvmalloc instead of kmalloc for devkmsg_user) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging pci/next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) +$ 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 +Merge made by the 'recursive' strategy. + fs/pstore/blk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (8ca10560f402 Merge branch 'for-5.15/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 10 +++++++--- + drivers/hid/hid-apple.c | 7 +++++++ + drivers/hid/hid-betopff.c | 13 ++++++++++--- + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-input.c | 1 + + drivers/hid/wacom_wac.c | 8 ++++++++ + 6 files changed, 34 insertions(+), 6 deletions(-) +Merging i2c/i2c/for-next (294b29f15469 i2c: xiic: Fix RX IRQ busy check) +$ 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 +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-xiic.c | 161 ++++++++++++++++++------------------------ + 1 file changed, 69 insertions(+), 92 deletions(-) +Merging i3c/i3c/next (41a0430dd5ca i3c/master/mipi-i3c-hci: Prefer kcalloc over open coded arithmetic) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- + drivers/i3c/master/mipi-i3c-hci/hci.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ 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 +Already up to date. +Merging hwmon-staging/hwmon-next (cd0b8e410937 hwmon: (nct6775) Support access via Asus WMI) +$ 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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/iio-hwmon.yaml | 37 ++ + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/max6620.rst | 46 ++ + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/i5500_temp.c | 114 ++-- + drivers/hwmon/max6620.c | 514 +++++++++++++++ + drivers/hwmon/mlxreg-fan.c | 126 ++-- + drivers/hwmon/nct6775.c | 706 ++++++++++++++------- + drivers/hwmon/raspberrypi-hwmon.c | 2 +- + 10 files changed, 1225 insertions(+), 333 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/iio-hwmon.yaml + create mode 100644 Documentation/hwmon/max6620.rst + create mode 100644 drivers/hwmon/max6620.c +Merging jc_docs/docs-next (242f4c77b1c8 docs: zh_TW/index: Move arm64/index to arch-specific section) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/block/queue-sysfs.rst | 9 +- + Documentation/dev-tools/checkpatch.rst | 38 + + Documentation/process/index.rst | 1 + + Documentation/process/maintainer-handbooks.rst | 18 + + Documentation/process/maintainer-tip.rst | 785 +++++++++++++++++++++ + Documentation/process/submitting-patches.rst | 7 + + .../translations/zh_CN/admin-guide/index.rst | 2 +- + .../translations/zh_CN/admin-guide/sysrq.rst | 280 ++++++++ + Documentation/translations/zh_TW/index.rst | 10 +- + Documentation/vm/page_migration.rst | 2 +- + 10 files changed, 1141 insertions(+), 11 deletions(-) + create mode 100644 Documentation/process/maintainer-handbooks.rst + create mode 100644 Documentation/process/maintainer-tip.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/sysrq.rst +Merging v4l-dvb/master (6880fa6c5660 Linux 5.15-rc1) +$ 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 (0a24c52d78e0 media: dvb-frontends/cxd2099: Remove repeated verbose license text) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging drivers/staging/media/sunxi/cedrus/cedrus_video.c +Auto-merging drivers/staging/media/hantro/hantro_drv.c +Auto-merging drivers/media/rc/ir_toy.c +Auto-merging drivers/media/platform/s5p-jpeg/jpeg-core.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/renesas,imr.txt +Removing Documentation/devicetree/bindings/media/i2c/mt9p031.txt +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/admin-guide/media/imx7.rst | 60 + + Documentation/admin-guide/media/ipu3.rst | 14 +- + Documentation/admin-guide/media/ivtv.rst | 2 +- + Documentation/admin-guide/media/vimc.rst | 20 +- + .../bindings/media/i2c/aptina,mt9p031.yaml | 108 ++ + .../devicetree/bindings/media/i2c/mt9p031.txt | 40 - + .../devicetree/bindings/media/mediatek-vcodec.txt | 2 + + .../devicetree/bindings/media/renesas,csi2.yaml | 1 + + .../devicetree/bindings/media/renesas,imr.txt | 31 - + .../devicetree/bindings/media/renesas,imr.yaml | 67 + + .../devicetree/bindings/media/rockchip-isp1.yaml | 114 +- + Documentation/driver-api/media/drivers/rkisp1.rst | 43 + + Documentation/driver-api/media/v4l2-subdev.rst | 14 +- + .../userspace-api/media/drivers/cx2341x-uapi.rst | 8 +- + Documentation/userspace-api/media/v4l/buffer.rst | 40 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 57 + + .../media/v4l/ext-ctrls-image-source.rst | 20 + + .../userspace-api/media/v4l/pixfmt-reserved.rst | 29 +- + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 50 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 7 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 3 + + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 3 + + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 6 + + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 16 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 2 + + MAINTAINERS | 15 +- + drivers/media/cec/core/cec-pin.c | 4 +- + drivers/media/cec/platform/meson/ao-cec-g12a.c | 4 +- + drivers/media/cec/platform/meson/ao-cec.c | 4 +- + drivers/media/cec/platform/s5p/s5p_cec.c | 4 +- + drivers/media/cec/platform/sti/stih-cec.c | 4 +- + drivers/media/cec/platform/stm32/stm32-cec.c | 4 +- + drivers/media/common/siano/smscoreapi.c | 7 +- + drivers/media/common/videobuf2/videobuf2-core.c | 149 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 195 ++- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 39 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 59 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 30 +- + drivers/media/dvb-core/dvb_vb2.c | 2 +- + drivers/media/dvb-frontends/cxd2099.c | 9 - + drivers/media/dvb-frontends/cxd2099.h | 9 - + drivers/media/dvb-frontends/cxd2820r_priv.h | 2 +- + drivers/media/dvb-frontends/mxl5xx.c | 9 - + drivers/media/dvb-frontends/mxl5xx.h | 9 - + drivers/media/dvb-frontends/mxl5xx_defs.h | 4 - + drivers/media/dvb-frontends/mxl5xx_regs.h | 10 - + drivers/media/dvb-frontends/mxl692.c | 9 - + drivers/media/dvb-frontends/mxl692.h | 9 - + drivers/media/dvb-frontends/mxl692_defs.h | 9 - + drivers/media/dvb-frontends/stv0910.c | 9 - + drivers/media/dvb-frontends/stv0910.h | 9 - + drivers/media/dvb-frontends/stv6111.c | 9 - + drivers/media/dvb-frontends/stv6111.h | 9 - + drivers/media/firewire/firedtv-avc.c | 14 +- + drivers/media/firewire/firedtv-ci.c | 2 + + drivers/media/i2c/Kconfig | 12 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/imx258.c | 12 +- + drivers/media/i2c/ir-kbd-i2c.c | 1 + + drivers/media/i2c/max9286.c | 17 +- + drivers/media/i2c/mt9p031.c | 80 +- + drivers/media/i2c/ov13b10.c | 1491 ++++++++++++++++++++ + drivers/media/i2c/ov8856.c | 83 +- + drivers/media/i2c/st-mipid02.c | 22 +- + drivers/media/i2c/tda1997x.c | 12 +- + drivers/media/i2c/video-i2c.c | 21 +- + drivers/media/mc/Kconfig | 8 - + drivers/media/pci/cobalt/cobalt-driver.c | 4 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx18/cx18-ioctl.c | 4 +- + drivers/media/pci/cx18/cx18-queue.c | 13 +- + drivers/media/pci/cx18/cx18-streams.c | 24 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 3 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 4 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 266 ++-- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 4 + + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 8 +- + drivers/media/pci/ivtv/ivtv-queue.c | 18 +- + drivers/media/pci/ivtv/ivtv-streams.c | 22 +- + drivers/media/pci/ivtv/ivtv-udma.c | 19 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 10 +- + drivers/media/pci/ivtv/ivtvfb.c | 8 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 29 +- + drivers/media/pci/pluto2/pluto2.c | 20 +- + drivers/media/pci/pt1/pt1.c | 2 +- + drivers/media/pci/saa7164/saa7164-api.c | 2 - + drivers/media/pci/tw5864/tw5864-core.c | 2 +- + drivers/media/platform/Kconfig | 4 + + drivers/media/platform/am437x/am437x-vpfe.c | 23 +- + drivers/media/platform/aspeed-video.c | 16 +- + drivers/media/platform/atmel/atmel-isc-base.c | 29 +- + drivers/media/platform/atmel/atmel-isc.h | 2 + + drivers/media/platform/atmel/atmel-isi.c | 17 +- + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 54 +- + drivers/media/platform/atmel/atmel-sama7g5-isc.c | 37 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 18 +- + drivers/media/platform/cadence/cdns-csi2tx.c | 4 +- + drivers/media/platform/coda/imx-vdoa.c | 3 +- + drivers/media/platform/davinci/vpbe_venc.c | 9 +- + drivers/media/platform/davinci/vpif.c | 5 +- + drivers/media/platform/davinci/vpif_capture.c | 21 +- + drivers/media/platform/davinci/vpss.c | 10 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 3 +- + drivers/media/platform/exynos4-is/media-dev.c | 20 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 4 +- + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 6 +- + drivers/media/platform/imx-pxp.c | 4 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 9 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 10 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 6 +- + drivers/media/platform/meson/ge2d/ge2d.c | 10 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/mtk-vcodec/Makefile | 3 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 820 ++--------- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 27 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 65 +- + .../platform/mtk-vcodec/mtk_vcodec_dec_stateful.c | 628 +++++++++ + .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 360 +++++ + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 59 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 148 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 69 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 774 ++++++++++ + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 3 + + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 1 + + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 23 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 43 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 5 + + drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 +- + drivers/media/platform/mx2_emmaprp.c | 4 +- + drivers/media/platform/omap3isp/isp.c | 21 +- + drivers/media/platform/pxa_camera.c | 26 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 9 +- + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 28 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 18 +- + drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 17 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 4 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 2 +- + drivers/media/platform/qcom/camss/camss.c | 18 +- + drivers/media/platform/qcom/venus/core.c | 4 +- + drivers/media/platform/rcar-vin/rcar-core.c | 1077 +++++++------- + drivers/media/platform/rcar-vin/rcar-csi2.c | 214 ++- + drivers/media/platform/rcar-vin/rcar-dma.c | 25 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 25 +- + drivers/media/platform/rcar_drif.c | 17 +- + drivers/media/platform/rcar_fdp1.c | 4 +- + drivers/media/platform/rcar_jpu.c | 4 +- + drivers/media/platform/renesas-ceu.c | 33 +- + drivers/media/platform/rockchip/rga/rga.c | 5 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 9 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 44 +- + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 98 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 29 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 557 ++++++-- + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 406 ++++-- + .../media/platform/rockchip/rkisp1/rkisp1-stats.c | 107 +- + drivers/media/platform/s3c-camif/camif-core.c | 6 +- + drivers/media/platform/s5p-g2d/g2d.c | 4 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 9 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 1 - + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 1 - + drivers/media/platform/sti/hva/hva-hw.c | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 37 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 16 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 33 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 2 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 8 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 4 +- + drivers/media/platform/ti-vpe/cal.c | 16 +- + drivers/media/platform/via-camera.c | 6 +- + drivers/media/platform/video-mux.c | 17 +- + drivers/media/platform/vsp1/vsp1_drv.c | 4 +- + drivers/media/platform/xilinx/xilinx-vip.c | 4 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 17 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- + drivers/media/rc/img-ir/img-ir-core.c | 4 +- + drivers/media/rc/imon.c | 2 + + drivers/media/rc/ir-hix5hd2.c | 4 +- + drivers/media/rc/ir_toy.c | 59 +- + drivers/media/rc/mceusb.c | 2 + + drivers/media/rc/meson-ir-tx.c | 1 - + drivers/media/rc/meson-ir.c | 4 +- + drivers/media/rc/mtk-cir.c | 4 +- + drivers/media/rc/st_rc.c | 5 +- + drivers/media/rc/streamzap.c | 1 + + drivers/media/rc/sunxi-cir.c | 4 +- + drivers/media/spi/cxd2880-spi.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 1 + + drivers/media/test-drivers/vim2m.c | 5 - + drivers/media/test-drivers/vimc/vimc-scaler.c | 366 ++--- + drivers/media/test-drivers/vivid/vivid-cec.c | 341 +++-- + drivers/media/test-drivers/vivid/vivid-cec.h | 9 +- + drivers/media/test-drivers/vivid/vivid-core.c | 52 +- + drivers/media/test-drivers/vivid/vivid-core.h | 23 +- + drivers/media/tuners/mxl5007t.c | 9 - + drivers/media/usb/airspy/airspy.c | 5 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 16 +- + drivers/media/usb/dvb-usb/az6027.c | 1 + + drivers/media/usb/em28xx/em28xx-cards.c | 5 +- + drivers/media/usb/gspca/gspca.c | 2 + + drivers/media/usb/gspca/m5602/m5602_ov7660.h | 1 - + drivers/media/usb/gspca/sn9c20x.c | 22 +- + drivers/media/usb/pvrusb2/pvrusb2-ctrl.c | 25 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 - + drivers/media/usb/stkwebcam/stk-webcam.c | 11 +- + drivers/media/usb/tm6000/tm6000-video.c | 3 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 10 +- + drivers/media/usb/uvc/uvc_ctrl.c | 260 +++- + drivers/media/usb/uvc/uvc_driver.c | 16 +- + drivers/media/usb/uvc/uvc_metadata.c | 2 +- + drivers/media/usb/uvc/uvc_v4l2.c | 103 +- + drivers/media/usb/uvc/uvc_video.c | 5 + + drivers/media/usb/uvc/uvcvideo.h | 17 +- + drivers/media/v4l2-core/v4l2-async.c | 168 ++- + drivers/media/v4l2-core/v4l2-common.c | 3 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 9 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 6 + + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 5 + + drivers/media/v4l2-core/v4l2-fwnode.c | 83 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 77 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 37 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 + + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 70 +- + .../pci/hive_isp_css_common/host/input_system.c | 2 + + drivers/staging/media/hantro/hantro_drv.c | 10 +- + drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 52 + + drivers/staging/media/hantro/hantro_hevc.c | 21 + + drivers/staging/media/hantro/hantro_hw.h | 4 + + drivers/staging/media/imx/TODO | 5 - + drivers/staging/media/imx/imx-media-csi.c | 17 +- + drivers/staging/media/imx/imx-media-dev-common.c | 9 +- + drivers/staging/media/imx/imx-media-dev.c | 6 +- + drivers/staging/media/imx/imx-media-of.c | 6 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 17 +- + drivers/staging/media/imx/imx7-media-csi.c | 24 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 16 +- + drivers/staging/media/imx/imx8mq-mipi-csi2.c | 16 +- + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 7 +- + drivers/staging/media/ipu3/ipu3-css-fw.c | 7 +- + drivers/staging/media/ipu3/ipu3-css-fw.h | 2 +- + drivers/staging/media/meson/vdec/esparser.h | 6 +- + drivers/staging/media/meson/vdec/vdec.c | 7 +- + drivers/staging/media/meson/vdec/vdec.h | 16 +- + drivers/staging/media/meson/vdec/vdec_helpers.h | 3 +- + drivers/staging/media/rkvdec/rkvdec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 8 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 1 + + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 70 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 6 +- + drivers/staging/media/tegra-video/vi.c | 17 +- + include/media/hevc-ctrls.h | 11 + + include/media/i2c/mt9p031.h | 1 + + include/media/v4l2-async.h | 105 +- + include/media/v4l2-fwnode.h | 12 +- + include/media/videobuf2-core.h | 59 +- + include/uapi/linux/v4l2-controls.h | 1 + + include/uapi/linux/videodev2.h | 31 +- + 265 files changed, 8656 insertions(+), 3799 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt + delete mode 100644 Documentation/devicetree/bindings/media/renesas,imr.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,imr.yaml + create mode 100644 Documentation/driver-api/media/drivers/rkisp1.rst + create mode 100644 drivers/media/i2c/ov13b10.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c +$ git am -3 ../patches/0001-fix-for-media-ir_toy-allow-tx-carrier-to-be-set.patch +Applying: fix for "media: ir_toy: allow tx carrier to be set" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/rc/ir_toy.c +$ git add -A . +$ git commit -v -a --amend +[master ae6eb8332b3d] Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git + Date: Mon Sep 20 10:05:29 2021 +1000 +Merging pm/linux-next (755793be0868 Merge branches 'pm-sleep' and 'acpi-resources' 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 +Merge made by the 'recursive' strategy. + arch/x86/kernel/acpi/boot.c | 9 +++++++++ + drivers/acpi/resource.c | 49 +++++++++++++++++++++++++++++++++++++++++++-- + include/acpi/actbl2.h | 1 + + kernel/power/suspend.c | 4 ++-- + kernel/power/swap.c | 2 +- + 5 files changed, 60 insertions(+), 5 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (4855e26bcf4d cpufreq: mediatek-hw: Add support for CPUFREQ HW) +$ 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 (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (94274f20f6bf dt-bindings: opp: Convert to DT schema) +$ 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 (fc26023f8816 thermal/drivers/int340x: Fix tcc offset on resume) +$ 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 +Merge made by the 'recursive' strategy. + .../intel/int340x_thermal/int3401_thermal.c | 8 ++++- + .../int340x_thermal/processor_thermal_device.c | 39 +++++++++++++++++----- + .../int340x_thermal/processor_thermal_device.h | 1 + + .../int340x_thermal/processor_thermal_device_pci.c | 18 +++++++++- + .../processor_thermal_device_pci_legacy.c | 8 ++++- + 5 files changed, 62 insertions(+), 12 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 (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace) +$ 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 swiotlb/linux-next (f3c4b1341e83 swiotlb: use depends on for DMA_RESTRICTED_POOL) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git swiotlb/linux-next +Already up to date. +Merging rdma/for-next (1b789bd4dbd4 IB/qib: Fix clang confusion of NULL pointer comparison) +$ 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 (14e94f9445a9 octeontx2-af: verify CQ context updates) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging lib/test_bpf.c +Auto-merging kernel/events/core.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/ethernet/freescale/enetc/enetc.c +Auto-merging drivers/net/dsa/b53/b53_priv.h +Auto-merging arch/x86/net/bpf_jit_comp.c +Removing Documentation/devicetree/bindings/net/lantiq,xrx200-net.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-timecard | 174 +++ + Documentation/bpf/btf.rst | 29 +- + .../devicetree/bindings/net/lantiq,etop-xway.yaml | 69 + + .../devicetree/bindings/net/lantiq,xrx200-net.txt | 21 - + .../devicetree/bindings/net/lantiq,xrx200-net.yaml | 75 ++ + arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 2 +- + arch/mips/lantiq/xway/dma.c | 57 +- + arch/x86/events/intel/core.c | 67 +- + arch/x86/events/intel/ds.c | 2 +- + arch/x86/events/intel/lbr.c | 20 +- + arch/x86/events/perf_event.h | 19 + + arch/x86/net/bpf_jit_comp.c | 53 +- + drivers/net/dsa/b53/b53_common.c | 59 +- + drivers/net/dsa/b53/b53_priv.h | 1 - + drivers/net/ethernet/arc/emac_mdio.c | 9 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 6 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 6 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 38 +- + drivers/net/ethernet/cadence/macb.h | 7 +- + drivers/net/ethernet/cadence/macb_main.c | 9 +- + drivers/net/ethernet/cavium/thunder/nic_main.c | 3 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 6 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 6 +- + drivers/net/ethernet/ethoc.c | 12 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 5 + + drivers/net/ethernet/freescale/enetc/enetc.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 12 +- + drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 6 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 5 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 3 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 46 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 + + drivers/net/ethernet/huawei/hinic/hinic_main.c | 6 +- + drivers/net/ethernet/ibm/ibmvnic.c | 640 ++++++---- + drivers/net/ethernet/ibm/ibmvnic.h | 10 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 + + drivers/net/ethernet/lantiq_etop.c | 21 +- + drivers/net/ethernet/lantiq_xrx200.c | 21 +- + drivers/net/ethernet/marvell/octeontx2/af/common.h | 1 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 62 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 54 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 2 + + .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 135 ++ + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 191 ++- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 2 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 2 + + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 37 +- + drivers/net/ethernet/marvell/sky2.c | 84 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 10 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 67 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 2 - + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 183 ++- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 13 + + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 30 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 177 ++- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 6 - + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 326 ++--- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 4 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 10 + + drivers/net/ethernet/microchip/encx24j600.c | 1 - + drivers/net/ethernet/qlogic/qed/qed_l2.c | 23 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 47 +- + drivers/net/ethernet/realtek/r8169.h | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 41 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 59 - + drivers/net/ethernet/socionext/netsec.c | 21 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 7 +- + drivers/net/netdevsim/ethtool.c | 28 + + drivers/net/netdevsim/health.c | 32 - + drivers/net/netdevsim/netdevsim.h | 1 + + drivers/net/phy/at803x.c | 15 + + drivers/net/phy/bcm7xxx.c | 201 +++ + drivers/net/phy/broadcom.c | 47 + + drivers/net/phy/phylink.c | 5 +- + drivers/net/virtio_net.c | 4 +- + drivers/nfc/fdp/i2c.c | 1 - + drivers/nfc/microread/mei.c | 4 +- + drivers/nfc/nfcmrvl/fw_dnld.c | 4 +- + drivers/nfc/pn533/i2c.c | 4 - + drivers/nfc/pn533/pn533.c | 4 +- + drivers/nfc/pn544/mei.c | 8 +- + drivers/ptp/idt8a340_reg.h | 65 +- + drivers/ptp/ptp_clockmatrix.c | 766 ++++++----- + drivers/ptp/ptp_clockmatrix.h | 64 +- + drivers/ptp/ptp_ocp.c | 1343 +++++++++++++++++--- + drivers/s390/net/ctcm_fsms.c | 60 +- + drivers/s390/net/ctcm_main.c | 38 +- + drivers/s390/net/ctcm_mpc.c | 8 +- + drivers/s390/net/fsm.c | 2 +- + drivers/s390/net/ism_drv.c | 2 +- + drivers/s390/net/lcs.c | 121 +- + drivers/s390/net/netiucv.c | 104 +- + include/linux/brcmphy.h | 2 + + include/linux/perf_event.h | 23 + + include/linux/qed/qed_eth_if.h | 21 +- + include/linux/socket.h | 1 + + include/net/devlink.h | 18 - + include/net/mptcp.h | 4 + + include/net/sch_generic.h | 6 + + include/uapi/linux/bpf.h | 26 +- + include/uapi/linux/btf.h | 55 +- + include/uapi/linux/mptcp.h | 35 + + include/uapi/linux/smc.h | 27 + + include/uapi/linux/tls.h | 30 + + kernel/bpf/btf.c | 128 ++ + kernel/bpf/trampoline.c | 3 +- + kernel/events/core.c | 2 + + kernel/trace/bpf_trace.c | 30 + + lib/test_bpf.c | 1 + + net/bpf/test_run.c | 16 +- + net/core/dev.c | 2 + + net/core/devlink.c | 150 +-- + net/core/filter.c | 21 + + net/core/net_namespace.c | 4 + + net/core/rtnetlink.c | 4 +- + net/core/skbuff.c | 19 +- + net/dsa/tag_rtl4_a.c | 2 +- + net/ethtool/ioctl.c | 4 + + net/ipv4/cipso_ipv4.c | 2 +- + net/mptcp/mptcp_diag.c | 26 +- + net/mptcp/sockopt.c | 276 ++++ + net/nfc/hci/llc_shdlc.c | 23 +- + net/sched/sch_generic.c | 33 + + net/sched/sch_mq.c | 1 + + net/sched/sch_mqprio.c | 1 + + net/smc/af_smc.c | 34 +- + net/smc/smc.h | 3 - + net/smc/smc_clc.c | 330 ++++- + net/smc/smc_clc.h | 19 +- + net/smc/smc_core.c | 10 +- + net/smc/smc_core.h | 1 + + net/smc/smc_ism.c | 16 +- + net/smc/smc_ism.h | 2 +- + net/smc/smc_netlink.c | 47 +- + net/smc/smc_netlink.h | 2 + + net/tls/tls_main.c | 46 + + net/tls/tls_sw.c | 34 + + tools/bpf/bpftool/Makefile | 3 + + tools/bpf/bpftool/btf.c | 12 + + tools/bpf/bpftool/gen.c | 31 +- + tools/bpf/resolve_btfids/Makefile | 5 +- + tools/include/uapi/linux/bpf.h | 26 +- + tools/include/uapi/linux/btf.h | 55 +- + tools/lib/bpf/.gitignore | 1 - + tools/lib/bpf/Makefile | 39 +- + tools/lib/bpf/btf.c | 84 +- + tools/lib/bpf/btf.h | 87 ++ + tools/lib/bpf/btf_dump.c | 3 + + tools/lib/bpf/libbpf.c | 431 ++++--- + tools/lib/bpf/libbpf.h | 41 +- + tools/lib/bpf/libbpf.map | 5 + + tools/lib/bpf/libbpf_common.h | 24 + + tools/lib/bpf/libbpf_internal.h | 27 +- + tools/lib/bpf/libbpf_version.h | 9 + + tools/lib/bpf/xsk.c | 4 +- + tools/testing/selftests/bpf/.gitignore | 5 +- + tools/testing/selftests/bpf/Makefile | 4 +- + tools/testing/selftests/bpf/README.rst | 14 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 19 +- + tools/testing/selftests/bpf/btf_helpers.c | 7 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 6 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 441 ++++++- + tools/testing/selftests/bpf/prog_tests/btf_tag.c | 20 + + tools/testing/selftests/bpf/prog_tests/btf_write.c | 21 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 17 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 43 +- + .../selftests/bpf/prog_tests/get_branch_snapshot.c | 100 ++ + .../selftests/bpf/prog_tests/module_attach.c | 39 - + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 6 + + tools/testing/selftests/bpf/prog_tests/skeleton.c | 6 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 25 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_cubic.c | 12 +- + .../selftests/bpf/progs/get_branch_snapshot.c | 40 + + tools/testing/selftests/bpf/progs/tag.c | 49 + + tools/testing/selftests/bpf/progs/tailcall6.c | 34 + + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 6 + + tools/testing/selftests/bpf/test_btf.h | 3 + + tools/testing/selftests/bpf/test_progs.c | 39 + + tools/testing/selftests/bpf/test_progs.h | 2 + + tools/testing/selftests/bpf/trace_helpers.c | 37 + + tools/testing/selftests/bpf/trace_helpers.h | 5 + + tools/testing/selftests/bpf/verifier/ctx_skb.c | 60 + + tools/testing/selftests/bpf/verifier/jit.c | 22 +- + tools/testing/selftests/bpf/xdpxceiver.c | 872 ++++++++----- + tools/testing/selftests/bpf/xdpxceiver.h | 66 +- + .../drivers/net/netdevsim/ethtool-common.sh | 2 +- + .../drivers/net/netdevsim/tc-mq-visibility.sh | 77 ++ + tools/testing/selftests/net/mptcp/.gitignore | 1 + + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 683 ++++++++++ + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 31 +- + 197 files changed, 8603 insertions(+), 2729 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-timecard + create mode 100644 Documentation/devicetree/bindings/net/lantiq,etop-xway.yaml + delete mode 100644 Documentation/devicetree/bindings/net/lantiq,xrx200-net.txt + create mode 100644 Documentation/devicetree/bindings/net/lantiq,xrx200-net.yaml + create mode 100644 tools/lib/bpf/libbpf_version.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_tag.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/get_branch_snapshot.c + create mode 100644 tools/testing/selftests/bpf/progs/get_branch_snapshot.c + create mode 100644 tools/testing/selftests/bpf/progs/tag.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall6.c + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh + create mode 100644 tools/testing/selftests/net/mptcp/mptcp_sockopt.c +Merging bpf-next/for-next (e57f52b42d1f Merge branch 'bpf: implement variadic printk helper') +$ 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 +Auto-merging include/linux/bpf.h +Merge made by the 'recursive' strategy. + include/linux/bpf.h | 3 + + include/uapi/linux/bpf.h | 16 ++++- + kernel/bpf/core.c | 5 ++ + kernel/bpf/helpers.c | 6 +- + kernel/trace/bpf_trace.c | 54 ++++++++++++++++- + tools/bpf/bpftool/feature.c | 1 + + tools/include/uapi/linux/bpf.h | 16 ++++- + tools/lib/bpf/bpf_helpers.h | 51 +++++++++++++--- + tools/testing/selftests/bpf/Makefile | 3 +- + .../selftests/bpf/prog_tests/reference_tracking.c | 39 ++++++++++--- + .../selftests/bpf/prog_tests/trace_printk.c | 24 +++----- + .../selftests/bpf/prog_tests/trace_vprintk.c | 68 ++++++++++++++++++++++ + tools/testing/selftests/bpf/progs/trace_vprintk.c | 33 +++++++++++ + tools/testing/selftests/bpf/test_bpftool.py | 22 +++---- + 14 files changed, 286 insertions(+), 55 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/trace_vprintk.c + create mode 100644 tools/testing/selftests/bpf/progs/trace_vprintk.c +Merging ipsec-next/master (9e9fb7655ed5 Merge tag 'net-next-5.15' 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/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (13bb8429ca98 net: wwan: iosm: firmware flashing and coredump collection) +$ 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 (13bb8429ca98 net: wwan: iosm: firmware flashing and coredump collection) +$ 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 wireless-drivers-next/master (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (81be03e026dc Bluetooth: RFCOMM: Replace use of memcpy_from_msg with bt_skb_sendmmsg) +$ 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 'recursive' strategy. + drivers/bluetooth/btintel.c | 239 ++++++++++++++++---- + drivers/bluetooth/btintel.h | 11 + + drivers/bluetooth/btusb.c | 24 ++ + drivers/bluetooth/hci_h5.c | 8 +- + drivers/bluetooth/hci_vhci.c | 20 ++ + include/net/bluetooth/bluetooth.h | 90 ++++++++ + include/net/bluetooth/hci.h | 117 ++++++++++ + include/net/bluetooth/hci_core.h | 34 ++- + net/bluetooth/Makefile | 2 +- + net/bluetooth/hci_codec.c | 238 ++++++++++++++++++++ + net/bluetooth/hci_codec.h | 7 + + net/bluetooth/hci_conn.c | 168 ++++++++++++-- + net/bluetooth/hci_core.c | 25 +-- + net/bluetooth/hci_event.c | 134 +++++++---- + net/bluetooth/hci_request.c | 47 ++++ + net/bluetooth/hci_request.h | 2 + + net/bluetooth/hci_sock.c | 50 ++--- + net/bluetooth/l2cap_core.c | 2 +- + net/bluetooth/l2cap_sock.c | 10 +- + net/bluetooth/mgmt.c | 456 +++++++++++++++++++++++++++++--------- + net/bluetooth/msft.c | 55 ++++- + net/bluetooth/msft.h | 4 + + net/bluetooth/rfcomm/core.c | 50 ++++- + net/bluetooth/rfcomm/sock.c | 46 +--- + net/bluetooth/sco.c | 213 ++++++++++++++++-- + 25 files changed, 1721 insertions(+), 331 deletions(-) + create mode 100644 net/bluetooth/hci_codec.c + create mode 100644 net/bluetooth/hci_codec.h +Merging mac80211-next/master (339133f6c318 net: dsa: tag_rtl4_a: Drop bit 9 from egress frames) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git mac80211-next/master +Already up to date. +Merging mtd/mtd/next (b72841e4dcd5 mtd: mtdswap: Remove redundant assignment of pointer eb) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/mtdswap.c | 1 - + 1 file changed, 1 deletion(-) +Merging nand/nand/next (46a0dc10fb32 mtd: rawnand: intel: Fix potential buffer overflow in probe) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/atmel/pmecc.c | 7 ++----- + drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c | 5 +---- + drivers/mtd/nand/raw/denali_dt.c | 7 ++----- + drivers/mtd/nand/raw/gpio.c | 3 +-- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 4 +--- + drivers/mtd/nand/raw/hisi504_nand.c | 7 ++----- + drivers/mtd/nand/raw/intel-nand-controller.c | 5 +++++ + drivers/mtd/nand/raw/mtk_ecc.c | 4 +--- + drivers/mtd/nand/raw/mtk_nand.c | 4 +--- + drivers/mtd/nand/raw/omap_elm.c | 5 ++--- + drivers/mtd/nand/raw/oxnas_nand.c | 4 +--- + drivers/mtd/nand/raw/plat_nand.c | 4 +--- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 8 ++------ + drivers/mtd/nand/raw/tegra_nand.c | 4 +--- + drivers/mtd/nand/raw/txx9ndfmc.c | 4 +--- + drivers/mtd/nand/raw/vf610_nfc.c | 4 +--- + drivers/mtd/nand/raw/xway_nand.c | 4 +--- + include/linux/mtd/mtd.h | 2 -- + 18 files changed, 26 insertions(+), 59 deletions(-) +Merging spi-nor/spi-nor/next (2734d6c1b1a0 Linux 5.14-rc2) +$ 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 (a2d3cbc80d25 crypto: aesni - check walk.nbytes instead of err) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'recursive' strategy. + arch/arm64/crypto/Kconfig | 6 - + arch/arm64/crypto/aes-ce-ccm-core.S | 24 +-- + arch/arm64/crypto/aes-ce-ccm-glue.c | 203 +++++++-------------- + arch/arm64/crypto/aes-glue.c | 102 ++--------- + arch/arm64/crypto/aes-neonbs-glue.c | 122 +------------ + arch/arm64/crypto/ghash-ce-glue.c | 209 ++++++---------------- + arch/x86/crypto/aesni-intel_glue.c | 2 +- + crypto/drbg.c | 2 +- + crypto/jitterentropy.c | 24 +-- + drivers/char/hw_random/Kconfig | 12 +- + drivers/char/hw_random/ixp4xx-rng.c | 4 +- + drivers/crypto/hisilicon/qm.c | 52 +++++- + drivers/crypto/img-hash.c | 7 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 23 ++- + drivers/crypto/qat/qat_common/adf_isr.c | 170 +++++++++--------- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 24 ++- + lib/crypto/sm4.c | 4 +- + 17 files changed, 328 insertions(+), 662 deletions(-) +Merging drm/drm-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (9fcb4a8ff2aa drm/v3d: fix sched job resources cleanup when a job is aborted) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Removing include/linux/seqno-fence.h +Removing drivers/gpu/drm/zte/zx_vou_regs.h +Removing drivers/gpu/drm/zte/zx_vou.h +Removing drivers/gpu/drm/zte/zx_vou.c +Removing drivers/gpu/drm/zte/zx_vga_regs.h +Removing drivers/gpu/drm/zte/zx_vga.c +Removing drivers/gpu/drm/zte/zx_tvenc_regs.h +Removing drivers/gpu/drm/zte/zx_tvenc.c +Removing drivers/gpu/drm/zte/zx_plane_regs.h +Removing drivers/gpu/drm/zte/zx_plane.h +Removing drivers/gpu/drm/zte/zx_plane.c +Removing drivers/gpu/drm/zte/zx_hdmi_regs.h +Removing drivers/gpu/drm/zte/zx_hdmi.c +Removing drivers/gpu/drm/zte/zx_drm_drv.h +Removing drivers/gpu/drm/zte/zx_drm_drv.c +Removing drivers/gpu/drm/zte/zx_common_regs.h +Removing drivers/gpu/drm/zte/Makefile +Removing drivers/gpu/drm/zte/Kconfig +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +Auto-merging drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Removing drivers/dma-buf/seqno-fence.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/display/panel/ilitek,ili9341.yaml | 2 +- + .../bindings/display/panel/samsung,s6d27a1.yaml | 98 +++ + Documentation/driver-api/dma-buf.rst | 6 - + Documentation/gpu/drm-mm.rst | 84 +- + MAINTAINERS | 6 + + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf.c | 1 + + drivers/dma-buf/dma-fence.c | 13 +- + drivers/dma-buf/dma-resv.c | 24 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/dma-buf/seqno-fence.c | 71 -- + drivers/gpu/drm/Kconfig | 9 +- + drivers/gpu/drm/Makefile | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 15 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 27 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 4 +- + drivers/gpu/drm/bridge/ite-it66121.c | 5 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 18 +- + drivers/gpu/drm/drm_bridge.c | 41 +- + drivers/gpu/drm/drm_connector.c | 79 ++ + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 23 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 1 - + drivers/gpu/drm/drm_ioctl.c | 21 +- + drivers/gpu/drm/drm_kms_helper_common.c | 11 - + drivers/gpu/drm/drm_of.c | 3 + + drivers/gpu/drm/drm_panel_orientation_quirks.c | 49 +- + drivers/gpu/drm/drm_sysfs.c | 87 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +- + drivers/gpu/drm/gud/Kconfig | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 1 - + drivers/gpu/drm/lima/lima_gem.c | 9 +- + drivers/gpu/drm/lima/lima_sched.c | 28 +- + drivers/gpu/drm/lima/lima_sched.h | 6 +- + drivers/gpu/drm/mcde/mcde_drv.c | 4 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 4 +- + drivers/gpu/drm/meson/meson_drv.c | 3 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 4 +- + drivers/gpu/drm/msm/msm_gem.h | 5 - + drivers/gpu/drm/msm/msm_gem_submit.c | 35 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 12 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 - + drivers/gpu/drm/omapdrm/Kconfig | 1 - + drivers/gpu/drm/panel/Kconfig | 11 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 85 +- + drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 320 +++++++ + drivers/gpu/drm/panel/panel-simple.c | 26 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 29 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 48 +- + drivers/gpu/drm/panfrost/panfrost_job.h | 5 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 42 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 1 - + drivers/gpu/drm/r128/ati_pcigart.c | 11 +- + drivers/gpu/drm/radeon/radeon_fence.c | 24 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- + drivers/gpu/drm/rockchip/Kconfig | 1 - + drivers/gpu/drm/scheduler/sched_entity.c | 140 ++-- + drivers/gpu/drm/scheduler/sched_fence.c | 62 +- + drivers/gpu/drm/scheduler/sched_main.c | 199 ++++- + drivers/gpu/drm/stm/ltdc.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 18 +- + drivers/gpu/drm/sun4i/sun8i_csc.h | 4 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 21 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 4 +- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/plane.c | 2 +- + drivers/gpu/drm/tiny/Kconfig | 4 +- + drivers/gpu/drm/tiny/bochs.c | 8 + + drivers/gpu/drm/ttm/ttm_bo.c | 67 +- + drivers/gpu/drm/ttm/ttm_device.c | 48 ++ + drivers/gpu/drm/ttm/ttm_module.c | 12 + + drivers/gpu/drm/ttm/ttm_pool.c | 40 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 8 +- + drivers/gpu/drm/ttm/ttm_resource.c | 49 ++ + drivers/gpu/drm/ttm/ttm_tt.c | 17 +- + drivers/gpu/drm/udl/Kconfig | 1 + + drivers/gpu/drm/v3d/Kconfig | 2 +- + drivers/gpu/drm/v3d/v3d_drv.h | 6 +- + drivers/gpu/drm/v3d/v3d_gem.c | 129 ++- + drivers/gpu/drm/v3d/v3d_sched.c | 44 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 15 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 28 +- + drivers/gpu/drm/vgem/vgem_drv.c | 342 +------- + drivers/gpu/drm/virtio/virtgpu_drv.h | 8 + + drivers/gpu/drm/virtio/virtgpu_prime.c | 32 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 61 ++ + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +- + drivers/gpu/drm/zte/Kconfig | 10 - + drivers/gpu/drm/zte/Makefile | 10 - + drivers/gpu/drm/zte/zx_common_regs.h | 28 - + drivers/gpu/drm/zte/zx_drm_drv.c | 184 ---- + drivers/gpu/drm/zte/zx_drm_drv.h | 34 - + drivers/gpu/drm/zte/zx_hdmi.c | 760 ----------------- + drivers/gpu/drm/zte/zx_hdmi_regs.h | 66 -- + drivers/gpu/drm/zte/zx_plane.c | 537 ------------ + drivers/gpu/drm/zte/zx_plane.h | 26 - + drivers/gpu/drm/zte/zx_plane_regs.h | 120 --- + drivers/gpu/drm/zte/zx_tvenc.c | 400 --------- + drivers/gpu/drm/zte/zx_tvenc_regs.h | 27 - + drivers/gpu/drm/zte/zx_vga.c | 527 ------------ + drivers/gpu/drm/zte/zx_vga_regs.h | 33 - + drivers/gpu/drm/zte/zx_vou.c | 921 --------------------- + drivers/gpu/drm/zte/zx_vou.h | 64 -- + drivers/gpu/drm/zte/zx_vou_regs.h | 212 ----- + drivers/usb/typec/altmodes/Kconfig | 1 + + drivers/usb/typec/altmodes/displayport.c | 58 +- + include/drm/drm_bridge.h | 2 + + include/drm/drm_connector.h | 25 + + include/drm/drm_ioctl.h | 1 - + include/drm/drm_mode_config.h | 13 +- + include/drm/drm_plane.h | 2 +- + include/drm/gpu_scheduler.h | 188 ++++- + include/drm/ttm/ttm_bo_api.h | 12 - + include/drm/ttm/ttm_caching.h | 17 + + include/drm/ttm/ttm_device.h | 77 +- + include/drm/ttm/ttm_placement.h | 1 + + include/drm/ttm/ttm_pool.h | 5 +- + include/drm/ttm/ttm_range_manager.h | 18 +- + include/drm/ttm/ttm_resource.h | 9 +- + include/drm/ttm/ttm_tt.h | 18 +- + include/linux/dma-buf.h | 7 + + include/linux/dma-fence.h | 32 +- + include/linux/dma-resv.h | 104 ++- + include/linux/seqno-fence.h | 109 --- + include/linux/shrinker.h | 1 + + include/uapi/drm/drm_fourcc.h | 6 + + include/uapi/drm/drm_mode.h | 3 + + mm/vmscan.c | 15 + + 147 files changed, 2124 insertions(+), 5481 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml + delete mode 100644 drivers/dma-buf/seqno-fence.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6d27a1.c + delete mode 100644 drivers/gpu/drm/zte/Kconfig + delete mode 100644 drivers/gpu/drm/zte/Makefile + delete mode 100644 drivers/gpu/drm/zte/zx_common_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.c + delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.h + delete mode 100644 drivers/gpu/drm/zte/zx_hdmi.c + delete mode 100644 drivers/gpu/drm/zte/zx_hdmi_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_plane.c + delete mode 100644 drivers/gpu/drm/zte/zx_plane.h + delete mode 100644 drivers/gpu/drm/zte/zx_plane_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_tvenc.c + delete mode 100644 drivers/gpu/drm/zte/zx_tvenc_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_vga.c + delete mode 100644 drivers/gpu/drm/zte/zx_vga_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_vou.c + delete mode 100644 drivers/gpu/drm/zte/zx_vou.h + delete mode 100644 drivers/gpu/drm/zte/zx_vou_regs.h + delete mode 100644 include/linux/seqno-fence.h +$ git am -3 ../patches/0001-Revert-drm-vc4-dsi-Switch-to-devm_drm_of_get_bridge.patch +Applying: Revert "drm/vc4: dsi: Switch to devm_drm_of_get_bridge" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/vc4/vc4_dsi.c +$ git add -A . +$ git commit -v -a --amend +[master 2280723e2262] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc + Date: Mon Sep 20 10:44:23 2021 +1000 +$ git am -3 ../patches/0002-Revert-drm-vc4-dpi-Switch-to-devm_drm_of_get_bridge.patch +Applying: Revert "drm/vc4: dpi: Switch to devm_drm_of_get_bridge" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/vc4/vc4_dpi.c +$ git add -A . +$ git commit -v -a --amend +[master 69389142ed5e] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc + Date: Mon Sep 20 10:44:23 2021 +1000 +$ git am -3 ../patches/0003-Revert-drm-bridge-Add-a-function-to-abstract-away-pa.patch +Applying: Revert "drm/bridge: Add a function to abstract away panels" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/drm_bridge.c +M drivers/gpu/drm/drm_of.c +M include/drm/drm_bridge.h +$ git add -A . +$ git commit -v -a --amend +[master a22f74d49373] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc + Date: Mon Sep 20 10:44:23 2021 +1000 +Merging amdgpu/drm-next (d12d06294907 drm/radeon: Add HD-audio component notifier support (v2)) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging include/drm/ttm/ttm_device.h +Auto-merging drivers/gpu/drm/ttm/ttm_device.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_types.h +Auto-merging drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +Auto-merging drivers/gpu/drm/Kconfig +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0f26c838f835] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 143 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 160 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 388 ------ + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 20 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 34 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 617 +++------- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 166 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h | 51 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 113 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 111 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 30 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 18 + + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 81 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 459 ++++++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 91 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 3 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 16 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 49 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 10 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 10 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 16 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 6 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 49 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 544 +++++++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1302 +++++++++++++++++++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 11 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 25 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 335 ++++- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 121 +- + drivers/gpu/drm/amd/display/dc/dc.h | 36 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 222 ++++ + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 16 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 21 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 16 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 12 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 2 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 164 ++- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 112 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 9 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 30 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 43 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 28 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 5 + + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 24 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 4 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 6 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 8 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h | 11 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 6 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 8 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.c | 92 ++ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.h | 126 ++ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 173 +++ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h | 115 ++ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 162 +++ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 18 + + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 4 + + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 616 +++++++++ + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 222 ++++ + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 747 +++++++++++ + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 ++++ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 28 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 - + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 318 ++++- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c | 87 ++ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h | 162 +++ + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 + + .../drm/amd/display/dc/dml/display_mode_enums.h | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 195 ++- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 22 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 23 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 4 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 91 ++ + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 83 ++ + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 2 +- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 18 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 25 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.h | 2 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 4 + + .../display/dc/virtual/virtual_stream_encoder.c | 2 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 4 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 31 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 8 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 10 +- + .../drm/amd/display/include/bios_parser_types.h | 8 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 2 +- + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 17 + + .../gpu/drm/amd/display/include/grph_object_defs.h | 12 + + .../gpu/drm/amd/display/include/grph_object_id.h | 8 + + .../drm/amd/display/include/link_service_types.h | 57 +- + drivers/gpu/drm/amd/display/include/logger_types.h | 6 + + .../drm/amd/display/modules/color/color_gamma.c | 32 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 4 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/radeon/ci_dpm.c | 3 +- + drivers/gpu/drm/radeon/r600_dpm.c | 10 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 ++ + include/drm/ttm/ttm_device.h | 1 + + 173 files changed, 8628 insertions(+), 1898 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h +$ git am -3 ../patches/0001-amdgpu-fix-bad-merge-pinned.patch +Applying: amdgpu: fix bad merge (pinned) +$ git reset HEAD^ +Unstaged changes after reset: +M include/drm/ttm/ttm_device.h +$ git add -A . +$ git commit -v -a --amend +[master 63d12fb13c26] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux + Date: Mon Sep 20 10:44:28 2021 +1000 +Merging drm-intel/for-linux-next (641dd82ffa9d drm/i915/display/adlp: Add new PSR2 workarounds) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/Makefile +Merge made by the 'recursive' strategy. + Documentation/gpu/i915.rst | 25 +- + drivers/gpu/drm/drm_edid.c | 89 +- + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/display/g4x_dp.c | 8 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 86 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 46 + + drivers/gpu/drm/i915/display/intel_acpi.h | 3 + + drivers/gpu/drm/i915/display/intel_backlight.c | 1776 +++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_backlight.h | 52 + + drivers/gpu/drm/i915/display/intel_bios.c | 375 ++-- + drivers/gpu/drm/i915/display/intel_bw.c | 19 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 10 + + drivers/gpu/drm/i915/display/intel_connector.c | 4 +- + drivers/gpu/drm/i915/display/intel_crt.c | 4 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 43 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 58 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 7 + + drivers/gpu/drm/i915/display/intel_display.c | 992 +---------- + drivers/gpu/drm/i915/display/intel_display.h | 18 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 88 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 4 + + drivers/gpu/drm/i915/display/intel_display_types.h | 28 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 9 +- + drivers/gpu/drm/i915/display/intel_dp.c | 712 ++------ + drivers/gpu/drm/i915/display/intel_dp.h | 15 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 12 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 78 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 19 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 595 +++---- + drivers/gpu/drm/i915/display/intel_dpll.h | 23 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 41 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 11 - + drivers/gpu/drm/i915/display/intel_dpt.c | 229 +++ + drivers/gpu/drm/i915/display/intel_dpt.h | 19 + + drivers/gpu/drm/i915/display/intel_drrs.c | 437 +++++ + drivers/gpu/drm/i915/display/intel_drrs.h | 36 + + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 33 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_fb.c | 481 ++++++ + drivers/gpu/drm/i915/display/intel_fb.h | 20 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 89 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 1 + + drivers/gpu/drm/i915/display/intel_fdi.c | 202 ++- + drivers/gpu/drm/i915/display/intel_fdi.h | 4 + + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 5 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 3 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 64 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 18 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 5 +- + drivers/gpu/drm/i915/display/intel_panel.c | 1794 +------------------- + drivers/gpu/drm/i915/display/intel_panel.h | 43 +- + drivers/gpu/drm/i915/display/intel_psr.c | 198 +-- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 222 ++- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 3 +- + drivers/gpu/drm/i915/display/intel_tv.c | 2 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 77 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 6 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 16 +- + drivers/gpu/drm/i915/i915_drv.h | 36 +- + drivers/gpu/drm/i915/i915_irq.c | 66 +- + drivers/gpu/drm/i915/i915_irq.h | 51 +- + drivers/gpu/drm/i915/i915_pci.c | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 65 +- + drivers/gpu/drm/i915/intel_pm.c | 29 +- + drivers/gpu/drm/i915/intel_pm.h | 2 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 - + drivers/video/fbdev/efifb.c | 21 +- + include/drm/drm_connector.h | 12 + + include/drm/drm_displayid.h | 101 +- + include/drm/i915_pciids.h | 8 +- + 72 files changed, 5080 insertions(+), 4583 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight.c + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.h + create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.c + create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.h +Merging drm-tegra/drm/tegra/for-next (c3dbfb9c49ee gpu: host1x: Plug potential memory leak) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 3 --- + drivers/gpu/drm/tegra/dc.h | 6 ------ + drivers/gpu/drm/tegra/uapi.c | 2 +- + drivers/gpu/host1x/fence.c | 6 ++++-- + 4 files changed, 5 insertions(+), 12 deletions(-) +Merging drm-msm/msm-next (cb0927ab80d2 drm/msi/mdp4: populate priv->kms in mdp4_kms_init) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (94d508fa3186 ALSA: hda/cs8409: Setup Dolphin Headset Mic as Phantom Jack) +$ 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 (eb4ec51579e8 Merge remote-tracking branch 'asoc/for-5.16' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Removing sound/soc/sof/probe.h +Removing sound/soc/sof/compress.h +Removing sound/soc/sof/compress.c +Removing Documentation/devicetree/bindings/sound/spdif-transmitter.txt +Removing Documentation/devicetree/bindings/sound/simple-amplifier.txt +Removing Documentation/devicetree/bindings/sound/rockchip,pdm.txt +Removing Documentation/devicetree/bindings/sound/name-prefix.txt +Removing Documentation/devicetree/bindings/sound/bt-sco.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/bt-sco.txt | 13 - + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 157 + + .../devicetree/bindings/sound/linux,bt-sco.yaml | 38 + + .../devicetree/bindings/sound/linux,spdif-dit.yaml | 32 + + .../devicetree/bindings/sound/name-prefix.txt | 24 - + .../devicetree/bindings/sound/name-prefix.yaml | 21 + + .../bindings/sound/nvidia,tegra186-dspk.yaml | 9 +- + .../bindings/sound/nvidia,tegra210-dmic.yaml | 9 +- + .../bindings/sound/nvidia,tegra210-i2s.yaml | 9 +- + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 9 +- + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 100 + + .../devicetree/bindings/sound/rockchip,pdm.txt | 46 - + .../devicetree/bindings/sound/rockchip,pdm.yaml | 120 + + Documentation/devicetree/bindings/sound/rt5659.txt | 2 +- + .../devicetree/bindings/sound/simple-amplifier.txt | 17 - + .../bindings/sound/simple-audio-amplifier.yaml | 45 + + .../bindings/sound/simple-audio-mux.yaml | 9 +- + .../bindings/sound/spdif-transmitter.txt | 10 - + .../devicetree/bindings/sound/wlf,wm8978.yaml | 58 + + include/dt-bindings/sound/qcom,lpass.h | 5 + + include/sound/cs35l41.h | 34 + + include/sound/rt5682s.h | 48 + + include/sound/sof.h | 5 - + sound/soc/amd/acp-da7219-max98357a.c | 6 +- + sound/soc/amd/acp-pcm-dma.c | 6 +- + sound/soc/amd/acp.h | 2 + + sound/soc/atmel/atmel-i2s.c | 6 +- + sound/soc/atmel/atmel_ssc_dai.c | 26 +- + sound/soc/atmel/atmel_wm8904.c | 2 +- + sound/soc/atmel/mchp-i2s-mcc.c | 10 +- + sound/soc/atmel/mikroe-proto.c | 4 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/atmel/sam9x5_wm8731.c | 2 +- + sound/soc/atmel/tse850-pcm5142.c | 2 +- + sound/soc/au1x/db1200.c | 6 +- + sound/soc/au1x/i2sc.c | 6 +- + sound/soc/au1x/psc-i2s.c | 10 +- + sound/soc/codecs/88pm860x-codec.c | 18 +- + sound/soc/codecs/Kconfig | 17 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/cs35l41-i2c.c | 113 + + sound/soc/codecs/cs35l41-spi.c | 138 + + sound/soc/codecs/cs35l41-tables.c | 594 ++++ + sound/soc/codecs/cs35l41.c | 1447 +++++++++ + sound/soc/codecs/cs35l41.h | 775 +++++ + sound/soc/codecs/cs42l42.c | 114 +- + sound/soc/codecs/cs42l42.h | 54 + + sound/soc/codecs/mt6359.c | 2 +- + sound/soc/codecs/pcm5102a.c | 2 +- + sound/soc/codecs/rt1011.c | 54 + + sound/soc/codecs/rt1011.h | 7 + + sound/soc/codecs/rt5682s.c | 3188 ++++++++++++++++++++ + sound/soc/codecs/rt5682s.h | 1455 +++++++++ + sound/soc/fsl/fsl_rpmsg.c | 46 +- + sound/soc/fsl/fsl_rpmsg.h | 12 + + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/sof_rt5682.c | 105 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 24 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 1 - + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 8 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 2 +- + .../mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 6 +- + sound/soc/rockchip/rockchip_pdm.c | 112 +- + sound/soc/rockchip/rockchip_pdm.h | 6 + + sound/soc/soc-topology.c | 6 +- + sound/soc/sof/Makefile | 3 +- + sound/soc/sof/compress.c | 147 - + sound/soc/sof/compress.h | 32 - + sound/soc/sof/control.c | 192 +- + sound/soc/sof/core.c | 11 +- + sound/soc/sof/debug.c | 26 +- + sound/soc/sof/imx/imx8.c | 12 +- + sound/soc/sof/imx/imx8m.c | 17 +- + sound/soc/sof/intel/Makefile | 2 +- + sound/soc/sof/intel/apl.c | 3 +- + sound/soc/sof/intel/bdw.c | 7 +- + sound/soc/sof/intel/byt.c | 6 +- + sound/soc/sof/intel/cnl.c | 3 +- + sound/soc/sof/intel/hda-dai.c | 16 +- + sound/soc/sof/intel/hda-dsp.c | 61 +- + .../soc/sof/intel/{hda-compress.c => hda-probes.c} | 0 + sound/soc/sof/intel/hda.c | 33 +- + sound/soc/sof/intel/hda.h | 41 - + sound/soc/sof/intel/icl.c | 3 +- + sound/soc/sof/intel/pci-apl.c | 2 - + sound/soc/sof/intel/pci-cnl.c | 3 - + sound/soc/sof/intel/pci-icl.c | 2 - + sound/soc/sof/intel/pci-tgl.c | 5 - + sound/soc/sof/intel/pci-tng.c | 4 +- + sound/soc/sof/intel/tgl.c | 3 +- + sound/soc/sof/ipc.c | 103 +- + sound/soc/sof/loader.c | 147 +- + sound/soc/sof/ops.h | 33 +- + sound/soc/sof/pcm.c | 6 +- + sound/soc/sof/probe.h | 85 - + sound/soc/sof/sof-audio.h | 5 + + sound/soc/sof/sof-priv.h | 75 +- + sound/soc/sof/{probe.c => sof-probes.c} | 280 +- + sound/soc/sof/sof-probes.h | 38 + + sound/soc/sof/utils.c | 28 +- + sound/soc/sof/xtensa/core.c | 2 +- + sound/soc/ti/Kconfig | 2 +- + 103 files changed, 9720 insertions(+), 947 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/bt-sco.txt + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs35l41.yaml + create mode 100644 Documentation/devicetree/bindings/sound/linux,bt-sco.yaml + create mode 100644 Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/name-prefix.txt + create mode 100644 Documentation/devicetree/bindings/sound/name-prefix.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/simple-amplifier.txt + create mode 100644 Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8978.yaml + create mode 100644 include/sound/cs35l41.h + create mode 100644 include/sound/rt5682s.h + create mode 100644 sound/soc/codecs/cs35l41-i2c.c + create mode 100644 sound/soc/codecs/cs35l41-spi.c + create mode 100644 sound/soc/codecs/cs35l41-tables.c + create mode 100644 sound/soc/codecs/cs35l41.c + create mode 100644 sound/soc/codecs/cs35l41.h + create mode 100644 sound/soc/codecs/rt5682s.c + create mode 100644 sound/soc/codecs/rt5682s.h + delete mode 100644 sound/soc/sof/compress.c + delete mode 100644 sound/soc/sof/compress.h + rename sound/soc/sof/intel/{hda-compress.c => hda-probes.c} (100%) + delete mode 100644 sound/soc/sof/probe.h + rename sound/soc/sof/{probe.c => sof-probes.c} (52%) + create mode 100644 sound/soc/sof/sof-probes.h +Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules/modules-next +Already up to date. +Merging input/next (e2afe95a87a2 dt-bindings: input: Add binding for cypress-sf) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/cypress-sf.yaml | 61 ++++++ + MAINTAINERS | 7 + + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/cypress-sf.c | 224 +++++++++++++++++++++ + drivers/input/misc/cpcap-pwrbutton.c | 6 +- + drivers/input/misc/palmas-pwrbutton.c | 5 + + drivers/input/touchscreen/ads7846.c | 192 +++++++----------- + drivers/input/touchscreen/raydium_i2c_ts.c | 50 ++++- + include/linux/spi/ads7846.h | 15 -- + 10 files changed, 427 insertions(+), 144 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/cypress-sf.yaml + create mode 100644 drivers/input/keyboard/cypress-sf.c +Merging block/for-next (32ac44a96a8e Merge branch 'for-5.16/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'recursive' strategy. + Documentation/cdrom/cdrom-standard.rst | 11 ++ + Documentation/userspace-api/ioctl/cdrom.rst | 3 + + drivers/block/null_blk/main.c | 102 +++++++++++++++- + drivers/block/null_blk/null_blk.h | 4 + + drivers/cdrom/cdrom.c | 59 ++++++++- + fs/io-wq.c | 9 +- + fs/io_uring.c | 178 ++++++++++++++++++---------- + include/linux/cdrom.h | 1 + + include/trace/events/io_uring.h | 61 ++++++++++ + include/uapi/linux/cdrom.h | 19 +++ + 10 files changed, 371 insertions(+), 76 deletions(-) +Merging device-mapper/for-next (d3703ef33129 dm crypt: use in_hardirq() instead of deprecated in_irq()) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) +$ 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 (4ed8431c42ba Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Removing Documentation/devicetree/bindings/mmc/mmc-card.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 25 +++++++++++ + Documentation/devicetree/bindings/mmc/mmc-card.txt | 30 -------------- + .../devicetree/bindings/mmc/mmc-card.yaml | 48 ++++++++++++++++++++++ + .../devicetree/bindings/mmc/mmc-controller.yaml | 6 --- + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + drivers/memstick/core/ms_block.c | 6 ++- + drivers/memstick/core/mspro_block.c | 6 ++- + drivers/memstick/host/jmb38x_ms.c | 3 +- + drivers/mmc/core/block.c | 7 +++- + drivers/mmc/host/cqhci-core.c | 4 +- + drivers/mmc/host/mtk-sd.c | 20 +++++---- + drivers/mmc/host/omap_hsmmc.c | 10 ++--- + drivers/mmc/host/sdhci-of-arasan.c | 29 ++++++++++++- + drivers/mmc/host/sdhci.c | 2 +- + 14 files changed, 137 insertions(+), 60 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-card.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-card.yaml +Merging mfd/for-mfd-next (cdff1eda6932 mfd: lpc_sch: Rename GPIOBASE to prevent build error) +$ 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 (79fad92f2e59 backlight: pwm_bl: Improve bootloader/kernel device handover) +$ 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 (c9398455b046 power: supply: core: Fix parsing of battery chemistry/technology) +$ 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 +Already up to date. +Merging regulator/for-next (ea6ad72324f8 Merge remote-tracking branch 'regulator/for-5.16' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Removing Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt +Merge made by the 'recursive' strategy. + .../bindings/regulator/silergy,sy8106a.yaml | 52 ++++++++++++++++++++++ + .../bindings/regulator/sy8106a-regulator.txt | 23 ---------- + drivers/regulator/Kconfig | 2 +- + drivers/regulator/core.c | 7 +-- + drivers/regulator/rtq6752-regulator.c | 18 ++++---- + drivers/regulator/ti-abb-regulator.c | 31 +++---------- + drivers/regulator/vqmmc-ipq4019-regulator.c | 4 +- + 7 files changed, 73 insertions(+), 64 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Already up to date. +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ 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 security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (836f7b6ca082 ima: fix deadlock when traversing "ima_default_rules".) +$ 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 'recursive' strategy. + security/integrity/ima/ima_policy.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +Resolved 'certs/system_keyring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b9de60fe74da] Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 (0817534ff9ea smackfs: Fix use-after-free in netlbl_catmap_walk()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'recursive' strategy. + security/smack/smackfs.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging tomoyo/master (7d2a07b76933 Linux 5.14) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (f985911b7bc7 crypto: public_key: fix overflow during implicit conversion) +$ 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 (41e73feb1024 dt-bindings: watchdog: Add compatible for Mediatek MT7986) +$ 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 (b58886bf14da Merge branch 'iommu/fixes' 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. +Merge made by the 'recursive' strategy. +Merging audit/next (d680c6b49c5e audit: Convert to SPDX identifier) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'recursive' strategy. + kernel/audit_tree.c | 20 ++++++++++---------- + kernel/auditsc.c | 15 +-------------- + 2 files changed, 11 insertions(+), 24 deletions(-) +Merging devicetree/for-next (bb667205406c dt-bindings: w1: update w1-gpio.yaml reference) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Makefile +Removing Documentation/devicetree/bindings/w1/w1-gpio.txt +Removing Documentation/devicetree/bindings/usb/udc-xilinx.txt +Removing Documentation/devicetree/bindings/memory-controllers/fsl/ddr.txt +Removing Documentation/devicetree/bindings/gnss/u-blox.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Removing Documentation/devicetree/bindings/arm/cci.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/arm,cci-400.yaml | 216 ++++++++++++++++++++ + .../devicetree/bindings/arm/cci-control-port.yaml | 38 ++++ + Documentation/devicetree/bindings/arm/cci.txt | 224 --------------------- + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 62 ++++++ + Documentation/devicetree/bindings/gnss/u-blox.txt | 45 ----- + .../devicetree/bindings/media/ti,cal.yaml | 4 +- + .../bindings/memory-controllers/fsl/ddr.txt | 29 --- + .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 83 ++++++++ + .../bindings/reserved-memory/memory-region.yaml | 40 ++++ + .../bindings/reserved-memory/reserved-memory.txt | 172 +--------------- + .../bindings/reserved-memory/reserved-memory.yaml | 100 +++++++++ + .../bindings/reserved-memory/shared-dma-pool.yaml | 87 ++++++++ + .../devicetree/bindings/usb/udc-xilinx.txt | 18 -- + .../devicetree/bindings/usb/xlnx,usb2.yaml | 41 ++++ + Documentation/devicetree/bindings/w1/w1-gpio.txt | 27 --- + Documentation/devicetree/bindings/w1/w1-gpio.yaml | 44 ++++ + Documentation/w1/masters/w1-gpio.rst | 2 +- + Makefile | 10 +- + 19 files changed, 723 insertions(+), 521 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/arm,cci-400.yaml + create mode 100644 Documentation/devicetree/bindings/arm/cci-control-port.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/cci.txt + create mode 100644 Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml + delete mode 100644 Documentation/devicetree/bindings/gnss/u-blox.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ddr.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/memory-region.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/reserved-memory.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/shared-dma-pool.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/udc-xilinx.txt + create mode 100644 Documentation/devicetree/bindings/usb/xlnx,usb2.yaml + delete mode 100644 Documentation/devicetree/bindings/w1/w1-gpio.txt + create mode 100644 Documentation/devicetree/bindings/w1/w1-gpio.yaml +Merging mailbox/mailbox-for-next (85dfdbfc13ea mailbox: cmdq: add multi-gce clocks support for mt8195) +$ 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 (9e36a96ee3da Merge remote-tracking branch 'spi/for-5.16' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/ingenic,spi.yaml | 72 +++ + arch/mips/boot/dts/ingenic/ci20.dts | 9 +- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 44 +- + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-amd.c | 113 ++--- + drivers/spi/spi-ingenic.c | 482 +++++++++++++++++++++ + drivers/spi/spi-rspi.c | 1 - + drivers/spi/spi-sh-msiof.c | 1 - + 9 files changed, 645 insertions(+), 87 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/ingenic,spi.yaml + create mode 100644 drivers/spi/spi-ingenic.c +Merging tip/auto-latest (7fc58d76a2ce Merge branch 'x86/urgent') +$ git merge -m Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/dma-resv.h +Auto-merging drivers/regulator/core.c +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 8 + + Documentation/scheduler/sched-bwc.rst | 84 ++++- + arch/x86/events/intel/bts.c | 6 + + arch/x86/events/intel/uncore_discovery.h | 2 +- + arch/x86/events/intel/uncore_snbep.c | 16 +- + arch/x86/ia32/ia32_signal.c | 14 +- + arch/x86/include/asm/asm.h | 55 ++- + arch/x86/include/asm/cpufeature.h | 13 +- + arch/x86/include/asm/extable.h | 44 ++- + arch/x86/include/asm/extable_fixup_types.h | 22 ++ + arch/x86/include/asm/fpu/internal.h | 46 +-- + arch/x86/include/asm/msr.h | 4 +- + arch/x86/include/asm/paravirt.h | 31 +- + arch/x86/include/asm/ptrace.h | 2 +- + arch/x86/include/asm/segment.h | 2 +- + arch/x86/include/asm/xen/hypercall.h | 6 +- + arch/x86/kernel/cpu/mce/core.c | 40 +-- + arch/x86/kernel/cpu/mce/internal.h | 14 +- + arch/x86/kernel/cpu/mce/severity.c | 22 +- + arch/x86/kernel/fpu/signal.c | 144 ++++---- + arch/x86/kernel/irqflags.S | 2 + + arch/x86/kernel/paravirt.c | 45 ++- + arch/x86/kernel/setup.c | 26 +- + arch/x86/kernel/sev-shared.c | 2 +- + arch/x86/kernel/signal.c | 18 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kvm/svm/svm.h | 8 +- + arch/x86/kvm/svm/svm_ops.h | 4 +- + arch/x86/kvm/vmx/evmcs.h | 4 +- + arch/x86/lib/copy_mc_64.S | 8 +- + arch/x86/mm/extable.c | 131 +++----- + arch/x86/net/bpf_jit_comp.c | 11 +- + arch/x86/xen/enlighten_pv.c | 70 ++-- + arch/x86/xen/irq.c | 31 +- + arch/x86/xen/mmu_pv.c | 93 +++--- + arch/x86/xen/xen-asm.S | 79 ++--- + arch/x86/xen/xen-head.S | 34 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + drivers/regulator/core.c | 2 +- + fs/proc/stat.c | 4 +- + fs/proc/uptime.c | 14 +- + include/linux/context_tracking.h | 2 +- + include/linux/debug_locks.h | 2 - + include/linux/dma-resv.h | 2 +- + include/linux/kernel_stat.h | 1 + + include/linux/lockdep_types.h | 2 +- + include/linux/sched.h | 8 +- + include/linux/ww_mutex.h | 15 +- + kernel/Kconfig.preempt | 32 +- + kernel/irq/manage.c | 6 +- + kernel/kthread.c | 16 +- + kernel/locking/lockdep.c | 6 +- + kernel/locking/mutex.c | 41 +++ + kernel/locking/test-ww_mutex.c | 86 +++-- + kernel/locking/ww_rt_mutex.c | 25 ++ + kernel/rcu/update.c | 4 +- + kernel/sched/core.c | 225 ++++++------- + kernel/sched/deadline.c | 99 +++++- + kernel/sched/debug.c | 100 +++--- + kernel/sched/fair.c | 288 ++++++++-------- + kernel/sched/rt.c | 130 +++++++- + kernel/sched/sched.h | 18 +- + kernel/sched/stats.c | 104 ++++++ + kernel/sched/stats.h | 49 +++ + kernel/sched/stop_task.c | 4 +- + lib/Kconfig.debug | 2 +- + lib/locking-selftest.c | 2 +- + scripts/sorttable.c | 4 +- + tools/objtool/arch/x86/decode.c | 74 +++- + tools/objtool/check.c | 464 ++++++++++++++++++++------ + tools/objtool/include/objtool/arch.h | 5 +- + tools/objtool/include/objtool/cfi.h | 2 + + tools/objtool/include/objtool/check.h | 2 +- + tools/objtool/include/objtool/elf.h | 1 + + tools/objtool/include/objtool/objtool.h | 9 + + tools/objtool/objtool.c | 22 ++ + tools/objtool/orc_gen.c | 15 +- + tools/testing/selftests/sched/cs_prctl_test.c | 28 +- + 78 files changed, 1995 insertions(+), 1065 deletions(-) + create mode 100644 arch/x86/include/asm/extable_fixup_types.h +Merging clockevents/timers/drivers/next (f196ae282070 dt-bindings: timer: Add ABIs for new Ingenic SoCs) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (4646da896a44 Merge branch 'edac-urgent' into edac-for-next) +$ 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 +Merge made by the 'recursive' strategy. + drivers/edac/dmc520_edac.c | 2 +- + drivers/edac/edac_mc.c | 42 ++++++++++++++++++------------------------ + drivers/edac/synopsys_edac.c | 2 +- + 3 files changed, 20 insertions(+), 26 deletions(-) +Merging irqchip/irq/irqchip-next (6e3b473ee064 Merge branch irq/qcom-pdc-nowake-cleanup 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 (5dfe50b05588 bootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Already up to date. +Merging rcu/rcu/next (9c2eed2c4c24 rcu: Replace ________p1 and _________p1 with __UNIQUE_ID(rcu)) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging kernel/rcu/update.c +Merge made by the 'recursive' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 69 +++-- + Documentation/RCU/stallwarn.rst | 10 + + .../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 +++ + arch/sh/configs/sdk7786_defconfig | 1 - + arch/xtensa/configs/nommu_kc705_defconfig | 1 - + include/linux/kcsan-checks.h | 3 + + include/linux/rcupdate.h | 53 ++-- + include/linux/rcupdate_trace.h | 5 +- + include/linux/srcu.h | 3 +- + include/linux/torture.h | 8 + + kernel/kcsan/core.c | 75 ++--- + kernel/kcsan/kcsan.h | 8 +- + kernel/kcsan/kcsan_test.c | 62 ++-- + kernel/kcsan/report.c | 77 ++++- + kernel/kcsan/selftest.c | 72 ++--- + kernel/locking/locktorture.c | 14 +- + kernel/rcu/rcuscale.c | 10 +- + kernel/rcu/rcutorture.c | 86 ++++-- + kernel/rcu/refscale.c | 6 +- + kernel/rcu/tasks.h | 109 ++++--- + kernel/rcu/tree.c | 34 +-- + kernel/rcu/tree_exp.h | 3 +- + kernel/rcu/tree_nocb.h | 2 +- + kernel/rcu/tree_plugin.h | 3 +- + kernel/rcu/update.c | 8 +- + kernel/scftorture.c | 43 +-- + kernel/softirq.c | 3 +- + kernel/time/clocksource-wdtest.c | 5 +- + kernel/time/clocksource.c | 31 +- + kernel/time/tick-sched.c | 7 + + 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 +++ + tools/rcu/extract-stall.sh | 34 +++ + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 1 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 11 +- + 54 files changed, 1430 insertions(+), 432 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 + create mode 100644 tools/rcu/extract-stall.sh +Merging kvm/next (109bbba5066b KVM: Drop unused kvm_dirty_gfn_invalid()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (419025b3b419 Merge branch kvm-arm64/misc-5.15 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 kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) +$ git merge -m Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (a3e03bc1368c KVM: s390: index kvm->arch.idle_mask by vcpu_idx) +$ 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 (d859ed25b242 swiotlb-xen: drop DEFAULT_NSLABS) +$ 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 (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) +$ 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. +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (1f88e0a22f7c platform/x86: acer-wmi: use __packed instead of __attribute__((packed))) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/platform/x86/Kconfig | 17 ++ + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 14 +- + drivers/platform/x86/hp-wmi.c | 329 +++++++++++++++++++++++++- + drivers/platform/x86/wmaa-backlight-wmi.c | 205 +++++++++++++++++ + drivers/platform/x86/wmi.c | 369 ++++++++++++++++-------------- + 7 files changed, 746 insertions(+), 195 deletions(-) + create mode 100644 drivers/platform/x86/wmaa-backlight-wmi.c +Merging chrome-platform/for-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (820879ee1865 sysfs: simplify sysfs_kf_seq_show) +$ 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 +Merge made by the 'recursive' strategy. + drivers/base/platform.c | 3 +- + fs/sysfs/file.c | 140 ++++++++++++++++++++++++++---------------------- + fs/sysfs/group.c | 15 +++--- + fs/sysfs/sysfs.h | 8 +-- + include/linux/kernfs.h | 28 ---------- + include/linux/kobject.h | 1 - + lib/kobject.c | 2 +- + 7 files changed, 89 insertions(+), 108 deletions(-) +Merging usb/usb-next (ae8709b296d8 USB: core: Make do_proc_control() and do_proc_bulk() killable) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging drivers/usb/host/ehci-hcd.c +Auto-merging drivers/usb/gadget/function/f_uac2.c +Auto-merging drivers/usb/dwc3/core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/atmel-usb.txt | 4 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/snps,dwc3.yaml | 8 ++ + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 83 ++++++++++++ + drivers/usb/core/devio.c | 144 ++++++++++++++++----- + drivers/usb/dwc3/core.c | 29 +++++ + drivers/usb/dwc3/core.h | 6 + + drivers/usb/gadget/epautoconf.c | 2 +- + drivers/usb/gadget/function/f_uac2.c | 16 +-- + drivers/usb/gadget/udc/goku_udc.c | 6 +- + drivers/usb/host/ehci-atmel.c | 8 ++ + drivers/usb/host/ehci-hcd.c | 11 +- + drivers/usb/host/ehci-platform.c | 6 + + drivers/usb/host/ehci.h | 1 + + drivers/usb/host/ohci-hcd.c | 3 +- + drivers/usb/musb/mediatek.c | 1 + + drivers/usb/typec/hd3ss3220.c | 8 +- + 17 files changed, 284 insertions(+), 53 deletions(-) +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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) +$ git merge -m Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-next/for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/udc.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging tty/tty-next (b55c8aa6b1ab tty: moxa: merge moxa.h into moxa.c) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Removing drivers/tty/moxa.h +Removing Documentation/devicetree/bindings/serial/xlnx,opb-uartlite.txt +Removing Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt +Merge made by the 'recursive' strategy. + .../bindings/serial/brcm,bcm6345-uart.txt | 36 --- + .../bindings/serial/brcm,bcm6345-uart.yaml | 47 ++++ + .../devicetree/bindings/serial/samsung_uart.yaml | 1 + + .../bindings/serial/xlnx,opb-uartlite.txt | 23 -- + .../bindings/serial/xlnx,opb-uartlite.yaml | 90 ++++++ + Documentation/driver-api/serial/n_gsm.rst | 71 ++++- + arch/sh/boot/dts/j2_mimas_v2.dts | 2 + + drivers/tty/moxa.c | 302 +++++++++++++++++++- + drivers/tty/moxa.h | 307 --------------------- + drivers/tty/n_gsm.c | 109 ++++++-- + drivers/tty/serial/8250/8250_pci.c | 4 +- + drivers/tty/serial/uartlite.c | 91 +++++- + 12 files changed, 670 insertions(+), 413 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/xlnx,opb-uartlite.txt + create mode 100644 Documentation/devicetree/bindings/serial/xlnx,opb-uartlite.yaml + delete mode 100644 drivers/tty/moxa.h +Merging char-misc/char-misc-next (d06246ebd773 scripts/tags.sh: Fix obsolete parameter for ctags) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/virt/ne_overview.rst | 21 ++++-- + drivers/char/mem.c | 8 +- + drivers/char/xillybus/xillybus.h | 10 +-- + drivers/char/xillybus/xillybus_core.c | 4 +- + drivers/char/xillybus/xillybus_of.c | 2 +- + drivers/char/xillybus/xillybus_pcie.c | 33 ++++----- + drivers/misc/cardreader/rtsx_pcr.c | 2 +- + drivers/misc/hisi_hikey_usb.c | 119 ++++++++++++++++-------------- + drivers/misc/pvpanic/pvpanic-mmio.c | 9 +-- + drivers/misc/pvpanic/pvpanic-pci.c | 26 +++---- + drivers/misc/pvpanic/pvpanic.c | 16 ++-- + drivers/misc/tifm_core.c | 3 +- + drivers/virt/nitro_enclaves/Kconfig | 8 +- + drivers/virt/nitro_enclaves/ne_misc_dev.c | 17 +++-- + drivers/virt/nitro_enclaves/ne_pci_dev.c | 2 +- + drivers/virt/nitro_enclaves/ne_pci_dev.h | 8 +- + include/uapi/linux/nitro_enclaves.h | 10 +-- + samples/nitro_enclaves/ne_ioctl_sample.c | 7 +- + scripts/tags.sh | 6 +- + 19 files changed, 154 insertions(+), 157 deletions(-) +Merging extcon/extcon-next (1a4bedc5305b extcon: extcon-axp288: Use P-Unit semaphore lock for register accesses) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'recursive' strategy. + .../bindings/extcon/extcon-usbc-tusb320.yaml | 4 +- + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-axp288.c | 31 +++- + drivers/extcon/extcon-max3355.c | 1 - + drivers/extcon/extcon-usb-gpio.c | 3 +- + drivers/extcon/extcon-usbc-tusb320.c | 156 ++++++++++++++++++++- + 6 files changed, 185 insertions(+), 12 deletions(-) +Merging phy-next/next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 thunderbolt/next (6880fa6c5660 Linux 5.15-rc1) +$ 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 vfio/next (ea870730d83f Merge branches 'v5.15/vfio/spdx-license-cleanups', 'v5.15/vfio/dma-valid-waited-v3', 'v5.15/vfio/vfio-pci-core-v5' and 'v5.15/vfio/vfio-ap' into v5.15/vfio/next) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (65e31407caea staging: r8188eu: remove struct _io_ops) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Removing drivers/staging/r8188eu/include/rtw_ioctl_rtl.h +Removing drivers/staging/r8188eu/include/odm_reg.h +Removing drivers/staging/r8188eu/include/HalHWImg8188E_FW.h +Removing drivers/staging/r8188eu/core/rtw_io.c +Merge made by the 'recursive' strategy. + drivers/staging/axis-fifo/axis-fifo.c | 88 ++---- + drivers/staging/fbtft/fbtft-core.c | 3 +- + drivers/staging/mt7621-dma/hsdma-mt7621.c | 6 +- + drivers/staging/pi433/pi433_if.h | 23 +- + drivers/staging/r8188eu/Kconfig | 10 - + drivers/staging/r8188eu/Makefile | 1 - + drivers/staging/r8188eu/core/rtw_ap.c | 19 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 65 +---- + drivers/staging/r8188eu/core/rtw_debug.c | 26 +- + drivers/staging/r8188eu/core/rtw_efuse.c | 203 +++---------- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 38 +-- + drivers/staging/r8188eu/core/rtw_io.c | 299 ------------------- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 5 - + drivers/staging/r8188eu/core/rtw_iol.c | 12 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 35 +-- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 187 ++---------- + drivers/staging/r8188eu/core/rtw_mp.c | 25 +- + drivers/staging/r8188eu/core/rtw_mp_ioctl.c | 18 +- + drivers/staging/r8188eu/core/rtw_p2p.c | 20 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 116 -------- + drivers/staging/r8188eu/core/rtw_recv.c | 25 +- + drivers/staging/r8188eu/core/rtw_security.c | 197 ++++--------- + drivers/staging/r8188eu/core/rtw_sreset.c | 2 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 34 +-- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 112 +------- + drivers/staging/r8188eu/core/rtw_xmit.c | 49 ++-- + drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c | 10 - + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 4 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 2 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 2 +- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 17 +- + drivers/staging/r8188eu/hal/hal_com.c | 23 +- + drivers/staging/r8188eu/hal/hal_intf.c | 319 +-------------------- + drivers/staging/r8188eu/hal/odm.c | 32 +-- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 166 +++-------- + drivers/staging/r8188eu/hal/odm_interface.c | 80 ------ + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 5 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 247 ++++------------ + drivers/staging/r8188eu/hal/rtl8188e_mp.c | 164 ++--------- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 215 +------------- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 125 +++----- + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 34 +-- + drivers/staging/r8188eu/hal/usb_halinit.c | 83 +----- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 76 ++--- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 13 - + .../staging/r8188eu/include/Hal8188ERateAdaptive.h | 2 - + drivers/staging/r8188eu/include/HalHWImg8188E_FW.h | 16 -- + drivers/staging/r8188eu/include/HalVerDef.h | 70 ----- + drivers/staging/r8188eu/include/drv_types.h | 8 - + drivers/staging/r8188eu/include/hal_intf.h | 248 ++-------------- + drivers/staging/r8188eu/include/ieee80211.h | 40 --- + drivers/staging/r8188eu/include/ioctl_cfg80211.h | 2 - + drivers/staging/r8188eu/include/mp_custom_oid.h | 270 +---------------- + drivers/staging/r8188eu/include/odm.h | 30 +- + drivers/staging/r8188eu/include/odm_HWConfig.h | 9 - + drivers/staging/r8188eu/include/odm_interface.h | 45 --- + drivers/staging/r8188eu/include/odm_precomp.h | 1 - + drivers/staging/r8188eu/include/odm_reg.h | 89 ------ + drivers/staging/r8188eu/include/odm_types.h | 18 -- + drivers/staging/r8188eu/include/osdep_intf.h | 1 - + drivers/staging/r8188eu/include/osdep_service.h | 21 +- + drivers/staging/r8188eu/include/rtl8188e_cmd.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_hal.h | 35 +-- + drivers/staging/r8188eu/include/rtl8188e_led.h | 2 - + drivers/staging/r8188eu/include/rtw_ap.h | 5 - + drivers/staging/r8188eu/include/rtw_cmd.h | 4 - + drivers/staging/r8188eu/include/rtw_debug.h | 8 - + drivers/staging/r8188eu/include/rtw_eeprom.h | 2 +- + drivers/staging/r8188eu/include/rtw_efuse.h | 9 - + drivers/staging/r8188eu/include/rtw_io.h | 87 +----- + drivers/staging/r8188eu/include/rtw_ioctl_rtl.h | 63 ---- + drivers/staging/r8188eu/include/rtw_iol.h | 6 +- + drivers/staging/r8188eu/include/rtw_mlme.h | 5 - + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 10 - + drivers/staging/r8188eu/include/rtw_mp.h | 2 - + drivers/staging/r8188eu/include/rtw_mp_ioctl.h | 1 - + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 105 ------- + drivers/staging/r8188eu/include/rtw_security.h | 20 +- + drivers/staging/r8188eu/include/rtw_xmit.h | 2 - + drivers/staging/r8188eu/include/sta_info.h | 7 - + drivers/staging/r8188eu/include/usb_ops.h | 2 - + drivers/staging/r8188eu/include/usb_ops_linux.h | 8 - + drivers/staging/r8188eu/include/usb_osintf.h | 2 - + drivers/staging/r8188eu/include/wifi.h | 52 ---- + drivers/staging/r8188eu/include/xmit_osdep.h | 2 - + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 125 +++----- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 4 - + drivers/staging/r8188eu/os_dep/os_intfs.c | 46 +-- + drivers/staging/r8188eu/os_dep/osdep_service.c | 18 -- + drivers/staging/r8188eu/os_dep/usb_intf.c | 149 ++-------- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 22 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 4 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 23 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 99 +++---- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 56 ++-- + drivers/staging/rtl8723bs/core/rtw_recv.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 15 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 33 ++- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 6 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 26 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 32 +-- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 4 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 7 - + .../interface/vchiq_arm/vchiq_connected.c | 20 +- + .../interface/vchiq_arm/vchiq_connected.h | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 6 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 178 ++++-------- + drivers/staging/wfx/bh.c | 37 ++- + drivers/staging/wfx/bh.h | 4 +- + drivers/staging/wfx/bus_sdio.c | 25 +- + drivers/staging/wfx/bus_spi.c | 22 +- + drivers/staging/wfx/data_rx.c | 7 +- + drivers/staging/wfx/data_rx.h | 4 +- + drivers/staging/wfx/data_tx.c | 87 +++--- + drivers/staging/wfx/data_tx.h | 6 +- + drivers/staging/wfx/debug.c | 56 ++-- + drivers/staging/wfx/debug.h | 2 +- + drivers/staging/wfx/fwio.c | 26 +- + drivers/staging/wfx/fwio.h | 2 +- + drivers/staging/wfx/hif_api_cmd.h | 14 +- + drivers/staging/wfx/hif_api_general.h | 25 +- + drivers/staging/wfx/hif_api_mib.h | 85 +++--- + drivers/staging/wfx/hif_rx.c | 23 +- + drivers/staging/wfx/hif_rx.h | 3 +- + drivers/staging/wfx/hif_tx.c | 60 ++-- + drivers/staging/wfx/hif_tx.h | 6 +- + drivers/staging/wfx/hif_tx_mib.c | 14 +- + drivers/staging/wfx/hif_tx_mib.h | 2 +- + drivers/staging/wfx/hwio.c | 6 +- + drivers/staging/wfx/hwio.h | 20 +- + drivers/staging/wfx/key.c | 30 +- + drivers/staging/wfx/key.h | 4 +- + drivers/staging/wfx/main.c | 37 ++- + drivers/staging/wfx/main.h | 3 +- + drivers/staging/wfx/queue.c | 43 +-- + drivers/staging/wfx/queue.h | 6 +- + drivers/staging/wfx/scan.c | 51 ++-- + drivers/staging/wfx/scan.h | 4 +- + drivers/staging/wfx/sta.c | 118 +++++--- + drivers/staging/wfx/sta.h | 8 +- + drivers/staging/wfx/traces.h | 2 +- + drivers/staging/wfx/wfx.h | 14 +- + drivers/staging/wlan-ng/hfa384x.h | 2 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- + drivers/staging/wlan-ng/p80211conv.c | 2 +- + drivers/staging/wlan-ng/p80211conv.h | 2 +- + drivers/staging/wlan-ng/p80211hdr.h | 2 +- + drivers/staging/wlan-ng/p80211ioctl.h | 2 +- + drivers/staging/wlan-ng/p80211mgmt.h | 2 +- + drivers/staging/wlan-ng/p80211msg.h | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/staging/wlan-ng/p80211netdev.h | 2 +- + drivers/staging/wlan-ng/p80211req.c | 2 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 2 +- + drivers/staging/wlan-ng/p80211wep.c | 2 +- + drivers/staging/wlan-ng/prism2mgmt.c | 2 +- + drivers/staging/wlan-ng/prism2mgmt.h | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 2 +- + drivers/staging/wlan-ng/prism2sta.c | 2 +- + 165 files changed, 1364 insertions(+), 4989 deletions(-) + delete mode 100644 drivers/staging/r8188eu/core/rtw_io.c + delete mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_FW.h + delete mode 100644 drivers/staging/r8188eu/include/odm_reg.h + delete mode 100644 drivers/staging/r8188eu/include/rtw_ioctl_rtl.h +Merging iio/togreg (5b8d4d8c912c iio: ep93xx: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Removing include/linux/counter_enum.h +Auto-merging drivers/iio/adc/aspeed_adc.c +Removing drivers/counter/counter.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-counter | 9 +- + .../ABI/testing/sysfs-bus-iio-temperature-max31865 | 20 + + .../devicetree/bindings/iio/accel/adi,adxl313.yaml | 86 ++ + .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 88 ++ + .../devicetree/bindings/iio/adc/adi,ad7949.yaml | 51 +- + .../bindings/iio/adc/aspeed,ast2600-adc.yaml | 100 ++ + .../bindings/iio/adc/atmel,sama5d2-adc.yaml | 1 + + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 2 + + .../bindings/iio/temperature/maxim,max31865.yaml | 52 + + Documentation/driver-api/generic-counter.rst | 243 +++- + MAINTAINERS | 17 +- + drivers/counter/104-quad-8.c | 449 +++--- + drivers/counter/Makefile | 1 + + drivers/counter/counter-core.c | 145 ++ + drivers/counter/counter-sysfs.c | 849 +++++++++++ + drivers/counter/counter-sysfs.h | 13 + + drivers/counter/counter.c | 1496 -------------------- + drivers/counter/ftm-quaddec.c | 60 +- + drivers/counter/intel-qep.c | 146 +- + drivers/counter/interrupt-cnt.c | 62 +- + drivers/counter/microchip-tcb-capture.c | 91 +- + drivers/counter/stm32-lptimer-cnt.c | 212 ++- + drivers/counter/stm32-timer-cnt.c | 195 +-- + drivers/counter/ti-eqep.c | 180 +-- + drivers/iio/accel/Kconfig | 62 + + drivers/iio/accel/Makefile | 6 + + drivers/iio/accel/adxl313.h | 54 + + drivers/iio/accel/adxl313_core.c | 332 +++++ + drivers/iio/accel/adxl313_i2c.c | 66 + + drivers/iio/accel/adxl313_spi.c | 92 ++ + drivers/iio/accel/adxl355.h | 21 + + drivers/iio/accel/adxl355_core.c | 765 ++++++++++ + drivers/iio/accel/adxl355_i2c.c | 62 + + drivers/iio/accel/adxl355_spi.c | 65 + + drivers/iio/accel/st_accel_core.c | 31 +- + drivers/iio/accel/st_accel_i2c.c | 23 +- + drivers/iio/accel/st_accel_spi.c | 23 +- + drivers/iio/adc/ad7949.c | 254 +++- + drivers/iio/adc/aspeed_adc.c | 64 +- + drivers/iio/adc/at91-sama5d2_adc.c | 594 +++++--- + drivers/iio/adc/ep93xx_adc.c | 4 +- + drivers/iio/adc/ti-ads8344.c | 27 +- + drivers/iio/adc/twl6030-gpadc.c | 6 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 34 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 - + drivers/iio/common/st_sensors/st_sensors_spi.c | 1 - + drivers/iio/common/st_sensors/st_sensors_trigger.c | 53 +- + drivers/iio/dac/ad5770r.c | 2 +- + drivers/iio/gyro/Kconfig | 1 - + drivers/iio/gyro/st_gyro_core.c | 27 +- + drivers/iio/gyro/st_gyro_i2c.c | 23 +- + drivers/iio/gyro/st_gyro_spi.c | 23 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c | 36 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 1 - + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 17 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 6 - + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 6 - + drivers/iio/magnetometer/Kconfig | 2 +- + drivers/iio/magnetometer/ak8975.c | 35 + + drivers/iio/magnetometer/st_magn_core.c | 29 +- + drivers/iio/magnetometer/st_magn_i2c.c | 23 +- + drivers/iio/magnetometer/st_magn_spi.c | 23 +- + drivers/iio/pressure/st_pressure_core.c | 27 +- + drivers/iio/pressure/st_pressure_i2c.c | 23 +- + drivers/iio/pressure/st_pressure_spi.c | 23 +- + drivers/iio/temperature/Kconfig | 10 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/ltc2983.c | 16 + + drivers/iio/temperature/max31865.c | 349 +++++ + drivers/staging/iio/cdc/ad7746.c | 4 +- + include/linux/counter.h | 700 ++++----- + include/linux/counter_enum.h | 45 - + include/linux/iio/common/st_sensors.h | 13 - + include/linux/mfd/stm32-lptimer.h | 5 + + include/linux/mfd/stm32-timers.h | 4 + + 75 files changed, 5253 insertions(+), 3429 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-temperature-max31865 + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl313.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl355.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/aspeed,ast2600-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/temperature/maxim,max31865.yaml + create mode 100644 drivers/counter/counter-core.c + create mode 100644 drivers/counter/counter-sysfs.c + create mode 100644 drivers/counter/counter-sysfs.h + delete mode 100644 drivers/counter/counter.c + create mode 100644 drivers/iio/accel/adxl313.h + create mode 100644 drivers/iio/accel/adxl313_core.c + create mode 100644 drivers/iio/accel/adxl313_i2c.c + create mode 100644 drivers/iio/accel/adxl313_spi.c + create mode 100644 drivers/iio/accel/adxl355.h + create mode 100644 drivers/iio/accel/adxl355_core.c + create mode 100644 drivers/iio/accel/adxl355_i2c.c + create mode 100644 drivers/iio/accel/adxl355_spi.c + create mode 100644 drivers/iio/temperature/max31865.c + delete mode 100644 include/linux/counter_enum.h +Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging icc/icc-next (8bf5d31c4f06 interconnect: qcom: osm-l3: Use driver-specific naming) +$ 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 dmaengine/next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (c0002d11d799 cgroupv2, docs: fix misinformation in "device controller" section) +$ 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 Documentation/admin-guide/cgroup-v2.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 28 ++++++++--------- + kernel/cgroup/cpuset.c | 56 +++++++++++++++++---------------- + 2 files changed, 43 insertions(+), 41 deletions(-) +Merging scsi/for-next (1a0db7744e45 scsi: bsg: Fix device unregistration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (7e642ca0375b scsi: target: Remove unused function arguments) +$ 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/ufs/ufshpb.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/lpfc/lpfc_nvme.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/elx/libefc/efc_fabric.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-fc | 27 ++++++ + drivers/scsi/elx/libefc/efc_fabric.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 2 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 24 +++--- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 8 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 37 ++++---- + drivers/scsi/libiscsi.c | 3 +- + drivers/scsi/libsas/sas_init.c | 5 +- + drivers/scsi/libsas/sas_scsi_host.c | 23 +++-- + drivers/scsi/lpfc/lpfc.h | 1 + + drivers/scsi/lpfc/lpfc_els.c | 41 +++++++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 32 +++++-- + drivers/scsi/lpfc/lpfc_init.c | 49 +++++++++-- + drivers/scsi/lpfc/lpfc_nvme.c | 70 +++++++++++++--- + drivers/scsi/lpfc/lpfc_nvmet.c | 44 +++++----- + drivers/scsi/lpfc/lpfc_scsi.c | 92 ++++++++++++-------- + drivers/scsi/lpfc/lpfc_sli.c | 139 +++++++++++++++++++++++++------ + drivers/scsi/lpfc/lpfc_sli4.h | 2 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/pm8001/pm8001_ctl.c | 6 +- + drivers/scsi/pm8001/pm8001_hwi.c | 7 +- + drivers/scsi/pm8001/pm8001_init.c | 12 +++ + drivers/scsi/pm8001/pm8001_sas.c | 15 ++++ + drivers/scsi/pm8001/pm8001_sas.h | 6 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 60 ++++++++++--- + drivers/scsi/qla2xxx/qla_attr.c | 24 +++++- + drivers/scsi/qla2xxx/qla_bsg.c | 48 +++++++++++ + drivers/scsi/qla2xxx/qla_bsg.h | 7 ++ + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 + + drivers/scsi/qla2xxx/qla_gs.c | 3 +- + drivers/scsi/qla2xxx/qla_init.c | 17 ++-- + drivers/scsi/qla2xxx/qla_mbx.c | 35 +++++++- + drivers/scsi/qla2xxx/qla_nvme.c | 20 ++++- + drivers/scsi/qla2xxx/qla_os.c | 90 ++++++++++---------- + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/ufs/ufs-mediatek.c | 21 ++++- + drivers/scsi/ufs/ufs-mediatek.h | 6 ++ + drivers/scsi/ufs/ufs-qcom.c | 3 +- + drivers/scsi/ufs/ufshpb.c | 8 +- + drivers/target/target_core_xcopy.c | 14 ++-- + 42 files changed, 750 insertions(+), 271 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fc +Merging vhost/linux-next (be9c6bad9b46 vdpa: potential uninitialized return in vhost_vdpa_va_map()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/vdpa/mlx5/net/mlx5_vnet.c | 5 +++++ + drivers/vdpa/vdpa_user/vduse_dev.c | 10 +++++----- + drivers/vhost/vdpa.c | 2 +- + drivers/virtio/virtio.c | 7 ++++++- + 4 files changed, 17 insertions(+), 7 deletions(-) +Merging rpmsg/for-next (99fdaca991f7 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/Kconfig | 10 +++++----- + drivers/remoteproc/qcom_wcnss.c | 1 - + drivers/rpmsg/qcom_glink_native.c | 2 +- + include/linux/rpmsg.h | 2 +- + 4 files changed, 7 insertions(+), 8 deletions(-) +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ 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 (3ea046564039 dt-bindings: gpio: add gpio-line-names to rockchip,gpio-bank.yaml) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml | 2 ++ + 1 file changed, 2 insertions(+) +Merging gpio-intel/for-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 pinctrl/for-next (788ac97efa94 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-rockchip.c | 22 +++++++++ + drivers/pinctrl/core.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 18 ++++++++ + drivers/pinctrl/mediatek/pinctrl-mt8195.c | 1 + + drivers/pinctrl/nomadik/Kconfig | 1 - + drivers/pinctrl/pinctrl-amd.c | 19 +++++--- + drivers/pinctrl/pinctrl-amd.h | 1 + + drivers/pinctrl/pinctrl-rockchip.c | 67 ++++++++++++++++++++++++++++ + drivers/pinctrl/pinctrl-rockchip.h | 10 +++++ + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8226.c | 74 ++++++++++++++++++++++--------- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 37 ++++++++++++++-- + 12 files changed, 221 insertions(+), 33 deletions(-) +Merging pinctrl-intel/for-next (6880fa6c5660 Linux 5.15-rc1) +$ 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 (075667cc6c29 pinctrl: renesas: No need to initialise global statics) +$ 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 +Merge made by the 'recursive' strategy. + drivers/pinctrl/renesas/core.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging pinctrl-samsung/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (3f2b16734914 pwm: mtk-disp: Implement atomic API .get_state()) +$ 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 (a3be01837fc9 Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for-v5.15 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 include/linux/sched/signal.h +CONFLICT (content): Merge conflict in include/linux/sched/signal.h +Resolved 'include/linux/sched/signal.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1a905551f8d6] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git +$ git diff -M --stat --summary HEAD^.. + include/linux/sched/signal.h | 1 + + 1 file changed, 1 insertion(+) +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 (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge -m Merge branch 'next' of git://git.linaro.org/kernel/coresight.git coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (bdd3c50d83bf dax: remove bdev_dax_supported) +$ 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 +Already up to date. +Merging at24/at24/for-next (762925405482 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'recursive' strategy. +Merging seccomp/for-next/seccomp (b4d8a58f8dcf seccomp: Fix setting loaded filter count during TSYNC) +$ 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 kspp/for-next/kspp (0c91d23b6783 treewide: Replace 0-element memcpy() destinations with flexible arrays) +$ 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 +Auto-merging net/xfrm/xfrm_user.c +Auto-merging lib/Kconfig.debug +Auto-merging drivers/staging/r8188eu/include/ieee80211.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + arch/arm/boot/compressed/string.c | 1 + + arch/s390/lib/string.c | 3 + + arch/x86/boot/compressed/misc.h | 2 + + arch/x86/boot/compressed/pgtable_64.c | 2 + + arch/x86/lib/string_32.c | 1 + + drivers/char/pcmcia/cm4000_cs.c | 9 +- + drivers/crypto/chelsio/chcr_crypto.h | 14 +- + drivers/cxl/cxl.h | 61 ++--- + drivers/gpu/drm/mga/mga_ioc32.c | 27 +- + drivers/hid/hid-cp2112.c | 14 +- + drivers/hid/hid-roccat-kone.c | 2 +- + drivers/hid/hid-roccat-kone.h | 12 +- + drivers/iommu/amd/init.c | 9 +- + drivers/macintosh/smu.c | 3 +- + drivers/net/can/flexcan.c | 68 ++--- + drivers/net/can/usb/etas_es58x/es581_4.h | 2 +- + drivers/net/can/usb/etas_es58x/es58x_fd.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 14 +- + drivers/net/wireless/ath/ath10k/bmi.h | 10 +- + drivers/net/wireless/ath/ath10k/htt.h | 7 +- + drivers/net/wireless/intel/iwlegacy/commands.h | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 12 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 6 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 3 +- + drivers/scsi/qla4xxx/ql4_def.h | 4 +- + drivers/staging/r8188eu/include/ieee80211.h | 6 +- + drivers/staging/rtl8712/ieee80211.h | 4 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 6 +- + fs/btrfs/root-tree.c | 6 +- + fs/hpfs/hpfs.h | 8 +- + include/linux/compiler-gcc.h | 2 - + include/linux/compiler_types.h | 5 - + include/linux/filter.h | 6 +- + include/linux/fortify-string.h | 77 ++++-- + include/linux/ieee80211.h | 30 +-- + include/linux/stddef.h | 65 ++++- + include/linux/string.h | 44 +++- + include/linux/thread_info.h | 2 +- + include/scsi/sas.h | 12 +- + include/uapi/drm/mga_drm.h | 22 +- + include/uapi/linux/dlm_device.h | 4 +- + include/uapi/linux/stddef.h | 37 +++ + include/uapi/rdma/rdma_user_rxe.h | 4 +- + include/uapi/sound/asoc.h | 4 +- + lib/.gitignore | 2 + + lib/Kconfig.debug | 11 + + lib/Makefile | 34 +++ + lib/memcpy_kunit.c | 289 ++++++++++++++++++++++ + lib/string.c | 210 +--------------- + lib/string_helpers.c | 195 +++++++++++++++ + lib/test_fortify/read_overflow-memchr.c | 5 + + lib/test_fortify/read_overflow-memchr_inv.c | 5 + + lib/test_fortify/read_overflow-memcmp.c | 5 + + lib/test_fortify/read_overflow-memscan.c | 5 + + lib/test_fortify/read_overflow2-memcmp.c | 5 + + lib/test_fortify/read_overflow2-memcpy.c | 5 + + lib/test_fortify/read_overflow2-memmove.c | 5 + + lib/test_fortify/test_fortify.h | 35 +++ + lib/test_fortify/write_overflow-memcpy.c | 5 + + lib/test_fortify/write_overflow-memmove.c | 5 + + lib/test_fortify/write_overflow-memset.c | 5 + + lib/test_fortify/write_overflow-strcpy-lit.c | 5 + + lib/test_fortify/write_overflow-strcpy.c | 5 + + lib/test_fortify/write_overflow-strlcpy-src.c | 5 + + lib/test_fortify/write_overflow-strlcpy.c | 5 + + lib/test_fortify/write_overflow-strncpy-src.c | 5 + + lib/test_fortify/write_overflow-strncpy.c | 5 + + lib/test_fortify/write_overflow-strscpy.c | 5 + + net/xfrm/xfrm_policy.c | 4 +- + net/xfrm/xfrm_user.c | 2 +- + scripts/kernel-doc | 9 + + scripts/test_fortify.sh | 62 +++++ + security/Kconfig | 3 + + 76 files changed, 1152 insertions(+), 446 deletions(-) + create mode 100644 lib/memcpy_kunit.c + create mode 100644 lib/test_fortify/read_overflow-memchr.c + create mode 100644 lib/test_fortify/read_overflow-memchr_inv.c + create mode 100644 lib/test_fortify/read_overflow-memcmp.c + create mode 100644 lib/test_fortify/read_overflow-memscan.c + create mode 100644 lib/test_fortify/read_overflow2-memcmp.c + create mode 100644 lib/test_fortify/read_overflow2-memcpy.c + create mode 100644 lib/test_fortify/read_overflow2-memmove.c + create mode 100644 lib/test_fortify/test_fortify.h + create mode 100644 lib/test_fortify/write_overflow-memcpy.c + create mode 100644 lib/test_fortify/write_overflow-memmove.c + create mode 100644 lib/test_fortify/write_overflow-memset.c + create mode 100644 lib/test_fortify/write_overflow-strcpy-lit.c + create mode 100644 lib/test_fortify/write_overflow-strcpy.c + create mode 100644 lib/test_fortify/write_overflow-strlcpy-src.c + create mode 100644 lib/test_fortify/write_overflow-strlcpy.c + create mode 100644 lib/test_fortify/write_overflow-strncpy-src.c + create mode 100644 lib/test_fortify/write_overflow-strncpy.c + create mode 100644 lib/test_fortify/write_overflow-strscpy.c + create mode 100644 scripts/test_fortify.sh +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 gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) +$ 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 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (536267aafb8a nvmem: core: Add stubs for nvmem_cell_read_variable_le_u32/64 if !CONFIG_NVMEM) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'recursive' strategy. +Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (9d68cd9120e4 hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer) +$ 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 (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (f8416aa29185 kernel: debug: Convert to SPDX identifier) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ 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 fpga/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga/for-next +Already up to date. +Merging kunit/test (6880fa6c5660 Linux 5.15-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 (ff1176468d36 Linux 5.14-rc3) +$ 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 (3b29021ddd10 kunit: tool: allow filtering test cases via glob) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/running_tips.rst | 11 ++- + lib/kunit/executor.c | 107 +++++++++++++++++++++--- + lib/kunit/executor_test.c | 109 ++++++++++++++++++++++--- + lib/kunit/kunit-test.c | 14 ++-- + tools/testing/kunit/kunit.py | 5 +- + 5 files changed, 211 insertions(+), 35 deletions(-) +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' 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/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (813272ed5238 Merge 5.14-rc5 into char-misc-next) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +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 rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/kallsyms.c +Auto-merging init/Kconfig +Auto-merging include/linux/spinlock.h +Auto-merging include/linux/kallsyms.h +CONFLICT (content): Merge conflict in include/linux/kallsyms.h +Auto-merging arch/riscv/Makefile +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/process/changes.rst +Resolved 'Makefile' using previous resolution. +Resolved 'include/linux/kallsyms.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 95c1d1898ad9] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 13 + + Documentation/rust/arch-support.rst | 35 + + Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes + Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes + Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes + Documentation/rust/coding.rst | 92 + + Documentation/rust/docs.rst | 110 + + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 222 ++ + MAINTAINERS | 14 + + Makefile | 158 +- + arch/arm/rust/target.json | 28 + + arch/arm64/rust/target.json | 35 + + arch/powerpc/rust/target.json | 30 + + arch/riscv/Makefile | 1 + + arch/riscv/rust/rv32ima.json | 37 + + arch/riscv/rust/rv32imac.json | 37 + + arch/riscv/rust/rv64ima.json | 37 + + arch/riscv/rust/rv64imac.json | 37 + + arch/x86/rust/target.json | 37 + + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 28 + + kernel/kallsyms.c | 7 + + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 6 + + rust/Makefile | 316 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 425 ++++ + rust/alloc/borrow.rs | 493 ++++ + rust/alloc/boxed.rs | 1728 ++++++++++++++ + rust/alloc/collections/mod.rs | 116 + + rust/alloc/fmt.rs | 587 +++++ + rust/alloc/lib.rs | 197 ++ + rust/alloc/macros.rs | 128 ++ + rust/alloc/prelude/mod.rs | 17 + + rust/alloc/prelude/v1.rs | 16 + + rust/alloc/raw_vec.rs | 612 +++++ + rust/alloc/rc.rs | 2539 +++++++++++++++++++++ + rust/alloc/slice.rs | 1271 +++++++++++ + rust/alloc/str.rs | 614 +++++ + rust/alloc/string.rs | 2847 +++++++++++++++++++++++ + rust/alloc/sync.rs | 2631 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 157 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 296 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3255 +++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 170 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 33 + + rust/compiler_builtins.rs | 146 ++ + rust/exports.c | 16 + + rust/helpers.c | 235 ++ + rust/kernel/allocator.rs | 63 + + rust/kernel/bindings.rs | 28 + + rust/kernel/bindings_helper.h | 24 + + rust/kernel/buffer.rs | 39 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 212 ++ + rust/kernel/error.rs | 272 +++ + rust/kernel/file.rs | 130 ++ + rust/kernel/file_operations.rs | 698 ++++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/iov_iter.rs | 95 + + rust/kernel/lib.rs | 220 ++ + rust/kernel/linked_list.rs | 245 ++ + rust/kernel/miscdev.rs | 113 + + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 176 ++ + rust/kernel/platdev.rs | 166 ++ + rust/kernel/prelude.rs | 28 + + rust/kernel/print.rs | 412 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 570 +++++ + rust/kernel/security.rs | 79 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/str.rs | 259 +++ + rust/kernel/sync/arc.rs | 227 ++ + rust/kernel/sync/condvar.rs | 136 ++ + rust/kernel/sync/guard.rs | 82 + + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 84 + + rust/kernel/sync/mutex.rs | 101 + + rust/kernel/sync/spinlock.rs | 109 + + rust/kernel/sysctl.rs | 198 ++ + rust/kernel/task.rs | 193 ++ + rust/kernel/traits.rs | 26 + + rust/kernel/types.rs | 249 ++ + rust/kernel/user_ptr.rs | 191 ++ + rust/macros/lib.rs | 127 ++ + rust/macros/module.rs | 754 +++++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 + + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 51 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 150 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 177 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Makefile.build | 22 + + scripts/Makefile.lib | 12 + + scripts/generate_rust_analyzer.py | 143 ++ + scripts/kallsyms.c | 33 +- + scripts/kconfig/confdata.c | 67 +- + scripts/rust-version.sh | 31 + + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 129 files changed, 29588 insertions(+), 26 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/assets/favicon-16x16.png + create mode 100644 Documentation/rust/assets/favicon-32x32.png + create mode 100644 Documentation/rust/assets/rust-logo.png + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + 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/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/prelude/mod.rs + create mode 100644 rust/alloc/prelude/v1.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/rc.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/sync.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/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.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/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platdev.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/traits.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.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/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100755 scripts/rust-version.sh +$ git am -3 ../patches/0001-fixup-for-rust-integration-with-Makefile.clang-creat.patch +Applying: fixup for rust integration with Makefile.clang creation +error: patch failed: scripts/Makefile.clang:12 +error: scripts/Makefile.clang: patch does not apply +error: Did you hand edit your patch? +It does not apply to blobs recorded in its index. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Using index info to reconstruct a base tree... +M scripts/Makefile.clang +Patch failed at 0001 fixup for rust integration with Makefile.clang creation +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/Makefile.clang +$ git add -A . +$ git commit -v -a --amend +[master 7c7e8a65a9ea] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Mon Sep 20 13:11:24 2021 +1000 +Merging cxl/next (2b922a9d064f cxl/registers: Fix Documentation warning) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging folio/for-next (1a90e9dae32c mm/writeback: Add folio_write_one) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging mm/workingset.c +Auto-merging mm/vmscan.c +Auto-merging mm/util.c +CONFLICT (content): Merge conflict in mm/util.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap_state.c +Auto-merging mm/swap.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Auto-merging mm/page_owner.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page-writeback.c +CONFLICT (content): Merge conflict in mm/page-writeback.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/ksm.c +Auto-merging mm/khugepaged.c +Auto-merging mm/internal.h +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging mm/compaction.c +Auto-merging mm/Makefile +Auto-merging kernel/bpf/verifier.c +Auto-merging include/linux/writeback.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page_idle.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/netfs.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/memcontrol.h +CONFLICT (content): Merge conflict in include/linux/memcontrol.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/highmem-internal.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/io_uring.c +Auto-merging fs/afs/write.c +Auto-merging arch/sh/include/asm/cacheflush.h +Auto-merging arch/parisc/include/asm/cacheflush.h +Auto-merging arch/nds32/include/asm/cacheflush.h +Auto-merging arch/mips/include/asm/cacheflush.h +Auto-merging arch/arm/include/asm/cacheflush.h +Auto-merging Documentation/core-api/cachetlb.rst +Resolved 'include/linux/memcontrol.h' using previous resolution. +Resolved 'mm/filemap.c' using previous resolution. +Resolved 'mm/memcontrol.c' using previous resolution. +Resolved 'mm/page-writeback.c' using previous resolution. +Resolved 'mm/rmap.c' using previous resolution. +Resolved 'mm/util.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c863b13451d7] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/cachetlb.rst | 6 + + Documentation/core-api/mm-api.rst | 5 + + Documentation/filesystems/netfs_library.rst | 2 + + arch/arc/include/asm/cacheflush.h | 1 + + arch/arm/include/asm/cacheflush.h | 1 + + arch/mips/include/asm/cacheflush.h | 2 + + arch/nds32/include/asm/cacheflush.h | 1 + + arch/nios2/include/asm/cacheflush.h | 3 +- + arch/parisc/include/asm/cacheflush.h | 3 +- + arch/sh/include/asm/cacheflush.h | 3 +- + arch/xtensa/include/asm/cacheflush.h | 3 +- + fs/afs/write.c | 9 +- + fs/cachefiles/rdwr.c | 16 +- + fs/io_uring.c | 2 +- + fs/jfs/jfs_metapage.c | 1 + + include/asm-generic/cacheflush.h | 6 + + include/linux/backing-dev.h | 6 +- + include/linux/flex_proportions.h | 9 +- + include/linux/gfp.h | 22 +- + include/linux/highmem-internal.h | 11 + + include/linux/highmem.h | 37 ++ + include/linux/huge_mm.h | 15 - + include/linux/ksm.h | 4 +- + include/linux/memcontrol.h | 242 +++++++----- + include/linux/migrate.h | 4 + + include/linux/mm.h | 239 +++++++++--- + include/linux/mm_inline.h | 103 +++-- + include/linux/mm_types.h | 77 ++++ + include/linux/mmdebug.h | 20 + + include/linux/netfs.h | 77 ++-- + include/linux/page-flags.h | 267 +++++++++---- + include/linux/page_idle.h | 99 +++-- + include/linux/page_owner.h | 8 +- + include/linux/page_ref.h | 158 +++++++- + include/linux/pagemap.h | 585 ++++++++++++++++++---------- + include/linux/rmap.h | 10 +- + include/linux/swap.h | 17 +- + include/linux/vmstat.h | 113 +++++- + include/linux/writeback.h | 9 +- + include/trace/events/pagemap.h | 46 ++- + include/trace/events/writeback.h | 28 +- + kernel/bpf/verifier.c | 2 +- + kernel/events/uprobes.c | 3 +- + lib/flex_proportions.c | 28 +- + mm/Makefile | 2 +- + mm/compaction.c | 4 +- + mm/filemap.c | 567 +++++++++++++-------------- + mm/folio-compat.c | 142 +++++++ + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 2 +- + mm/internal.h | 36 +- + mm/khugepaged.c | 8 +- + mm/ksm.c | 34 +- + mm/memcontrol.c | 358 +++++++++-------- + mm/memory-failure.c | 2 +- + mm/memory.c | 20 +- + mm/mempolicy.c | 10 + + mm/memremap.c | 2 +- + mm/migrate.c | 189 +++++---- + mm/mlock.c | 3 +- + mm/page-writeback.c | 476 ++++++++++++---------- + mm/page_alloc.c | 14 +- + mm/page_io.c | 4 +- + mm/page_owner.c | 10 +- + mm/rmap.c | 14 +- + mm/shmem.c | 7 +- + mm/swap.c | 197 +++++----- + mm/swap_state.c | 2 +- + mm/swapfile.c | 8 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 111 +++--- + mm/vmscan.c | 8 +- + mm/workingset.c | 52 +-- + 73 files changed, 2900 insertions(+), 1694 deletions(-) + create mode 100644 mm/folio-compat.c +Merging v5.15-rc2 (e4e737bb5c17 Linux 5.15-rc2) +$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git tag v5.15-rc2 +Merge made by the 'recursive' strategy. + Makefile | 2 +- + include/asm-generic/io.h | 26 +++----------------------- + lib/pci_iomap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 47 insertions(+), 24 deletions(-) +Merging akpm-current/current (7f0fbfc0a77b ipc-check-checkpoint_restore_ns_capable-to-modify-c-r-proc-files-fix) +$ git merge --no-ff akpm-current/current +Auto-merging mm/workingset.c +Auto-merging mm/vmscan.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_owner.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/internal.h +Auto-merging mm/filemap.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/kthread.c +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/gfp.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/vm/page_owner.rst | 23 ++++- + Makefile | 15 +++ + arch/Kconfig | 28 ++++++ + arch/arm/mach-rpc/ecard.c | 2 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + drivers/block/zram/zram_drv.c | 4 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 5 +- + drivers/gpu/drm/drm_mm.c | 5 +- + drivers/gpu/drm/i915/i915_vma.c | 5 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 20 +--- + drivers/mmc/core/mmc_test.c | 1 - + drivers/of/kexec.c | 1 + + drivers/rapidio/devices/rio_mport_cdev.c | 9 +- + fs/buffer.c | 56 ++++++++++- + fs/coda/cnode.c | 13 ++- + fs/coda/coda_linux.c | 39 ++++---- + fs/coda/coda_linux.h | 6 +- + fs/coda/dir.c | 20 ++-- + fs/coda/file.c | 12 +-- + fs/coda/psdev.c | 14 +-- + fs/coda/upcall.c | 3 +- + fs/exec.c | 4 +- + fs/hfsplus/catalog.c | 16 +-- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 ++- + fs/hfsplus/xattr.c | 18 ++-- + fs/hugetlbfs/inode.c | 14 +-- + fs/inode.c | 46 +++++---- + fs/internal.h | 1 - + fs/ocfs2/alloc.c | 2 + + fs/ocfs2/dlmglue.c | 3 +- + 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 | 23 ++++- + fs/proc/page.c | 40 ++++---- + fs/ramfs/inode.c | 4 + + include/linux/compiler-gcc.h | 9 ++ + include/linux/compiler_types.h | 5 + + include/linux/fs.h | 1 + + include/linux/gfp.h | 2 + + include/linux/highmem.h | 28 +++--- + include/linux/kasan.h | 2 + + include/linux/mempolicy.h | 5 +- + include/linux/memremap.h | 6 ++ + include/linux/mm.h | 54 ++++------- + include/linux/mmzone.h | 4 +- + include/linux/page-flags.h | 2 +- + include/linux/pagemap.h | 50 ++++++++++ + include/linux/percpu.h | 3 + + include/linux/rmap.h | 8 +- + include/linux/sched.h | 8 ++ + include/linux/sched/mm.h | 21 ++++ + include/linux/slab.h | 118 +++++++++++++++------- + include/linux/stackdepot.h | 11 +++ + include/linux/swap.h | 1 - + include/linux/vmalloc.h | 13 ++- + init/main.c | 25 +++-- + ipc/ipc_sysctl.c | 29 ++++-- + kernel/cpu.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 60 ++++++++++-- + kernel/hung_task.c | 44 +++++++++ + kernel/kthread.c | 21 ++-- + kernel/sched/core.c | 35 +++++-- + kernel/sched/sched.h | 4 +- + kernel/sched/topology.c | 1 - + kernel/sysctl.c | 8 +- + kernel/tsacct.c | 2 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 8 +- + lib/Kconfig.kasan | 2 + + lib/stackdepot.c | 98 ++++++++++++++++--- + lib/test_kasan.c | 18 +++- + mm/damon/Kconfig | 2 +- + mm/damon/dbgfs-test.h | 16 +-- + mm/filemap.c | 20 ++-- + mm/gup.c | 5 +- + mm/internal.h | 1 + + mm/kasan/common.c | 6 +- + mm/kasan/generic.c | 14 ++- + mm/kasan/kasan.h | 2 +- + mm/kasan/report.c | 15 +-- + mm/memcontrol.c | 27 ++---- + mm/memory-failure.c | 2 +- + mm/memory.c | 162 +++++++++++++------------------ + mm/memory_hotplug.c | 8 +- + mm/mempolicy.c | 12 +-- + mm/memremap.c | 20 ++++ + mm/mmap.c | 2 +- + mm/mremap.c | 50 +++++----- + mm/nommu.c | 6 -- + mm/oom_kill.c | 7 +- + mm/page_alloc.c | 45 ++++----- + mm/page_isolation.c | 29 ++---- + mm/page_owner.c | 18 +--- + mm/rmap.c | 14 +-- + mm/shmem.c | 5 +- + mm/slub.c | 31 ++++-- + mm/sparse-vmemmap.c | 2 +- + mm/truncate.c | 19 +++- + mm/userfaultfd.c | 3 +- + mm/vmalloc.c | 14 ++- + mm/vmscan.c | 7 ++ + mm/vmstat.c | 60 ++++++------ + mm/workingset.c | 10 ++ + mm/zsmalloc.c | 10 +- + net/ipv4/tcp.c | 1 - + net/ipv4/udp.c | 1 - + net/netfilter/ipvs/ip_vs_ctl.c | 1 - + net/openvswitch/meter.c | 1 - + net/sctp/protocol.c | 1 - + scripts/checkpatch.pl | 3 +- + scripts/spelling.txt | 16 +++ + tools/testing/selftests/vm/ksm_tests.c | 29 +++++- + tools/vm/page_owner_sort.c | 94 ++++++++++++++++-- + 120 files changed, 1362 insertions(+), 695 deletions(-) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 5a544c7cd917...9e72aed1f82d akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (9e72aed1f82d mm: unexport {,un}lock_page_memcg) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + mm/memcontrol.c | 4 ---- + mm/migrate.c | 6 ------ + 2 files changed, 10 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..ae1c2f23dc4e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210920 |