diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-11-08 14:48:02 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-11-08 14:48:02 +1100 |
| commit | e844ee04dee0cf1b6d97183c12266c7726d73636 (patch) | |
| tree | 7f18bb81b069fb4e38117f3c9e369d8bc14915e9 | |
| parent | a7e08abf8c2037cd5c39fce45042acb21b8e55ef (diff) | |
Add linux-next specific files for 20211108next-20211108
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 344 | ||||
| -rw-r--r-- | Next/Trees | 346 | ||||
| -rw-r--r-- | Next/merge.log | 5306 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5997 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..068b684137c8 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,344 @@ +Name SHA1 +---- ---- +origin 6b75d88fa81b122cce37ebf17428a849ccd3d0f1 +fixes 3ca706c189db861b2ca2019a0901b94050ca49d8 +kbuild-current 0664684e1ebd7875e120d0cecd525bac4805f8ed +arc-current b9cac915c541749864acf02fa7f1b675d6048374 +arm-current 00568b8a6364e15009b345b462e927e0b9fc2bb9 +arm64-fixes 596143e3aec35c93508d6b7a05ddc999ee209b61 +arm-soc-fixes 76f79231666a7a3c9a1db82c002e083125de5861 +drivers-memory-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +m68k-current 8a3c0a74ae87473589cb881a3854948d40000b7a +powerpc-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +s390-fixes 8b7216439e2e2128f6f1a19ad4b6be94d8b0e23d +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 9fec40f850658e00a14a7dd9e06f7fbc7e59cc4a +bpf 47b3708c6088a60e7dc3b809dbb0d4c46590b32f +ipsec 93ec1320b0170d7a207eda2d119c669b673401ed +netfilter 2199f562730dd1382946e0a2532afc38cd444129 +ipvs 2199f562730dd1382946e0a2532afc38cd444129 +wireless-drivers 603a1621caa097be23c7784e36cb8edf23cd31db +mac80211 436014e860d3923a284635bfd515acf9c59f4704 +rdma-fixes 4f960393a0ee9a39469ceb7c8077ae8db665cc12 +sound-current 8e537d5dec34cac746dd6abf6a83e5de3aa471fc +sound-asoc-fixes 13b1ef781f41c8562e7676d195aa5c8b1059c283 +regmap-fixes 38a4b4fb7c733bc491d160cec862433f5c42918f +regulator-fixes 519d81956ee277b4419c723adfb154603c2565ba +spi-fixes d81d0e41ed5fe7229a2c9a29d13bad288c7cf2d2 +pci-current e4e737bb5c170df6135a127739a9e6148ee3da82 +driver-core.current b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +tty.current b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +usb.current e1959faf085b004e6c3afaaaa743381f00e7c015 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 519d81956ee277b4419c723adfb154603c2565ba +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +staging.current b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +iio-fixes b762f932ef0ee2aeccbf34c49331b2140b1a2ca2 +char-misc.current a4119be4370eea352df0dad294488e60e67321cf +soundwire-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +thunderbolt-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +input-current a02dcde595f7cbd240ccd64de96034ad91cffc40 +crypto-current 39ef08517082a424b5b65c3dbaa6c0fa9d3303b9 +vfio-fixes 42de956ca7e5f6c47048dde640f797e783b23198 +kselftest-fixes 519d81956ee277b4419c723adfb154603c2565ba +modules-fixes 0d67e332e6df72f43eaa21228daa3a79e23093f3 +dmaengine-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes f60f5741002b9fde748cff65fd09bd6222c5db0c +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 206704a1fe0bcaaa036d3e90358bb168fac8bea1 +reset-fixes 3ad60b4b3570937f3278509fe6797a5093ce53f8 +mips-fixes 740da9d7ca4e25f5d87db9f80d75432681b61305 +at91-fixes dbe68bc9e82b6951ff88285ccffc191d872d9a01 +omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394 +kvm-fixes ca5e83eddc8bc85db5698ef702b610ee64243459 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes ada61aa0b1184a8fda1a89a340c7d6cc4e59aee5 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes ba9bc05f36558e8c58f2a4d8542ff14b2fb81e64 +vfs-fixes 25f54d08f12feb593e62cc2193fedefaf7825301 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 7df227847ab562c42d318bceccebb0c911c87b04 +samsung-krzk-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pinctrl-samsung-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +devicetree-fixes b2d70c0dbf2731a37d1c7bcc86ab2387954d5f56 +scsi-fixes 09d9e4d041876684d33f21d02bcdaea6586734f1 +drm-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +mmc-fixes 90935eb303e0d12f3d3d0383262e65290321f5f6 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hyperv-fixes c1ea031dc8a8688a495b6d5f999743a018242346 +soc-fsl-fixes 7e5e744183bbb0ad02412b21b1e61380c998dd18 +risc-v-fixes 54c5639d8f507ebefa814f574cb6f763033a72a5 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +spdx d4439a1189f93d0ac1eaf0197db8e6b3e197d5c7 +gpio-brgl-fixes c0eee6fbfa2b3377f1efed10dad539abeb7312aa +gpio-intel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +pinctrl-intel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +erofs-fixes c186b38dc7f91b34343699b6e43c088176359998 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 519d81956ee277b4419c723adfb154603c2565ba +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes b484d7f223db5944d57ef3f05e0fd3c84d005f31 +cel-fixes 8bb7eca972ad531c9b149c0a51ab43a417385813 +irqchip-fixes 4d7a0f5ebd8df659d78122c350283a84a36c2e05 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 8bb7eca972ad531c9b149c0a51ab43a417385813 +efi-fixes 38fa3206bf441911258e5001ac8b6738693f8d82 +drm-misc-fixes f55aaf63bde0d0336c3823bb3713bd4a464abbcf +kbuild 7c5c49dc2b808ff9562a0ae207caf45b5e3f83c9 +perf 6b491a86b77c0dc323ca49f3a29a0f67178b75f8 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 9fbd8dc19aa57ec8fe92606043199919527cd9be +asm-generic 7efbbe6e141466dbe022b39fafbc81d17a8ed8be +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 2aa8f79c7509128a44512c5767c031dde30e6564 +arm64 e6359798f62da66a4a48061d2324a69ea59ff39b +arm-perf e656972b69864348a747954ea187576808000c5a +arm-soc 76f79231666a7a3c9a1db82c002e083125de5861 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 83e38509109e44b884be13fb6c6943aca1742a57 +aspeed 9d4a146c082c8147d4f1e2738d511f515e099225 +at91 f3c0366411d6893360be21a7544595bf275bc9b2 +drivers-memory 0fcbc3b7bceaf3d8eb1c2308a920fd8275c1f40c +imx-mxs 8bd7cd1cc7f06391880fc73cab39e1d5bb6bbe0e +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 0efac36e9559b13b8c4daa794a478abd8fbaacc5 +mvebu 04e78a787b74b2a8ebece8e59ec0a54230fcf6ae +omap 92d190433bd8fff5595f4641510d0c63b4004632 +qcom bbe9515ab0880fd57f2647696b78f68f4279eb5a +raspberrypi a036b0a5d7d6ab4bae3b9028bb1d44b677bba5f7 +renesas 525a6b4bd53f32db8b94e94f802cfa91466d92f9 +reset 8c81620ac1ace77dd0cbcc2193d4c7311f77d49b +rockchip cc3bcb015bb1067d2bcd9cb065d6e0083d8e9ec1 +samsung-krzk 0d5808cf190b575b4e62d3ea1f00c367028a5d04 +scmi 9c8df6432a73d5624a7e5bd134a42464241e2d5c +stm32 d4b3aaf0f90bcb4fe9f994016156ffb91c482b42 +sunxi 7fb77af71236681ccf007554cca576ca33589ebd +tegra bbd827b4de7ed0e2e5cf701d58fb0de634c2d781 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new f46d16cf5b43b66de030f0e3b2f20d24ba95f369 +xilinx 326b5e9db528f5b50870f6db3e9fa7f2afbb8f20 +clk 05cf3ec00d460b50088d421fb878a0f83f57e262 +clk-imx e8271eff5d8c8499289380edbf3bc47de83ab70b +clk-renesas 2bd9feed23166f5ab67dec2ca02bd3f74c77b0ba +clk-samsung 651521d396a8712be1e4eb5b67a1ad340faa6c56 +csky e21e52ad1e0126e2a5e2013084ac3f47cf1e887a +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 8a3c0a74ae87473589cb881a3854948d40000b7a +m68knommu 6dbe88e93c351a6cf5b7c70850d7a1a7f67d83ab +microblaze 43bdcbd5004393faad06b65c1539d3c9b9d5f6b2 +mips 36de23a4c5f0b61ceb4812b535422fa6c6e97447 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 27dff9a9c247d4e38d82c2e7234914cfe8499294 +parisc-hd 5df5ac6a39f282e1713057dc33459e51e57925f8 +powerpc c12ab8dbc492b992e1ea717db933cee568780c47 +soc-fsl 54c8b5b6f8a868b9c21a7b0efe92ed2fbcc67080 +risc-v ffa7a9141bb70702744a312f904b190ca064bdd7 +s390 4ab5b2549146981be7c03913ae896a0405ee2e25 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ab6ff1fda1e8646b27b9d87b718250f8c828ad55 +xtensa bd47cdb78997f83bd170c389ef59de9eec65976a +pidfd 61bc346ce64a3864ac55f5d18bdc1572cda4fb18 +fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 +fscache 8bb7eca972ad531c9b149c0a51ab43a417385813 +afs 52af7105eceb311b96b3b7971a367f30a70de907 +btrfs ec522ac876329a05b37f501ef33bc94d4f199ee2 +ceph 324bfaa1a6cc948c58f7af521994d0edc1836708 +cifs c9f1c19cf7c50949885fa5afdb2cb242d61a7fac +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs a0961f351d82d43ab0b845304caa235dfe249ae9 +exfat 0df2d764b9790a83e9d90283deadcfae199c4f3b +ext3 697a6e3118ed0dcf5fce6434442e43bf2a191fca +ext4 124e7c61deb27d758df5ec0521c36cf08d417f7a +f2fs 261f6940554a7c1491fae3a6d4b48c1da433abb2 +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 712a951025c0667ff00b25afc360f74e639dfabe +gfs2 f3506eee81d1f700d9ee2d2f4a88fddb669ec032 +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 79364beea4d104a91507617fd93112e602341c8a +nfs aa97a3ef15c303697ca58340938a5c385be00cf7 +nfs-anna 8cfb9015280d49f9d92d5b0f88cedf5f0856c0fd +nfsd 6d91929a6fa6b340241bf09ded8740cd439d4df3 +cel c20106944eb679fa3ab7e686fe5f6ba30fbc51e5 +ntfs3 8607954cf255329d1c6dfc073ff1508b7585573c +orangefs ac2c63757f4f413980d6c676dbe1ae2941b94afa +overlayfs 5b0a414d06c3ed2097e32ef7944a4abb644b89bd +ubifs 9aaa6cc099f6c0f0d626f8aecf067df5ce6cd1e9 +v9fs 6e195b0f7c8e50927fa31946369c22a0534ec7e2 +xfs 2a09b575074ff3ed23907b6f6f3da87af41f592b +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 03b8df8d43ecc3c5724e6bfb80bc0b9ea2aa2612 +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks 482e00075d660a16de822686a4be4f7c0e11e5e2 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk eafd42c87753c18dbc359fbe17e4e33f46ca99a8 +pci dda4b381f05d447a0ae31e2e44aeb35d313a311f +pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e +hid bbbd1fb77db5cca1d8b12020728966cc3cf761eb +i2c 26950bc4bad39cb5561e5660df562e44bac72985 +i3c a3587e2c0578101900d4abbbd72ab3dad6d5568a +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 10f0d2ab9aa672707559d46601fd35544759ff70 +jc_docs 603bdf5d6c092eb05666decd84288dfda71eee90 +v4l-dvb 57c3b9f55ba875a6f6295fa59f0bdc0a01c544f8 +v4l-dvb-next 320510b91925e0ebdb5fdaa1d4843dc470067440 +pm f8057ee1cd841f0720dbd44ac4e580c205ca56f6 +cpufreq-arm 4a08e3271c55f8b5d56906a8aa5bd041911cf897 +cpupower 79a0dc5530a91694b1e85ef7219893397d85e5bb +devfreq 5cf79c293821d12fd88dee901692cd404247782e +opp 7ca81b690e598fdf16a6c738a466247ef9be7ac7 +thermal a67a46af4ad6342378e332b7420c1d1a2818c53f +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm b87b1883efe385e56384ff48e6f3108a33fde508 +rdma f1a090f09f42be5a5542009f0be310fdb3e768fc +net-next cc0356d6a02e064387c16a83cb96fe43ef33181e +bpf-next cc0356d6a02e064387c16a83cb96fe43ef33181e +ipsec-next ad57dae8a64da3926a22debbbe7d3b487a685a08 +mlx5-next 60dd57c7479418e2bc902143eb46a2fdcfeecbbb +netfilter-next d4a07dc5ac34528f292a4f328cf3c65aba312e1b +ipvs-next d4a07dc5ac34528f292a4f328cf3c65aba312e1b +wireless-drivers-next 2619f904b25cd056fba9b4694c57647d6782b1af +bluetooth 258f56d11bbbf39df5bc5faf0119d28be528f27d +mac80211-next 62bf703f44239869b55165fc5bbed3f38e869aae +mtd e269d7caf9e0dbd95fac9991991298f74930c2c0 +nand fc9e18f9e987ad46722dad53adab1c12148c213c +spi-nor df872ab1ffe4bd865dfb5956cae4901429004ab6 +crypto 39ef08517082a424b5b65c3dbaa6c0fa9d3303b9 +drm 806acd381960008700c15c3dc616d578e9558853 +drm-misc 14d9a37c952588930d7226953359fea3ab956d39 +amdgpu 0e502fb10d8e5ebde85f2ca83ef7c412148ad0db +drm-intel 1977e8eb40ed53f0cac7db1a78295726f4ac0b24 +drm-intel-gt 1977e8eb40ed53f0cac7db1a78295726f4ac0b24 +drm-tegra 5dccbc9de8f0071eb731b4de81d0638ea6c06a53 +drm-msm 02d44fde976a8e9330f855fc535180727c779b9b +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap a8d880671c13971b2b88b66e80d12d5e3f0808de +sound 8e537d5dec34cac746dd6abf6a83e5de3aa471fc +sound-asoc 13b1ef781f41c8562e7676d195aa5c8b1059c283 +modules ced75a2f5da71de5775fda44250e27d7b8024355 +input 322a552e19550872eb9f3a54330a5f615db42916 +block 2d81841aa5c376c560f5a22e371e3f1885e41b4e +device-mapper 7552750d0494fdd12f71acd8a432f51334a4462d +libata 1af5f7af2484004e71d384d8b88c221fc62cd6b5 +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc 348ecd61770f6aca0d060fea2bb538e749775638 +mfd 5dc6dafe62099ade0e7232ce9db4013b7673d860 +backlight 3976e974df1fd3a718627b0c9bdfee1953baa0d5 +battery 22ad4f99f63fc892412cde5a45d43b2288a60b88 +regulator 7492b724df4d33ca3d5b38b70fb4acb93e6d02bf +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor 582122f1d73af28407234321c94711e09aa3fd04 +integrity 32ba540f3c2a7ef61ed5a577ce25069a3d714fc9 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 15bf32398ad488c0df1cbaf16431422c87e4feea +smack 0934ad42bb2c5df90a1b9de690f93de735b622fe +tomoyo 7d2a07b769330c34b4deabeed939325c77a7ec2f +tpmdd 7eba41fe8c7bb01ff3d4b757bd622375792bc720 +watchdog c738888032ffafa1bbb971cd55b3d43b05b344cf +iommu 52d96919d6a846aace5841cd23055927c6e6ec2c +audit d9516f346e8b8e9c7dd37976a06a5bde1a871d6f +devicetree 4c7a7d5086cd0f9ce22bb3df86604576d0604db5 +mailbox 97961f78e8bc7f50ff7113fec030af6fa5f004d0 +spi e6f98315aba2deaf7c96449bd272c0c487248e36 +tip ea79c24a30aa27ccc4aac26be33f8b73f3f1f59c +clockevents eda9a4f7af6ee47e9e131f20e4f8a41a97379293 +edac f889e52436d6a42e773c4e8aab390c6b25841d61 +irqchip 11e45471abea1a69dc3a92b1d1632c4d628b3b98 +ftrace 67d4f6e3bf5dddced226fbf19704cdbbb0c98847 +rcu 587a7d1703f35b104de67b968818050e4bf34c4f +kvm 9c6eb531e7606dc957bf0ef7f3eed8a5c5cb774d +kvm-arm 5a2acbbb0179a7ffbb5440b9fa46689f619705ac +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 3fd8417f2c728d810a3b26d7e2008012ffb7fd01 +xen-tip 121f2faca2c0a1b3af5581213c04817b3f3ceeb9 +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues f9eaaa82b474350aa8436d15a7ae150a3c8b9d5c +drivers-x86 97ae45953ea957887170078f488fd629dd1ce786 +chrome-platform 297d34e73d491a3edbd6e8c31d33ec90447a908b +hsi 4ef69e17eb567a3b276fcc3cb3452dcf89d8b063 +leds 97b31c1f8eb865bc3aa5f4a08286a6406d782ea8 +ipmi 56d33754481fe0dc7436dc4ee4fbd44b3039361d +driver-core b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +usb 048ff8629e117d8411a787559417c781bcd78d7e +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 910c996335c37552ee30fcb837375b808bb4f33b +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +char-misc b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +extcon 9e6ef3a25e5e13899381282dbd8d8d157a899262 +phy-next b4dc97ab0a629eda8bda20d96ef47dac08a505d9 +soundwire abd9a6049bb59a9bab8cc8b42ccbe4a46c307f92 +thunderbolt 0a0624a26f9ceb8aae16882d87dc3b12f17f4a49 +vfio 3bf1311f351ef289f2aee79b86bcece2039fa611 +staging b5013d084e03e82ceeab4db8ae8ceeaebe76b0eb +iio 12b6d77431f5c345792d77db88f1860b25a589cd +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc dfe14674bf7b267c44eb91d66bad076af3827a47 +dmaengine e0674853943287669a82d1ffe09a700944615978 +cgroup 588e5d8766486e52ee332a4bb097b016a355b465 +scsi a4dde9b4c3b0a39ab8ed18be2b1238d8a460d4ff +scsi-mkp 3344b58b53a76199dae48faa396e9fc37bf86992 +vhost 47ed049614717cee813e054f3584bc71da66ad09 +rpmsg 6ee5808de07417fce77167ed72da60f627f682bc +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 7d0003da6297eb128f3490e396e6fc6df71557cd +gpio-intel 8bb7eca972ad531c9b149c0a51ab43a417385813 +gpio-sim 5065e08e4ef3c3fd0daf141f601de4b4d1af2333 +pinctrl a0f160ffcb83de6a04fa75f9e7bdfe969f2863f7 +pinctrl-intel 176412f8674be8ba9a45bb61086e224e2118324a +pinctrl-renesas f4e260bffcf367523b77f936fe0dbd278581305e +pinctrl-samsung f9d8de699ac4a059e30cf0e84e7027f1058b9163 +pwm e9d866d5a6296c701e5b46a94c0bbd6e2c0e357e +userns a21aa98d069acc523f457b157a4885443f6c1cb3 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest f35dcaa0a8a29188ed61083d153df1454cf89d08 +livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76 +coresight 20b02fe36530a1e48dde73c80b882ae276346ea3 +rtc a5feda3b361e11b291786d5c4ff86d4b9a55498f +nvdimm e765f13ed126fe7e41d1a6e3c60d754cd6c2af93 +at24 7629254054820bead6e18f8c3ae65c2bb01a5ae2 +ntb f96cb827ce49627543b4aabe8d54d8ea9740ae4e +seccomp 1e6d69c7b9cd7735bbf4c6754ccbb9cce8bd8ff4 +kspp 879f756fa9bf9025a3bae61557bcbf56ace0e2de +kspp-gustavo 704f6142a9033e76aaa054c7ecf93b4bb4bf0028 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 0f79ce970e79ffb771733f9634d5918d0eb3e30a +fsi 7cc2f34e1f4da07c791737cc6b3d965b31815ea0 +slimbus 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nvmem 413333fd6a88d023229cc121a5c65d48c4e9c7d6 +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 285f68afa8b20f752b0b7194d54980b5e0e27b75 +auxdisplay 97fbb29fc1ebde6ce362e3d0a9473d4c6dec7442 +kgdb b77dbc86d60459b42ab375e4e23172e7245f2854 +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 8bb7eca972ad531c9b149c0a51ab43a417385813 +kunit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +cfi ff1176468d368232b684f75e82563369208bc371 +kunit-next 52a5d80a2225e2d0b2a8f4656b76aead2a443b2a +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 8c61951b372d83b426a66dafc9c4ac24b3ce3335 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 988f45dfe7ea7deaeacd2fb528dbc76d05f7304f +cxl c6d7e1341cc99ba49df1384c8c5b3f534a5463b1 +folio d2f0559fc2d15a704d648c5ed999e3ec943e781b +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +zstd 8e211b894b58568a3065503334e150f305b3a735 +efi 720dff78de360ad9742d5f438101cedcdb5dad84 +unicode e2a58d2d3416aceeae63dfc7bf680dd390ff331d +akpm-current 8cfbd4096945e6667b9d9b22027a25dce2501a93 +akpm cb3cc26151a99d0f51e4492addc7a05d4b909d58 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..6d2ecd0de7dc --- /dev/null +++ b/Next/Trees @@ -0,0 +1,346 @@ +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 +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +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 +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.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 +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-intel-gt git git://anongit.freedesktop.org/drm-intel#for-linux-next-gt +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/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.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 +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/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 +bitmap git https://guthub.com/norov/linux.git#bitmap-master-5.15 +zstd git https://github.com/terrelln/linux.git#zstd-1.4.10 +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +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..99c755efe461 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5306 @@ +$ date -R +Mon, 08 Nov 2021 08:05:22 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at d4439a1189f9 Merge tag 'hsi-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi +Merging origin/master (6b75d88fa81b Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating d4439a1189f9..6b75d88fa81b +Fast-forward (no commit created; -m option ignored) + Documentation/ABI/testing/sysfs-bus-pci | 11 + + Documentation/ABI/testing/sysfs-class-fc | 27 + + Documentation/ABI/testing/sysfs-driver-ufs | 2 +- + Documentation/admin-guide/blockdev/zram.rst | 8 + + Documentation/admin-guide/cgroup-v1/memory.rst | 11 +- + .../admin-guide/filesystem-monitoring.rst | 78 + + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 26 +- + Documentation/admin-guide/mm/damon/index.rst | 1 + + Documentation/admin-guide/mm/damon/reclaim.rst | 235 ++ + Documentation/admin-guide/mm/damon/start.rst | 128 +- + Documentation/admin-guide/mm/damon/usage.rst | 109 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 42 +- + Documentation/admin-guide/mm/index.rst | 2 + + Documentation/admin-guide/mm/memory-hotplug.rst | 143 +- + Documentation/admin-guide/mm/pagemap.rst | 53 +- + Documentation/{vm => admin-guide/mm}/swap_numa.rst | 0 + Documentation/{vm => admin-guide/mm}/zswap.rst | 0 + Documentation/core-api/memory-hotplug.rst | 3 - + Documentation/dev-tools/kfence.rst | 23 +- + .../bindings/auxdisplay/holtek,ht16k33.yaml | 32 +- + .../bindings/pci/mediatek,mt7621-pcie.yaml | 142 ++ + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 158 ++ + .../devicetree/bindings/pci/qcom,pcie.txt | 5 +- + .../devicetree/bindings/pci/rockchip-dw-pcie.yaml | 141 ++ + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 10 + + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 363 +++ + .../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 7 + + .../bindings/pinctrl/pinctrl-mt8195.yaml | 86 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 4 + + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 187 -- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 188 ++ + .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 165 ++ + .../bindings/pinctrl/qcom,sm6350-pinctrl.yaml | 148 ++ + .../bindings/pinctrl/rockchip,pinctrl.txt | 114 - + .../bindings/pinctrl/rockchip,pinctrl.yaml | 184 ++ + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + .../pinctrl/socionext,uniphier-pinctrl.yaml | 1 + + Documentation/leds/well-known-leds.txt | 14 + + .../translations/zh_CN/core-api/memory-hotplug.rst | 4 - + Documentation/vm/damon/design.rst | 29 +- + Documentation/vm/damon/faq.rst | 5 +- + Documentation/vm/damon/index.rst | 1 - + Documentation/vm/index.rst | 26 +- + Documentation/vm/page_owner.rst | 23 +- + MAINTAINERS | 56 +- + Makefile | 15 + + arch/alpha/kernel/core_irongate.c | 2 +- + arch/arc/mm/init.c | 6 +- + arch/arm/mach-hisi/platmcpm.c | 2 +- + arch/arm/mm/init.c | 2 +- + arch/arm64/Kconfig | 4 + + arch/arm64/mm/kasan_init.c | 16 + + arch/arm64/mm/mmu.c | 4 +- + arch/ia64/mm/contig.c | 2 +- + arch/ia64/mm/init.c | 2 +- + arch/m68k/mm/mcfmmu.c | 3 +- + arch/m68k/mm/motorola.c | 6 +- + arch/microblaze/boot/dts/system.dts | 5 - + arch/microblaze/pci/pci-common.c | 3 +- + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 92 +- + arch/mips/boot/compressed/uart-16550.c | 12 - + arch/mips/boot/dts/Makefile | 1 - + arch/mips/boot/dts/netlogic/Makefile | 8 - + arch/mips/boot/dts/netlogic/xlp_evp.dts | 131 -- + arch/mips/boot/dts/netlogic/xlp_fvp.dts | 131 -- + arch/mips/boot/dts/netlogic/xlp_gvp.dts | 89 - + arch/mips/boot/dts/netlogic/xlp_rvp.dts | 89 - + arch/mips/boot/dts/netlogic/xlp_svp.dts | 131 -- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 - + arch/mips/cavium-octeon/executive/cvmx-pko.c | 14 - + arch/mips/configs/loongson3_defconfig | 1 + + arch/mips/configs/nlm_xlp_defconfig | 557 ----- + arch/mips/configs/nlm_xlr_defconfig | 508 ----- + arch/mips/include/asm/cmpxchg.h | 5 +- + arch/mips/include/asm/cop2.h | 11 - + arch/mips/include/asm/cpu-type.h | 8 - + arch/mips/include/asm/cpu.h | 2 +- + arch/mips/include/asm/ginvt.h | 11 +- + arch/mips/include/asm/hazards.h | 2 +- + .../include/asm/mach-loongson64/loongson_regs.h | 12 + + .../asm/mach-netlogic/cpu-feature-overrides.h | 57 - + arch/mips/include/asm/mach-netlogic/irq.h | 17 - + arch/mips/include/asm/mach-netlogic/multi-node.h | 74 - + arch/mips/include/asm/mips-cm.h | 12 +- + arch/mips/include/asm/mipsregs.h | 190 +- + arch/mips/include/asm/msa.h | 34 +- + arch/mips/include/asm/netlogic/common.h | 132 -- + arch/mips/include/asm/netlogic/haldefs.h | 171 -- + arch/mips/include/asm/netlogic/interrupt.h | 45 - + arch/mips/include/asm/netlogic/mips-extns.h | 301 --- + arch/mips/include/asm/netlogic/psb-bootinfo.h | 95 - + arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 186 -- + .../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 89 - + arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 214 -- + arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 113 - + arch/mips/include/asm/netlogic/xlp-hal/pic.h | 366 --- + arch/mips/include/asm/netlogic/xlp-hal/sys.h | 213 -- + arch/mips/include/asm/netlogic/xlp-hal/uart.h | 192 -- + arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 119 - + arch/mips/include/asm/netlogic/xlr/bridge.h | 104 - + arch/mips/include/asm/netlogic/xlr/flash.h | 55 - + arch/mips/include/asm/netlogic/xlr/fmn.h | 365 --- + arch/mips/include/asm/netlogic/xlr/gpio.h | 74 - + arch/mips/include/asm/netlogic/xlr/iomap.h | 109 - + arch/mips/include/asm/netlogic/xlr/msidef.h | 84 - + arch/mips/include/asm/netlogic/xlr/pic.h | 306 --- + arch/mips/include/asm/netlogic/xlr/xlr.h | 59 - + arch/mips/include/asm/octeon/cvmx-helper.h | 7 - + arch/mips/include/asm/octeon/cvmx-pko.h | 1 - + arch/mips/include/asm/pgtable.h | 45 +- + arch/mips/include/asm/processor.h | 13 - + arch/mips/include/asm/vermagic.h | 4 - + arch/mips/kernel/cpu-probe.c | 84 - + arch/mips/kernel/idle.c | 2 - + arch/mips/kernel/mips-cm.c | 21 +- + arch/mips/kernel/perf_event_mipsxx.c | 86 - + arch/mips/kernel/proc.c | 227 +- + arch/mips/kvm/entry.c | 8 +- + arch/mips/loongson64/init.c | 5 +- + arch/mips/mm/c-r4k.c | 2 - + arch/mips/mm/init.c | 2 +- + arch/mips/mm/tlbex.c | 9 +- + arch/mips/netlogic/Kconfig | 86 - + arch/mips/netlogic/Makefile | 4 - + arch/mips/netlogic/Platform | 16 - + arch/mips/netlogic/common/Makefile | 5 - + arch/mips/netlogic/common/earlycons.c | 63 - + arch/mips/netlogic/common/irq.c | 350 --- + arch/mips/netlogic/common/reset.S | 299 --- + arch/mips/netlogic/common/smp.c | 285 --- + arch/mips/netlogic/common/smpboot.S | 141 -- + arch/mips/netlogic/common/time.c | 110 - + arch/mips/netlogic/xlp/Makefile | 11 - + arch/mips/netlogic/xlp/ahci-init-xlp2.c | 390 ---- + arch/mips/netlogic/xlp/ahci-init.c | 209 -- + arch/mips/netlogic/xlp/cop2-ex.c | 121 - + arch/mips/netlogic/xlp/dt.c | 95 - + arch/mips/netlogic/xlp/nlm_hal.c | 508 ----- + arch/mips/netlogic/xlp/setup.c | 174 -- + arch/mips/netlogic/xlp/usb-init-xlp2.c | 288 --- + arch/mips/netlogic/xlp/usb-init.c | 149 -- + arch/mips/netlogic/xlp/wakeup.c | 212 -- + arch/mips/netlogic/xlr/Makefile | 3 - + arch/mips/netlogic/xlr/fmn-config.c | 296 --- + arch/mips/netlogic/xlr/fmn.c | 199 -- + arch/mips/netlogic/xlr/platform-flash.c | 216 -- + arch/mips/netlogic/xlr/platform.c | 250 --- + arch/mips/netlogic/xlr/setup.c | 206 -- + arch/mips/netlogic/xlr/wakeup.c | 85 - + arch/mips/pci/Makefile | 3 - + arch/mips/pci/fixup-cobalt.c | 15 + + arch/mips/pci/msi-xlp.c | 571 ----- + arch/mips/pci/pci-bcm47xx.c | 16 +- + arch/mips/pci/pci-xlp.c | 332 --- + arch/mips/pci/pci-xlr.c | 368 ---- + arch/mips/ralink/Kconfig | 3 +- + arch/mips/sgi-ip27/ip27-memory.c | 3 +- + arch/mips/sgi-ip30/ip30-setup.c | 6 +- + arch/mips/sni/time.c | 4 +- + arch/powerpc/Kconfig | 20 +- + arch/powerpc/boot/Makefile | 2 +- + arch/powerpc/boot/dts/a4m072.dts | 6 +- + arch/powerpc/boot/dts/charon.dts | 8 +- + arch/powerpc/boot/dts/digsy_mtc.dts | 8 +- + arch/powerpc/boot/dts/lite5200.dts | 8 +- + arch/powerpc/boot/dts/lite5200b.dts | 8 +- + arch/powerpc/boot/dts/media5200.dts | 8 +- + arch/powerpc/boot/dts/mpc5200b.dtsi | 6 +- + arch/powerpc/boot/dts/mucmc52.dts | 6 +- + arch/powerpc/boot/dts/o2d.dts | 2 +- + arch/powerpc/boot/dts/o2d.dtsi | 2 +- + arch/powerpc/boot/dts/o2dnt2.dts | 2 +- + arch/powerpc/boot/dts/o3dnt.dts | 2 +- + arch/powerpc/boot/dts/pcm030.dts | 6 +- + arch/powerpc/boot/dts/pcm032.dts | 8 +- + arch/powerpc/boot/dts/tqm5200.dts | 8 +- + arch/powerpc/boot/serial.c | 2 +- + arch/powerpc/boot/wrapper | 2 + + arch/powerpc/configs/cell_defconfig | 1 - + arch/powerpc/configs/g5_defconfig | 1 + + arch/powerpc/configs/maple_defconfig | 1 + + arch/powerpc/configs/microwatt_defconfig | 1 + + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ps3_defconfig | 1 + + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/configs/skiroot_defconfig | 2 - + arch/powerpc/include/asm/asm-const.h | 2 - + arch/powerpc/include/asm/atomic.h | 8 +- + arch/powerpc/include/asm/book3s/64/hash.h | 2 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 10 + + arch/powerpc/include/asm/book3s/64/radix.h | 3 + + arch/powerpc/include/asm/io.h | 4 +- + arch/powerpc/include/asm/iommu.h | 6 - + arch/powerpc/include/asm/kexec.h | 1 - + arch/powerpc/include/asm/kvm_book3s_64.h | 4 + + arch/powerpc/include/asm/machdep.h | 15 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 21 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 22 + + arch/powerpc/include/asm/nohash/64/pgtable.h | 5 - + arch/powerpc/include/asm/nohash/pte-book3e.h | 18 +- + arch/powerpc/include/asm/nohash/tlbflush.h | 15 + + arch/powerpc/include/asm/paravirt.h | 40 +- + arch/powerpc/include/asm/pgtable-types.h | 18 +- + arch/powerpc/include/asm/ppc-pci.h | 5 - + arch/powerpc/include/asm/ppc_asm.h | 4 +- + arch/powerpc/include/asm/sections.h | 13 - + arch/powerpc/include/asm/static_call.h | 28 + + arch/powerpc/include/asm/uaccess.h | 6 +- + arch/powerpc/include/uapi/asm/perf_regs.h | 28 +- + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/kernel/align.c | 1 + + arch/powerpc/kernel/dt_cpu_ftrs.c | 4 +- + arch/powerpc/kernel/eeh.c | 20 +- + arch/powerpc/kernel/eeh_driver.c | 10 +- + arch/powerpc/kernel/firmware.c | 7 +- + arch/powerpc/kernel/head_8xx.S | 2 +- + arch/powerpc/kernel/head_booke.h | 15 +- + arch/powerpc/kernel/hw_breakpoint_constraints.c | 15 +- + arch/powerpc/kernel/interrupt.c | 2 +- + arch/powerpc/kernel/paca.c | 8 +- + arch/powerpc/kernel/pci-common.c | 2 +- + arch/powerpc/kernel/setup-common.c | 5 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/static_call.c | 37 + + arch/powerpc/kernel/swsusp_64.c | 5 - + arch/powerpc/kernel/swsusp_asm64.S | 1 - + arch/powerpc/kernel/sysfs.c | 3 +- + arch/powerpc/kernel/time.c | 22 +- + arch/powerpc/kernel/vmlinux.lds.S | 12 +- + arch/powerpc/kexec/core.c | 13 - + arch/powerpc/kexec/core_32.c | 2 +- + arch/powerpc/kexec/core_64.c | 2 +- + arch/powerpc/kexec/file_load_64.c | 1 + + arch/powerpc/kvm/book3s_hv.c | 30 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 9 + + arch/powerpc/kvm/booke.c | 16 +- + arch/powerpc/kvm/powerpc.c | 4 +- + arch/powerpc/lib/feature-fixups.c | 11 + + arch/powerpc/lib/sstep.c | 197 +- + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 7 + + arch/powerpc/mm/hugetlbpage.c | 9 +- + arch/powerpc/mm/mem.c | 4 +- + arch/powerpc/mm/mmu_decl.h | 4 +- + arch/powerpc/mm/nohash/Makefile | 4 +- + .../mm/nohash/{fsl_booke.c => fsl_book3e.c} | 76 +- + arch/powerpc/mm/nohash/kaslr_booke.c | 2 +- + arch/powerpc/mm/nohash/tlb.c | 6 +- + arch/powerpc/mm/nohash/tlb_low.S | 8 +- + arch/powerpc/mm/nohash/tlb_low_64e.S | 8 +- + arch/powerpc/mm/pgtable.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/net/bpf_jit_comp.c | 2 +- + arch/powerpc/perf/perf_regs.c | 4 + + arch/powerpc/perf/power10-events-list.h | 8 +- + arch/powerpc/perf/power10-pmu.c | 44 +- + arch/powerpc/platforms/44x/fsp2.c | 2 + + arch/powerpc/platforms/44x/ppc476.c | 4 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 7 +- + arch/powerpc/platforms/85xx/Makefile | 4 +- + arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 7 +- + arch/powerpc/platforms/85xx/smp.c | 12 +- + arch/powerpc/platforms/book3s/vas-api.c | 4 +- + arch/powerpc/platforms/powermac/pmac.h | 1 - + arch/powerpc/platforms/powermac/setup.c | 2 - + arch/powerpc/platforms/powernv/opal-dump.c | 2 +- + arch/powerpc/platforms/powernv/opal-prd.c | 12 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/powernv/pci-sriov.c | 8 +- + arch/powerpc/platforms/powernv/setup.c | 4 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 298 +-- + arch/powerpc/platforms/pseries/iommu.c | 14 +- + arch/powerpc/platforms/pseries/mobility.c | 34 + + arch/powerpc/platforms/pseries/setup.c | 5 +- + arch/powerpc/platforms/pseries/svm.c | 3 +- + arch/powerpc/sysdev/dcr-low.S | 2 +- + arch/powerpc/xmon/xmon.c | 3 +- + arch/riscv/kernel/setup.c | 4 +- + arch/s390/Kconfig | 26 + + arch/s390/boot/compressed/decompressor.h | 1 + + arch/s390/boot/head.S | 54 +- + arch/s390/boot/ipl_parm.c | 4 +- + arch/s390/boot/pgm_check_info.c | 4 +- + arch/s390/boot/startup.c | 8 + + arch/s390/configs/debug_defconfig | 9 +- + arch/s390/configs/defconfig | 6 + + arch/s390/include/asm/barrier.h | 24 +- + arch/s390/include/asm/bitops.h | 2 +- + arch/s390/include/asm/cpu.h | 3 + + arch/s390/include/asm/debug.h | 2 +- + arch/s390/include/asm/ftrace.h | 58 +- + arch/s390/include/asm/jump_label.h | 2 + + arch/s390/include/asm/livepatch.h | 4 +- + arch/s390/include/asm/lowcore.h | 9 +- + arch/s390/include/asm/nospec-branch.h | 5 + + arch/s390/include/asm/pgtable.h | 12 +- + arch/s390/include/asm/ptrace.h | 23 +- + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/asm/sections.h | 12 - + arch/s390/include/asm/setup.h | 9 +- + arch/s390/include/asm/string.h | 4 - + arch/s390/include/asm/text-patching.h | 16 + + arch/s390/include/uapi/asm/setup.h | 13 - + arch/s390/kernel/alternative.c | 20 + + arch/s390/kernel/asm-offsets.c | 7 +- + arch/s390/kernel/cpcmd.c | 6 +- + arch/s390/kernel/dumpstack.c | 2 +- + arch/s390/kernel/early.c | 3 +- + arch/s390/kernel/entry.S | 45 +- + arch/s390/kernel/entry.h | 1 + + arch/s390/kernel/ftrace.c | 96 +- + arch/s390/kernel/head64.S | 18 - + arch/s390/kernel/irq.c | 10 +- + arch/s390/kernel/jump_label.c | 34 +- + arch/s390/kernel/kprobes.c | 48 +- + arch/s390/kernel/machine_kexec_file.c | 35 +- + arch/s390/kernel/mcount.S | 64 +- + arch/s390/kernel/nospec-branch.c | 2 +- + arch/s390/kernel/nospec-sysfs.c | 2 +- + arch/s390/kernel/perf_cpum_cf.c | 228 +- + arch/s390/kernel/process.c | 2 +- + arch/s390/kernel/setup.c | 51 +- + arch/s390/kernel/smp.c | 4 +- + arch/s390/kernel/syscall.c | 2 + + arch/s390/kernel/traps.c | 10 +- + arch/s390/kernel/uv.c | 2 +- + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/lib/Makefile | 2 + + arch/s390/lib/spinlock.c | 2 +- + arch/s390/lib/string.c | 45 - + arch/s390/lib/test_kprobes.c | 75 + + arch/s390/lib/test_kprobes.h | 10 + + arch/s390/lib/test_kprobes_asm.S | 45 + + arch/s390/lib/test_unwind.c | 169 +- + arch/s390/mm/cmm.c | 11 +- + arch/s390/mm/dump_pagetables.c | 14 +- + arch/s390/mm/init.c | 3 - + arch/s390/mm/kasan_init.c | 2 +- + arch/s390/mm/pageattr.c | 4 +- + arch/s390/mm/vmem.c | 10 +- + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/s390/pci/pci.c | 2 +- + arch/s390/pci/pci_dma.c | 25 +- + arch/s390/pci/pci_event.c | 4 + + arch/s390/pci/pci_sysfs.c | 8 + + arch/sh/boards/mach-ap325rxa/setup.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 4 +- + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 4 +- + arch/sparc/kernel/pci.c | 2 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/um/kernel/mem.c | 2 +- + arch/x86/Kconfig | 8 +- + arch/x86/events/intel/uncore.c | 2 +- + arch/x86/kernel/probe_roms.c | 2 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/init_32.c | 31 - + arch/x86/mm/kasan_init_64.c | 4 +- + arch/x86/mm/numa.c | 2 +- + arch/x86/mm/numa_emulation.c | 2 +- + arch/x86/pci/common.c | 2 +- + arch/x86/xen/mmu_pv.c | 6 +- + arch/x86/xen/p2m.c | 2 +- + arch/x86/xen/setup.c | 6 +- + arch/xtensa/boot/boot-elf/bootstrap.S | 2 + + arch/xtensa/boot/boot-redboot/bootstrap.S | 72 +- + arch/xtensa/include/asm/asmmacro.h | 65 + + arch/xtensa/include/asm/atomic.h | 26 +- + arch/xtensa/include/asm/cmpxchg.h | 16 +- + arch/xtensa/include/asm/core.h | 11 + + arch/xtensa/include/asm/processor.h | 32 +- + arch/xtensa/include/asm/sections.h | 41 + + arch/xtensa/include/asm/traps.h | 2 + + arch/xtensa/kernel/align.S | 2 + + arch/xtensa/kernel/entry.S | 216 +- + arch/xtensa/kernel/head.S | 24 +- + arch/xtensa/kernel/mcount.S | 38 +- + arch/xtensa/kernel/process.c | 27 +- + arch/xtensa/kernel/setup.c | 102 +- + arch/xtensa/kernel/signal.c | 12 +- + arch/xtensa/kernel/traps.c | 6 +- + arch/xtensa/kernel/vectors.S | 55 +- + arch/xtensa/kernel/vmlinux.lds.S | 12 +- + arch/xtensa/lib/strncpy_user.S | 17 +- + arch/xtensa/lib/usercopy.S | 28 +- + drivers/acpi/pci_root.c | 161 +- + drivers/ata/ahci.h | 8 +- + drivers/ata/ata_piix.c | 8 +- + drivers/ata/libahci.c | 52 +- + drivers/ata/libata-sata.c | 21 +- + drivers/ata/libata-scsi.c | 29 +- + drivers/ata/pata_macio.c | 2 +- + drivers/ata/sata_mv.c | 2 +- + drivers/ata/sata_nv.c | 4 +- + drivers/ata/sata_sil24.c | 2 +- + drivers/auxdisplay/Kconfig | 12 +- + drivers/auxdisplay/Makefile | 1 + + drivers/auxdisplay/cfag12864bfb.c | 9 +- + drivers/auxdisplay/ht16k33.c | 501 ++++- + drivers/auxdisplay/img-ascii-lcd.c | 205 +- + drivers/auxdisplay/ks0108.c | 3 - + drivers/auxdisplay/line-display.c | 261 +++ + drivers/auxdisplay/line-display.h | 43 + + drivers/base/Makefile | 2 +- + drivers/base/arch_numa.c | 92 +- + drivers/base/node.c | 9 +- + drivers/bcma/host_pci.c | 6 +- + drivers/block/zram/zram_drv.c | 66 +- + drivers/crypto/hisilicon/qm.c | 2 +- + drivers/crypto/qat/qat_4xxx/adf_drv.c | 7 +- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 7 +- + drivers/crypto/qat/qat_c62x/adf_drv.c | 7 +- + drivers/crypto/qat/qat_common/adf_aer.c | 10 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 3 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 7 +- + drivers/firewire/sbp2.c | 10 +- + drivers/firmware/efi/memmap.c | 2 +- + drivers/gpio/gpiolib.c | 9 +- + drivers/hid/Kconfig | 32 + + drivers/hid/Makefile | 2 + + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 3 +- + drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 2 + + drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 2 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 21 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 3 +- + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 3 +- + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h | 3 +- + .../hid_descriptor/amd_sfh_hid_report_desc.h | 3 +- + drivers/hid/hid-apple.c | 66 +- + drivers/hid/hid-asus.c | 2 +- + drivers/hid/hid-cougar.c | 3 +- + drivers/hid/hid-debug.c | 10 +- + drivers/hid/hid-ids.h | 18 +- + drivers/hid/hid-input.c | 1 + + drivers/hid/hid-multitouch.c | 13 + + drivers/hid/hid-nintendo.c | 2319 ++++++++++++++++++++ + drivers/hid/hid-playstation.c | 159 +- + drivers/hid/hid-quirks.c | 3 +- + drivers/hid/hid-u2fzero.c | 55 +- + drivers/hid/hid-xiaomi.c | 94 + + drivers/hid/wacom_sys.c | 15 +- + drivers/hwmon/occ/p9_sbe.c | 1 + + drivers/i2c/busses/i2c-xgene-slimpro.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 59 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 38 +- + drivers/input/joydev.c | 10 + + drivers/iommu/apple-dart.c | 28 + + drivers/macintosh/smu.c | 2 +- + drivers/message/fusion/mptbase.c | 7 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/message/fusion/mptctl.c | 4 +- + drivers/message/fusion/mptfc.c | 8 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/message/fusion/mptsas.c | 4 +- + drivers/message/fusion/mptscsih.c | 46 +- + drivers/message/fusion/mptscsih.h | 2 +- + drivers/message/fusion/mptspi.c | 6 +- + drivers/misc/cxl/guest.c | 30 +- + drivers/misc/cxl/pci.c | 35 +- + drivers/mmc/core/mmc_test.c | 1 - + drivers/mtd/mtdcore.c | 1 + + drivers/net/ethernet/chelsio/cxgb3/common.h | 2 - + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 38 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 98 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +- + .../net/ethernet/marvell/prestera/prestera_pci.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 3 +- + drivers/of/irq.c | 17 +- + drivers/of/kexec.c | 4 +- + drivers/of/of_reserved_mem.c | 5 +- + drivers/pci/controller/Kconfig | 28 +- + drivers/pci/controller/Makefile | 3 + + drivers/pci/controller/cadence/pci-j721e.c | 2 +- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 2 + + drivers/pci/controller/dwc/Kconfig | 30 +- + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-dra7xx.c | 22 +- + drivers/pci/controller/dwc/pci-imx6.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 3 + + drivers/pci/controller/dwc/pcie-designware-host.c | 19 +- + drivers/pci/controller/dwc/pcie-designware.c | 1 + + drivers/pci/controller/dwc/pcie-kirin.c | 646 ++++-- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 721 ++++++ + drivers/pci/controller/dwc/pcie-qcom.c | 96 +- + drivers/pci/controller/dwc/pcie-uniphier.c | 26 +- + drivers/pci/controller/dwc/pcie-visconti.c | 5 +- + drivers/pci/controller/pci-aardvark.c | 491 +++-- + drivers/pci/controller/pci-hyperv.c | 4 +- + drivers/pci/controller/pci-thunder-ecam.c | 4 +- + drivers/pci/controller/pci-xgene-msi.c | 2 +- + drivers/pci/controller/pci-xgene.c | 3 +- + drivers/pci/controller/pcie-apple.c | 824 +++++++ + drivers/pci/controller/pcie-brcmstb.c | 2 +- + drivers/pci/controller/pcie-iproc.c | 2 +- + .../pci-mt7621.c => pci/controller/pcie-mt7621.c} | 24 +- + drivers/pci/controller/pcie-rcar-ep.c | 5 +- + drivers/pci/controller/pcie-rcar-host.c | 2 - + drivers/pci/controller/vmd.c | 47 +- + drivers/pci/endpoint/functions/pci-epf-ntb.c | 22 +- + drivers/pci/endpoint/pci-ep-cfs.c | 48 +- + drivers/pci/endpoint/pci-epc-core.c | 2 +- + drivers/pci/endpoint/pci-epf-core.c | 4 +- + drivers/pci/hotplug/acpiphp_glue.c | 2 +- + drivers/pci/hotplug/cpqphp.h | 2 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 4 +- + drivers/pci/hotplug/cpqphp_pci.c | 6 +- + drivers/pci/hotplug/ibmphp.h | 4 +- + drivers/pci/hotplug/pciehp.h | 2 + + drivers/pci/hotplug/pciehp_core.c | 2 + + drivers/pci/hotplug/pciehp_hpc.c | 26 + + drivers/pci/hotplug/shpchp_hpc.c | 2 +- + drivers/pci/iov.c | 38 +- + drivers/pci/msi.c | 3 +- + drivers/pci/of.c | 10 +- + drivers/pci/p2pdma.c | 8 +- + drivers/pci/pci-bridge-emul.c | 13 + + drivers/pci/pci-driver.c | 57 +- + drivers/pci/pci-sysfs.c | 51 +- + drivers/pci/pci.c | 65 +- + drivers/pci/pci.h | 1 + + drivers/pci/pcie/Makefile | 4 +- + drivers/pci/pcie/aer.c | 2 +- + drivers/pci/pcie/aspm.c | 4 +- + drivers/pci/pcie/err.c | 40 +- + drivers/pci/pcie/portdrv.h | 6 +- + drivers/pci/pcie/portdrv_core.c | 67 +- + drivers/pci/pcie/portdrv_pci.c | 27 +- + drivers/pci/probe.c | 60 +- + drivers/pci/quirks.c | 70 +- + drivers/pci/rom.c | 2 +- + drivers/pci/setup-bus.c | 2 +- + drivers/pci/setup-irq.c | 26 +- + drivers/pci/switch/switchtec.c | 95 +- + drivers/pci/vpd.c | 93 +- + drivers/pci/xen-pcifront.c | 58 +- + drivers/pinctrl/Kconfig | 16 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/bcm/Kconfig | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 9 +- + drivers/pinctrl/core.c | 2 + + drivers/pinctrl/intel/Kconfig | 6 +- + drivers/pinctrl/mediatek/Kconfig | 7 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-moore.c | 18 + + drivers/pinctrl/mediatek/pinctrl-mt7986.c | 927 ++++++++ + drivers/pinctrl/mediatek/pinctrl-mt8195.c | 134 ++ + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 231 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 46 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 68 +- + drivers/pinctrl/nomadik/Kconfig | 1 - + drivers/pinctrl/pinctrl-apple-gpio.c | 534 +++++ + drivers/pinctrl/pinctrl-equilibrium.c | 7 +- + drivers/pinctrl/pinctrl-gemini.c | 4 +- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 7 + + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/qcom/Kconfig | 17 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-msm8226.c | 74 +- + drivers/pinctrl/qcom/pinctrl-qcm2290.c | 1129 ++++++++++ + drivers/pinctrl/qcom/pinctrl-sm6350.c | 1401 ++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 7 + + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 111 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 133 +- + drivers/pinctrl/renesas/core.c | 83 +- + drivers/pinctrl/renesas/pfc-r8a77950.c | 14 + + drivers/pinctrl/renesas/pfc-r8a77951.c | 22 +- + drivers/pinctrl/renesas/pfc-r8a7796.c | 22 +- + drivers/pinctrl/renesas/pfc-r8a77965.c | 22 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 108 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 16 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 32 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 2 + + drivers/pinctrl/tegra/pinctrl-tegra194.c | 1794 ++++++++++++++- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 330 +-- + drivers/pinctrl/uniphier/Kconfig | 4 + + drivers/pinctrl/uniphier/Makefile | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 18 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 35 + + drivers/pinctrl/uniphier/pinctrl-uniphier-nx1.c | 489 +++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 40 + + drivers/rapidio/devices/rio_mport_cdev.c | 9 +- + drivers/s390/block/dasd_genhd.c | 10 +- + drivers/s390/block/dcssblk.c | 8 +- + drivers/s390/block/scm_blk.c | 7 +- + drivers/s390/char/sclp.c | 14 +- + drivers/s390/char/sclp.h | 2 +- + drivers/s390/char/sclp_early.c | 7 +- + drivers/s390/char/sclp_ftp.c | 3 + + drivers/s390/char/sclp_sd.c | 11 +- + drivers/s390/char/sclp_vt220.c | 4 +- + drivers/s390/cio/css.c | 9 +- + drivers/s390/cio/device.c | 2 + + drivers/s390/cio/device_ops.c | 12 +- + drivers/s390/crypto/ap_bus.c | 81 +- + drivers/s390/crypto/ap_debug.h | 2 +- + drivers/s390/crypto/ap_queue.c | 9 +- + drivers/s390/crypto/vfio_ap_drv.c | 16 +- + drivers/s390/crypto/vfio_ap_ops.c | 5 +- + drivers/s390/crypto/vfio_ap_private.h | 43 +- + drivers/s390/crypto/zcrypt_api.c | 45 +- + drivers/s390/crypto/zcrypt_card.c | 8 +- + drivers/s390/crypto/zcrypt_debug.h | 2 +- + drivers/s390/crypto/zcrypt_error.h | 22 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 18 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 40 +- + drivers/s390/crypto/zcrypt_queue.c | 17 +- + drivers/s390/scsi/zfcp_ext.h | 4 +- + drivers/s390/scsi/zfcp_fsf.c | 2 +- + drivers/s390/scsi/zfcp_scsi.c | 8 +- + drivers/s390/scsi/zfcp_sysfs.c | 52 +- + drivers/scsi/3w-9xxx.c | 18 +- + drivers/scsi/3w-sas.c | 18 +- + drivers/scsi/3w-xxxx.c | 26 +- + drivers/scsi/53c700.c | 20 +- + drivers/scsi/BusLogic.c | 13 +- + drivers/scsi/NCR5380.c | 12 +- + drivers/scsi/a100u2w.c | 5 +- + drivers/scsi/aacraid/aachba.c | 53 +- + drivers/scsi/aacraid/linit.c | 38 +- + drivers/scsi/advansys.c | 14 +- + drivers/scsi/aha152x.c | 29 +- + drivers/scsi/aha1542.c | 16 +- + drivers/scsi/aha1740.c | 4 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 6 +- + drivers/scsi/aic7xxx/aic79xx_osm.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 6 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 2 +- + drivers/scsi/arcmsr/arcmsr.h | 2 +- + drivers/scsi/arcmsr/arcmsr_attr.c | 33 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 22 +- + drivers/scsi/arm/acornscsi.c | 20 +- + drivers/scsi/arm/arxescsi.c | 1 + + drivers/scsi/arm/cumana_2.c | 1 + + drivers/scsi/arm/eesox.c | 1 + + drivers/scsi/arm/fas216.c | 26 +- + drivers/scsi/arm/fas216.h | 10 + + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/atp870u.c | 17 +- + drivers/scsi/be2iscsi/be_main.c | 21 +- + drivers/scsi/bfa/bfad_attr.c | 68 +- + drivers/scsi/bfa/bfad_im.c | 16 +- + drivers/scsi/bfa/bfad_im.h | 4 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 8 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 8 +- + drivers/scsi/bnx2i/bnx2i.h | 2 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/bnx2i/bnx2i_sysfs.c | 15 +- + drivers/scsi/csiostor/csio_lnode.c | 2 +- + drivers/scsi/csiostor/csio_scsi.c | 32 +- + drivers/scsi/cxlflash/main.c | 46 +- + drivers/scsi/dc395x.c | 12 +- + drivers/scsi/dpt_i2o.c | 13 +- + drivers/scsi/elx/efct/efct_driver.c | 6 +- + drivers/scsi/elx/efct/efct_lio.c | 4 +- + drivers/scsi/elx/efct/efct_scsi.c | 3 +- + drivers/scsi/elx/libefc/efc.h | 2 +- + drivers/scsi/elx/libefc/efc_cmds.c | 7 +- + drivers/scsi/elx/libefc/efc_fabric.c | 2 +- + drivers/scsi/elx/libefc/efclib.h | 1 + + drivers/scsi/esas2r/esas2r_main.c | 8 +- + drivers/scsi/esp_scsi.c | 12 +- + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fdomain.c | 2 +- + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/fnic_attrs.c | 17 +- + drivers/scsi/fnic/fnic_main.c | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 122 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 113 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 23 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 35 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 62 +- + drivers/scsi/hosts.c | 17 +- + drivers/scsi/hpsa.c | 56 +- + drivers/scsi/hptiop.c | 20 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 30 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 28 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 42 +- + drivers/scsi/imm.c | 6 +- + drivers/scsi/initio.c | 7 +- + drivers/scsi/ipr.c | 48 +- + drivers/scsi/ips.c | 31 +- + drivers/scsi/isci/init.c | 8 +- + drivers/scsi/isci/task.h | 4 - + drivers/scsi/libfc/fc_fcp.c | 6 +- + drivers/scsi/libiscsi.c | 7 +- + drivers/scsi/libsas/sas_init.c | 8 +- + drivers/scsi/libsas/sas_scsi_host.c | 27 +- + drivers/scsi/lpfc/lpfc.h | 1 + + drivers/scsi/lpfc/lpfc_attr.c | 314 +-- + drivers/scsi/lpfc/lpfc_crtn.h | 7 +- + drivers/scsi/lpfc/lpfc_disc.h | 12 +- + drivers/scsi/lpfc/lpfc_els.c | 61 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 144 +- + drivers/scsi/lpfc/lpfc_hw4.h | 4 + + drivers/scsi/lpfc/lpfc_init.c | 135 +- + drivers/scsi/lpfc/lpfc_nvme.c | 70 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 44 +- + drivers/scsi/lpfc/lpfc_scsi.c | 131 +- + drivers/scsi/lpfc/lpfc_sli.c | 197 +- + drivers/scsi/lpfc/lpfc_sli4.h | 2 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mac53c94.c | 6 +- + drivers/scsi/megaraid.c | 24 +- + drivers/scsi/megaraid/megaraid_mbox.c | 28 +- + drivers/scsi/megaraid/megaraid_sas.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 40 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 56 +- + drivers/scsi/mesh.c | 18 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 32 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 26 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 84 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 26 +- + drivers/scsi/mvsas/mv_init.c | 12 +- + drivers/scsi/mvumi.c | 4 +- + drivers/scsi/myrb.c | 60 +- + drivers/scsi/myrs.c | 50 +- + drivers/scsi/ncr53c8xx.c | 16 +- + drivers/scsi/nsp32.c | 7 +- + drivers/scsi/pcmcia/nsp_cs.c | 7 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 14 +- + drivers/scsi/pm8001/pm8001_ctl.c | 70 +- + drivers/scsi/pm8001/pm8001_hwi.c | 12 +- + drivers/scsi/pm8001/pm8001_init.c | 14 +- + drivers/scsi/pm8001/pm8001_sas.c | 15 + + drivers/scsi/pm8001/pm8001_sas.h | 8 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 63 +- + drivers/scsi/pmcraid.c | 27 +- + drivers/scsi/ppa.c | 6 +- + drivers/scsi/ps3rom.c | 8 +- + drivers/scsi/qedf/qedf.h | 2 +- + drivers/scsi/qedf/qedf_attr.c | 15 +- + drivers/scsi/qedf/qedf_io.c | 19 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qedi/qedi_gbl.h | 2 +- + drivers/scsi/qedi/qedi_iscsi.c | 2 +- + drivers/scsi/qedi/qedi_sysfs.c | 15 +- + drivers/scsi/qla1280.c | 8 +- + drivers/scsi/qla2xxx/qla_attr.c | 149 +- + 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 | 8 +- + 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 | 103 +- + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 73 +- + drivers/scsi/qla4xxx/ql4_attr.c | 41 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 3 +- + drivers/scsi/qla4xxx/ql4_os.c | 6 +- + drivers/scsi/qlogicfas408.c | 7 +- + drivers/scsi/qlogicpti.c | 7 +- + drivers/scsi/scsi.c | 8 - + drivers/scsi/scsi_debug.c | 19 +- + drivers/scsi/scsi_error.c | 17 +- + drivers/scsi/scsi_lib.c | 64 +- + drivers/scsi/scsi_pm.c | 105 +- + drivers/scsi/scsi_priv.h | 7 +- + drivers/scsi/scsi_scan.c | 74 +- + drivers/scsi/scsi_sysfs.c | 54 +- + drivers/scsi/scsi_transport_sas.c | 1 + + drivers/scsi/sd.c | 38 +- + drivers/scsi/smartpqi/smartpqi.h | 61 +- + drivers/scsi/smartpqi/smartpqi_init.c | 588 +++-- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 6 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 60 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 4 +- + drivers/scsi/snic/snic.h | 2 +- + drivers/scsi/snic/snic_attrs.c | 19 +- + drivers/scsi/snic/snic_main.c | 2 +- + drivers/scsi/snic/snic_scsi.c | 33 +- + drivers/scsi/sr.c | 7 +- + drivers/scsi/stex.c | 10 +- + drivers/scsi/storvsc_drv.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 6 +- + drivers/scsi/ufs/Kconfig | 19 +- + drivers/scsi/ufs/Makefile | 1 + + drivers/scsi/ufs/ufs-exynos.c | 6 +- + drivers/scsi/ufs/ufs-hisi.c | 6 +- + drivers/scsi/ufs/ufs-hwmon.c | 210 ++ + drivers/scsi/ufs/ufs-mediatek.c | 111 +- + drivers/scsi/ufs/ufs-mediatek.h | 27 + + drivers/scsi/ufs/ufs-qcom.c | 21 +- + drivers/scsi/ufs/ufs.h | 7 + + drivers/scsi/ufs/ufshcd-pltfrm.c | 4 +- + drivers/scsi/ufs/ufshcd.c | 341 ++- + drivers/scsi/ufs/ufshcd.h | 43 +- + drivers/scsi/ufs/ufshpb.c | 7 +- + drivers/scsi/virtio_scsi.c | 7 +- + drivers/scsi/vmw_pvscsi.c | 9 +- + drivers/scsi/wd33c93.c | 18 +- + drivers/scsi/wd719x.c | 4 +- + drivers/scsi/xen-scsifront.c | 4 +- + drivers/ssb/pcihost_wrapper.c | 6 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/mt7621-pci/Kconfig | 8 - + drivers/staging/mt7621-pci/Makefile | 2 - + drivers/staging/mt7621-pci/TODO | 4 - + drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt | 104 - + drivers/staging/rts5208/rtsx.c | 9 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 20 +- + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 8 +- + drivers/target/iscsi/cxgbit/cxgbit_main.c | 17 +- + drivers/target/iscsi/cxgbit/cxgbit_target.c | 28 +- + drivers/target/iscsi/iscsi_target_configfs.c | 91 +- + drivers/target/loopback/tcm_loop.c | 4 +- + drivers/target/sbp/sbp_target.c | 30 +- + drivers/target/target_core_alua.c | 83 +- + drivers/target/target_core_configfs.c | 1 + + drivers/target/target_core_device.c | 2 + + drivers/target/target_core_fabric_configfs.c | 78 +- + drivers/target/target_core_iblock.c | 4 +- + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_transport.c | 94 +- + drivers/target/target_core_user.c | 7 +- + drivers/target/target_core_xcopy.c | 14 +- + drivers/usb/early/xhci-dbc.c | 10 +- + drivers/usb/gadget/function/f_tcm.c | 31 +- + drivers/usb/host/xhci-pci.c | 2 +- + drivers/usb/image/microtek.c | 5 +- + drivers/usb/storage/scsiglue.c | 13 +- + drivers/usb/storage/uas.c | 13 +- + drivers/usb/storage/usb.c | 4 +- + drivers/video/fbdev/chipsfb.c | 2 +- + drivers/virtio/Kconfig | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + fs/cifs/cifsfs.c | 1 - + fs/cifs/cifsglob.h | 3 +- + fs/cifs/connect.c | 26 +- + fs/cifs/fs_context.c | 16 + + fs/cifs/fs_context.h | 2 + + fs/cifs/misc.c | 2 +- + fs/cifs/smb2maperror.c | 16 +- + fs/cifs/smb2misc.c | 47 +- + fs/cifs/smb2ops.c | 73 +- + fs/cifs/smb2pdu.c | 187 +- + fs/cifs/smb2pdu.h | 919 +------- + fs/cifs/smb2proto.h | 2 +- + fs/cifs/smb2transport.c | 36 +- + fs/cifs/trace.h | 71 + + fs/d_path.c | 8 +- + fs/ext4/super.c | 8 + + fs/isofs/inode.c | 2 + + fs/nfsd/filecache.c | 3 + + fs/notify/fanotify/fanotify.c | 117 +- + fs/notify/fanotify/fanotify.h | 54 +- + fs/notify/fanotify/fanotify_user.c | 157 +- + fs/notify/fsnotify.c | 10 +- + fs/notify/group.c | 2 +- + fs/notify/inotify/inotify_fsnotify.c | 5 +- + fs/notify/inotify/inotify_user.c | 6 +- + fs/notify/notification.c | 14 +- + fs/ocfs2/alloc.c | 21 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/file.c | 8 +- + fs/ocfs2/inode.c | 4 +- + fs/ocfs2/journal.c | 26 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/super.c | 40 +- + fs/open.c | 16 +- + fs/posix_acl.c | 3 +- + fs/proc/task_mmu.c | 28 +- + fs/quota/quota_tree.c | 15 + + fs/reiserfs/super.c | 6 - + fs/smbfs_common/smb2pdu.h | 989 +++++++++ + fs/super.c | 3 + + include/asm-generic/sections.h | 14 - + include/dt-bindings/leds/common.h | 7 + + include/dt-bindings/pinctrl/mt65xx.h | 9 + + include/linux/acpi.h | 2 - + include/linux/backing-dev-defs.h | 3 + + include/linux/backing-dev.h | 1 - + include/linux/cma.h | 1 + + include/linux/compiler-gcc.h | 8 + + include/linux/compiler_attributes.h | 11 +- + include/linux/compiler_types.h | 20 +- + include/linux/cpuset.h | 17 + + include/linux/damon.h | 236 +- + include/linux/fanotify.h | 9 +- + include/linux/fs.h | 1 + + include/linux/fsnotify.h | 58 +- + include/linux/fsnotify_backend.h | 96 +- + include/linux/gfp.h | 8 +- + include/linux/gpio/driver.h | 19 +- + include/linux/highmem.h | 28 +- + include/linux/hugetlb.h | 36 +- + include/linux/io-mapping.h | 6 - + include/linux/irqdomain.h | 4 + + include/linux/kasan.h | 8 + + include/linux/kernel.h | 1 + + include/linux/kfence.h | 21 +- + include/linux/libata.h | 8 +- + include/linux/memblock.h | 48 +- + include/linux/memcontrol.h | 9 +- + include/linux/memory.h | 26 +- + include/linux/memory_hotplug.h | 3 - + include/linux/mempolicy.h | 5 - + include/linux/migrate.h | 23 +- + include/linux/migrate_mode.h | 13 + + include/linux/mm.h | 57 +- + include/linux/mm_types.h | 2 - + include/linux/mmzone.h | 41 +- + include/linux/node.h | 4 +- + include/linux/page-flags.h | 2 +- + include/linux/pci.h | 21 +- + include/linux/percpu.h | 6 +- + include/linux/slab.h | 135 +- + include/linux/slub_def.h | 13 +- + include/linux/stackdepot.h | 8 +- + include/linux/stacktrace.h | 1 + + include/linux/swap.h | 1 - + include/linux/switchtec.h | 1 + + include/linux/vmalloc.h | 24 +- + include/scsi/libsas.h | 1 + + include/scsi/scsi_cmnd.h | 14 +- + include/scsi/scsi_device.h | 6 + + include/scsi/scsi_host.h | 27 +- + include/scsi/scsi_transport_sas.h | 1 + + include/target/target_core_base.h | 9 +- + include/target/target_core_fabric.h | 1 + + include/trace/events/mmap_lock.h | 48 +- + include/trace/events/vmscan.h | 38 + + include/trace/events/writeback.h | 7 - + include/uapi/linux/fanotify.h | 8 + + include/uapi/linux/map_to_14segment.h | 241 ++ + include/uapi/linux/pci_regs.h | 6 + + init/Kconfig | 2 +- + init/initramfs.c | 2 +- + init/main.c | 6 +- + kernel/audit_fsnotify.c | 3 +- + kernel/audit_watch.c | 3 +- + kernel/cgroup/cpuset.c | 23 + + kernel/dma/swiotlb.c | 2 +- + kernel/extable.c | 2 +- + kernel/irq/irqdomain.c | 7 +- + kernel/kexec_file.c | 5 + + kernel/locking/lockdep.c | 15 + + kernel/printk/printk.c | 4 +- + kernel/sched/topology.c | 1 - + kernel/stacktrace.c | 30 + + kernel/tsacct.c | 2 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 2 +- + lib/Kconfig.kfence | 26 +- + lib/bootconfig.c | 2 +- + lib/cpumask.c | 2 +- + lib/stackdepot.c | 72 +- + lib/test_kasan.c | 26 +- + lib/test_kasan_module.c | 2 + + lib/test_vmalloc.c | 6 +- + mm/Kconfig | 10 +- + mm/backing-dev.c | 65 +- + mm/cma.c | 26 +- + mm/compaction.c | 10 +- + mm/damon/Kconfig | 24 +- + mm/damon/Makefile | 4 +- + mm/damon/core.c | 446 +++- + mm/damon/dbgfs-test.h | 54 + + mm/damon/dbgfs.c | 430 +++- + mm/damon/paddr.c | 273 +++ + mm/damon/prmtv-common.c | 133 ++ + mm/damon/prmtv-common.h | 20 + + mm/damon/reclaim.c | 356 +++ + mm/damon/vaddr-test.h | 2 +- + mm/damon/vaddr.c | 167 +- + mm/debug.c | 20 +- + mm/debug_vm_pgtable.c | 7 +- + mm/filemap.c | 78 +- + mm/gup.c | 5 +- + mm/highmem.c | 6 +- + mm/hugetlb.c | 699 +++++- + mm/hugetlb_cgroup.c | 3 - + mm/internal.h | 22 + + mm/kasan/common.c | 8 +- + mm/kasan/generic.c | 14 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/shadow.c | 5 + + mm/kfence/core.c | 200 +- + mm/kfence/kfence.h | 2 + + mm/kfence/kfence_test.c | 14 +- + mm/khugepaged.c | 10 +- + mm/list_lru.c | 58 +- + mm/memblock.c | 35 +- + mm/memcontrol.c | 213 +- + mm/memory-failure.c | 111 +- + mm/memory.c | 162 +- + mm/memory_hotplug.c | 53 +- + mm/mempolicy.c | 143 +- + mm/migrate.c | 61 + + mm/mmap.c | 2 +- + mm/mprotect.c | 5 +- + mm/mremap.c | 86 +- + mm/nommu.c | 6 - + mm/oom_kill.c | 25 +- + mm/page-writeback.c | 11 +- + mm/page_alloc.c | 119 +- + mm/page_ext.c | 2 +- + mm/page_isolation.c | 29 +- + mm/percpu.c | 8 +- + mm/readahead.c | 2 +- + mm/rmap.c | 8 +- + mm/shmem.c | 44 +- + mm/slab.c | 16 - + mm/slab_common.c | 8 - + mm/slub.c | 109 +- + mm/sparse-vmemmap.c | 2 +- + mm/sparse.c | 2 +- + mm/swap.c | 23 +- + mm/swapfile.c | 6 +- + mm/userfaultfd.c | 8 +- + mm/vmalloc.c | 107 +- + mm/vmpressure.c | 2 +- + mm/vmscan.c | 154 +- + mm/vmstat.c | 76 +- + mm/zsmalloc.c | 7 +- + 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 - + samples/Kconfig | 17 +- + samples/Makefile | 2 + + samples/fanotify/Makefile | 5 + + samples/fanotify/fs-monitor.c | 142 ++ + samples/ftrace/Makefile | 2 +- + samples/ftrace/ftrace-direct-modify.c | 44 + + samples/ftrace/ftrace-direct-too.c | 28 + + samples/ftrace/ftrace-direct.c | 28 + + scripts/checkpatch.pl | 3 +- + scripts/decodecode | 2 +- + scripts/spelling.txt | 16 + + security/Kconfig | 14 - + tools/testing/selftests/damon/debugfs_attrs.sh | 13 + + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 3 + + .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 4 + + tools/testing/selftests/memory-hotplug/config | 1 - + .../powerpc/security/mitigation-patching.sh | 4 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/hugepage-mremap.c | 159 ++ + tools/testing/selftests/vm/ksm_tests.c | 154 +- + tools/testing/selftests/vm/madv_populate.c | 15 +- + tools/testing/selftests/vm/run_vmtests.sh | 11 + + tools/testing/selftests/vm/transhuge-stress.c | 2 +- + tools/testing/selftests/vm/userfaultfd.c | 157 +- + tools/vm/page-types.c | 38 +- + tools/vm/page_owner_sort.c | 94 +- + 1064 files changed, 31796 insertions(+), 21629 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fc + create mode 100644 Documentation/admin-guide/filesystem-monitoring.rst + create mode 100644 Documentation/admin-guide/mm/damon/reclaim.rst + rename Documentation/{vm => admin-guide/mm}/swap_numa.rst (100%) + rename Documentation/{vm => admin-guide/mm}/zswap.rst (100%) + create mode 100644 Documentation/devicetree/bindings/pci/mediatek,mt7621-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm6350-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.yaml + delete mode 100644 arch/mips/boot/dts/netlogic/Makefile + delete mode 100644 arch/mips/boot/dts/netlogic/xlp_evp.dts + delete mode 100644 arch/mips/boot/dts/netlogic/xlp_fvp.dts + delete mode 100644 arch/mips/boot/dts/netlogic/xlp_gvp.dts + delete mode 100644 arch/mips/boot/dts/netlogic/xlp_rvp.dts + delete mode 100644 arch/mips/boot/dts/netlogic/xlp_svp.dts + delete mode 100644 arch/mips/configs/nlm_xlp_defconfig + delete mode 100644 arch/mips/configs/nlm_xlr_defconfig + delete mode 100644 arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h + delete mode 100644 arch/mips/include/asm/mach-netlogic/irq.h + delete mode 100644 arch/mips/include/asm/mach-netlogic/multi-node.h + delete mode 100644 arch/mips/include/asm/netlogic/common.h + delete mode 100644 arch/mips/include/asm/netlogic/haldefs.h + delete mode 100644 arch/mips/include/asm/netlogic/interrupt.h + delete mode 100644 arch/mips/include/asm/netlogic/mips-extns.h + delete mode 100644 arch/mips/include/asm/netlogic/psb-bootinfo.h + delete mode 100644 arch/mips/include/asm/netlogic/xlp-hal/bridge.h + delete mode 100644 arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h + delete mode 100644 arch/mips/include/asm/netlogic/xlp-hal/iomap.h + delete mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pcibus.h + delete mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pic.h + delete mode 100644 arch/mips/include/asm/netlogic/xlp-hal/sys.h + delete mode 100644 arch/mips/include/asm/netlogic/xlp-hal/uart.h + delete mode 100644 arch/mips/include/asm/netlogic/xlp-hal/xlp.h + delete mode 100644 arch/mips/include/asm/netlogic/xlr/bridge.h + delete mode 100644 arch/mips/include/asm/netlogic/xlr/flash.h + delete mode 100644 arch/mips/include/asm/netlogic/xlr/fmn.h + delete mode 100644 arch/mips/include/asm/netlogic/xlr/gpio.h + delete mode 100644 arch/mips/include/asm/netlogic/xlr/iomap.h + delete mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h + delete mode 100644 arch/mips/include/asm/netlogic/xlr/pic.h + delete mode 100644 arch/mips/include/asm/netlogic/xlr/xlr.h + delete mode 100644 arch/mips/netlogic/Kconfig + delete mode 100644 arch/mips/netlogic/Makefile + delete mode 100644 arch/mips/netlogic/Platform + delete mode 100644 arch/mips/netlogic/common/Makefile + delete mode 100644 arch/mips/netlogic/common/earlycons.c + delete mode 100644 arch/mips/netlogic/common/irq.c + delete mode 100644 arch/mips/netlogic/common/reset.S + delete mode 100644 arch/mips/netlogic/common/smp.c + delete mode 100644 arch/mips/netlogic/common/smpboot.S + delete mode 100644 arch/mips/netlogic/common/time.c + delete mode 100644 arch/mips/netlogic/xlp/Makefile + delete mode 100644 arch/mips/netlogic/xlp/ahci-init-xlp2.c + delete mode 100644 arch/mips/netlogic/xlp/ahci-init.c + delete mode 100644 arch/mips/netlogic/xlp/cop2-ex.c + delete mode 100644 arch/mips/netlogic/xlp/dt.c + delete mode 100644 arch/mips/netlogic/xlp/nlm_hal.c + delete mode 100644 arch/mips/netlogic/xlp/setup.c + delete mode 100644 arch/mips/netlogic/xlp/usb-init-xlp2.c + delete mode 100644 arch/mips/netlogic/xlp/usb-init.c + delete mode 100644 arch/mips/netlogic/xlp/wakeup.c + delete mode 100644 arch/mips/netlogic/xlr/Makefile + delete mode 100644 arch/mips/netlogic/xlr/fmn-config.c + delete mode 100644 arch/mips/netlogic/xlr/fmn.c + delete mode 100644 arch/mips/netlogic/xlr/platform-flash.c + delete mode 100644 arch/mips/netlogic/xlr/platform.c + delete mode 100644 arch/mips/netlogic/xlr/setup.c + delete mode 100644 arch/mips/netlogic/xlr/wakeup.c + delete mode 100644 arch/mips/pci/msi-xlp.c + delete mode 100644 arch/mips/pci/pci-xlp.c + delete mode 100644 arch/mips/pci/pci-xlr.c + create mode 100644 arch/powerpc/include/asm/static_call.h + create mode 100644 arch/powerpc/kernel/static_call.c + rename arch/powerpc/mm/nohash/{fsl_booke.c => fsl_book3e.c} (84%) + create mode 100644 arch/s390/include/asm/text-patching.h + create mode 100644 arch/s390/lib/test_kprobes.c + create mode 100644 arch/s390/lib/test_kprobes.h + create mode 100644 arch/s390/lib/test_kprobes_asm.S + create mode 100644 arch/xtensa/include/asm/sections.h + create mode 100644 drivers/auxdisplay/line-display.c + create mode 100644 drivers/auxdisplay/line-display.h + create mode 100644 drivers/hid/hid-nintendo.c + create mode 100644 drivers/hid/hid-xiaomi.c + create mode 100644 drivers/pci/controller/dwc/pcie-qcom-ep.c + create mode 100644 drivers/pci/controller/pcie-apple.c + rename drivers/{staging/mt7621-pci/pci-mt7621.c => pci/controller/pcie-mt7621.c} (95%) + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7986.c + create mode 100644 drivers/pinctrl/pinctrl-apple-gpio.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-qcm2290.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm6350.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-nx1.c + create mode 100644 drivers/scsi/ufs/ufs-hwmon.c + delete mode 100644 drivers/staging/mt7621-pci/Kconfig + delete mode 100644 drivers/staging/mt7621-pci/Makefile + delete mode 100644 drivers/staging/mt7621-pci/TODO + delete mode 100644 drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt + create mode 100644 fs/smbfs_common/smb2pdu.h + create mode 100644 include/uapi/linux/map_to_14segment.h + create mode 100644 mm/damon/paddr.c + create mode 100644 mm/damon/prmtv-common.c + create mode 100644 mm/damon/prmtv-common.h + create mode 100644 mm/damon/reclaim.c + create mode 100644 samples/fanotify/Makefile + create mode 100644 samples/fanotify/fs-monitor.c + create mode 100644 tools/testing/selftests/vm/hugepage-mremap.c +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 (b9cac915c541 ARC: thread_info.h: correct two typos in a comment) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/thread_info.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging arm-current/fixes (00568b8a6364 ARM: 9148/1: handle CONFIG_CPU_ENDIAN_BE32 in arch/arm/kernel/head.S) +$ 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 (596143e3aec3 acpi/arm64: fix next_platform_timer() section mismatch error) +$ 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 (76f79231666a Merge tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Auto-merging drivers/soc/fsl/dpio/qbman-portal.c +Auto-merging drivers/soc/fsl/dpio/dpio-service.c +Merge made by the 'recursive' strategy. + drivers/soc/fsl/dpaa2-console.c | 1 + + drivers/soc/fsl/dpio/dpio-service.c | 2 +- + drivers/soc/fsl/dpio/qbman-portal.c | 9 +++------ + 3 files changed, 5 insertions(+), 7 deletions(-) +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 (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (8bb7eca972ad Linux 5.15) +$ 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 (8b7216439e2e s390: add Alexander Gordeev as reviewer) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Already up to date. +Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (9fec40f85065 nfc: pn533: Fix double free when pn533_fill_fragment_skbs() fails) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/ipv4/tcp.c +Auto-merging mm/shmem.c +Auto-merging include/linux/fs.h +Auto-merging drivers/net/ethernet/marvell/prestera/prestera_pci.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.rst | 6 +- + Documentation/security/SCTP.rst | 65 +++++----- + MAINTAINERS | 5 +- + arch/riscv/mm/extable.c | 4 +- + arch/riscv/net/bpf_jit_comp64.c | 2 + + drivers/net/amt.c | 9 +- + drivers/net/bonding/bond_sysfs_slave.c | 36 ++---- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 6 +- + drivers/net/can/usb/etas_es58x/es58x_core.c | 6 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 27 ++-- + drivers/net/dsa/ocelot/felix.c | 9 +- + drivers/net/dsa/qca8k.c | 8 ++ + drivers/net/dsa/qca8k.h | 1 + + drivers/net/ethernet/asix/ax88796c_main.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 1 - + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 6 +- + drivers/net/ethernet/intel/ice/ice.h | 5 +- + drivers/net/ethernet/intel/ice/ice_base.c | 2 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 141 ++++++++++---------- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 5 + + drivers/net/ethernet/litex/litex_liteeth.c | 4 +- + drivers/net/ethernet/marvell/octeontx2/Kconfig | 1 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 4 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- + .../ethernet/marvell/prestera/prestera_ethtool.c | 3 +- + .../net/ethernet/marvell/prestera/prestera_hw.c | 144 ++++++++++++--------- + .../net/ethernet/marvell/prestera/prestera_main.c | 6 +- + .../net/ethernet/marvell/prestera/prestera_pci.c | 3 +- + drivers/net/ethernet/sfc/falcon/efx.c | 8 +- + drivers/net/ethernet/ti/davinci_emac.c | 16 ++- + drivers/net/phy/microchip_t1.c | 44 ++++++- + drivers/net/phy/phy.c | 7 +- + drivers/nfc/pn533/pn533.c | 6 +- + drivers/nfc/port100.c | 6 +- + fs/libfs.c | 29 ++++- + include/linux/dsa/ocelot.h | 1 + + include/linux/ethtool_netlink.h | 3 + + include/linux/fs.h | 2 + + include/linux/lsm_hook_defs.h | 6 +- + include/linux/lsm_hooks.h | 13 +- + include/linux/security.h | 17 ++- + include/linux/skbuff.h | 35 ++++- + include/net/llc.h | 4 +- + include/net/sctp/structs.h | 20 +-- + include/net/tcp.h | 8 +- + include/uapi/linux/ethtool_netlink.h | 4 +- + kernel/bpf/verifier.c | 18 +-- + mm/shmem.c | 24 +--- + net/8021q/vlan.c | 3 - + net/8021q/vlan_dev.c | 3 + + net/can/j1939/main.c | 7 + + net/can/j1939/transport.c | 11 ++ + net/core/datagram.c | 3 +- + net/core/devlink.c | 2 +- + net/core/skbuff.c | 17 +-- + net/core/sock.c | 2 +- + net/dsa/tag_ocelot.c | 3 + + net/ethtool/pause.c | 3 +- + net/ipv4/tcp.c | 22 +++- + net/ipv4/tcp_output.c | 27 ++-- + net/ipv6/seg6.c | 2 +- + net/ipv6/tcp_ipv6.c | 1 - + net/ipv6/udp.c | 6 +- + net/mctp/af_mctp.c | 24 +++- + net/netfilter/ipvs/ip_vs_ctl.c | 2 + + net/netfilter/nfnetlink_queue.c | 2 +- + net/nfc/netlink.c | 15 +++ + net/sctp/sm_statefuns.c | 34 ++--- + net/sctp/socket.c | 5 +- + net/smc/smc_tracepoint.h | 2 +- + security/security.c | 15 ++- + security/selinux/hooks.c | 34 +++-- + security/selinux/include/netlabel.h | 4 +- + security/selinux/netlabel.c | 18 +-- + tools/bpf/bpftool/Makefile | 32 +++-- + tools/lib/bpf/bpf.c | 4 +- + tools/testing/selftests/bpf/prog_tests/netcnt.c | 2 +- + .../testing/selftests/bpf/prog_tests/test_bpffs.c | 85 ++++++++++-- + .../selftests/bpf/test_xdp_redirect_multi.sh | 62 +++++---- + tools/testing/selftests/bpf/verifier/spill_fill.c | 17 +++ + tools/testing/selftests/bpf/xdp_redirect_multi.c | 4 +- + tools/testing/selftests/net/Makefile | 9 +- + tools/testing/selftests/net/gre_gso.sh | 9 +- + tools/testing/selftests/net/reuseport_bpf_numa.c | 4 + + tools/testing/selftests/net/tls.c | 3 - + 86 files changed, 813 insertions(+), 473 deletions(-) +Merging bpf/master (47b3708c6088 Merge branch 'bpf: Fix out-of-bound issue when jit-ing bpf_pseudo_func') +$ 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. + include/linux/bpf.h | 6 ++++ + kernel/bpf/core.c | 7 ++++ + kernel/bpf/verifier.c | 37 ++++++++-------------- + .../selftests/bpf/progs/for_each_array_map_elem.c | 12 +++++++ + 4 files changed, 39 insertions(+), 23 deletions(-) +Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/master (2199f562730d ipvs: autoload ipvs on genl access) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (2199f562730d ipvs: autoload ipvs on genl access) +$ 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 (603a1621caa0 mwifiex: avoid null-pointer-subtraction warning) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git wireless-drivers/master +Already up to date. +Merging mac80211/master (436014e860d3 Merge branch 'mctp-sockaddr-padding-check-initialisation-fixup') +$ 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 (4f960393a0ee RDMA/qedr: Fix NULL deref for query_qp on the GSI QP) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (8e537d5dec34 ALSA: PCM: Fix NULL dereference at mmap checks) +$ 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. + include/sound/memalloc.h | 14 +-- + sound/core/Makefile | 1 + + sound/core/memalloc.c | 58 ++-------- + sound/core/sgbuf.c | 201 +++++++++++++++++++++++++++++++++ + sound/core/timer.c | 17 ++- + sound/firewire/motu/motu-protocol-v3.c | 22 +++- + sound/firewire/motu/motu.c | 1 + + sound/firewire/motu/motu.h | 1 + + sound/pci/hda/patch_realtek.c | 16 +++ + 9 files changed, 264 insertions(+), 67 deletions(-) + create mode 100644 sound/core/sgbuf.c +Merging sound-asoc-fixes/for-linus (13b1ef781f41 Merge remote-tracking branch 'asoc/for-5.16' 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 +Merge made by the 'recursive' strategy. + sound/soc/codecs/cs35l41.c | 14 +-- + sound/soc/intel/boards/sof_sdw.c | 69 ++++++++++++++ + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 105 ++++++++++++++++++++++ + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 8 +- + sound/soc/soc-dapm.c | 29 ++++-- + sound/soc/sof/control.c | 8 +- + sound/soc/sof/intel/hda-bus.c | 17 ++++ + sound/soc/sof/intel/hda-dsp.c | 3 +- + sound/soc/sof/intel/hda.c | 16 ++++ + 9 files changed, 246 insertions(+), 23 deletions(-) +Merging regmap-fixes/for-linus (38a4b4fb7c73 Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus) +$ 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. +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (519d81956ee2 Linux 5.15-rc6) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (d81d0e41ed5f spi: spl022: fix Microwire full duplex mode) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (e4e737bb5c17 Linux 5.15-rc2) +$ 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 (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ 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 (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (e1959faf085b xhci: Fix USB 3.1 enumeration issues by increasing roothub power-on-good delay) +$ 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. + drivers/usb/core/hcd.c | 29 ++++++----------------------- + drivers/usb/host/xhci-hub.c | 3 ++- + drivers/usb/host/xhci.c | 1 - + include/linux/usb/hcd.h | 2 -- + 4 files changed, 8 insertions(+), 27 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 (519d81956ee2 Linux 5.15-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ 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 (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (b762f932ef0e iio: dln2: Check return value of devm_iio_trigger_register()) +$ 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/kxcjk-1013.c | 5 ++--- + drivers/iio/accel/kxsd9.c | 6 +++--- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/adc/dln2-adc.c | 21 ++++++++++++--------- + drivers/iio/adc/stm32-adc.c | 1 + + drivers/iio/industrialio-trigger.c | 1 - + drivers/iio/light/ltr501.c | 2 +- + drivers/iio/light/stk3310.c | 6 +++--- + 8 files changed, 23 insertions(+), 21 deletions(-) +Merging char-misc.current/char-misc-linus (a4119be4370e Merge tag 'coresight-fixes-v5.16' of gitolite.kernel.org:pub/scm/linux/kernel/git/coresight/linux into char-misc-linus) +$ 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. + arch/arm64/kernel/cpufeature.c | 1 + + 1 file changed, 1 insertion(+) +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 (8bb7eca972ad Linux 5.15) +$ 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 (a02dcde595f7 Input: touchscreen - avoid bitwise vs logical OR warning) +$ 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 (39ef08517082 crypto: testmgr - fix wrong key length for pkcs1pad) +$ 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 (42de956ca7e5 vfio/ap_ops: Add missed vfio_uninit_group_dev()) +$ 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 (519d81956ee2 Linux 5.15-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (0d67e332e6df module: fix clang CFI with MODULE_UNLOAD=n) +$ 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 +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (206704a1fe0b media: atomisp: restore missing 'return' statement) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (3ad60b4b3570 reset: socfpga: add empty driver allowing consumers to probe) +$ 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 (740da9d7ca4e MIPS: Revert "add support for buggy MT7621S core detection") +$ 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 (dbe68bc9e82b ARM: dts: at91: sama7g5ek: to not touch slew-rate for SDMMC pins) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (ca5e83eddc8b Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ 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 (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu) +$ 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 (ada61aa0b118 hwmon: Fix possible memleak in __hwmon_device_register()) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount) +$ 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 (ba9bc05f3655 Merge tag 'v5.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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (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 (7df227847ab5 platform/x86: int1092: Fix non sequential device mode handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (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 (b2d70c0dbf27 dt-bindings: drm/bridge: ti-sn65dsi86: Fix reg value) +$ 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 (09d9e4d04187 scsi: ufs: ufshpb: Remove HPB2.0 flows) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (8bb7eca972ad Linux 5.15) +$ 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 (8bb7eca972ad Linux 5.15) +$ 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 (90935eb303e0 mmc: tmio: reenable card irqs after the reset callback) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the '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 (c1ea031dc8a8 Drivers: hv: balloon: Use VMBUS_RING_SIZE() wrapper for dm_ring_size) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/hv/hv_balloon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Auto-merging drivers/soc/fsl/dpio/qbman-portal.c +Merge made by the 'recursive' strategy. + drivers/soc/fsl/dpio/qbman-portal.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) +Merging risc-v-fixes/fixes (54c5639d8f50 riscv: Fix asan-stack clang build) +$ 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 (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (d4439a1189f9 Merge tag 'hsi-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi) +$ 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 (c0eee6fbfa2b gpio: mlxbf2.c: Add check for bgpio_init failure) +$ 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 (8bb7eca972ad Linux 5.15) +$ 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 (8bb7eca972ad Linux 5.15) +$ 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 (c186b38dc7f9 erofs: fix unsafe pagevec reuse of hooked pclusters) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Auto-merging fs/erofs/zdata.c +Merge made by the 'recursive' strategy. + fs/erofs/zdata.c | 13 +++++++------ + fs/erofs/zpvec.h | 13 ++++++++++--- + 2 files changed, 17 insertions(+), 9 deletions(-) +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 (519d81956ee2 Linux 5.15-rc6) +$ 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 (b484d7f223db arm64: Track no early_pgtable_alloc() for kmemleak) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/mm/kasan_init.c | 2 +- + arch/arm64/mm/kasan_init.c | 5 +++-- + arch/arm64/mm/mmu.c | 3 ++- + include/linux/memblock.h | 2 +- + mm/memblock.c | 9 ++++++--- + 5 files changed, 13 insertions(+), 8 deletions(-) +Merging cel-fixes/for-rc (8bb7eca972ad Linux 5.15) +$ 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 (4d7a0f5ebd8d irqchip/sifive-plic: Fixup EOI failed when masked) +$ 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. + drivers/irqchip/irq-csky-mpintc.c | 8 ++++---- + drivers/irqchip/irq-sifive-plic.c | 8 +++++++- + 2 files changed, 11 insertions(+), 5 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 (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (38fa3206bf44 efi: Change down_interruptible() in virt_efi_reset_system() to down_trylock()) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (f55aaf63bde0 drm/nouveau: clean up all clients on device removal) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/nouveau/nouveau_svm.c +Auto-merging drivers/gpu/drm/drm_prime.c +Auto-merging drivers/dma-buf/dma-buf.c +Merge made by the 'recursive' strategy. + drivers/dma-buf/dma-buf.c | 3 ++ + drivers/gpu/drm/drm_prime.c | 6 ++-- + drivers/gpu/drm/nouveau/nouveau_drm.c | 42 ++++++++++++++++++++--- + drivers/gpu/drm/nouveau/nouveau_drv.h | 5 +++ + drivers/gpu/drm/nouveau/nouveau_svm.c | 4 +++ + drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 +- + 7 files changed, 55 insertions(+), 10 deletions(-) +Merging kbuild/for-next (7c5c49dc2b80 [for -next only] kconfig: generate include/generated/rustc_cfg) +$ 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/link-vmlinux.sh +Auto-merging scripts/Makefile.lib +Auto-merging arch/x86/Makefile +Auto-merging arch/riscv/Makefile +Auto-merging arch/powerpc/Makefile +Auto-merging arch/arm/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.rst | 17 +- + Makefile | 41 +--- + arch/alpha/Kbuild | 3 + + arch/alpha/Makefile | 3 - + arch/arc/Kbuild | 3 + + arch/arc/Makefile | 3 - + arch/arm/Kbuild | 3 + + arch/arm/Makefile | 4 - + arch/arm64/Kbuild | 3 + + arch/arm64/Makefile | 7 - + arch/arm64/kernel/Makefile | 3 + + arch/arm64/lib/Makefile | 2 + + arch/csky/Kbuild | 3 + + arch/csky/Makefile | 3 - + arch/h8300/Kbuild | 3 + + arch/h8300/Makefile | 3 - + arch/ia64/Makefile | 2 - + arch/m68k/Makefile | 4 +- + arch/microblaze/Kbuild | 3 + + arch/microblaze/Makefile | 3 - + arch/mips/Kbuild | 3 + + arch/mips/Makefile | 8 +- + arch/mips/boot/Makefile | 3 + + arch/nds32/Kbuild | 3 + + arch/nds32/Makefile | 5 +- + arch/nios2/Kbuild | 3 + + arch/nios2/Makefile | 9 +- + arch/nios2/boot/Makefile | 3 - + arch/openrisc/Kbuild | 3 + + arch/openrisc/Makefile | 7 +- + arch/parisc/Kbuild | 3 + + arch/parisc/Makefile | 7 +- + arch/powerpc/Kbuild | 3 + + arch/powerpc/Makefile | 7 +- + arch/powerpc/lib/Makefile | 2 + + arch/riscv/Kbuild | 3 + + arch/riscv/Makefile | 7 +- + arch/s390/Kbuild | 3 + + arch/s390/Makefile | 8 +- + arch/sh/Kbuild | 3 + + arch/sh/Makefile | 4 - + arch/sparc/Kbuild | 3 + + arch/sparc/Makefile | 3 - + arch/sparc/boot/Makefile | 8 +- + arch/x86/Kbuild | 3 + + arch/x86/Makefile | 2 - + arch/xtensa/Makefile | 4 +- + crypto/Makefile | 2 + + lib/raid6/Makefile | 4 + + scripts/Makefile.build | 63 ++--- + scripts/Makefile.debug | 33 +++ + scripts/Makefile.lib | 11 - + scripts/Makefile.package | 10 +- + scripts/kconfig/conf.c | 15 +- + scripts/kconfig/confdata.c | 468 +++++++++++++++++++++---------------- + scripts/kconfig/lexer.l | 9 +- + scripts/kconfig/lkc_proto.h | 2 +- + scripts/kconfig/menu.c | 33 +-- + scripts/kconfig/symbol.c | 43 ---- + scripts/link-vmlinux.sh | 6 +- + scripts/package/buildtar | 4 + + usr/gen_init_cpio.c | 20 +- + 62 files changed, 487 insertions(+), 472 deletions(-) + create mode 100644 scripts/Makefile.debug +Merging perf/perf/core (6b491a86b77c perf build: Install libbpf headers locally when building) +$ 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/arch/powerpc/include/uapi/asm/perf_regs.h | 28 +- + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 12 +- + tools/build/feature/test-libtracefs.c | 10 + + tools/include/linux/list_sort.h | 14 + + tools/include/uapi/linux/perf_event.h | 15 + + tools/lib/list_sort.c | 252 ++++ + tools/lib/perf/cpumap.c | 16 +- + tools/lib/perf/include/perf/event.h | 6 + + tools/perf/Documentation/itrace.txt | 2 + + tools/perf/Documentation/perf-inject.txt | 7 + + tools/perf/Documentation/perf-intel-pt.txt | 35 +- + tools/perf/Documentation/perf-kmem.txt | 13 +- + tools/perf/Documentation/perf-list.txt | 4 + + tools/perf/Documentation/perf-record.txt | 16 + + tools/perf/Documentation/perf-script.txt | 2 +- + tools/perf/Documentation/perf.data-file-format.txt | 2 +- + tools/perf/MANIFEST | 4 + + tools/perf/Makefile.config | 23 +- + tools/perf/Makefile.perf | 36 +- + tools/perf/arch/arm64/util/pmu.c | 2 +- + tools/perf/arch/powerpc/include/perf_regs.h | 2 + + tools/perf/arch/powerpc/util/header.c | 2 +- + tools/perf/arch/powerpc/util/kvm-stat.c | 5 +- + tools/perf/arch/powerpc/util/perf_regs.c | 2 + + tools/perf/arch/riscv64/annotate/instructions.c | 34 + + tools/perf/arch/x86/annotate/instructions.c | 28 +- + tools/perf/arch/x86/util/evsel.c | 23 + + tools/perf/bench/evlist-open-close.c | 15 +- + tools/perf/bench/futex.h | 43 +- + tools/perf/bench/synthesize.c | 4 +- + tools/perf/builtin-annotate.c | 4 + + tools/perf/builtin-c2c.c | 4 + + tools/perf/builtin-daemon.c | 15 +- + tools/perf/builtin-inject.c | 11 +- + tools/perf/builtin-kvm.c | 2 +- + tools/perf/builtin-list.c | 42 +- + tools/perf/builtin-probe.c | 5 + + tools/perf/builtin-record.c | 52 +- + tools/perf/builtin-report.c | 13 +- + tools/perf/builtin-sched.c | 4 + + tools/perf/builtin-script.c | 17 +- + tools/perf/builtin-stat.c | 46 +- + tools/perf/builtin-top.c | 6 +- + tools/perf/builtin-trace.c | 23 +- + tools/perf/check-headers.sh | 2 + + tools/perf/dlfilters/dlfilter-show-cycles.c | 144 ++ + .../pmu-events/arch/arm64/ampere/emag/bus.json | 2 +- + .../pmu-events/arch/arm64/ampere/emag/cache.json | 20 +- + .../pmu-events/arch/arm64/ampere/emag/clock.json | 2 +- + .../arch/arm64/ampere/emag/exception.json | 4 +- + .../arch/arm64/ampere/emag/instruction.json | 10 +- + .../pmu-events/arch/arm64/ampere/emag/memory.json | 4 +- + .../arch/arm64/arm/cortex-a76-n1/branch.json | 4 +- + .../arch/arm64/arm/cortex-a76-n1/bus.json | 12 +- + .../arch/arm64/arm/cortex-a76-n1/cache.json | 34 +- + .../arch/arm64/arm/cortex-a76-n1/exception.json | 4 +- + .../arch/arm64/arm/cortex-a76-n1/instruction.json | 18 +- + .../arch/arm64/arm/cortex-a76-n1/memory.json | 2 +- + .../arch/arm64/arm/cortex-a76-n1/other.json | 2 +- + .../arch/arm64/arm/cortex-a76-n1/pipeline.json | 4 +- + .../arch/arm64/arm/neoverse-v1/branch.json | 8 + + .../pmu-events/arch/arm64/arm/neoverse-v1/bus.json | 20 + + .../arch/arm64/arm/neoverse-v1/cache.json | 155 +++ + .../arch/arm64/arm/neoverse-v1/exception.json | 47 + + .../arch/arm64/arm/neoverse-v1/instruction.json | 89 ++ + .../arch/arm64/arm/neoverse-v1/memory.json | 20 + + .../arch/arm64/arm/neoverse-v1/other.json | 5 + + .../arch/arm64/arm/neoverse-v1/pipeline.json | 23 + + .../arch/arm64/armv8-common-and-microarch.json | 72 + + .../arch/arm64/hisilicon/hip08/metrics.json | 2 +- + .../arch/arm64/hisilicon/hip08/uncore-ddrc.json | 32 +- + .../arch/arm64/hisilicon/hip08/uncore-hha.json | 120 +- + .../arch/arm64/hisilicon/hip08/uncore-l3c.json | 52 +- + tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 + + tools/perf/pmu-events/arch/nds32/n13/atcpmu.json | 2 +- + tools/perf/pmu-events/arch/s390/cf_z10/basic.json | 2 +- + tools/perf/pmu-events/arch/s390/cf_z10/crypto.json | 2 +- + .../perf/pmu-events/arch/s390/cf_z10/extended.json | 2 +- + tools/perf/pmu-events/arch/s390/cf_z13/basic.json | 2 +- + tools/perf/pmu-events/arch/s390/cf_z13/crypto.json | 2 +- + .../perf/pmu-events/arch/s390/cf_z13/extended.json | 2 +- + tools/perf/pmu-events/arch/s390/cf_z14/basic.json | 2 +- + tools/perf/pmu-events/arch/s390/cf_z14/crypto.json | 2 +- + .../perf/pmu-events/arch/s390/cf_z14/extended.json | 2 +- + tools/perf/pmu-events/arch/s390/cf_z15/basic.json | 2 +- + tools/perf/pmu-events/arch/s390/cf_z15/crypto.json | 2 +- + .../perf/pmu-events/arch/s390/cf_z15/crypto6.json | 2 +- + .../perf/pmu-events/arch/s390/cf_z15/extended.json | 2 +- + tools/perf/pmu-events/arch/s390/cf_z196/basic.json | 2 +- + .../perf/pmu-events/arch/s390/cf_z196/crypto.json | 2 +- + .../pmu-events/arch/s390/cf_z196/extended.json | 2 +- + .../perf/pmu-events/arch/s390/cf_zec12/basic.json | 2 +- + .../perf/pmu-events/arch/s390/cf_zec12/crypto.json | 2 +- + .../pmu-events/arch/s390/cf_zec12/extended.json | 2 +- + .../pmu-events/arch/test/test_soc/cpu/uncore.json | 2 +- + .../pmu-events/arch/test/test_soc/sys/uncore.json | 7 + + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 2 +- + tools/perf/pmu-events/jevents.c | 32 +- + tools/perf/pmu-events/jsmn.c | 43 +- + tools/perf/pmu-events/pmu-events.h | 8 +- + tools/perf/tests/backward-ring-buffer.c | 3 +- + tools/perf/tests/bpf.c | 3 +- + tools/perf/tests/code-reading.c | 3 +- + tools/perf/tests/expand-cgroup.c | 6 +- + tools/perf/tests/expr.c | 163 ++- + tools/perf/tests/mmap-thread-lookup.c | 4 +- + tools/perf/tests/parse-events.c | 14 +- + tools/perf/tests/parse-metric.c | 2 +- + tools/perf/tests/pmu-events.c | 206 ++- + tools/perf/tests/sample-parsing.c | 43 +- + .../tests/shell/record+script_probe_vfs_getname.sh | 6 +- + tools/perf/tests/shell/stat_all_metricgroups.sh | 12 + + tools/perf/tests/shell/stat_all_metrics.sh | 22 + + tools/perf/tests/shell/stat_all_pmu.sh | 22 + + tools/perf/tests/shell/test_arm_coresight.sh | 11 +- + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 4 +- + tools/perf/tests/topology.c | 2 + + tools/perf/tests/vmlinux-kallsyms.c | 102 ++ + tools/perf/trace/beauty/include/linux/socket.h | 2 + + tools/perf/util/Build | 6 + + tools/perf/util/annotate.c | 9 +- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.c | 2 +- + tools/perf/util/auxtrace.c | 3 + + tools/perf/util/auxtrace.h | 6 + + tools/perf/util/bpf-event.c | 45 +- + tools/perf/util/bpf-event.h | 2 +- + tools/perf/util/bpf-utils.c | 261 ++++ + tools/perf/util/bpf-utils.h | 76 + + tools/perf/util/bpf_counter.c | 14 +- + tools/perf/util/bpf_counter_cgroup.c | 8 +- + tools/perf/util/c++/clang.cpp | 21 +- + tools/perf/util/data-convert-bt.c | 2 +- + tools/perf/util/debug.c | 19 + + tools/perf/util/dso.c | 1 + + tools/perf/util/dso.h | 2 +- + tools/perf/util/env.c | 1 + + tools/perf/util/event.c | 18 + + tools/perf/util/event.h | 5 + + tools/perf/util/evsel.c | 133 +- + tools/perf/util/evsel.h | 20 + + tools/perf/util/evsel_fprintf.c | 12 +- + tools/perf/util/expr.c | 159 ++- + tools/perf/util/expr.h | 34 +- + tools/perf/util/expr.l | 15 +- + tools/perf/util/expr.y | 325 +++-- + tools/perf/util/genelf.h | 2 +- + tools/perf/util/header.c | 13 +- + tools/perf/util/intel-bts.c | 2 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 1 + + .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 1 + + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 2 +- + tools/perf/util/intel-pt-decoder/intel-pt-log.c | 8 +- + .../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 2 +- + tools/perf/util/intel-pt.c | 106 +- + tools/perf/util/machine.c | 10 + + tools/perf/util/machine.h | 2 + + tools/perf/util/metricgroup.c | 1454 ++++++++++++-------- + tools/perf/util/metricgroup.h | 37 +- + tools/perf/util/mmap.c | 11 + + tools/perf/util/mmap.h | 3 + + tools/perf/util/parse-events-hybrid.c | 34 +- + tools/perf/util/parse-events-hybrid.h | 6 +- + tools/perf/util/parse-events.c | 392 ++++-- + tools/perf/util/parse-events.h | 27 +- + tools/perf/util/parse-events.l | 19 +- + tools/perf/util/parse-events.y | 27 +- + tools/perf/util/pfm.c | 3 +- + tools/perf/util/pmu.c | 59 +- + tools/perf/util/pmu.h | 16 +- + tools/perf/util/python-ext-sources | 1 + + tools/perf/util/python.c | 12 + + tools/perf/util/record.h | 1 + + tools/perf/util/s390-cpumsf.c | 8 +- + tools/perf/util/s390-sample-raw.c | 6 +- + tools/perf/util/session.c | 198 ++- + tools/perf/util/session.h | 10 +- + tools/perf/util/srcline.c | 338 +++-- + tools/perf/util/stat-shadow.c | 76 +- + tools/perf/util/symbol.c | 26 + + tools/perf/util/symbol.h | 2 + + tools/perf/util/synthetic-events.c | 73 +- + tools/perf/util/synthetic-events.h | 20 +- + tools/perf/util/tool.h | 1 + + 184 files changed, 5083 insertions(+), 1705 deletions(-) + create mode 100644 tools/build/feature/test-libtracefs.c + create mode 100644 tools/include/linux/list_sort.h + create mode 100644 tools/lib/list_sort.c + create mode 100644 tools/perf/arch/riscv64/annotate/instructions.c + create mode 100644 tools/perf/dlfilters/dlfilter-show-cycles.c + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/instruction.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/other.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/pipeline.json + create mode 100755 tools/perf/tests/shell/stat_all_metricgroups.sh + create mode 100755 tools/perf/tests/shell/stat_all_metrics.sh + create mode 100755 tools/perf/tests/shell/stat_all_pmu.sh + create mode 100644 tools/perf/util/bpf-utils.c + create mode 100644 tools/perf/util/bpf-utils.h +Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (9fbd8dc19aa5 dma-mapping: use 'bitmap_zalloc()' when applicable) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 3 +- + arch/sparc/kernel/ioport.c | 76 +++++----------------------------------------- + kernel/dma/coherent.c | 5 ++- + 3 files changed, 12 insertions(+), 72 deletions(-) +Merging asm-generic/master (7efbbe6e1414 qcom_scm: hide Kconfig symbol) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging drivers/pinctrl/qcom/Kconfig +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/media/platform/Kconfig +Auto-merging drivers/iommu/Kconfig +Auto-merging drivers/gpu/drm/msm/Kconfig +Auto-merging drivers/firmware/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/riscv/include/asm/syscall.h +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ddfa624d7032] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git +$ git diff -M --stat --summary HEAD^.. + 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 (2aa8f79c7509 Merge branch 'devel-stable' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (e6359798f62d Merge branch 'for-next/fixes' into for-next/core) +$ 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 (e656972b6986 drivers/perf: Improve build test coverage) +$ 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 (76f79231666a Merge tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes) +$ 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 (83e38509109e 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (9d4a146c082c Merge branches 'dt-for-v5.16' and 'defconfig-for-v5.16' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging at91/at91-next (f3c0366411d6 ARM: dts: at91: sama7g5-ek: use blocks 0 and 1 of TCB0 as cs and ce) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Already up to date. +Merging drivers-memory/for-next (0fcbc3b7bcea Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (8bd7cd1cc7f0 Merge branch 'imx/maintainers' 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 (0efac36e9559 Merge branch 'v5.16-tmp/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mvebu/for-next (04e78a787b74 arm/arm64: dts: Enable 2.5G Ethernet port on CN9130-CRB) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging omap/for-next (92d190433bd8 Merge branch 'omap-for-v5.16/gpmc' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging qcom/for-next (bbe9515ab088 Merge branches 'arm64-defconfig-for-5.16', '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 +Merge made by the 'recursive' strategy. +Merging raspberrypi/for-next (a036b0a5d7d6 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. +Merging renesas/next (525a6b4bd53f Merge branch 'renesas-arm-dt-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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging reset/reset/next (8c81620ac1ac reset: mchp: sparx5: Extend support for lan966x) +$ 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 (cc3bcb015bb1 Merge branch 'v5.16-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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (0d5808cf190b Merge branch 'next/dt64' 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/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 4 ++-- + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +- + arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 10 +++------- + arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 7 +------ + 4 files changed, 7 insertions(+), 16 deletions(-) +Merging scmi/for-linux-next (9c8df6432a73 Merge branch 'for-next/ffa' 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. + drivers/firmware/arm_scmi/virtio.c | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) +Merging stm32/stm32-next (d4b3aaf0f90b ARM: dts: stm32: use usbphyc ck_usbo_48m as USBH OHCI clock on stm32mp151) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/stm32mp151.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (7fb77af71236 Merge branch 'sunxi/dt-for-5.16' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging tegra/for-next (bbd827b4de7e Merge branch for-5.16/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'recursive' strategy. + drivers/firmware/tegra/bpmp-debugfs.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +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 (f46d16cf5b43 arm64: dts: ti: k3-j721e-sk: Add DDR carveout memory nodes) +$ 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 +Already up to date. +Merging xilinx/for-next (326b5e9db528 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging drivers/firmware/xilinx/zynqmp.c +Merge made by the 'recursive' strategy. + drivers/firmware/xilinx/zynqmp.c | 5 +- + drivers/soc/xilinx/zynqmp_pm_domains.c | 91 +++++++++++++++++++--------------- + drivers/soc/xilinx/zynqmp_power.c | 1 - + 3 files changed, 55 insertions(+), 42 deletions(-) +Merging clk/clk-next (05cf3ec00d46 clk: qcom: gcc-msm8996: Drop (again) gcc_aggre1_pnoc_ahb_clk) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'recursive' strategy. + .../bindings/clock/sifive/fu740-prci.yaml | 4 ++ + .../devicetree/bindings/clock/silabs,si5351.txt | 2 +- + .../bindings/clock/socionext,uniphier-clock.yaml | 6 +++ + drivers/clk/actions/owl-factor.c | 1 - + drivers/clk/clk-ast2600.c | 12 +++--- + drivers/clk/clk-composite.c | 1 + + drivers/clk/clk-si5351.c | 8 ++-- + drivers/clk/clk-si5351.h | 2 +- + drivers/clk/clk-versaclock5.c | 4 +- + drivers/clk/imx/clk.h | 4 +- + drivers/clk/ingenic/cgu.c | 6 +-- + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 2 - + drivers/clk/qcom/gcc-msm8996.c | 15 ------- + drivers/clk/rockchip/Kconfig | 4 +- + drivers/clk/rockchip/clk-rk3399.c | 6 +-- + drivers/clk/rockchip/clk-rk3568.c | 6 +-- + drivers/clk/uniphier/clk-uniphier-core.c | 17 ++++++++ + drivers/clk/uniphier/clk-uniphier-sys.c | 47 ++++++++++++++++++++++ + drivers/clk/uniphier/clk-uniphier.h | 6 +++ + 19 files changed, 105 insertions(+), 48 deletions(-) +Merging clk-imx/for-next (e8271eff5d8c clk: imx: Make CLK_IMX8ULP select MXC_CLK) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (2bd9feed2316 clk: renesas: r8a779[56]x: Add MLP clocks) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (651521d396a8 clk: samsung: remove __clk_lookup() usage) +$ 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-exynos4.c | 18 ++++++++++-------- + drivers/clk/samsung/clk-exynos5250.c | 10 +++++----- + drivers/clk/samsung/clk-exynos5420.c | 2 +- + drivers/clk/samsung/clk-s3c2410.c | 6 ++++-- + drivers/clk/samsung/clk-s3c64xx.c | 8 ++++++-- + drivers/clk/samsung/clk-s5pv210.c | 8 ++++++-- + drivers/clk/samsung/clk.c | 14 -------------- + drivers/clk/samsung/clk.h | 2 -- + include/dt-bindings/clock/exynos4.h | 4 +++- + include/dt-bindings/clock/exynos5250.h | 4 +++- + 10 files changed, 38 insertions(+), 38 deletions(-) +Merging csky/linux-next (e21e52ad1e01 csky: Make HAVE_TCM depend on !COMPILE_TEST) +$ 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/include/asm/processor.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 (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (6dbe88e93c35 m68knommu: Remove MCPU32 config symbol) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.cpu | 11 ----------- + arch/m68k/Kconfig.machine | 1 + + arch/m68k/include/asm/bitops.h | 2 +- + 3 files changed, 2 insertions(+), 12 deletions(-) +Merging microblaze/next (43bdcbd50043 microblaze: timer: Remove unused properties) +$ 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 (36de23a4c5f0 MIPS: Cobalt: Explain GT64111 early PCI fixup) +$ 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 +Auto-merging arch/nds32/Kbuild +CONFLICT (content): Merge conflict in arch/nds32/Kbuild +Resolved 'arch/nds32/Kbuild' using previous resolution. +Resolved 'arch/nds32/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 238a5dd7079c] 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 (27dff9a9c247 openrisc: fix SMP tlb flush NULL pointer dereference) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Auto-merging arch/openrisc/kernel/smp.c +Merge made by the 'recursive' strategy. + arch/openrisc/kernel/dma.c | 4 ++-- + arch/openrisc/kernel/signal.c | 2 -- + arch/openrisc/kernel/smp.c | 6 ++++-- + arch/openrisc/kernel/time.c | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) +Merging parisc-hd/for-next (5df5ac6a39f2 parisc: Fix code/instruction patching on PA1.x machines) +$ 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 +Merge made by the 'recursive' strategy. + arch/parisc/kernel/patch.c | 5 +++-- + arch/parisc/kernel/vmlinux.lds.S | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging powerpc/next (c12ab8dbc492 powerpc/8xx: Fix Oops with STRICT_KERNEL_RWX without DEBUG_RODATA_TEST) +$ 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 (54c8b5b6f8a8 soc: fsl: dpio: rename the enqueue descriptor variable) +$ 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 (ffa7a9141bb7 riscv: defconfig: enable DRM_NOUVEAU) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/kernel/head.S +Auto-merging arch/riscv/Makefile +CONFLICT (content): Merge conflict in arch/riscv/Makefile +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Resolved 'arch/riscv/Kconfig' using previous resolution. +Resolved 'arch/riscv/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1783aee9c605] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 10 + + .../dts/microchip/microchip-mpfs-icicle-kit.dts | 18 +- + arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 36 +-- + arch/riscv/configs/32-bit.config | 2 + + arch/riscv/configs/64-bit.config | 2 + + arch/riscv/configs/defconfig | 7 +- + arch/riscv/include/asm/page.h | 2 + + arch/riscv/include/asm/pgtable.h | 6 +- + arch/riscv/include/asm/vdso.h | 13 +- + arch/riscv/include/asm/vdso/gettimeofday.h | 7 + + arch/riscv/kernel/head.S | 12 + + arch/riscv/kernel/reset.c | 12 +- + arch/riscv/kernel/vdso.c | 250 ++++++++++++++++----- + arch/riscv/kernel/vdso/vdso.lds.S | 3 + + arch/riscv/kernel/vmlinux-xip.lds.S | 10 +- + arch/riscv/mm/context.c | 8 +- + arch/riscv/mm/init.c | 7 +- + 18 files changed, 285 insertions(+), 121 deletions(-) + create mode 100644 arch/riscv/configs/32-bit.config + create mode 100644 arch/riscv/configs/64-bit.config +Merging s390/for-next (4ab5b2549146 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Auto-merging arch/sh/boot/Makefile +Merge made by the 'recursive' strategy. + arch/sh/Kconfig | 1 - + arch/sh/Kconfig.debug | 1 + + 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/irq.h | 11 --- + arch/sh/include/asm/sfp-machine.h | 8 ++ + 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 | 147 ++++++------------------------------- + arch/sh/mm/nommu.c | 4 +- + drivers/sh/maple/maple.c | 5 +- + 21 files changed, 78 insertions(+), 180 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 (ab6ff1fda1e8 uml: x86: add FORCE to user_constants.h) +$ 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 ++++---- + arch/x86/um/Makefile | 2 +- + 8 files changed, 16 insertions(+), 16 deletions(-) +Merging xtensa/xtensa-for-next (bd47cdb78997 xtensa: move section symbols to asm/sections.h) +$ 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 (61bc346ce64a uapi/linux/prctl: provide macro definitions for the PR_SCHED_CORE type argument) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging kernel/sched/core_sched.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/hw-vuln/core-scheduling.rst | 5 +++-- + include/uapi/linux/prctl.h | 3 +++ + kernel/sched/core_sched.c | 4 ++++ + 3 files changed, 10 insertions(+), 2 deletions(-) +Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments) +$ 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 (8bb7eca972ad Linux 5.15) +$ 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 (52af7105eceb afs: Set mtime from the client for yfs create operations) +$ 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 (ec522ac87632 Merge branch 'for-next-resolved' into for-next-20211102) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging ceph/master (324bfaa1a6cc libceph: drop ->monmap and err initialization) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/addr.c | 13 +------------ + net/ceph/mon_client.c | 3 +-- + 2 files changed, 2 insertions(+), 14 deletions(-) +Merging cifs/for-next (c9f1c19cf7c5 cifs: nosharesock should not share socket with future sessions) +$ 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/cifs_debug.c | 2 ++ + fs/cifs/cifsglob.h | 1 + + fs/cifs/connect.c | 8 +++++++- + 3 files changed, 10 insertions(+), 1 deletion(-) +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 (a0961f351d82 erofs: don't trigger WARN() when decompression fails) +$ 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 (0df2d764b979 exfat: reuse exfat_inode_info variable instead of calling EXFAT_I()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/dir.c | 6 +++--- + fs/exfat/exfat_fs.h | 2 -- + fs/exfat/fatent.c | 4 +--- + fs/exfat/file.c | 14 +++++++------- + fs/exfat/inode.c | 11 +++++------ + fs/exfat/namei.c | 6 +++--- + fs/exfat/super.c | 6 +++--- + 7 files changed, 22 insertions(+), 27 deletions(-) +Merging ext3/for_next (697a6e3118ed Pull a few fixups for filesystem error reporting series.) +$ 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 (124e7c61deb2 ext4: fix error code saved on super block during file system abort) +$ 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/super.c +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 3 +- + fs/ext4/extents.c | 175 +++++++++++++++----------- + fs/ext4/fast_commit.c | 11 +- + fs/ext4/inode.c | 331 ++++++++++++++++++++++++++------------------------ + fs/ext4/mballoc.c | 5 +- + fs/ext4/namei.c | 2 +- + fs/ext4/page-io.c | 8 +- + fs/ext4/super.c | 15 +-- + 8 files changed, 300 insertions(+), 250 deletions(-) +Merging f2fs/dev (261f6940554a F2FS: invalidate META_MAPPING before IPU/DIO write) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/compress.c +Auto-merging Documentation/filesystems/f2fs.rst +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 16 ++++++ + Documentation/filesystems/f2fs.rst | 19 +++++++ + fs/f2fs/checkpoint.c | 8 ++- + fs/f2fs/compress.c | 20 +++++++ + fs/f2fs/data.c | 95 +++++++++++++++++++++++++-------- + fs/f2fs/f2fs.h | 54 ++++++++++++++++--- + fs/f2fs/file.c | 6 +-- + fs/f2fs/gc.c | 5 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/namei.c | 32 +++++------ + fs/f2fs/node.c | 1 + + fs/f2fs/node.h | 5 -- + fs/f2fs/recovery.c | 14 ++--- + fs/f2fs/segment.c | 83 +++++++++++++++++++++------- + fs/f2fs/segment.h | 1 + + fs/f2fs/super.c | 37 ++++++++++++- + fs/f2fs/sysfs.c | 24 ++++++++- + fs/f2fs/verity.c | 2 +- + fs/f2fs/xattr.c | 2 +- + include/trace/events/f2fs.h | 33 ++++++++---- + 21 files changed, 357 insertions(+), 106 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 (712a951025c0 fuse: fix page stealing) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/dax.c | 5 +- + fs/fuse/dev.c | 24 ++++++--- + fs/fuse/dir.c | 128 ++++++++++++++++++++++------------------------ + fs/fuse/file.c | 106 ++++++++++++++++++++------------------ + fs/fuse/fuse_i.h | 17 ++++-- + fs/fuse/inode.c | 45 +++++++++++++--- + fs/fuse/ioctl.c | 4 +- + fs/fuse/readdir.c | 6 +-- + fs/fuse/virtio_fs.c | 2 +- + fs/fuse/xattr.c | 10 ++-- + include/uapi/linux/fuse.h | 7 ++- + 11 files changed, 203 insertions(+), 151 deletions(-) +Merging gfs2/for-next (f3506eee81d1 gfs2: Fix length of holes reported at end-of-file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 2 +- + fs/gfs2/file.c | 6 +++--- + fs/gfs2/glock.c | 8 ++------ + fs/gfs2/super.c | 14 +++++++------- + 4 files changed, 13 insertions(+), 17 deletions(-) +Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (79364beea4d1 ksmbd: Use the SMB3_Create definitions from the shared) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'recursive' strategy. + fs/ksmbd/Kconfig | 2 +- + fs/ksmbd/auth.c | 11 +- + fs/ksmbd/connection.c | 11 +- + fs/ksmbd/ksmbd_work.c | 1 - + fs/ksmbd/ksmbd_work.h | 4 +- + fs/ksmbd/oplock.c | 48 ++-- + fs/ksmbd/oplock.h | 2 - + fs/ksmbd/server.c | 2 +- + fs/ksmbd/smb2misc.c | 16 +- + fs/ksmbd/smb2ops.c | 9 +- + fs/ksmbd/smb2pdu.c | 591 +++++++++++++++++++-------------------- + fs/ksmbd/smb2pdu.h | 696 ++-------------------------------------------- + fs/ksmbd/smb_common.c | 13 +- + fs/ksmbd/smb_common.h | 55 +--- + fs/ksmbd/transport_rdma.c | 3 +- + fs/ksmbd/vfs.c | 8 +- + fs/ksmbd/vfs.h | 39 --- + 17 files changed, 372 insertions(+), 1139 deletions(-) +Merging nfs/linux-next (aa97a3ef15c3 NFSv4.2: alloc_file_pseudo() takes an open flag, not an f_mode) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Removing include/linux/pnfs_osd_xdr.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/direct.c +Merge made by the 'recursive' strategy. + fs/lockd/clntproc.c | 3 - + fs/lockd/svc4proc.c | 2 - + fs/lockd/svcproc.c | 2 - + fs/nfs/callback_proc.c | 3 + + fs/nfs/client.c | 37 +- + fs/nfs/delegation.c | 10 +- + fs/nfs/dir.c | 55 +- + fs/nfs/direct.c | 2 +- + fs/nfs/filelayout/filelayout.c | 2 - + fs/nfs/flexfilelayout/flexfilelayout.c | 2 - + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 4 +- + fs/nfs/inode.c | 67 ++- + fs/nfs/internal.h | 3 +- + fs/nfs/nfs3xdr.c | 2 +- + fs/nfs/nfs42proc.c | 9 + + fs/nfs/nfs4client.c | 65 +-- + fs/nfs/nfs4file.c | 13 +- + fs/nfs/nfs4idmap.c | 2 +- + fs/nfs/nfs4proc.c | 124 ++-- + fs/nfs/nfs4state.c | 5 +- + fs/nfs/nfs4trace.h | 920 ++++++++++++++++-------------- + fs/nfs/nfs4xdr.c | 38 +- + fs/nfs/nfstrace.h | 467 +++++++-------- + fs/nfs/pagelist.c | 13 +- + fs/nfs/pnfs.h | 6 +- + fs/nfs/pnfs_nfs.c | 6 +- + fs/nfs/proc.c | 2 +- + fs/nfs/read.c | 11 +- + fs/nfs/super.c | 7 +- + fs/nfs/write.c | 73 +-- + fs/nfsd/trace.h | 1 + + include/linux/nfs4.h | 4 + + include/linux/nfs_fs.h | 54 +- + include/linux/pnfs_osd_xdr.h | 317 ---------- + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/sched.h | 16 +- + include/trace/events/fs.h | 122 ++++ + include/trace/events/nfs.h | 375 ++++++++++++ + include/trace/events/rpcgss.h | 18 +- + include/trace/events/rpcrdma.h | 55 +- + include/trace/events/sunrpc.h | 99 ++-- + include/trace/events/sunrpc_base.h | 18 + + net/sunrpc/clnt.c | 33 +- + net/sunrpc/sched.c | 20 +- + net/sunrpc/sysfs.c | 12 +- + net/sunrpc/xprt.c | 41 +- + net/sunrpc/xprtrdma/frwr_ops.c | 48 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 23 +- + net/sunrpc/xprtrdma/verbs.c | 3 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 6 +- + net/sunrpc/xprtsock.c | 109 ++-- + 51 files changed, 1822 insertions(+), 1508 deletions(-) + delete mode 100644 include/linux/pnfs_osd_xdr.h + create mode 100644 include/trace/events/fs.h + create mode 100644 include/trace/events/nfs.h + create mode 100644 include/trace/events/sunrpc_base.h +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 (6d91929a6fa6 nfsd: document server-to-server-copy parameters) +$ git merge -m Merge branch 'nfsd-next' of git://git.linux-nfs.org/~bfields/linux.git nfsd/nfsd-next +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Removing include/uapi/linux/nfsd/nfsfh.h +Auto-merging include/trace/events/sunrpc.h +CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h +Auto-merging include/trace/events/rpcrdma.h +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'include/trace/events/sunrpc.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ede38817d672] Merge branch 'nfsd-next' of git://git.linux-nfs.org/~bfields/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 14 + + Documentation/filesystems/nfs/index.rst | 1 + + Documentation/filesystems/nfs/reexport.rst | 113 +++++++ + fs/lockd/svc.c | 6 +- + fs/lockd/xdr.c | 152 +++++----- + fs/lockd/xdr4.c | 153 +++++----- + fs/nfs/callback_xdr.c | 4 +- + fs/nfsd/flexfilelayout.c | 2 +- + fs/nfsd/lockd.c | 2 +- + fs/nfsd/nfs2acl.c | 44 +-- + fs/nfsd/nfs3acl.c | 48 +-- + fs/nfsd/nfs3proc.c | 3 +- + fs/nfsd/nfs3xdr.c | 387 +++++++++++------------- + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4proc.c | 11 +- + fs/nfsd/nfs4state.c | 6 +- + fs/nfsd/nfs4xdr.c | 52 ++-- + fs/nfsd/nfscache.c | 17 +- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfsd.h | 6 +- + fs/nfsd/nfsfh.c | 173 ++++------- + fs/nfsd/nfsfh.h | 55 +++- + fs/nfsd/nfsproc.c | 3 +- + fs/nfsd/nfssvc.c | 28 +- + fs/nfsd/nfsxdr.c | 187 +++++------- + fs/nfsd/vfs.c | 4 +- + fs/nfsd/xdr.h | 37 +-- + fs/nfsd/xdr3.h | 63 ++-- + fs/nfsd/xdr4.h | 7 +- + include/linux/lockd/xdr.h | 27 +- + include/linux/lockd/xdr4.h | 29 +- + include/linux/sunrpc/svc.h | 14 +- + include/trace/events/rpcrdma.h | 185 ++++++++++- + include/trace/events/sunrpc.h | 38 ++- + include/uapi/linux/nfsd/nfsfh.h | 115 ------- + net/sunrpc/addr.c | 40 ++- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/svc.c | 80 +---- + net/sunrpc/svc_xprt.c | 1 + + net/sunrpc/xdr.c | 32 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 9 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 30 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 14 +- + 43 files changed, 1155 insertions(+), 1047 deletions(-) + create mode 100644 Documentation/filesystems/nfs/reexport.rst + delete mode 100644 include/uapi/linux/nfsd/nfsfh.h +Merging cel/for-next (c20106944eb6 NFSD: Keep existing listeners on portlist error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel/for-next +Already up to date. +Merging ntfs3/master (8607954cf255 fs/ntfs3: Check for NULL pointers in ni_try_remove_attr_list) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (ac2c63757f4f orangefs: Fix sb refcount leak when allocate sb info failed.) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Auto-merging fs/orangefs/super.c +Merge made by the 'recursive' strategy. + fs/orangefs/dcache.c | 4 +++- + fs/orangefs/super.c | 4 ++-- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging overlayfs/overlayfs-next (5b0a414d06c3 ovl: fix filattr copy-up failure) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Auto-merging fs/overlayfs/file.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 23 ++++++++++++++++++----- + fs/overlayfs/dir.c | 3 +-- + fs/overlayfs/file.c | 16 ++++++++++++++-- + fs/overlayfs/inode.c | 5 ++++- + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/super.c | 12 ++++++++---- + 6 files changed, 46 insertions(+), 14 deletions(-) +Merging ubifs/next (9aaa6cc099f6 ubifs: Document sysfs nodes) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-ubifs | 35 +++++++ + MAINTAINERS | 1 + + drivers/mtd/ubi/debug.c | 2 +- + fs/ubifs/Makefile | 2 +- + fs/ubifs/dir.c | 4 +- + fs/ubifs/io.c | 21 +++++ + fs/ubifs/replay.c | 2 +- + fs/ubifs/super.c | 23 +++-- + fs/ubifs/sysfs.c | 153 +++++++++++++++++++++++++++++++ + fs/ubifs/ubifs.h | 35 +++++++ + 10 files changed, 267 insertions(+), 11 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-fs-ubifs + create mode 100644 fs/ubifs/sysfs.c +Merging v9fs/9p-next (6e195b0f7c8e 9p: fix a bunch of checkpatch warnings) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'recursive' strategy. + fs/9p/Kconfig | 1 + + fs/9p/acl.c | 11 +- + fs/9p/acl.h | 27 ++- + fs/9p/cache.c | 141 +-------------- + fs/9p/cache.h | 97 +--------- + fs/9p/fid.c | 3 +- + fs/9p/v9fs.c | 22 ++- + fs/9p/v9fs.h | 17 +- + fs/9p/v9fs_vfs.h | 11 +- + fs/9p/vfs_addr.c | 203 +++++++++++---------- + fs/9p/vfs_dentry.c | 4 +- + fs/9p/vfs_dir.c | 6 +- + fs/9p/vfs_file.c | 20 ++- + fs/9p/vfs_inode.c | 29 +-- + fs/9p/vfs_inode_dotl.c | 11 +- + fs/9p/vfs_super.c | 14 +- + fs/9p/xattr.c | 10 +- + fs/9p/xattr.h | 29 ++- + include/linux/fscache.h | 2 +- + include/net/9p/9p.h | 12 +- + include/net/9p/client.h | 24 +-- + include/net/9p/transport.h | 26 +-- + net/9p/client.c | 436 ++++++++++++++++++++++----------------------- + net/9p/error.c | 4 +- + net/9p/mod.c | 41 +++-- + net/9p/protocol.c | 38 ++-- + net/9p/protocol.h | 4 +- + net/9p/trans_common.c | 10 +- + net/9p/trans_common.h | 12 +- + net/9p/trans_fd.c | 2 - + net/9p/trans_rdma.c | 3 +- + net/9p/trans_virtio.c | 1 + + net/9p/trans_xen.c | 26 +-- + 33 files changed, 518 insertions(+), 779 deletions(-) +Merging xfs/for-next (2a09b575074f xfs: use swap() to make code cleaner) +$ 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 (482e00075d66 fs: remove leftover comments from mandatory locking removal) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging vfs/for-next (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 (eafd42c87753 Merge branch 'for-5.16-vsprintf-pgp' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging pci/next (dda4b381f05d Merge branch 'remotes/lorenzo/pci/xgene') +$ 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 +Auto-merging fs/pstore/blk.c +Merge made by the 'recursive' strategy. + fs/pstore/blk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (bbbd1fb77db5 Merge branch 'for-5.16/nintendo' 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (26950bc4bad3 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 6 + + .../devicetree/bindings/i2c/apple,i2c.yaml | 61 ++++++++ + MAINTAINERS | 2 +- + drivers/i2c/busses/Kconfig | 16 +- + drivers/i2c/busses/Makefile | 3 + + drivers/i2c/busses/i2c-amd-mp2-pci.c | 4 +- + drivers/i2c/busses/i2c-amd-mp2-plat.c | 5 +- + drivers/i2c/busses/i2c-bcm-kona.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 83 ++++------- + drivers/i2c/busses/i2c-ismt.c | 12 +- + drivers/i2c/busses/i2c-kempld.c | 3 +- + drivers/i2c/busses/i2c-mlxcpld.c | 14 +- + drivers/i2c/busses/i2c-mt65xx.c | 82 ++++++++++- + .../i2c/busses/{i2c-pasemi.c => i2c-pasemi-core.c} | 114 ++++----------- + drivers/i2c/busses/i2c-pasemi-core.h | 21 +++ + drivers/i2c/busses/i2c-pasemi-pci.c | 85 +++++++++++ + drivers/i2c/busses/i2c-pasemi-platform.c | 122 ++++++++++++++++ + drivers/i2c/busses/i2c-pxa.c | 1 - + drivers/i2c/busses/i2c-qup.c | 6 +- + drivers/i2c/busses/i2c-rcar.c | 6 +- + drivers/i2c/busses/i2c-tegra.c | 4 +- + drivers/i2c/busses/i2c-xiic.c | 161 +++++++++------------ + drivers/i2c/busses/i2c-xlr.c | 6 +- + 23 files changed, 558 insertions(+), 261 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/apple,i2c.yaml + rename drivers/i2c/busses/{i2c-pasemi.c => i2c-pasemi-core.c} (77%) + create mode 100644 drivers/i2c/busses/i2c-pasemi-core.h + create mode 100644 drivers/i2c/busses/i2c-pasemi-pci.c + create mode 100644 drivers/i2c/busses/i2c-pasemi-platform.c +Merging i3c/i3c/next (a3587e2c0578 i3c: fix incorrect address slot lookup on 64-bit) +$ 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.c | 3 ++- + drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- + drivers/i3c/master/mipi-i3c-hci/hci.h | 2 +- + 3 files changed, 4 insertions(+), 3 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 (10f0d2ab9aa6 hwmon: (nct7802) Add of_node_put() before return) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (603bdf5d6c09 kernel-doc: support DECLARE_PHY_INTERFACE_MASK()) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (57c3b9f55ba8 media: venus: core: Add sdm660 DT compatible and resource struct) +$ 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 (320510b91925 media: atomisp: get rid of two unused functions) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging drivers/media/platform/Kconfig +Auto-merging drivers/media/common/videobuf2/videobuf2-dma-contig.c +Merge made by the 'recursive' strategy. + .../admin-guide/media/platform-cardlist.rst | 1 + + .../devicetree/bindings/media/st,stm32-dma2d.yaml | 71 ++ + Documentation/userspace-api/media/v4l/control.rst | 9 + + .../media/common/videobuf2/videobuf2-dma-contig.c | 8 +- + drivers/media/platform/Kconfig | 11 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/stm32/Makefile | 2 + + drivers/media/platform/stm32/dma2d/dma2d-hw.c | 143 ++++ + drivers/media/platform/stm32/dma2d/dma2d-regs.h | 113 ++++ + drivers/media/platform/stm32/dma2d/dma2d.c | 739 +++++++++++++++++++++ + drivers/media/platform/stm32/dma2d/dma2d.h | 135 ++++ + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 12 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 21 + + .../atomisp/pci/hive_isp_css_common/host/gdc.c | 11 - + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 6 - + include/media/v4l2-mem2mem.h | 5 + + include/uapi/linux/v4l2-controls.h | 4 +- + 17 files changed, 1268 insertions(+), 24 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/st,stm32-dma2d.yaml + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d-hw.c + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d-regs.h + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d.c + create mode 100644 drivers/media/platform/stm32/dma2d/dma2d.h +Merging pm/linux-next (f8057ee1cd84 Merge branch 'pm-sleep' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging include/linux/acpi.h +Auto-merging drivers/i2c/i2c-core-acpi.c +Merge made by the 'recursive' strategy. + Documentation/firmware-guide/acpi/index.rst | 1 + + Documentation/firmware-guide/acpi/non-d0-probe.rst | 78 ++++++++++++++++++++ + drivers/acpi/device_pm.c | 26 +++++++ + drivers/acpi/ec.c | 11 ++- + drivers/acpi/pmic/intel_pmic.c | 51 +++++++------ + drivers/acpi/power.c | 8 +- + drivers/acpi/scan.c | 4 + + drivers/acpi/video_detect.c | 78 +++++++++++--------- + drivers/base/power/main.c | 85 +++++++++++++++------- + drivers/cpufreq/intel_pstate.c | 36 ++++++++- + drivers/i2c/i2c-core-acpi.c | 10 +++ + drivers/i2c/i2c-core-base.c | 7 +- + drivers/media/i2c/imx319.c | 74 +++++++++++-------- + drivers/misc/eeprom/at24.c | 45 +++++++----- + .../int340x_thermal/processor_thermal_device.h | 2 +- + .../intel/int340x_thermal/processor_thermal_mbox.c | 22 +++--- + .../intel/int340x_thermal/processor_thermal_rfim.c | 10 +-- + include/acpi/acpi_bus.h | 1 + + include/acpi/platform/acgcc.h | 13 ---- + include/linux/acpi.h | 5 ++ + include/linux/i2c.h | 18 +++++ + 21 files changed, 412 insertions(+), 173 deletions(-) + create mode 100644 Documentation/firmware-guide/acpi/non-d0-probe.rst +Merging cpufreq-arm/cpufreq/arm/linux-next (4a08e3271c55 cpufreq: Fix parameter in parse_perf_domain()) +$ 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 (5cf79c293821 PM / devfreq: Strengthen check for freq_table) +$ 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 (7ca81b690e59 dt-bindings: opp: Allow multi-worded OPP entry name) +$ 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 +Auto-merging drivers/devfreq/devfreq.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/opp/opp-v2-base.yaml | 2 +- + drivers/devfreq/devfreq.c | 26 +++++ + drivers/devfreq/governor.h | 3 + + drivers/devfreq/tegra30-devfreq.c | 109 +++++++++------------ + drivers/opp/core.c | 6 +- + drivers/opp/of.c | 50 ++++++++-- + include/linux/pm_opp.h | 20 +++- + 7 files changed, 137 insertions(+), 79 deletions(-) +Merging thermal/thermal/linux-next (a67a46af4ad6 thermal/core: Deprecate changing cooling device state from userspace) +$ 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 +Already up to date. +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 (b87b1883efe3 fs: dlm: remove double list_first_entry call) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/ast.c | 12 ++- + fs/dlm/debug_fs.c | 96 ++++++++++++++++- + fs/dlm/dir.c | 3 +- + fs/dlm/dlm_internal.h | 11 +- + fs/dlm/lock.c | 90 +++++++++++++++- + fs/dlm/lock.h | 4 + + fs/dlm/lockspace.c | 37 ++++--- + fs/dlm/lowcomms.c | 26 ++--- + fs/dlm/lowcomms.h | 4 +- + fs/dlm/main.c | 3 + + fs/dlm/member.c | 3 +- + fs/dlm/midcomms.c | 62 +++++++++-- + fs/dlm/midcomms.h | 2 + + fs/dlm/rcom.c | 2 +- + fs/dlm/recoverd.c | 3 +- + fs/dlm/requestqueue.c | 17 ++- + include/trace/events/dlm.h | 260 +++++++++++++++++++++++++++++++++++++++++++++ + 17 files changed, 568 insertions(+), 67 deletions(-) + create mode 100644 include/trace/events/dlm.h +Merging rdma/for-next (f1a090f09f42 RDMA/core: Require the driver to set the IOVA correctly during rereg_mr) +$ 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 (cc0356d6a02e Merge tag 'x86_core_for_v5.16_rc1' 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/netdev/net-next.git net-next/master +Already up to date. +Merging bpf-next/for-next (cc0356d6a02e Merge tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (ad57dae8a64d xfrm: Remove redundant fields and related parentheses) +$ 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 (60dd57c74794 Merge brank 'mlx5_mkey' into rdma.git for-next) +$ 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 (d4a07dc5ac34 Merge branch 'SMC-tracepoints') +$ 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 (d4a07dc5ac34 Merge branch 'SMC-tracepoints') +$ 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 (2619f904b25c Merge tag 'iwlwifi-next-for-kalle-2021-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ 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 (258f56d11bbb Bluetooth: aosp: Support AOSP Bluetooth Quality Report) +$ 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/Kconfig | 6 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/bfusb.c | 3 + + drivers/bluetooth/btintel.c | 22 +- + drivers/bluetooth/btmtk.c | 289 +++ + drivers/bluetooth/btmtk.h | 111 + + drivers/bluetooth/btmtksdio.c | 496 ++-- + drivers/bluetooth/btsdio.c | 2 + + drivers/bluetooth/btusb.c | 389 +-- + drivers/bluetooth/hci_bcm.c | 1 - + drivers/bluetooth/hci_vhci.c | 120 +- + drivers/bluetooth/virtio_bt.c | 3 + + include/linux/mmc/sdio_ids.h | 1 + + include/net/bluetooth/bluetooth.h | 2 + + include/net/bluetooth/hci_core.h | 22 +- + include/net/bluetooth/hci_sync.h | 97 + + net/bluetooth/Makefile | 2 +- + net/bluetooth/aosp.c | 168 +- + net/bluetooth/aosp.h | 13 + + net/bluetooth/cmtp/core.c | 4 +- + net/bluetooth/hci_codec.c | 18 +- + net/bluetooth/hci_conn.c | 20 +- + net/bluetooth/hci_core.c | 1334 +---------- + net/bluetooth/hci_event.c | 159 +- + net/bluetooth/hci_request.c | 338 +-- + net/bluetooth/hci_request.h | 10 + + net/bluetooth/hci_sock.c | 11 +- + net/bluetooth/hci_sync.c | 4799 +++++++++++++++++++++++++++++++++++++ + net/bluetooth/hci_sysfs.c | 2 + + net/bluetooth/l2cap_sock.c | 19 + + net/bluetooth/mgmt.c | 2086 ++++++++-------- + net/bluetooth/mgmt_util.c | 15 +- + net/bluetooth/mgmt_util.h | 4 + + net/bluetooth/msft.c | 511 ++-- + net/bluetooth/msft.h | 15 +- + 35 files changed, 7472 insertions(+), 3621 deletions(-) + create mode 100644 drivers/bluetooth/btmtk.c + create mode 100644 drivers/bluetooth/btmtk.h + create mode 100644 include/net/bluetooth/hci_sync.h + create mode 100644 net/bluetooth/hci_sync.c +Merging mac80211-next/master (62bf703f4423 cfg80211: move offchan_cac_event to a dedicated work) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git mac80211-next/master +Auto-merging net/wireless/mlme.c +Auto-merging net/wireless/core.h +Auto-merging net/wireless/core.c +Auto-merging include/net/cfg80211.h +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 2 +- + include/net/cfg80211.h | 19 +++++ + include/net/mac80211.h | 10 +++ + include/uapi/linux/nl80211.h | 13 ++++ + net/mac80211/cfg.c | 13 ++++ + net/wireless/core.c | 7 ++ + net/wireless/core.h | 16 +++++ + net/wireless/mlme.c | 129 ++++++++++++++++++++++++++++++++++ + net/wireless/nl80211.c | 17 +++-- + net/wireless/rdev-ops.h | 17 +++++ + net/wireless/trace.h | 19 +++++ + 11 files changed, 255 insertions(+), 7 deletions(-) +Merging mtd/mtd/next (e269d7caf9e0 Merge tag 'spi-nor/for-5.16' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging drivers/mtd/mtdcore.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 +++++++++-- + drivers/mtd/chips/Kconfig | 2 ++ + drivers/mtd/devices/block2mtd.c | 29 +++++++++++++++++++-------- + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/mtdcore.c | 4 ++-- + drivers/mtd/mtdswap.c | 1 - + drivers/mtd/nand/ecc-sw-hamming.c | 7 ++++--- + drivers/mtd/nand/onenand/Kconfig | 9 +++++---- + drivers/mtd/nand/raw/ams-delta.c | 12 ++++++++--- + drivers/mtd/nand/raw/arasan-nand-controller.c | 15 ++++++++++++++ + drivers/mtd/nand/raw/atmel/pmecc.c | 7 ++----- + drivers/mtd/nand/raw/au1550nd.c | 12 ++++++++--- + drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c | 5 +---- + drivers/mtd/nand/raw/cs553x_nand.c | 12 +---------- + drivers/mtd/nand/raw/denali_dt.c | 7 ++----- + drivers/mtd/nand/raw/fsmc_nand.c | 4 +++- + drivers/mtd/nand/raw/gpio.c | 15 +++++++++----- + 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/lpc32xx_slc.c | 15 +------------- + drivers/mtd/nand/raw/mpc5121_nfc.c | 12 ++++++++--- + drivers/mtd/nand/raw/mtk_ecc.c | 4 +--- + drivers/mtd/nand/raw/mtk_nand.c | 4 +--- + drivers/mtd/nand/raw/nand_hynix.c | 14 +++++++++++++ + drivers/mtd/nand/raw/nand_ids.c | 4 ++++ + drivers/mtd/nand/raw/ndfc.c | 12 +---------- + drivers/mtd/nand/raw/omap_elm.c | 5 ++--- + drivers/mtd/nand/raw/orion_nand.c | 12 ++++++++--- + drivers/mtd/nand/raw/oxnas_nand.c | 4 +--- + drivers/mtd/nand/raw/pasemi_nand.c | 12 ++++++++--- + drivers/mtd/nand/raw/plat_nand.c | 16 +++++++++------ + drivers/mtd/nand/raw/sharpsl.c | 12 +---------- + drivers/mtd/nand/raw/socrates_nand.c | 12 ++++++++--- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 8 ++------ + drivers/mtd/nand/raw/tegra_nand.c | 4 +--- + drivers/mtd/nand/raw/tmio_nand.c | 8 +++----- + drivers/mtd/nand/raw/txx9ndfmc.c | 9 +++------ + drivers/mtd/nand/raw/vf610_nfc.c | 4 +--- + drivers/mtd/nand/raw/xway_nand.c | 16 +++++++++------ + drivers/mtd/spi-nor/controllers/hisi-sfc.c | 8 ++------ + drivers/mtd/spi-nor/controllers/nxp-spifi.c | 7 ++----- + drivers/mtd/spi-nor/micron-st.c | 4 +++- + include/linux/mtd/mtd.h | 2 -- + 44 files changed, 204 insertions(+), 175 deletions(-) +Merging nand/nand/next (fc9e18f9e987 mtd: rawnand: arasan: Prevent an unsupported configuration) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (df872ab1ffe4 mtd: spi-nor: nxp-spifi: Make use of the helper function devm_platform_ioremap_resource_byname()) +$ 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 (39ef08517082 crypto: testmgr - fix wrong key length for pkcs1pad) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (806acd381960 Merge tag 'amd-drm-fixes-5.16-2021-11-03' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/lvds-codec.yaml | 33 +- + .../devicetree/bindings/display/bridge/ps8640.yaml | 19 +- + .../bindings/display/panel/panel-simple.yaml | 5 + + .../bindings/display/panel/sharp,ls060t1sx01.yaml | 56 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/todo.rst | 13 +- + drivers/dma-buf/dma-buf.c | 60 +-- + drivers/dma-buf/dma-resv.c | 69 ++- + drivers/gpu/drm/Kconfig | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 45 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 44 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 41 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 150 ++++-- + drivers/gpu/drm/amd/display/dc/core/dc.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 + + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 22 + + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 4 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 6 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 7 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 78 ++-- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 6 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 13 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 14 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 + + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 1 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 + + drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h | 4 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 26 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 11 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 87 ---- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 9 +- + drivers/gpu/drm/bridge/lvds-codec.c | 76 ++- + drivers/gpu/drm/bridge/nwl-dsi.c | 35 ++ + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 17 +- + drivers/gpu/drm/drm_connector.c | 32 +- + drivers/gpu/drm/drm_gem.c | 26 +- + drivers/gpu/drm/drm_modeset_lock.c | 49 +- + drivers/gpu/drm/drm_plane_helper.c | 1 - + drivers/gpu/drm/i915/i915_request.c | 34 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 4 - + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 4 +- + drivers/gpu/drm/panel/Kconfig | 10 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 9 + + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.h | 2 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 333 ++++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 35 ++ + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 8 + + drivers/gpu/drm/scheduler/sched_main.c | 26 +- + drivers/gpu/drm/ttm/ttm_bo.c | 16 +- + drivers/gpu/drm/v3d/v3d_gem.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- + drivers/video/fbdev/core/bitblit.c | 16 - + drivers/video/fbdev/core/fbcon.c | 509 +-------------------- + drivers/video/fbdev/core/fbcon.h | 59 --- + drivers/video/fbdev/core/fbcon_ccw.c | 28 +- + drivers/video/fbdev/core/fbcon_cw.c | 28 +- + drivers/video/fbdev/core/fbcon_rotate.h | 9 - + drivers/video/fbdev/core/fbcon_ud.c | 37 +- + drivers/video/fbdev/core/fbmem.c | 5 +- + drivers/video/fbdev/core/tileblit.c | 16 - + drivers/video/fbdev/skeletonfb.c | 12 +- + include/drm/drm_modeset_lock.h | 8 + + include/drm/ttm/ttm_bo_api.h | 6 +- + include/linux/dma-resv.h | 25 +- + include/linux/fb.h | 2 +- + 89 files changed, 1337 insertions(+), 1112 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls060t1sx01.yaml + create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c +$ git am -3 ../patches/0001-drm-locking-fix-for-name-conflict.patch +Applying: drm/locking: fix for name conflict +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/drm_modeset_lock.c +$ git add -A . +$ git commit -v -a --amend +[master b305d6885ed3] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git + Date: Mon Nov 8 09:26:01 2021 +1100 +Merging drm-misc/for-linux-next (14d9a37c9525 Revert "drm/imx: Annotate dma-fence critical section in commit path") +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c'. +[master ed9c3cf3adf4] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + drivers/dma-buf/dma-buf.c | 18 ++++-- + drivers/gpu/drm/Kconfig | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/imx/imx-drm-core.c | 2 - + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 94 +----------------------------- + drivers/gpu/drm/udl/udl_connector.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 -- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 72 +---------------------- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 3 - + include/drm/ttm/ttm_bo_api.h | 3 +- + 12 files changed, 22 insertions(+), 187 deletions(-) +Merging amdgpu/drm-next (0e502fb10d8e drm/amdgpu: bump driver version for INFO SENSOR profile mode subquery) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 116 +++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 100 +++--- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 18 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 126 +++---- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 143 +++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 128 +++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 124 +++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 128 +++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 71 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 +- + 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_gem.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 20 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 42 +-- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 39 +-- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 45 +-- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 55 ++- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 34 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 46 +-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 57 ++- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 10 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 2 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.h | 13 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 12 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- + 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/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 +++++ + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/linux/kfd_sysfs.h | 108 ++++++ + 71 files changed, 1017 insertions(+), 1327 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c + create mode 100644 include/uapi/linux/kfd_sysfs.h +Merging drm-intel/for-linux-next (1977e8eb40ed drm/i915: Fix type1 DVI DP dual mode adapter heuristic for modern platforms) +$ 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/gem/i915_gem_dmabuf.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master eab1684e3f91] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/display/intel_bios.c | 132 +++++++++++----------- + drivers/gpu/drm/i915/display/intel_cdclk.c | 44 ++++---- + drivers/gpu/drm/i915/display/intel_dp.c | 31 +++-- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 7 ++ + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 +- + 5 files changed, 116 insertions(+), 101 deletions(-) +Merging drm-intel-gt/for-linux-next-gt (1977e8eb40ed drm/i915: Fix type1 DVI DP dual mode adapter heuristic for modern platforms) +$ git merge -m Merge branch 'for-linux-next-gt' of git://anongit.freedesktop.org/drm-intel drm-intel-gt/for-linux-next-gt +Already up to date. +Merging drm-tegra/drm/tegra/for-next (5dccbc9de8f0 drm/tegra: dc: rgb: Allow changing PLLD rate on Tegra30+) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/plane.c +Auto-merging drivers/gpu/drm/tegra/gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gem.c +Resolved 'drivers/gpu/drm/tegra/gem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1427cfcd3a83] Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/tegra/Makefile | 3 +- + drivers/gpu/drm/tegra/dc.c | 117 ++++++++-- + drivers/gpu/drm/tegra/dc.h | 1 + + drivers/gpu/drm/tegra/drm.c | 4 + + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/gem.c | 171 +++++++++------ + drivers/gpu/drm/tegra/gr2d.c | 33 ++- + drivers/gpu/drm/tegra/hub.h | 1 - + drivers/gpu/drm/tegra/nvdec.c | 470 +++++++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/tegra/plane.c | 65 ++---- + drivers/gpu/drm/tegra/plane.h | 2 +- + drivers/gpu/drm/tegra/rgb.c | 53 ++++- + drivers/gpu/drm/tegra/submit.c | 63 ++++-- + drivers/gpu/drm/tegra/uapi.c | 68 +++--- + drivers/gpu/drm/tegra/uapi.h | 5 +- + drivers/gpu/drm/tegra/vic.c | 8 + + drivers/gpu/host1x/Kconfig | 1 + + drivers/gpu/host1x/bus.c | 79 ++++++- + drivers/gpu/host1x/dev.c | 20 ++ + drivers/gpu/host1x/dev.h | 2 + + drivers/gpu/host1x/job.c | 160 +++++--------- + drivers/gpu/host1x/job.h | 6 +- + include/linux/host1x.h | 75 +++++-- + 23 files changed, 1087 insertions(+), 321 deletions(-) + create mode 100644 drivers/gpu/drm/tegra/nvdec.c +Merging drm-msm/msm-next (02d44fde976a drm/msm/dp: fix missing #include) +$ 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 (a8d880671c13 Merge remote-tracking branch 'regmap/for-5.16' into regmap-next) +$ 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. +Merge made by the 'recursive' strategy. +Merging sound/for-next (8e537d5dec34 ALSA: PCM: Fix NULL dereference at mmap checks) +$ 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 (13b1ef781f41 Merge remote-tracking branch 'asoc/for-5.16' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (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 (322a552e1955 Input: cap11xx - add support for cap1206) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging kernel/reboot.c +Removing include/linux/input/cy8ctmg110_pdata.h +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/input/touchscreen/elants_i2c.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/joystick/analog.c +Auto-merging MAINTAINERS +CONFLICT (modify/delete): Documentation/devicetree/bindings/input/cap11xx.txt deleted in HEAD and modified in input/next. Version input/next of Documentation/devicetree/bindings/input/cap11xx.txt left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/input/cap11xx.txt +rm 'Documentation/devicetree/bindings/input/cap11xx.txt' +$ git commit --no-edit -v -a +[master b0e88bea39b2] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/cypress-sf.yaml | 61 +++ + MAINTAINERS | 12 +- + drivers/input/joystick/analog.c | 18 +- + drivers/input/joystick/tmdc.c | 2 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/cap11xx.c | 43 +- + drivers/input/keyboard/cypress-sf.c | 224 +++++++++ + drivers/input/keyboard/ep93xx_keypad.c | 172 +++---- + drivers/input/keyboard/mpr121_touchkey.c | 4 +- + drivers/input/keyboard/omap-keypad.c | 3 +- + drivers/input/keyboard/tm2-touchkey.c | 7 + + drivers/input/misc/adxl34x-i2c.c | 4 +- + drivers/input/misc/adxl34x-spi.c | 4 +- + drivers/input/misc/adxl34x.c | 6 +- + drivers/input/misc/adxl34x.h | 2 +- + drivers/input/misc/ariel-pwrbutton.c | 7 + + drivers/input/misc/cpcap-pwrbutton.c | 7 +- + drivers/input/misc/max77693-haptic.c | 1 - + drivers/input/misc/max8925_onkey.c | 2 +- + drivers/input/misc/palmas-pwrbutton.c | 5 + + drivers/input/misc/pm8941-pwrkey.c | 6 +- + drivers/input/touchscreen/Kconfig | 1 + + drivers/input/touchscreen/Makefile | 3 +- + drivers/input/touchscreen/ads7846.c | 200 +++----- + drivers/input/touchscreen/elants_i2c.c | 4 +- + drivers/input/touchscreen/goodix.c | 231 +++++---- + drivers/input/touchscreen/goodix.h | 117 +++++ + drivers/input/touchscreen/goodix_fwupload.c | 427 +++++++++++++++++ + drivers/input/touchscreen/ili210x.c | 529 ++++++++++++++++++++- + drivers/input/touchscreen/raydium_i2c_ts.c | 54 ++- + drivers/input/touchscreen/st1232.c | 3 +- + drivers/input/touchscreen/tsc2004.c | 4 +- + drivers/input/touchscreen/tsc2005.c | 4 +- + drivers/input/touchscreen/tsc200x-core.c | 4 +- + drivers/input/touchscreen/tsc200x-core.h | 2 +- + include/linux/input/cy8ctmg110_pdata.h | 10 - + include/linux/spi/ads7846.h | 15 - + kernel/reboot.c | 1 + + 39 files changed, 1765 insertions(+), 445 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/cypress-sf.yaml + create mode 100644 drivers/input/keyboard/cypress-sf.c + create mode 100644 drivers/input/touchscreen/goodix.h + create mode 100644 drivers/input/touchscreen/goodix_fwupload.c + delete mode 100644 include/linux/input/cy8ctmg110_pdata.h +$ git am -3 ../patches/0001-Input-cap11xx-fix-for-dt-bindings-input-microchip-ca.patch +Applying: Input: cap11xx: fix for "dt-bindings: input: microchip,cap11xx: Convert txt bindings to yaml" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/devicetree/bindings/input/microchip,cap11xx.yaml +$ git add -A . +$ git commit -v -a --amend +[master 6ef3680b1c36] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git + Date: Mon Nov 8 09:32:28 2021 +1100 +Merging block/for-next (2d81841aa5c3 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 +Auto-merging drivers/block/zram/zram_drv.c +Merge made by the 'recursive' strategy. + block/blk-core.c | 61 ++++++---------- + block/blk-merge.c | 6 +- + block/blk-mq-debugfs.c | 1 + + block/blk-mq-sched.c | 15 ++-- + block/blk-mq.c | 153 ++++++++++++++++++++++++++++------------- + block/blk-mq.h | 12 +++- + block/blk.h | 35 ++++++++++ + block/fops.c | 4 +- + block/genhd.c | 13 +++- + drivers/block/ataflop.c | 61 +++++++++------- + drivers/block/brd.c | 9 ++- + drivers/block/drbd/drbd_main.c | 4 +- + drivers/block/floppy.c | 17 +++-- + drivers/block/loop.c | 1 - + drivers/block/nbd.c | 44 ++++++------ + drivers/block/ps3disk.c | 8 ++- + drivers/block/ps3vram.c | 7 +- + drivers/block/sunvdc.c | 14 +++- + drivers/block/z2ram.c | 7 +- + drivers/block/zram/zram_drv.c | 45 +++++++++--- + drivers/md/bcache/super.c | 2 +- + drivers/md/dm.c | 10 --- + drivers/md/md-bitmap.c | 19 +++++ + drivers/md/raid5-ppl.c | 6 +- + drivers/mtd/ubi/block.c | 8 ++- + drivers/nvdimm/blk.c | 21 ++++-- + drivers/nvdimm/btt.c | 21 +++--- + drivers/nvdimm/pmem.c | 21 ++++-- + fs/io-wq.c | 16 ++++- + fs/io_uring.c | 7 +- + include/linux/genhd.h | 2 +- + 31 files changed, 429 insertions(+), 221 deletions(-) +Merging device-mapper/for-next (7552750d0494 dm table: log table creation error code) +$ 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 +Auto-merging include/uapi/linux/audit.h +CONFLICT (content): Merge conflict in include/uapi/linux/audit.h +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-zoned-target.c +Auto-merging drivers/md/dm-writecache.c +Auto-merging drivers/md/dm-verity-target.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/md/dm-log-writes.c +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-bufio.c +Resolved 'include/uapi/linux/audit.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a3da363039ec] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git +$ git diff -M --stat --summary HEAD^.. + drivers/md/Kconfig | 10 ++++++ + drivers/md/Makefile | 4 +++ + drivers/md/dm-audit.c | 84 +++++++++++++++++++++++++++++++++++++++++++ + drivers/md/dm-audit.h | 66 ++++++++++++++++++++++++++++++++++ + drivers/md/dm-bufio.c | 1 - + drivers/md/dm-crypt.c | 25 +++++++++---- + drivers/md/dm-integrity.c | 35 +++++++++++++----- + drivers/md/dm-log-writes.c | 6 ++-- + drivers/md/dm-table.c | 4 +-- + drivers/md/dm-verity-target.c | 6 ++-- + drivers/md/dm-writecache.c | 6 ++-- + drivers/md/dm-zoned-target.c | 1 - + drivers/md/dm.c | 2 +- + include/uapi/linux/audit.h | 2 ++ + 14 files changed, 221 insertions(+), 31 deletions(-) + create mode 100644 drivers/md/dm-audit.c + create mode 100644 drivers/md/dm-audit.h +Merging libata/for-next (1af5f7af2484 pata_radisys: fix checking of DMA state) +$ 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 (348ecd61770f 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 +Already up to date. +Merging mfd/for-mfd-next (5dc6dafe6209 mfd: simple-mfd-i2c: Select MFD_CORE to fix 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 +Removing include/linux/mfd/tps80031.h +Removing include/linux/mfd/hi6421-spmi-pmic.h +Removing drivers/mfd/tps80031.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mfd/samsung,sec-core.txt +Auto-merging Documentation/devicetree/bindings/mfd/brcm,cru.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/brcm,cru.yaml +Removing Documentation/devicetree/bindings/mfd/axp20x.txt +Removing Documentation/devicetree/bindings/mfd/ac100.txt +Removing Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt +Removing Documentation/devicetree/bindings/gpio/gpio-axp209.txt +Resolved 'Documentation/devicetree/bindings/mfd/brcm,cru.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5b03d1db925e] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/maxim,max77686.txt | 4 +- + .../devicetree/bindings/gpio/gpio-axp209.txt | 75 --- + .../bindings/gpio/x-powers,axp209-gpio.yaml | 55 ++ + .../bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 2 +- + .../devicetree/bindings/iio/adc/ti,am3359-adc.yaml | 70 +++ + .../bindings/input/touchscreen/ti,am3359-tsc.yaml | 76 +++ + .../bindings/input/touchscreen/ti-tsc-adc.txt | 91 --- + Documentation/devicetree/bindings/mfd/ac100.txt | 50 -- + Documentation/devicetree/bindings/mfd/axp20x.txt | 273 --------- + .../devicetree/bindings/mfd/brcm,cru.yaml | 21 + + .../devicetree/bindings/mfd/brcm,misc.yaml | 60 ++ + Documentation/devicetree/bindings/mfd/max14577.txt | 4 +- + Documentation/devicetree/bindings/mfd/max77686.txt | 2 +- + Documentation/devicetree/bindings/mfd/max77693.txt | 2 +- + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 39 +- + .../devicetree/bindings/mfd/qcom,tcsr.txt | 1 + + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 1 + + .../devicetree/bindings/mfd/samsung,s2mpa01.yaml | 91 +++ + .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 267 +++++++++ + .../devicetree/bindings/mfd/samsung,s5m8767.yaml | 307 ++++++++++ + .../devicetree/bindings/mfd/samsung,sec-core.txt | 86 --- + Documentation/devicetree/bindings/mfd/syscon.yaml | 3 + + .../devicetree/bindings/mfd/ti,am3359-tscadc.yaml | 84 +++ + .../devicetree/bindings/mfd/x-powers,ac100.yaml | 116 ++++ + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 400 +++++++++++++ + .../devicetree/bindings/mfd/xylon,logicvc.yaml | 3 + + .../devicetree/bindings/regulator/max77686.txt | 2 +- + MAINTAINERS | 3 +- + drivers/clk/ti/clk-43xx.c | 1 + + drivers/iio/adc/ti_am335x_adc.c | 220 ++++--- + drivers/mfd/Kconfig | 23 +- + drivers/mfd/Makefile | 1 - + drivers/mfd/altera-a10sr.c | 9 + + drivers/mfd/altera-sysmgr.c | 2 +- + drivers/mfd/arizona-core.c | 13 - + drivers/mfd/arizona-i2c.c | 14 +- + drivers/mfd/arizona-spi.c | 13 +- + drivers/mfd/arizona.h | 2 - + drivers/mfd/cros_ec_dev.c | 1 - + drivers/mfd/da9063-i2c.c | 2 + + drivers/mfd/dln2.c | 18 + + drivers/mfd/hi6421-spmi-pmic.c | 16 +- + drivers/mfd/intel-lpss-pci.c | 2 + + drivers/mfd/janz-cmodio.c | 2 +- + drivers/mfd/max14577.c | 6 +- + drivers/mfd/max77686.c | 3 +- + drivers/mfd/max77693.c | 12 +- + drivers/mfd/mc13xxx-core.c | 4 +- + drivers/mfd/mc13xxx-i2c.c | 3 +- + drivers/mfd/mc13xxx-spi.c | 3 +- + drivers/mfd/mc13xxx.h | 2 +- + drivers/mfd/mfd-core.c | 2 + + drivers/mfd/motorola-cpcap.c | 8 + + drivers/mfd/qcom-pm8xxx.c | 39 +- + drivers/mfd/qcom-spmi-pmic.c | 47 +- + drivers/mfd/rk808.c | 4 + + drivers/mfd/sec-irq.c | 3 +- + drivers/mfd/sprd-sc27xx-spi.c | 17 + + drivers/mfd/stmpe-i2c.c | 4 +- + drivers/mfd/stmpe-spi.c | 4 +- + drivers/mfd/stmpe.c | 4 +- + drivers/mfd/stmpe.h | 2 +- + drivers/mfd/ti_am335x_tscadc.c | 237 ++++---- + drivers/mfd/tps65912-core.c | 4 +- + drivers/mfd/tps65912-i2c.c | 4 +- + drivers/mfd/tps65912-spi.c | 4 +- + drivers/mfd/tps80031.c | 526 ----------------- + drivers/mfd/wcd934x.c | 21 +- + drivers/misc/hi6421v600-irq.c | 9 +- + drivers/regulator/hi6421v600-regulator.c | 10 +- + include/dt-bindings/clock/am4.h | 1 + + include/linux/mfd/da9063/core.h | 1 + + include/linux/mfd/hi6421-spmi-pmic.h | 25 - + include/linux/mfd/max77686-private.h | 26 +- + include/linux/mfd/ti_am335x_tscadc.h | 119 ++-- + include/linux/mfd/tps65912.h | 2 +- + include/linux/mfd/tps80031.h | 637 --------------------- + 77 files changed, 2120 insertions(+), 2200 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-axp209.txt + create mode 100644 Documentation/devicetree/bindings/gpio/x-powers,axp209-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,am3359-adc.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ti,am3359-tsc.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/ac100.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/axp20x.txt + create mode 100644 Documentation/devicetree/bindings/mfd/brcm,misc.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/samsung,s2mpa01.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/samsung,s2mps11.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/samsung,sec-core.txt + create mode 100644 Documentation/devicetree/bindings/mfd/ti,am3359-tscadc.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/x-powers,ac100.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml + delete mode 100644 drivers/mfd/tps80031.c + delete mode 100644 include/linux/mfd/hi6421-spmi-pmic.h + delete mode 100644 include/linux/mfd/tps80031.h +Merging backlight/for-backlight-next (3976e974df1f video: backlight: ili9320: Make ili9320_remove() return void) +$ 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 +Merge made by the 'recursive' strategy. + drivers/video/backlight/backlight.c | 28 +++++++++++++++++----------- + drivers/video/backlight/ili9320.c | 3 +-- + drivers/video/backlight/ili9320.h | 2 +- + drivers/video/backlight/vgg2432a4.c | 4 +++- + 4 files changed, 22 insertions(+), 15 deletions(-) +Merging battery/for-next (22ad4f99f63f power: supply: bq25890: Fix initial setting of the F_CONV_RATE field) +$ 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 (7492b724df4d Merge series "Remove TPS80031 driver" from Dmitry Osipenko <digetx@gmail.com>:) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next-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 (582122f1d73a apparmor: remove duplicated 'Returns:' comments) +$ 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 | 17 +++++------ + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 5 +-- + security/apparmor/include/lib.h | 9 ++++-- + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 7 ++--- + security/apparmor/lsm.c | 42 ++++++++------------------ + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 62 +++++++++++++++++++++++++++++++------- + security/apparmor/policy_unpack.c | 2 +- + security/apparmor/procattr.c | 2 -- + 11 files changed, 90 insertions(+), 66 deletions(-) +Merging integrity/next-integrity (32ba540f3c2a evm: mark evm_fixmode as __ro_after_init) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +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 1d94969779cc] 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 (15bf32398ad4 security: Return xattr name from security_dentry_init_security()) +$ 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 (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +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 (7eba41fe8c7b tpm_tis_spi: Add missing SPI ID) +$ 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 (c738888032ff watchdog: db8500_wdt: Rename symbols) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Removing include/linux/platform_data/ux500_wdt.h +Auto-merging drivers/watchdog/mtk_wdt.c +Removing drivers/watchdog/iop_wdt.c +Merge made by the 'recursive' strategy. + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 48 +- + .../devicetree/bindings/watchdog/mtk-wdt.txt | 2 + + drivers/mfd/db8500-prcmu.c | 13 +- + drivers/watchdog/Kconfig | 35 +- + drivers/watchdog/Makefile | 3 +- + drivers/watchdog/ar7_wdt.c | 6 +- + drivers/watchdog/bcm63xx_wdt.c | 2 + + drivers/watchdog/da9062_wdt.c | 7 + + drivers/watchdog/da9063_wdt.c | 7 + + drivers/watchdog/{ux500_wdt.c => db8500_wdt.c} | 89 ++- + drivers/watchdog/f71808e_wdt.c | 615 +++++++-------------- + drivers/watchdog/iTCO_wdt.c | 19 +- + drivers/watchdog/iop_wdt.c | 250 --------- + drivers/watchdog/meson_gxbb_wdt.c | 12 + + drivers/watchdog/mlx_wdt.c | 5 +- + drivers/watchdog/mtk_wdt.c | 7 + + drivers/watchdog/rti_wdt.c | 4 +- + drivers/watchdog/rza_wdt.c | 4 +- + drivers/watchdog/sp5100_tco.c | 9 + + drivers/watchdog/stm32_iwdg.c | 4 +- + drivers/watchdog/sunxi_wdt.c | 20 +- + include/linux/platform_data/ux500_wdt.h | 18 - + 22 files changed, 384 insertions(+), 795 deletions(-) + rename drivers/watchdog/{ux500_wdt.c => db8500_wdt.c} (54%) + delete mode 100644 drivers/watchdog/iop_wdt.c + delete mode 100644 include/linux/platform_data/ux500_wdt.h +Merging iommu/next (52d96919d6a8 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/smmu', 'arm/tegra', 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (d9516f346e8b audit: return early if the filter rule has a lower priority) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (4c7a7d5086cd dt-bindings: net: ti,bluetooth: Document default max-speed) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (97961f78e8bc mailbox: imx: support i.MX8ULP S4 MU) +$ 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 (e6f98315aba2 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (ea79c24a30aa Merge branch 'timers/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 kernel/fork.c +Merge made by the 'recursive' strategy. + include/linux/posix-timers.h | 2 ++ + kernel/fork.c | 1 + + kernel/time/posix-cpu-timers.c | 19 +++++++++++++++++-- + 3 files changed, 20 insertions(+), 2 deletions(-) +Merging clockevents/timers/drivers/next (eda9a4f7af6e clocksource/drivers/timer-ti-dm: Select TIMER_OF) +$ 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 (f889e52436d6 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 +Already up to date. +Merge made by the 'recursive' strategy. +Merging irqchip/irq/irqchip-next (11e45471abea Merge branch irq/misc-5.16 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 (67d4f6e3bf5d ftrace/samples: Add missing prototype for my_direct_func) +$ 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 (587a7d1703f3 Merge branch 'kcsan.2021.09.13b' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Merge made by the 'recursive' strategy. + include/linux/kcsan-checks.h | 3 ++ + 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 +++++++++++++++++------------------------ + 6 files changed, 186 insertions(+), 111 deletions(-) +Merging kvm/next (9c6eb531e760 Merge tag 'kvm-s390-next-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (5a2acbbb0179 Merge branch kvm/selftests/memslot 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 (3fd8417f2c72 KVM: s390: add debug statement for diag 318 CPNC data) +$ 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 (121f2faca2c0 xen/balloon: rename alloc/free_xenballooned_pages) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging arch/x86/xen/setup.c +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 + + arch/arm/xen/enlighten.c | 1 - + arch/arm/xen/hypercall.S | 1 - + arch/arm64/xen/hypercall.S | 1 - + arch/x86/include/asm/paravirt_types.h | 2 + + arch/x86/include/asm/xen/hypercall.h | 233 +++++++++++------------- + arch/x86/include/asm/xen/hypervisor.h | 4 + + arch/x86/include/asm/xen/pci.h | 19 -- + arch/x86/kernel/paravirt.c | 13 +- + arch/x86/pci/xen.c | 76 +------- + arch/x86/xen/enlighten.c | 116 +++--------- + arch/x86/xen/enlighten_hvm.c | 6 +- + arch/x86/xen/enlighten_pv.c | 35 +--- + arch/x86/xen/irq.c | 62 +------ + arch/x86/xen/mmu_pv.c | 52 ++++-- + arch/x86/xen/setup.c | 10 +- + arch/x86/xen/smp.c | 28 --- + arch/x86/xen/smp_pv.c | 2 - + arch/x86/xen/xen-head.S | 12 +- + arch/x86/xen/xen-ops.h | 4 +- + drivers/xen/Kconfig | 24 +++ + drivers/xen/Makefile | 2 +- + drivers/xen/balloon.c | 110 +++++++---- + drivers/xen/mem-reservation.c | 27 +-- + drivers/xen/pci.c | 76 ++++++++ + drivers/xen/pvcalls-back.c | 1 - + drivers/xen/xen-acpi-processor.c | 6 +- + drivers/xen/xen-pciback/Makefile | 7 + + drivers/xen/xen-pciback/conf_space_capability.c | 2 +- + drivers/xen/xen-pciback/conf_space_header.c | 8 +- + drivers/xen/xen-pciback/pci_stub.c | 3 +- + drivers/xen/xen-pciback/pciback.h | 5 + + drivers/xen/xen-pciback/xenbus.c | 8 +- + include/xen/arm/hypercall.h | 15 -- + include/xen/balloon.h | 3 - + include/xen/interface/callback.h | 19 +- + include/xen/interface/elfnote.h | 19 +- + include/xen/interface/event_channel.h | 2 +- + include/xen/interface/features.h | 2 +- + include/xen/interface/grant_table.h | 19 +- + include/xen/interface/hvm/dm_op.h | 19 +- + include/xen/interface/hvm/hvm_op.h | 20 +- + include/xen/interface/hvm/hvm_vcpu.h | 19 +- + include/xen/interface/hvm/params.h | 20 +- + include/xen/interface/hvm/start_info.h | 19 +- + include/xen/interface/io/9pfs.h | 19 +- + include/xen/interface/io/blkif.h | 2 +- + include/xen/interface/io/console.h | 2 +- + include/xen/interface/io/displif.h | 19 +- + include/xen/interface/io/fbif.h | 19 +- + include/xen/interface/io/kbdif.h | 19 +- + include/xen/interface/io/netif.h | 19 +- + include/xen/interface/io/pciif.h | 19 +- + include/xen/interface/io/protocols.h | 2 +- + include/xen/interface/io/pvcalls.h | 2 + + include/xen/interface/io/ring.h | 19 +- + include/xen/interface/io/sndif.h | 19 +- + include/xen/interface/io/vscsiif.h | 19 +- + include/xen/interface/io/xenbus.h | 2 +- + include/xen/interface/io/xs_wire.h | 2 +- + include/xen/interface/memory.h | 2 +- + include/xen/interface/nmi.h | 2 +- + include/xen/interface/physdev.h | 20 +- + include/xen/interface/platform.h | 19 +- + include/xen/interface/sched.h | 19 +- + include/xen/interface/vcpu.h | 19 +- + include/xen/interface/version.h | 2 +- + include/xen/interface/xen-mca.h | 1 + + include/xen/interface/xen.h | 19 +- + include/xen/interface/xenpmu.h | 2 +- + include/xen/pci.h | 28 +++ + include/xen/xen.h | 6 - + 72 files changed, 494 insertions(+), 967 deletions(-) + create mode 100644 include/xen/pci.h +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 (f9eaaa82b474 workqueue: doc: Call out the non-reentrance conditions) +$ 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 (97ae45953ea9 platform/x86: system76_acpi: Fix input device error handling) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (297d34e73d49 platform/chrome: cros_ec_proto: Use ec_command for check_features) +$ 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 +Auto-merging drivers/mfd/cros_ec_dev.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 14 +++- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 3 +- + drivers/mfd/cros_ec_dev.c | 4 +- + drivers/platform/chrome/cros_ec_lpc.c | 4 +- + drivers/platform/chrome/cros_ec_proto.c | 79 ++++++++++++++++------ + drivers/platform/chrome/cros_ec_sensorhub.c | 6 +- + drivers/platform/chrome/cros_ec_typec.c | 74 ++++++-------------- + drivers/platform/chrome/cros_usbpd_notify.c | 50 +------------- + include/linux/platform_data/cros_ec_proto.h | 7 +- + 9 files changed, 104 insertions(+), 137 deletions(-) +Merging hsi/for-next (4ef69e17eb56 HSI: cmt_speech: unmark comments as kernel-doc) +$ 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 (97b31c1f8eb8 leds: trigger: Disable CPU trigger on PREEMPT_RT) +$ 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 (56d33754481f Merge tag 'drm-next-2021-11-03' of git://anongit.freedesktop.org/drm/drm) +$ 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 (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (048ff8629e11 Merge tag 'usb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging 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 (910c996335c3 USB: serial: keyspan: fix memleak on probe errors) +$ 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. +Merging tty/tty-next (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (9e6ef3a25e5e dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging phy-next/next (b4dc97ab0a62 phy: Sparx5 Eth SerDes: Fix return value check in sparx5_serdes_probe()) +$ 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 (abd9a6049bb5 soundwire: qcom: add debugfs entry for soundwire register dump) +$ 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 (0a0624a26f9c thunderbolt: Fix -Wrestrict warning) +$ 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 (3bf1311f351e vfio/ccw: Convert to use vfio_register_emulated_iommu_dev()) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging iio/togreg (12b6d77431f5 iio: adc: ina2xx: Avoid double reference counting from get_task_struct/put_task_struct()) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/iio/adc/stm32-adc.c +Merge made by the 'recursive' strategy. + drivers/iio/accel/mma7660.c | 8 +++- + drivers/iio/adc/imx7d_adc.c | 5 +- + drivers/iio/adc/ina2xx-adc.c | 11 ++--- + drivers/iio/adc/lpc18xx_adc.c | 6 +-- + drivers/iio/adc/stm32-adc.c | 3 +- + drivers/iio/adc/xilinx-xadc-core.c | 62 ++++++++++++++++--------- + drivers/iio/common/st_sensors/st_sensors_core.c | 4 +- + drivers/iio/pressure/ms5611.h | 6 +-- + drivers/iio/pressure/ms5611_core.c | 7 ++- + drivers/iio/pressure/ms5611_i2c.c | 11 ++--- + drivers/iio/pressure/ms5611_spi.c | 17 +++---- + 11 files changed, 77 insertions(+), 63 deletions(-) +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 (dfe14674bf7b Merge branch 'icc-rpm' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging dmaengine/next (e06748539432 dmaengine: fsl-edma: support edma memcpy) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/qcom_bam_dma.txt | 2 + + drivers/dma/Kconfig | 2 +- + drivers/dma/altera-msgdma.c | 10 +- + drivers/dma/at_xdmac.c | 69 ++++++------- + drivers/dma/bestcomm/ata.c | 2 +- + drivers/dma/bestcomm/bestcomm.c | 22 ++-- + drivers/dma/bestcomm/fec.c | 4 +- + drivers/dma/bestcomm/gen_bd.c | 4 +- + drivers/dma/dma-jz4780.c | 1 + + drivers/dma/dmaengine.c | 3 +- + drivers/dma/dmaengine.h | 2 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 112 +++++++++++++++------ + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 35 ++++++- + drivers/dma/dw-edma/dw-edma-core.c | 1 - + drivers/dma/dw-edma/dw-edma-pcie.c | 17 +--- + drivers/dma/dw/pci.c | 6 +- + drivers/dma/fsl-edma-common.c | 35 ++++++- + drivers/dma/fsl-edma-common.h | 4 + + drivers/dma/fsl-edma.c | 7 ++ + drivers/dma/hisi_dma.c | 6 +- + drivers/dma/hsu/pci.c | 6 +- + drivers/dma/idxd/device.c | 29 ++---- + drivers/dma/idxd/dma.c | 5 +- + drivers/dma/idxd/idxd.h | 2 - + drivers/dma/idxd/init.c | 14 ++- + drivers/dma/idxd/irq.c | 8 +- + drivers/dma/idxd/registers.h | 4 +- + drivers/dma/imx-sdma.c | 28 +++--- + drivers/dma/ioat/init.c | 10 +- + drivers/dma/milbeaut-hdmac.c | 2 +- + drivers/dma/mmp_pdma.c | 1 + + drivers/dma/plx_dma.c | 10 +- + drivers/dma/qcom/bam_dma.c | 90 +++++++++++------ + drivers/dma/sa11x0-dma.c | 11 +- + drivers/dma/sh/rcar-dmac.c | 13 +-- + drivers/dma/sh/rz-dmac.c | 16 ++- + drivers/dma/stm32-dma.c | 24 +++-- + drivers/dma/stm32-mdma.c | 3 +- + drivers/dma/tegra210-adma.c | 58 +++++++---- + drivers/dma/xilinx/xilinx_dma.c | 14 ++- + drivers/dma/xilinx/xilinx_dpdma.c | 15 +-- + drivers/dma/xilinx/zynqmp_dma.c | 79 +++++++-------- + include/linux/dmaengine.h | 2 - + 43 files changed, 464 insertions(+), 324 deletions(-) +Merging cgroup/for-next (588e5d876648 cgroup: bpf: Move wrapper for __cgroup_bpf_*() to kernel/bpf/cgroup.c) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Already up to date. +Merging scsi/for-next (a4dde9b4c3b0 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging include/scsi/scsi_device.h +Auto-merging drivers/scsi/ufs/ufshcd.h +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/sr.c +Merge made by the 'recursive' strategy. + drivers/scsi/elx/libefc_sli/sli4.c | 9 +- + drivers/scsi/qla2xxx/qla_attr.c | 7 +- + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_edif.c | 328 +++++++++++++++--------------- + drivers/scsi/qla2xxx/qla_edif.h | 13 +- + drivers/scsi/qla2xxx/qla_edif_bsg.h | 2 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 +- + drivers/scsi/qla2xxx/qla_init.c | 108 +++++++--- + drivers/scsi/qla2xxx/qla_iocb.c | 3 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 + + drivers/scsi/qla2xxx/qla_mr.c | 23 --- + drivers/scsi/qla2xxx/qla_os.c | 37 +--- + drivers/scsi/qla2xxx/qla_target.c | 3 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/scsi_sysfs.c | 11 +- + drivers/scsi/sr.c | 1 - + drivers/scsi/ufs/ufs-debugfs.c | 98 ++++++++- + drivers/scsi/ufs/ufs-exynos.c | 354 +++++++++++++++++++++++++++++++-- + drivers/scsi/ufs/ufs-exynos.h | 27 ++- + drivers/scsi/ufs/ufshcd.c | 110 ++++++---- + drivers/scsi/ufs/ufshcd.h | 13 ++ + drivers/scsi/ufs/ufshci.h | 15 +- + drivers/target/target_core_tmr.c | 17 +- + drivers/target/target_core_transport.c | 30 ++- + include/scsi/scsi_device.h | 6 - + 25 files changed, 867 insertions(+), 364 deletions(-) +Merging scsi-mkp/for-next (3344b58b53a7 scsi: scsi_debug: Don't call kcalloc() if size arg is zero) +$ 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 include/scsi/scsi_cmnd.h +Auto-merging drivers/scsi/ufs/ufshpb.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_ioctl.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/scsi_debug.c +Merge made by the 'recursive' strategy. + drivers/scsi/hosts.c | 1 + + drivers/scsi/scsi_debug.c | 4 ++++ + drivers/scsi/scsi_error.c | 25 +++++++++++++++++++++++++ + drivers/scsi/scsi_ioctl.c | 2 ++ + drivers/scsi/scsi_lib.c | 3 +-- + drivers/scsi/scsi_sysfs.c | 1 + + drivers/scsi/ufs/ufshpb.c | 24 +++++++++++++----------- + drivers/scsi/ufs/ufshpb.h | 1 - + include/scsi/scsi_cmnd.h | 2 +- + include/scsi/scsi_host.h | 1 + + 10 files changed, 49 insertions(+), 15 deletions(-) +Merging vhost/linux-next (47ed04961471 virtio_gpio: drop packed attribute) +$ 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/iommu/virtio-iommu.c | 113 +++++++++++++++++++++++++++++++------- + include/uapi/linux/virtio_gpio.h | 2 +- + include/uapi/linux/virtio_iommu.h | 8 ++- + 3 files changed, 102 insertions(+), 21 deletions(-) +Merging rpmsg/for-next (6ee5808de074 Merge branches '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/remoteproc/linux.git rpmsg/for-next +Auto-merging include/linux/rpmsg.h +Auto-merging drivers/soc/qcom/qcom_aoss.c +Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/remoteproc/mtk,scp.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 123 +- + .../remoteproc/amlogic,meson-mx-ao-arc.yaml | 87 ++ + .../devicetree/bindings/remoteproc/mtk,scp.txt | 36 - + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 92 ++ + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 59 +- + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 39 +- + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 4 +- + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 4 +- + MAINTAINERS | 4 +- + drivers/remoteproc/Kconfig | 32 +- + drivers/remoteproc/Makefile | 2 + + drivers/remoteproc/imx_dsp_rproc.c | 1206 ++++++++++++++++++++ + drivers/remoteproc/imx_rproc.c | 71 +- + drivers/remoteproc/imx_rproc.h | 39 + + drivers/remoteproc/meson_mx_ao_arc.c | 261 +++++ + drivers/remoteproc/mtk_common.h | 1 + + drivers/remoteproc/mtk_scp.c | 48 +- + drivers/remoteproc/omap_remoteproc.c | 6 +- + drivers/remoteproc/qcom_q6v5.c | 57 +- + drivers/remoteproc/qcom_q6v5.h | 7 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 7 +- + drivers/remoteproc/qcom_q6v5_mss.c | 304 ++++- + drivers/remoteproc/qcom_q6v5_pas.c | 141 +-- + drivers/remoteproc/qcom_q6v5_wcss.c | 5 +- + drivers/remoteproc/qcom_wcnss.c | 1 - + drivers/remoteproc/remoteproc_core.c | 8 +- + drivers/remoteproc/remoteproc_coredump.c | 2 +- + drivers/remoteproc/remoteproc_elf_loader.c | 4 +- + drivers/remoteproc/remoteproc_virtio.c | 12 + + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 +- + drivers/rpmsg/mtk_rpmsg.c | 2 +- + drivers/rpmsg/qcom_glink_native.c | 90 +- + drivers/rpmsg/rpmsg_char.c | 2 - + drivers/rpmsg/virtio_rpmsg_bus.c | 3 +- + include/linux/remoteproc.h | 12 - + include/linux/rpmsg.h | 2 +- + 37 files changed, 2462 insertions(+), 315 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/amlogic,meson-mx-ao-arc.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/mtk,scp.yaml + create mode 100644 drivers/remoteproc/imx_dsp_rproc.c + create mode 100644 drivers/remoteproc/imx_rproc.h + create mode 100644 drivers/remoteproc/meson_mx_ao_arc.c +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 (7d0003da6297 virtio_gpio: drop packed attribute) +$ 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 +Auto-merging include/uapi/linux/virtio_gpio.h +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Auto-merging drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +Removing drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_gpio.c +Auto-merging drivers/gpio/gpio-uniphier.c +Auto-merging drivers/gpio/gpio-mlxbf2.c +Auto-merging drivers/firmware/xilinx/zynqmp.c +Merge made by the 'recursive' strategy. + .../bindings/gpio/rockchip,gpio-bank.yaml | 2 + + .../bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml | 43 +++ + drivers/firmware/xilinx/zynqmp.c | 46 ++++ + drivers/gpio/Kconfig | 123 +++++---- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-aggregator.c | 25 +- + drivers/gpio/gpio-max7300.c | 4 +- + drivers/gpio/gpio-max7301.c | 4 +- + drivers/gpio/gpio-max730x.c | 6 +- + drivers/gpio/gpio-max77620.c | 1 - + drivers/gpio/gpio-mc33880.c | 2 - + drivers/gpio/gpio-mlxbf2.c | 142 +++++++++- + drivers/gpio/gpio-realtek-otto.c | 2 +- + drivers/gpio/gpio-tegra186.c | 114 +++++++- + drivers/gpio/gpio-tps65218.c | 1 - + drivers/gpio/gpio-uniphier.c | 18 +- + drivers/gpio/gpio-virtio.c | 302 ++++++++++++++++++++- + drivers/gpio/gpio-xilinx.c | 6 +- + drivers/gpio/gpio-zynqmp-modepin.c | 162 +++++++++++ + drivers/net/ethernet/mellanox/mlxbf_gige/Makefile | 1 - + .../net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h | 12 - + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_gpio.c | 212 --------------- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 22 +- + include/linux/firmware/xlnx-zynqmp.h | 14 + + include/linux/spi/max7301.h | 2 +- + include/uapi/linux/virtio_gpio.h | 25 ++ + 26 files changed, 942 insertions(+), 350 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml + create mode 100644 drivers/gpio/gpio-zynqmp-modepin.c + delete mode 100644 drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_gpio.c +Merging gpio-intel/for-next (8bb7eca972ad Linux 5.15) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (5065e08e4ef3 gpio: sim: fix missing unlock on error in gpio_sim_config_commit_item()) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Merge made by the 'recursive' strategy. + Documentation/admin-guide/gpio/gpio-sim.rst | 72 +++ + Documentation/filesystems/configfs.rst | 6 +- + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-sim.c | 884 ++++++++++++++++++++++++++ + fs/configfs/configfs_internal.h | 22 +- + fs/configfs/dir.c | 276 +++++++- + include/linux/configfs.h | 3 +- + samples/configfs/configfs_sample.c | 153 +++++ + tools/testing/selftests/gpio/.gitignore | 2 + + tools/testing/selftests/gpio/Makefile | 4 +- + tools/testing/selftests/gpio/config | 1 + + tools/testing/selftests/gpio/gpio-chip-info.c | 57 ++ + tools/testing/selftests/gpio/gpio-line-name.c | 55 ++ + tools/testing/selftests/gpio/gpio-sim.sh | 229 +++++++ + 15 files changed, 1750 insertions(+), 23 deletions(-) + create mode 100644 Documentation/admin-guide/gpio/gpio-sim.rst + create mode 100644 drivers/gpio/gpio-sim.c + create mode 100644 tools/testing/selftests/gpio/gpio-chip-info.c + create mode 100644 tools/testing/selftests/gpio/gpio-line-name.c + create mode 100755 tools/testing/selftests/gpio/gpio-sim.sh +Merging pinctrl/for-next (a0f160ffcb83 pinctrl: add pinctrl/GPIO driver for Apple SoCs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (176412f8674b pinctrl: intel: Kconfig: Add configuration menu to Intel pin control) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'recursive' strategy. +Merging pinctrl-renesas/renesas-pinctrl (f4e260bffcf3 pinctrl: renesas: checker: Prefix common checker output) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (f9d8de699ac4 pinctrl: samsung: support ExynosAutov9 SoC pinctrl) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. +Merging pwm/for-next (e9d866d5a629 pwm: vt8500: Rename pwm_busy_wait() to make it obviously driver-specific) +$ 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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 2 ++ + drivers/pwm/Kconfig | 4 ++- + drivers/pwm/core.c | 9 +++++++ + drivers/pwm/pwm-atmel.c | 1 - + drivers/pwm/pwm-samsung.c | 30 ++++++++++++++++------ + drivers/pwm/pwm-visconti.c | 14 +--------- + drivers/pwm/pwm-vt8500.c | 16 ++++++------ + include/linux/pwm.h | 13 ++++++++++ + 8 files changed, 58 insertions(+), 31 deletions(-) +Merging userns/for-next (a21aa98d069a Merge of per_signal_struct_coredumps-for-v5.16, ucount-fixes-for-v5.16, and exit-cleanups-for-v5.16 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 net/batman-adv/tp_meter.c +Auto-merging kernel/signal.c +Auto-merging kernel/reboot.c +Auto-merging kernel/kthread.c +Auto-merging fs/ocfs2/journal.c +Auto-merging drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +Auto-merging drivers/staging/rtl8723bs/core/rtw_xmit.c +Auto-merging drivers/staging/rtl8723bs/core/rtw_cmd.c +Auto-merging drivers/staging/r8188eu/include/osdep_service.h +CONFLICT (modify/delete): drivers/staging/r8188eu/core/rtw_mp.c deleted in HEAD and modified in userns/for-next. Version userns/for-next of drivers/staging/r8188eu/core/rtw_mp.c left in tree. +Auto-merging drivers/staging/r8188eu/core/rtw_cmd.c +Auto-merging arch/xtensa/kernel/traps.c +Auto-merging arch/s390/kernel/traps.c +Auto-merging arch/s390/kernel/dumpstack.c +Auto-merging arch/powerpc/kernel/signal_64.c +Auto-merging arch/powerpc/kernel/signal_32.c +Auto-merging arch/m68k/kernel/traps.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/r8188eu/core/rtw_mp.c +rm 'drivers/staging/r8188eu/core/rtw_mp.c' +$ git commit --no-edit -v -a +[master f21e5bdca23a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git +$ git diff -M --stat --summary HEAD^.. + arch/arc/kernel/process.c | 2 +- + arch/m68k/kernel/traps.c | 2 +- + arch/mips/kernel/r2300_fpu.S | 4 +-- + arch/mips/kernel/syscall.c | 9 ------ + arch/nds32/kernel/traps.c | 2 +- + arch/nds32/mm/fault.c | 6 +--- + arch/openrisc/kernel/traps.c | 2 +- + arch/openrisc/mm/fault.c | 4 +-- + arch/powerpc/kernel/signal_32.c | 6 ++-- + arch/powerpc/kernel/signal_64.c | 9 ++++-- + arch/s390/include/asm/kdebug.h | 2 +- + arch/s390/kernel/dumpstack.c | 2 +- + arch/s390/kernel/traps.c | 2 +- + arch/s390/mm/fault.c | 2 -- + arch/sh/kernel/cpu/fpu.c | 10 ++++--- + arch/sh/kernel/traps.c | 2 +- + arch/sh/mm/fault.c | 2 -- + arch/sparc/kernel/signal_32.c | 4 +-- + arch/sparc/kernel/windows.c | 6 ++-- + arch/sparc/mm/fault_32.c | 1 - + arch/sparc/mm/tsb.c | 2 +- + arch/um/kernel/trap.c | 2 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 3 +- + arch/x86/kernel/doublefault_32.c | 3 -- + arch/x86/kernel/vm86_32.c | 10 +++---- + arch/xtensa/kernel/traps.c | 2 +- + arch/xtensa/mm/fault.c | 3 +- + drivers/firmware/stratix10-svc.c | 4 +-- + drivers/soc/ti/wkup_m3_ipc.c | 2 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 2 +- + drivers/staging/r8188eu/include/osdep_service.h | 2 -- + drivers/staging/rtl8712/osdep_service.h | 1 - + drivers/staging/rtl8712/rtl8712_cmd.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 +- + .../rtl8723bs/include/osdep_service_linux.h | 2 -- + fs/exec.c | 2 +- + fs/ocfs2/journal.c | 5 +--- + include/linux/sched/signal.h | 1 + + include/linux/signal_types.h | 3 ++ + include/uapi/asm-generic/signal-defs.h | 1 + + kernel/entry/syscall_user_dispatch.c | 12 +++++--- + kernel/kthread.c | 2 +- + kernel/reboot.c | 1 - + kernel/signal.c | 34 +++++++++++++++------- + net/batman-adv/tp_meter.c | 2 +- + 47 files changed, 94 insertions(+), 94 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (f35dcaa0a8a2 selftests/core: fix conflicting types compile error for close_range()) +$ 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 (20b02fe36530 arm64: cpufeature: Export this_cpu_has_cap helper) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging rtc/rtc-next (a5feda3b361e rtc: s3c: Add time range) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Removing drivers/rtc/rtc-tps80031.c +Auto-merging drivers/rtc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 49 +++ + .../devicetree/bindings/rtc/nxp,pcf85063.txt | 9 + + MAINTAINERS | 1 + + drivers/rtc/Kconfig | 19 +- + drivers/rtc/Makefile | 2 +- + drivers/rtc/class.c | 20 +- + drivers/rtc/dev.c | 65 +++ + drivers/rtc/interface.c | 3 +- + drivers/rtc/rtc-ds1302.c | 7 + + drivers/rtc/rtc-ds1390.c | 7 + + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-mcp795.c | 7 + + drivers/rtc/rtc-msc313.c | 259 ++++++++++++ + drivers/rtc/rtc-omap.c | 1 - + drivers/rtc/rtc-pcf2123.c | 9 + + drivers/rtc/rtc-pcf85063.c | 14 + + drivers/rtc/rtc-pcf8523.c | 434 +++++++++------------ + drivers/rtc/rtc-rv3028.c | 74 ++++ + drivers/rtc/rtc-rv3032.c | 80 +++- + drivers/rtc/rtc-rx6110.c | 2 +- + drivers/rtc/rtc-s3c.c | 106 +++-- + drivers/rtc/rtc-s5m.c | 1 - + drivers/rtc/rtc-sun6i.c | 13 +- + drivers/rtc/rtc-tps80031.c | 324 --------------- + include/linux/rtc.h | 3 + + include/uapi/linux/rtc.h | 31 +- + 26 files changed, 902 insertions(+), 640 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/mstar,msc313-rtc.yaml + create mode 100644 drivers/rtc/rtc-msc313.c + delete mode 100644 drivers/rtc/rtc-tps80031.c +Merging nvdimm/libnvdimm-for-next (e765f13ed126 nvdimm/pmem: move dax_attribute_group from dax to pmem) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Auto-merging drivers/nvdimm/pmem.c +Merge made by the 'recursive' strategy. + drivers/dax/super.c | 100 +++++++++----------------------------------------- + drivers/nvdimm/pmem.c | 43 ++++++++++++++++++++++ + include/linux/dax.h | 2 - + 3 files changed, 61 insertions(+), 84 deletions(-) +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 +Already up to date. +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 (1e6d69c7b9cd selftests/seccomp: Report event mismatches more clearly) +$ 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 +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'recursive' strategy. + tools/testing/selftests/seccomp/seccomp_bpf.c | 56 ++++++++++++++++++++++++--- + 1 file changed, 50 insertions(+), 6 deletions(-) +Merging kspp/for-next/kspp (879f756fa9bf Merge branches 'for-next/hardening', 'for-next/overflow' and 'for-next/thread_info/cpu' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merge made by the 'recursive' strategy. +Merging kspp-gustavo/for-next/kspp (704f6142a903 firmware/psci: fix application of sizeof to pointer) +$ 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 drivers/scsi/st.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 8 ++++++++ + 1 file changed, 8 insertions(+) +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 (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking) +$ 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 (413333fd6a88 nvmem: imx-ocotp: add support for post processing) +$ 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 (285f68afa8b2 x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted) +$ 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 (97fbb29fc1eb MAINTAINERS: Add DT Bindings for Auxiliary Display Drivers) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification) +$ 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 +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_bt.c | 16 +++--- + kernel/debug/kdb/kdb_main.c | 37 ++++++------- + kernel/debug/kdb/kdb_private.h | 4 +- + kernel/debug/kdb/kdb_support.c | 118 +++++++++-------------------------------- + 4 files changed, 53 insertions(+), 122 deletions(-) +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 (8bb7eca972ad Linux 5.15) +$ 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 (52a5d80a2225 kunit: tool: fix typecheck errors about loading qemu configs) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging trivial/for-next (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 (8c61951b372d Merge tag 'soundwire-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire 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 (988f45dfe7ea MAINTAINERS: Rust) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging tools/lib/perf/include/perf/event.h +Auto-merging scripts/kconfig/confdata.c +CONFLICT (content): Merge conflict in scripts/kconfig/confdata.c +Auto-merging scripts/Makefile.modfinal +CONFLICT (content): Merge conflict in scripts/Makefile.modfinal +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Makefile +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 arch/riscv/Makefile +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Resolved 'Makefile' using previous resolution. +Resolved 'scripts/Makefile.modfinal' using previous resolution. +Resolved 'scripts/kconfig/confdata.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dcbe41626133] 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 | 218 ++ + MAINTAINERS | 14 + + Makefile | 153 +- + arch/arm/rust/target.json | 27 + + arch/arm64/rust/target.json | 34 + + arch/powerpc/rust/target.json | 29 + + arch/riscv/Makefile | 1 + + arch/riscv/rust/rv32ima.json | 36 + + arch/riscv/rust/rv32imac.json | 36 + + arch/riscv/rust/rv64ima.json | 36 + + arch/riscv/rust/rv64imac.json | 36 + + arch/x86/rust/target.json | 36 + + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 31 +- + kernel/kallsyms.c | 10 +- + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 7 + + rust/Makefile | 355 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 425 ++++ + rust/alloc/borrow.rs | 494 ++++ + rust/alloc/boxed.rs | 1789 +++++++++++++++ + rust/alloc/collections/mod.rs | 155 ++ + rust/alloc/fmt.rs | 587 +++++ + rust/alloc/lib.rs | 202 ++ + rust/alloc/macros.rs | 126 + + rust/alloc/prelude/mod.rs | 17 + + rust/alloc/prelude/v1.rs | 16 + + rust/alloc/raw_vec.rs | 609 +++++ + rust/alloc/slice.rs | 1271 +++++++++++ + rust/alloc/str.rs | 614 +++++ + rust/alloc/string.rs | 2845 +++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 157 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 303 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3295 +++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 172 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 33 + + rust/compiler_builtins.rs | 57 + + rust/exports.c | 16 + + rust/helpers.c | 301 +++ + rust/kernel/allocator.rs | 63 + + rust/kernel/bindings.rs | 46 + + rust/kernel/bindings_helper.h | 25 + + 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 | 523 +++++ + rust/kernel/file.rs | 131 ++ + rust/kernel/file_operations.rs | 715 ++++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/io_mem.rs | 207 ++ + rust/kernel/iov_iter.rs | 81 + + rust/kernel/lib.rs | 250 ++ + rust/kernel/linked_list.rs | 247 ++ + rust/kernel/miscdev.rs | 111 + + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 162 ++ + rust/kernel/platdev.rs | 153 ++ + rust/kernel/power.rs | 118 + + rust/kernel/prelude.rs | 26 + + rust/kernel/print.rs | 441 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 562 +++++ + rust/kernel/security.rs | 56 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/std_vendor.rs | 150 ++ + rust/kernel/str.rs | 253 ++ + rust/kernel/sync/arc.rs | 480 ++++ + rust/kernel/sync/condvar.rs | 132 ++ + rust/kernel/sync/guard.rs | 91 + + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 80 + + rust/kernel/sync/mutex.rs | 101 + + rust/kernel/sync/spinlock.rs | 102 + + rust/kernel/sysctl.rs | 198 ++ + rust/kernel/task.rs | 182 ++ + rust/kernel/types.rs | 228 ++ + rust/kernel/user_ptr.rs | 175 ++ + rust/macros/helpers.rs | 79 + + rust/macros/lib.rs | 128 ++ + rust/macros/module.rs | 678 ++++++ + 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/Makefile.modfinal | 10 +- + scripts/generate_rust_analyzer.py | 133 ++ + scripts/is_rust_module.sh | 19 + + scripts/kallsyms.c | 40 +- + 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 +- + 131 files changed, 25442 insertions(+), 34 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/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.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/io_mem.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/power.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/std_vendor.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/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/helpers.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/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/is_rust_module.sh + create mode 100755 scripts/rust-version.sh +$ git am -3 ../patches/0001-Kbuild-fix-for-kbuild-split-DEBUG_CFLAGS-out-to-scri.patch +Applying: Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug" +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/Makefile.debug +$ git add -A . +$ git commit -v -a --amend +[master db5bfc81fb23] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Mon Nov 8 11:18:29 2021 +1100 +Merging cxl/next (c6d7e1341cc9 ocxl: Use pci core's DVSEC functionality) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/nvdimm/core.c +Auto-merging drivers/nvdimm/btt.c +Auto-merging drivers/cxl/cxl.h +Merge made by the 'recursive' strategy. + Documentation/driver-api/cxl/memory-devices.rst | 6 + + arch/powerpc/platforms/powernv/ocxl.c | 3 +- + drivers/cxl/acpi.c | 139 ++- + drivers/cxl/core/Makefile | 1 + + drivers/cxl/core/bus.c | 119 ++- + drivers/cxl/core/core.h | 11 +- + drivers/cxl/core/mbox.c | 787 ++++++++++++++ + drivers/cxl/core/memdev.c | 118 ++- + drivers/cxl/core/pmem.c | 39 +- + drivers/cxl/cxl.h | 58 +- + drivers/cxl/cxlmem.h | 202 +++- + drivers/cxl/pci.c | 1240 ++--------------------- + drivers/cxl/pci.h | 14 +- + drivers/cxl/pmem.c | 163 ++- + drivers/misc/ocxl/config.c | 13 +- + drivers/nvdimm/btt.c | 11 +- + drivers/nvdimm/btt_devs.c | 14 +- + drivers/nvdimm/core.c | 40 +- + drivers/nvdimm/label.c | 139 ++- + drivers/nvdimm/label.h | 94 +- + drivers/nvdimm/namespace_devs.c | 95 +- + drivers/nvdimm/nd-core.h | 5 +- + drivers/nvdimm/nd.h | 185 +++- + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/pci/pci.c | 32 + + include/linux/nd.h | 4 +- + include/linux/pci.h | 1 + + tools/testing/cxl/Kbuild | 38 + + tools/testing/cxl/config_check.c | 13 + + tools/testing/cxl/mock_acpi.c | 109 ++ + tools/testing/cxl/mock_pmem.c | 24 + + tools/testing/cxl/test/Kbuild | 10 + + tools/testing/cxl/test/cxl.c | 576 +++++++++++ + tools/testing/cxl/test/mem.c | 256 +++++ + tools/testing/cxl/test/mock.c | 171 ++++ + tools/testing/cxl/test/mock.h | 27 + + 36 files changed, 3269 insertions(+), 1490 deletions(-) + create mode 100644 drivers/cxl/core/mbox.c + create mode 100644 tools/testing/cxl/Kbuild + create mode 100644 tools/testing/cxl/config_check.c + create mode 100644 tools/testing/cxl/mock_acpi.c + create mode 100644 tools/testing/cxl/mock_pmem.c + create mode 100644 tools/testing/cxl/test/Kbuild + create mode 100644 tools/testing/cxl/test/cxl.c + create mode 100644 tools/testing/cxl/test/mem.c + create mode 100644 tools/testing/cxl/test/mock.c + create mode 100644 tools/testing/cxl/test/mock.h +Merging folio/for-next (d2f0559fc2d1 csky,sparc: Declare flush_dcache_folio()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Merge made by the 'recursive' strategy. + arch/csky/abiv1/inc/abi/cacheflush.h | 1 + + arch/csky/abiv2/inc/abi/cacheflush.h | 2 ++ + arch/sparc/include/asm/cacheflush_32.h | 1 + + arch/sparc/include/asm/cacheflush_64.h | 1 + + 4 files changed, 5 insertions(+) +Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string) +$ git merge -m Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git bitmap/bitmap-master-5.15 +Removing tools/include/asm-generic/bitops/find.h +Auto-merging mm/percpu.c +Auto-merging lib/vsprintf.c +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/bitmap.h +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/f2fs/segment.c +Auto-merging drivers/tty/n_tty.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/infiniband/hw/irdma/hw.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/block/rnbd/rnbd-clt.c +Auto-merging block/blk-mq.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/bitops.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/parisc/include/asm/bitops.h +CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/include/asm/bitops.h +Auto-merging arch/csky/include/asm/bitops.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/parisc/include/asm/bitops.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 80996d6b47c6] Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + arch/alpha/include/asm/bitops.h | 2 - + arch/arc/Kconfig | 1 - + arch/arc/include/asm/bitops.h | 1 - + arch/arm/include/asm/bitops.h | 1 - + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/bitops.h | 1 - + arch/csky/include/asm/bitops.h | 1 - + arch/h8300/include/asm/bitops.h | 1 - + arch/hexagon/include/asm/bitops.h | 1 - + arch/ia64/include/asm/bitops.h | 2 - + arch/m68k/include/asm/bitops.h | 2 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/bitops.h | 1 - + arch/openrisc/include/asm/bitops.h | 1 - + arch/parisc/include/asm/bitops.h | 1 - + arch/powerpc/include/asm/bitops.h | 2 - + arch/powerpc/include/asm/cputhreads.h | 2 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/riscv/include/asm/bitops.h | 1 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/bitops.h | 1 - + arch/s390/kvm/kvm-s390.c | 2 +- + arch/sh/include/asm/bitops.h | 1 - + arch/sparc/include/asm/bitops_32.h | 1 - + arch/sparc/include/asm/bitops_64.h | 2 - + arch/x86/Kconfig | 1 - + arch/x86/include/asm/bitops.h | 2 - + arch/x86/kernel/apic/vector.c | 4 +- + arch/x86/um/Kconfig | 1 - + arch/xtensa/include/asm/bitops.h | 1 - + block/blk-mq.c | 2 +- + drivers/block/rnbd/rnbd-clt.c | 2 +- + drivers/dma/ti/edma.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +- + drivers/hwmon/ltc2992.c | 3 +- + drivers/iio/adc/ad7124.c | 2 +- + drivers/infiniband/hw/irdma/hw.c | 16 +- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/mc/mc-devnode.c | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/net/virtio_net.c | 2 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/soc/fsl/qbman/bman_portal.c | 2 +- + drivers/soc/fsl/qbman/qman_portal.c | 2 +- + drivers/soc/ti/k3-ringacc.c | 4 +- + drivers/tty/n_tty.c | 2 +- + drivers/virt/acrn/ioreq.c | 3 +- + fs/f2fs/segment.c | 8 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 4 +- + fs/ocfs2/dlm/dlmmaster.c | 18 +- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/dlm/dlmthread.c | 2 +- + include/asm-generic/bitops.h | 1 - + include/asm-generic/bitops/le.h | 64 ---- + include/linux/bitmap.h | 34 +- + include/linux/bitops.h | 34 -- + include/linux/cpumask.h | 46 ++- + include/linux/find.h | 372 +++++++++++++++++++++ + kernel/time/clocksource.c | 4 +- + lib/Kconfig | 3 - + lib/find_bit.c | 21 ++ + lib/find_bit_benchmark.c | 21 ++ + lib/genalloc.c | 2 +- + lib/test_bitmap.c | 37 ++ + lib/vsprintf.c | 24 +- + mm/percpu.c | 35 +- + net/ncsi/ncsi-manage.c | 4 +- + tools/include/asm-generic/bitops.h | 1 - + tools/include/asm-generic/bitops/find.h | 145 -------- + tools/include/linux/bitmap.h | 7 +- + .../bitops => tools/include/linux}/find.h | 54 ++- + tools/lib/find_bit.c | 20 ++ + 75 files changed, 637 insertions(+), 440 deletions(-) + create mode 100644 include/linux/find.h + delete mode 100644 tools/include/asm-generic/bitops/find.h + rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%) +Merging zstd/zstd-1.4.10 (8e211b894b58 lib: zstd: Add cast to silence clang's -Wbitwise-instead-of-logical) +$ git merge -m Merge branch 'zstd-1.4.10' of https://github.com/terrelln/linux.git zstd/zstd-1.4.10 +Removing lib/zstd/zstd_opt.h +Removing lib/zstd/zstd_internal.h +Removing lib/zstd/zstd_common.c +Removing lib/zstd/mem.h +Removing lib/zstd/huf_decompress.c +Removing lib/zstd/huf_compress.c +Removing lib/zstd/huf.h +Removing lib/zstd/fse_decompress.c +Removing lib/zstd/fse_compress.c +Removing lib/zstd/fse.h +Removing lib/zstd/error_private.h +Removing lib/zstd/entropy_common.c +Removing lib/zstd/decompress.c +Removing lib/zstd/compress.c +Removing lib/zstd/bitstream.h +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/compress.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 + + crypto/zstd.c | 28 +- + fs/btrfs/zstd.c | 68 +- + fs/f2fs/compress.c | 56 +- + fs/f2fs/super.c | 2 +- + fs/pstore/platform.c | 2 +- + fs/squashfs/zstd_wrapper.c | 16 +- + include/linux/zstd.h | 1252 ++---- + include/linux/zstd_errors.h | 77 + + include/linux/zstd_lib.h | 2432 +++++++++++ + lib/decompress_unzstd.c | 48 +- + lib/zstd/Makefile | 46 +- + lib/zstd/bitstream.h | 380 -- + lib/zstd/common/bitstream.h | 437 ++ + lib/zstd/common/compiler.h | 170 + + lib/zstd/common/cpu.h | 194 + + lib/zstd/common/debug.c | 24 + + lib/zstd/common/debug.h | 101 + + lib/zstd/common/entropy_common.c | 357 ++ + lib/zstd/common/error_private.c | 56 + + lib/zstd/common/error_private.h | 66 + + lib/zstd/common/fse.h | 710 ++++ + lib/zstd/common/fse_decompress.c | 390 ++ + lib/zstd/common/huf.h | 356 ++ + lib/zstd/common/mem.h | 259 ++ + lib/zstd/common/zstd_common.c | 83 + + lib/zstd/common/zstd_deps.h | 125 + + lib/zstd/common/zstd_internal.h | 450 +++ + lib/zstd/compress.c | 3485 ---------------- + lib/zstd/compress/fse_compress.c | 625 +++ + lib/zstd/compress/hist.c | 165 + + lib/zstd/compress/hist.h | 75 + + lib/zstd/compress/huf_compress.c | 905 +++++ + lib/zstd/compress/zstd_compress.c | 5109 ++++++++++++++++++++++++ + lib/zstd/compress/zstd_compress_internal.h | 1188 ++++++ + lib/zstd/compress/zstd_compress_literals.c | 158 + + lib/zstd/compress/zstd_compress_literals.h | 29 + + lib/zstd/compress/zstd_compress_sequences.c | 439 ++ + lib/zstd/compress/zstd_compress_sequences.h | 54 + + lib/zstd/compress/zstd_compress_superblock.c | 850 ++++ + lib/zstd/compress/zstd_compress_superblock.h | 32 + + lib/zstd/compress/zstd_cwksp.h | 482 +++ + lib/zstd/compress/zstd_double_fast.c | 519 +++ + lib/zstd/compress/zstd_double_fast.h | 32 + + lib/zstd/compress/zstd_fast.c | 496 +++ + lib/zstd/compress/zstd_fast.h | 31 + + lib/zstd/compress/zstd_lazy.c | 1414 +++++++ + lib/zstd/compress/zstd_lazy.h | 81 + + lib/zstd/compress/zstd_ldm.c | 686 ++++ + lib/zstd/compress/zstd_ldm.h | 110 + + lib/zstd/compress/zstd_ldm_geartab.h | 103 + + lib/zstd/compress/zstd_opt.c | 1346 +++++++ + lib/zstd/compress/zstd_opt.h | 50 + + lib/zstd/decompress.c | 2531 ------------ + lib/zstd/decompress/huf_decompress.c | 1206 ++++++ + lib/zstd/decompress/zstd_ddict.c | 241 ++ + lib/zstd/decompress/zstd_ddict.h | 44 + + lib/zstd/decompress/zstd_decompress.c | 2085 ++++++++++ + lib/zstd/decompress/zstd_decompress_block.c | 1540 +++++++ + lib/zstd/decompress/zstd_decompress_block.h | 62 + + lib/zstd/decompress/zstd_decompress_internal.h | 202 + + lib/zstd/decompress_sources.h | 28 + + lib/zstd/entropy_common.c | 243 -- + lib/zstd/error_private.h | 53 - + lib/zstd/fse.h | 575 --- + lib/zstd/fse_compress.c | 795 ---- + lib/zstd/fse_decompress.c | 325 -- + lib/zstd/huf.h | 212 - + lib/zstd/huf_compress.c | 773 ---- + lib/zstd/huf_decompress.c | 960 ----- + lib/zstd/mem.h | 151 - + lib/zstd/zstd_common.c | 75 - + lib/zstd/zstd_compress_module.c | 160 + + lib/zstd/zstd_decompress_module.c | 105 + + lib/zstd/zstd_internal.h | 273 -- + lib/zstd/zstd_opt.h | 1014 ----- + 76 files changed, 27373 insertions(+), 12941 deletions(-) + create mode 100644 include/linux/zstd_errors.h + create mode 100644 include/linux/zstd_lib.h + delete mode 100644 lib/zstd/bitstream.h + create mode 100644 lib/zstd/common/bitstream.h + create mode 100644 lib/zstd/common/compiler.h + create mode 100644 lib/zstd/common/cpu.h + create mode 100644 lib/zstd/common/debug.c + create mode 100644 lib/zstd/common/debug.h + create mode 100644 lib/zstd/common/entropy_common.c + create mode 100644 lib/zstd/common/error_private.c + create mode 100644 lib/zstd/common/error_private.h + create mode 100644 lib/zstd/common/fse.h + create mode 100644 lib/zstd/common/fse_decompress.c + create mode 100644 lib/zstd/common/huf.h + create mode 100644 lib/zstd/common/mem.h + create mode 100644 lib/zstd/common/zstd_common.c + create mode 100644 lib/zstd/common/zstd_deps.h + create mode 100644 lib/zstd/common/zstd_internal.h + delete mode 100644 lib/zstd/compress.c + create mode 100644 lib/zstd/compress/fse_compress.c + create mode 100644 lib/zstd/compress/hist.c + create mode 100644 lib/zstd/compress/hist.h + create mode 100644 lib/zstd/compress/huf_compress.c + create mode 100644 lib/zstd/compress/zstd_compress.c + create mode 100644 lib/zstd/compress/zstd_compress_internal.h + create mode 100644 lib/zstd/compress/zstd_compress_literals.c + create mode 100644 lib/zstd/compress/zstd_compress_literals.h + create mode 100644 lib/zstd/compress/zstd_compress_sequences.c + create mode 100644 lib/zstd/compress/zstd_compress_sequences.h + create mode 100644 lib/zstd/compress/zstd_compress_superblock.c + create mode 100644 lib/zstd/compress/zstd_compress_superblock.h + create mode 100644 lib/zstd/compress/zstd_cwksp.h + create mode 100644 lib/zstd/compress/zstd_double_fast.c + create mode 100644 lib/zstd/compress/zstd_double_fast.h + create mode 100644 lib/zstd/compress/zstd_fast.c + create mode 100644 lib/zstd/compress/zstd_fast.h + create mode 100644 lib/zstd/compress/zstd_lazy.c + create mode 100644 lib/zstd/compress/zstd_lazy.h + create mode 100644 lib/zstd/compress/zstd_ldm.c + create mode 100644 lib/zstd/compress/zstd_ldm.h + create mode 100644 lib/zstd/compress/zstd_ldm_geartab.h + create mode 100644 lib/zstd/compress/zstd_opt.c + create mode 100644 lib/zstd/compress/zstd_opt.h + delete mode 100644 lib/zstd/decompress.c + create mode 100644 lib/zstd/decompress/huf_decompress.c + create mode 100644 lib/zstd/decompress/zstd_ddict.c + create mode 100644 lib/zstd/decompress/zstd_ddict.h + create mode 100644 lib/zstd/decompress/zstd_decompress.c + create mode 100644 lib/zstd/decompress/zstd_decompress_block.c + create mode 100644 lib/zstd/decompress/zstd_decompress_block.h + create mode 100644 lib/zstd/decompress/zstd_decompress_internal.h + create mode 100644 lib/zstd/decompress_sources.h + delete mode 100644 lib/zstd/entropy_common.c + delete mode 100644 lib/zstd/error_private.h + delete mode 100644 lib/zstd/fse.h + delete mode 100644 lib/zstd/fse_compress.c + delete mode 100644 lib/zstd/fse_decompress.c + delete mode 100644 lib/zstd/huf.h + delete mode 100644 lib/zstd/huf_compress.c + delete mode 100644 lib/zstd/huf_decompress.c + delete mode 100644 lib/zstd/mem.h + delete mode 100644 lib/zstd/zstd_common.c + create mode 100644 lib/zstd/zstd_compress_module.c + create mode 100644 lib/zstd/zstd_decompress_module.c + delete mode 100644 lib/zstd/zstd_internal.h + delete mode 100644 lib/zstd/zstd_opt.h +Merging efi/next (720dff78de36 efi: Allow efi=runtime) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (e2a58d2d3416 unicode: only export internal symbols for the selftests) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/f2fs/sysfs.c +CONFLICT (content): Merge conflict in fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Resolved 'fs/f2fs/sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master af85024d487e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git +$ git diff -M --stat --summary HEAD^.. + fs/ext4/super.c | 39 ++- + fs/f2fs/super.c | 38 +-- + fs/f2fs/sysfs.c | 3 +- + fs/unicode/Kconfig | 13 +- + fs/unicode/Makefile | 13 +- + fs/unicode/mkutf8data.c | 24 +- + fs/unicode/utf8-core.c | 109 ++++----- + fs/unicode/utf8-norm.c | 262 +++------------------ + fs/unicode/utf8-selftest.c | 94 ++++---- + .../{utf8data.h_shipped => utf8data.c_shipped} | 22 +- + fs/unicode/utf8n.h | 81 +++---- + include/linux/unicode.h | 49 +++- + 12 files changed, 291 insertions(+), 456 deletions(-) + rename fs/unicode/{utf8data.h_shipped => utf8data.c_shipped} (99%) +$ git am -3 ../patches/0001-Mark-NTFS_RW-as-BROKEN.patch +Applying: Mark NTFS_RW as BROKEN +Merging akpm-current/current (8cfbd4096945 kernel.h: split out instruction pointer accessors) +$ git merge --no-ff akpm-current/current +Auto-merging mm/workingset.c +Auto-merging mm/vmscan.c +Auto-merging mm/rmap.c +Auto-merging mm/page_owner.c +Auto-merging mm/oom_kill.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/kasan/report.c +Auto-merging mm/filemap.c +Auto-merging mm/backing-dev.c +Auto-merging lib/vsprintf.c +Auto-merging lib/test_kasan.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +CONFLICT (content): Merge conflict in kernel/sched/core.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +CONFLICT (content): Merge conflict in kernel/exit.c +Auto-merging init/main.c +Auto-merging include/linux/spinlock.h +Auto-merging include/linux/signal.h +Auto-merging include/linux/sched/task.h +Auto-merging include/linux/sched/mm.h +CONFLICT (content): Merge conflict in include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/sbitmap.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page_owner.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/kallsyms.h +Auto-merging include/linux/fs.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/vmcore.c +Auto-merging fs/proc/base.c +Auto-merging fs/nilfs2/the_nilfs.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/nilfs2/ioctl.c +Auto-merging fs/internal.h +Auto-merging fs/inode.c +Auto-merging fs/exec.c +Auto-merging fs/buffer.c +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/virtio/Kconfig +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging arch/x86/kernel/unwind_orc.c +Auto-merging arch/powerpc/mm/pgtable_32.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Resolved 'include/linux/sched/mm.h' using previous resolution. +Resolved 'kernel/exit.c' using previous resolution. +Resolved 'kernel/sched/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9a99f4189e3d] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/kcov.rst | 5 + + MAINTAINERS | 21 +- + arch/Kconfig | 28 ++ + arch/alpha/kernel/traps.c | 4 +- + arch/arm/mach-rpc/ecard.c | 2 +- + arch/microblaze/mm/pgtable.c | 3 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + arch/powerpc/mm/pgtable_32.c | 7 +- + arch/riscv/lib/delay.c | 4 + + arch/s390/include/asm/facility.h | 4 + + arch/x86/kernel/aperture_64.c | 13 +- + arch/x86/kernel/unwind_orc.c | 2 +- + arch/x86/mm/init_32.c | 14 +- + arch/x86/xen/mmu_hvm.c | 37 +-- + 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 +- + .../media/dvb-frontends/cxd2880/cxd2880_common.h | 1 + + drivers/virtio/Kconfig | 1 + + drivers/virtio/virtio_mem.c | 301 +++++++++++++++------ + fs/binfmt_elf.c | 56 ++-- + 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/hfs/inode.c | 6 +- + fs/hfsplus/catalog.c | 16 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/inode.c | 12 +- + fs/hfsplus/xattr.c | 18 +- + fs/hugetlbfs/inode.c | 7 +- + fs/inode.c | 46 ++-- + fs/internal.h | 1 - + fs/nilfs2/alloc.c | 2 +- + fs/nilfs2/alloc.h | 2 +- + fs/nilfs2/bmap.c | 2 +- + fs/nilfs2/bmap.h | 2 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btnode.h | 2 +- + fs/nilfs2/btree.c | 2 +- + fs/nilfs2/btree.h | 2 +- + fs/nilfs2/cpfile.c | 2 +- + fs/nilfs2/cpfile.h | 2 +- + fs/nilfs2/dat.c | 2 +- + fs/nilfs2/dat.h | 2 +- + fs/nilfs2/dir.c | 2 +- + fs/nilfs2/direct.c | 2 +- + fs/nilfs2/direct.h | 2 +- + fs/nilfs2/file.c | 2 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/ifile.c | 2 +- + fs/nilfs2/ifile.h | 2 +- + fs/nilfs2/inode.c | 2 +- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/mdt.c | 2 +- + fs/nilfs2/mdt.h | 2 +- + fs/nilfs2/namei.c | 2 +- + fs/nilfs2/nilfs.h | 2 +- + fs/nilfs2/page.c | 2 +- + fs/nilfs2/page.h | 2 +- + fs/nilfs2/recovery.c | 2 +- + fs/nilfs2/segbuf.c | 2 +- + fs/nilfs2/segbuf.h | 2 +- + fs/nilfs2/segment.c | 2 +- + fs/nilfs2/segment.h | 2 +- + fs/nilfs2/sufile.c | 2 +- + fs/nilfs2/sufile.h | 2 +- + fs/nilfs2/super.c | 2 +- + fs/nilfs2/sysfs.c | 78 +++--- + fs/nilfs2/sysfs.h | 2 +- + fs/nilfs2/the_nilfs.c | 2 +- + fs/nilfs2/the_nilfs.h | 2 +- + 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/base.c | 21 +- + fs/proc/fd.c | 23 +- + fs/proc/page.c | 40 +-- + fs/proc/vmcore.c | 105 ++++--- + fs/ramfs/inode.c | 11 +- + fs/seq_file.c | 16 -- + fs/sysv/super.c | 6 +- + include/asm-generic/sections.h | 75 +++-- + include/kunit/test.h | 13 +- + include/linux/bottom_half.h | 1 + + include/linux/container_of.h | 40 +++ + include/linux/crash_dump.h | 26 +- + include/linux/delay.h | 2 +- + include/linux/fs.h | 1 + + include/linux/generic-radix-tree.h | 3 +- + include/linux/instruction_pointer.h | 8 + + include/linux/ipc_namespace.h | 15 + + include/linux/kallsyms.h | 13 +- + include/linux/kernel.h | 39 +-- + include/linux/list.h | 4 +- + include/linux/llist.h | 4 +- + include/linux/mempolicy.h | 5 +- + include/linux/memremap.h | 6 + + include/linux/page_owner.h | 12 +- + include/linux/pagemap.h | 50 ++++ + include/linux/plist.h | 5 +- + include/linux/radix-tree.h | 4 +- + include/linux/rmap.h | 8 +- + include/linux/rwsem.h | 1 - + include/linux/sbitmap.h | 11 +- + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 21 ++ + include/linux/sched/task.h | 2 +- + include/linux/seq_file.h | 17 +- + include/linux/shm.h | 2 +- + include/linux/signal.h | 1 - + include/linux/smp.h | 1 - + include/linux/spinlock.h | 1 - + include/linux/stackdepot.h | 5 + + include/linux/string_helpers.h | 1 + + include/media/media-entity.h | 3 +- + init/main.c | 29 +- + ipc/ipc_sysctl.c | 32 ++- + ipc/shm.c | 170 +++++++++--- + ipc/util.c | 6 +- + kernel/cpu.c | 2 +- + kernel/exit.c | 2 +- + kernel/extable.c | 33 +-- + kernel/fork.c | 60 +++- + kernel/hung_task.c | 44 +++ + kernel/kcov.c | 36 +-- + kernel/kthread.c | 21 +- + kernel/locking/lockdep.c | 3 - + kernel/resource.c | 54 +++- + kernel/sched/core.c | 35 ++- + kernel/sched/sched.h | 4 +- + kernel/sysctl.c | 8 +- + kernel/trace/ftrace.c | 2 +- + lib/Kconfig.debug | 6 + + lib/scatterlist.c | 11 +- + lib/stackdepot.c | 46 ++++ + lib/test_kasan.c | 5 +- + lib/vsprintf.c | 3 +- + mm/Kconfig | 10 +- + mm/backing-dev.c | 7 + + mm/filemap.c | 8 + + mm/kasan/report.c | 17 +- + mm/memory.c | 4 + + mm/memory_hotplug.c | 6 + + mm/mempolicy.c | 12 +- + mm/memremap.c | 20 ++ + mm/oom_kill.c | 7 +- + mm/page_owner.c | 24 +- + mm/rmap.c | 14 +- + mm/truncate.c | 19 +- + mm/vmscan.c | 7 + + mm/workingset.c | 10 + + mm/zsmalloc.c | 3 +- + net/sysctl_net.c | 2 +- + scripts/checkpatch.pl | 33 ++- + scripts/const_structs.checkpatch | 4 + + tools/testing/selftests/kselftest/runner.sh | 28 +- + tools/testing/selftests/proc/.gitignore | 1 + + tools/testing/selftests/proc/Makefile | 2 + + tools/testing/selftests/proc/proc-tid0.c | 81 ++++++ + 171 files changed, 1791 insertions(+), 837 deletions(-) + create mode 100644 include/linux/container_of.h + create mode 100644 include/linux/instruction_pointer.h + create mode 100644 tools/testing/selftests/proc/proc-tid0.c +$ 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/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 2476049ddba1...cb3cc26151a9 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (cb3cc26151a9 kasan: add kasan mode messages when kasan init) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/vm/hmm.rst | 2 +- + arch/arm64/mm/kasan_init.c | 2 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 - + drivers/gpu/drm/drm_dp_mst_topology.c | 1 + + drivers/gpu/drm/drm_mm.c | 4 + + drivers/gpu/drm/drm_modeset_lock.c | 9 ++ + drivers/gpu/drm/i915/intel_runtime_pm.c | 3 + + drivers/gpu/drm/nouveau/nouveau_dmem.c | 4 +- + include/linux/migrate.h | 1 - + include/linux/stackdepot.h | 25 +++-- + init/Kconfig | 2 + + init/main.c | 9 +- + lib/Kconfig | 4 + + lib/Kconfig.kasan | 2 +- + lib/stackdepot.c | 33 ++++++- + lib/test_hmm.c | 5 +- + mm/kasan/hw_tags.c | 14 ++- + mm/kasan/sw_tags.c | 2 +- + mm/memcontrol.c | 4 - + mm/migrate.c | 151 ++++++------------------------- + mm/page_owner.c | 2 + + 22 files changed, 126 insertions(+), 159 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..ccb4c3d89866 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20211108 |