diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-10-28 22:42:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-10-28 22:42:26 +1100 |
| commit | 503f375baa99edff894eb1a534d2ac0b4f799573 (patch) | |
| tree | 8d268cc3766c77b7c761eb62375bc1d9fd0600ac | |
| parent | c8f97173a1790fc10791c3eea00e293d16de7953 (diff) | |
Add linux-next specific files for 20211028next-20211028
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 343 | ||||
| -rw-r--r-- | Next/Trees | 346 | ||||
| -rw-r--r-- | Next/merge.log | 15447 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 16137 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..284f061dcf3e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,343 @@ +Name SHA1 +---- ---- +origin 1fc596a56b334f4d593a2b49e5ff55af6aaa0816 +fixes 3ca706c189db861b2ca2019a0901b94050ca49d8 +kbuild-current 0664684e1ebd7875e120d0cecd525bac4805f8ed +arc-current 3906fe9bb7f1a2c8667ae54e967dc8690824f4ea +arm-current 00568b8a6364e15009b345b462e927e0b9fc2bb9 +arm64-fixes 596143e3aec35c93508d6b7a05ddc999ee209b61 +arm-soc-fixes 76f79231666a7a3c9a1db82c002e083125de5861 +drivers-memory-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +m68k-current 9fde0348640252c79d462c4d29a09a14e8741f5c +powerpc-fixes d853adc7adf601d7d6823afe3ed396065a3e08d1 +s390-fixes 8b7216439e2e2128f6f1a19ad4b6be94d8b0e23d +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 6f7c88691191e6c52ef2543d6f1da8d360b27a24 +bpf 440ffcdd9db4758f1503a25fb49a8e15ca83d6bc +ipsec 93ec1320b0170d7a207eda2d119c669b673401ed +netfilter 2199f562730dd1382946e0a2532afc38cd444129 +ipvs 2199f562730dd1382946e0a2532afc38cd444129 +wireless-drivers 603a1621caa097be23c7784e36cb8edf23cd31db +mac80211 689a0a9f505f7bffdefe6f17fddb41c8ab6344f6 +rdma-fixes 64733956ebba7cc629856f4a6ee35a52bc9c023f +sound-current 3ab7992018455ac63c33e9b3eaa7264e293e40f4 +sound-asoc-fixes a985f0eee47032dc496448cb770506e4b7878f23 +regmap-fixes 38a4b4fb7c733bc491d160cec862433f5c42918f +regulator-fixes 519d81956ee277b4419c723adfb154603c2565ba +spi-fixes d81d0e41ed5fe7229a2c9a29d13bad288c7cf2d2 +pci-current e4e737bb5c170df6135a127739a9e6148ee3da82 +driver-core.current 519d81956ee277b4419c723adfb154603c2565ba +tty.current 519d81956ee277b4419c723adfb154603c2565ba +usb.current 519d81956ee277b4419c723adfb154603c2565ba +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 519d81956ee277b4419c723adfb154603c2565ba +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +staging.current 519d81956ee277b4419c723adfb154603c2565ba +iio-fixes 486a25084155bf633768c26f022201c051d6fd95 +char-misc.current 519d81956ee277b4419c723adfb154603c2565ba +soundwire-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +thunderbolt-fixes 3906fe9bb7f1a2c8667ae54e967dc8690824f4ea +input-current a02dcde595f7cbd240ccd64de96034ad91cffc40 +crypto-current f8690a4b5a1b64f74ae5c4f7c4ea880d8a8e1a0d +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 95e16b4792b0429f1933872f743410f00e590c55 +kvms390-fixes 0e9ff65f455dfd0a8aea5e7843678ab6fe097e21 +hwmon-fixes ada61aa0b1184a8fda1a89a340c7d6cc4e59aee5 +nvdimm-fixes 3dd60fb9d95db9c78fec86ba4df20852a7b974ba +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes d7395f03c79cd6693b9ebf838039a8e25675a133 +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 282da7cef078a87b6d5e8ceba8b17e428cf0e37c +drm-fixes defbbcd99fa68cb7feed453662048baa87e9a441 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 6e6f96630805874fa80b0067e1a57aafc06225f6 +mmc-fixes 92b18252b91de567cd875f2e84722b10ab34ee28 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hyperv-fixes 8017c99680fa65e1e8d999df1583de476a187830 +soc-fsl-fixes 7e5e744183bbb0ad02412b21b1e61380c998dd18 +risc-v-fixes 64a19591a2938b170aa736443d5d3bf4c51e1388 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 2a2a79577ddae7d5314b2f57ca86b44d794403d5 +spdx 519d81956ee277b4419c723adfb154603c2565ba +gpio-brgl-fixes c0eee6fbfa2b3377f1efed10dad539abeb7312aa +gpio-intel-fixes 1649b83766944e320a6f087abf1e8a221f1cd8b0 +pinctrl-intel-fixes 3906fe9bb7f1a2c8667ae54e967dc8690824f4ea +erofs-fixes c40dd3ca2a45d5bd6e8b3f4ace5cb81493096263 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 519d81956ee277b4419c723adfb154603c2565ba +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 87066fdd2e30fe9dd531125d95257c118a74617e +cel-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f +irqchip-fixes b78f26926b17cc289e4f16b63363abe0aa2e8efc +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 3ff6d64e68abc231955d216236615918797614ae +efi-fixes 38fa3206bf441911258e5001ac8b6738693f8d82 +drm-misc-fixes 61b1d445f3bfe4c3ba4335ceeb7e8ba688fd31e2 +kbuild 7c5c49dc2b808ff9562a0ae207caf45b5e3f83c9 +perf 342cb7ebf5e29fff4dc09ab2c8f37d710f8f5206 +compiler-attributes 7c00621dcaeea206d7489b3e8b50b1864841ae69 +dma-mapping 9fbd8dc19aa57ec8fe92606043199919527cd9be +asm-generic 7efbbe6e141466dbe022b39fafbc81d17a8ed8be +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 61c96499021b922cc1a78adc5a9b6225b7f4d656 +arm64 e3690c95157cba99df50fdc2f0e2b36ffa188b2c +arm-perf e656972b69864348a747954ea187576808000c5a +arm-soc fdf79096aec7f697505f531fe59051f9f6880066 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 83e38509109e44b884be13fb6c6943aca1742a57 +aspeed 509d3f2b755fe1289c19ba63d0152e14f5ac482d +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 9c4c7a13f4c8729de7838374b096abb0a12aa27c +clk-imx e8271eff5d8c8499289380edbf3bc47de83ab70b +clk-renesas 2bd9feed23166f5ab67dec2ca02bd3f74c77b0ba +clk-samsung 651521d396a8712be1e4eb5b67a1ad340faa6c56 +csky e21e52ad1e0126e2a5e2013084ac3f47cf1e887a +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 8a3c0a74ae87473589cb881a3854948d40000b7a +m68knommu 6dbe88e93c351a6cf5b7c70850d7a1a7f67d83ab +microblaze 43bdcbd5004393faad06b65c1539d3c9b9d5f6b2 +mips 95b8a5e0111a47e5ef780c04cb6293be33d6ee0d +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 210893cad279e4b33d707beebeacd81c36020da2 +parisc-hd dd7bf3ebe9e6724f287ef3e995d26c64befa6f60 +powerpc 44a8214de96bafb5210e43bfa2c97c19bf75af3d +soc-fsl 54c8b5b6f8a868b9c21a7b0efe92ed2fbcc67080 +risc-v ffa7a9141bb70702744a312f904b190ca064bdd7 +s390 4ab5b2549146981be7c03913ae896a0405ee2e25 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ab6ff1fda1e8646b27b9d87b718250f8c828ad55 +xtensa bd47cdb78997f83bd170c389ef59de9eec65976a +pidfd 61bc346ce64a3864ac55f5d18bdc1572cda4fb18 +fscrypt b7e072f9b77f4c516df96e0c22ec09f8b2e76ba1 +fscache d8daa20d78981b28632901b63724c6056001332b +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs 23b461ade5edb7861021c6cddd5bca9b6c9285c2 +ceph 324bfaa1a6cc948c58f7af521994d0edc1836708 +cifs 08e9f52e2dcea8028c06cb3abbb098a0f3d9cc97 +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 4e8bf1a671980a01a77533a6cda0dfd7bda7677a +exfat efc7bd8527d02155ec71f0aa6a149d3e2cc01bdc +ext3 d1ccf9fdcfc98aab129254df464809ea4bc75355 +ext4 916ff8d5ea0e24fd43f113b6b5326d5ea8f68310 +f2fs 02d58cd253d7536c412993573fc6b3b4454960eb +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 85bf4c6df4e91d3693748d769d2ea6a30b573339 +gfs2 e34e6f8133b8c783a44c235b843e9046e55adbf0 +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 0d994cd482ee4e8e851388a70869beee51be1c54 +nfs 01d29f87fcfef38d51ce2b473981a5c1e861ac0a +nfs-anna 8cfb9015280d49f9d92d5b0f88cedf5f0856c0fd +nfsd 291cd656da04163f4bba67953c1f2f823e0d1231 +cel c20106944eb679fa3ab7e686fe5f6ba30fbc51e5 +ntfs3 8607954cf255329d1c6dfc073ff1508b7585573c +orangefs ac2c63757f4f413980d6c676dbe1ae2941b94afa +overlayfs 1dc1eed46f9fa4cb8a07baa24fb44c96d6dd35c9 +ubifs 9a620291fc01a90693789a9a7abcf0bdff9a1f31 +v9fs 9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe +xfs 5ca5916b6bc93577c360c06cb7cdf71adb9b5faf +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 03b8df8d43ecc3c5724e6bfb80bc0b9ea2aa2612 +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks 482e00075d660a16de822686a4be4f7c0e11e5e2 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk ad7fea30c59e0639364792c3333c0128bde6207c +pci 6de1dedb1db18c6ecf892f12b21bfd6805105bce +pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e +hid 05a194aaf5e4c95e247976a991a2f96c6a5ca969 +i2c 26701d49482a9acf9a6c557c02430efd0c0e583a +i3c a3587e2c0578101900d4abbbd72ab3dad6d5568a +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging f4cbba74c3ec481af882c1057f911c237a5d37d5 +jc_docs 52ba072e110a2fc1fde78f4786d43f11f067e2a2 +v4l-dvb 57c3b9f55ba875a6f6295fa59f0bdc0a01c544f8 +v4l-dvb-next bdbbd511ef0cf414b3bad89dd8fd7b6a169b4a5e +pm ba9410801460466c3d47801e2df1052da9f36132 +cpufreq-arm b3c08d1ad2bb1a731e1d7f4eaa6b1373e5cf52d3 +cpupower 79a0dc5530a91694b1e85ef7219893397d85e5bb +devfreq 5cf79c293821d12fd88dee901692cd404247782e +opp 27ff8187f13ecfec8a26fb1928e906f46f326cc5 +thermal a67a46af4ad6342378e332b7420c1d1a2818c53f +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm ecd95673142ef80169a6c003b569b8a86d1e6329 +rdma e058953c0ed18b5d2e125edec1cb6a258aa52446 +net-next f25c0515c521375154c62c72447869f40218c861 +bpf-next 252c765bd764a246a8bd516fabf6d6123df4a24f +ipsec-next 83688aec17bf3203d8477a9dd7cce88132950798 +mlx5-next 60dd57c7479418e2bc902143eb46a2fdcfeecbbb +netfilter-next 241eb3f3ee42f6639b31f6e69e7b6ea845e2d182 +ipvs-next 241eb3f3ee42f6639b31f6e69e7b6ea845e2d182 +wireless-drivers-next a427aca0a931b8c65b47231bbf09e8873b29d554 +bluetooth c603bf1f94d0ef8ce3ef081112eae13cd744ef17 +mac80211-next 62bf703f44239869b55165fc5bbed3f38e869aae +mtd c13de2386c78e890d4ae6f01a85eefd0b293fb08 +nand fc9e18f9e987ad46722dad53adab1c12148c213c +spi-nor df872ab1ffe4bd865dfb5956cae4901429004ab6 +crypto 3ae88f676aa63366ffa9eebb8ae787c7e19f0c57 +drm 27f4432577e4f78bbdf15c104748cc738db8eead +drm-misc 099afadc533febb0ad789ee61eef41a3d5d8bab2 +amdgpu 6a806feef1d2620abf7a5a9da871c5a3774c7497 +drm-intel 5740211ea442dbfd143093f8eea39faba186042f +drm-intel-gt 5740211ea442dbfd143093f8eea39faba186042f +drm-tegra 5dccbc9de8f0071eb731b4de81d0638ea6c06a53 +drm-msm 02d44fde976a8e9330f855fc535180727c779b9b +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap a8d880671c13971b2b88b66e80d12d5e3f0808de +sound f4000b58b64344871d7b27c05e73932f137cfef6 +sound-asoc 6f19a44bbe1d771ac45ed6f22fe667f665a2e719 +modules ced75a2f5da71de5775fda44250e27d7b8024355 +input c6ac8f0b4ca927316eb40e1e9ba83df5d29f3793 +block 47af7468b7e07f697ab352eac174c38ca94c41a7 +device-mapper 54d97aac0bb909d9212630c1a1a602748b4ec93e +libata 1af5f7af2484004e71d384d8b88c221fc62cd6b5 +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc 88b950ce58f7d7cecd072f0789c22032b3ed9950 +mfd 818ed35d6425236a793f1f6cb79ad3d6f74bc302 +backlight 3976e974df1fd3a718627b0c9bdfee1953baa0d5 +battery 172d0ccea55ce69718bac693d2ea9341fb61b6c7 +regulator 7492b724df4d33ca3d5b38b70fb4acb93e6d02bf +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity cc4299ea039972e57e219e2981b74967c133d41c +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 15bf32398ad488c0df1cbaf16431422c87e4feea +smack 0934ad42bb2c5df90a1b9de690f93de735b622fe +tomoyo 7d2a07b769330c34b4deabeed939325c77a7ec2f +tpmdd 7eba41fe8c7bb01ff3d4b757bd622375792bc720 +watchdog ee1a0696934a8b77a6a2098f92832c46d34ec5da +iommu 6a0df9df4c642a13731de32866b28111f4194e77 +audit d9516f346e8b8e9c7dd37976a06a5bde1a871d6f +devicetree 9065b969c53f9968eb5802771167e191ae42a9b4 +mailbox 0a5ad4322927ee4aaba6facc0e4faf1ab6c0d48e +spi f2c05cbd667031a40e24a847efcba6ef92bad0d9 +tip 34d813e44ba4f759c660a1bab9452361fb902ad3 +clockevents eda9a4f7af6ee47e9e131f20e4f8a41a97379293 +edac f889e52436d6a42e773c4e8aab390c6b25841d61 +irqchip 965acf76b68d1865e62a6e0bc19d58725be3f2eb +ftrace e531e90b5ab0f7ce5ff298e165214c1aec6ed187 +rcu a01016aa420e33f0c5f2b8d88f99966aba83ca0b +kvm 0d7d84498fb43c42fa730c3a46b3048dc62165a5 +kvm-arm 5a2acbbb0179a7ffbb5440b9fa46689f619705ac +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 3fd8417f2c728d810a3b26d7e2008012ffb7fd01 +xen-tip 97c79d81697911132a9ed3a21b78f053180f2cf6 +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues f9eaaa82b474350aa8436d15a7ae150a3c8b9d5c +drivers-x86 fc3341b4b55f46ad0846a22ae149d94bac6ce40b +chrome-platform 3119c28634ddc6ee3813778d9d17741baceef19d +hsi 4ef69e17eb567a3b276fcc3cb3452dcf89d8b063 +leds 97b31c1f8eb865bc3aa5f4a08286a6406d782ea8 +ipmi fc4e78481afa33585195e896f0f9d9cec1129c80 +driver-core 27e0bcd02990f7291adb0f111e300f06c495d509 +usb 79a4479a17b83310deb0b1a2a274fe5be12d2318 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 910c996335c37552ee30fcb837375b808bb4f33b +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty 73a3d4f41886e6bd27f8b09c6235539a586e5131 +char-misc 08e438e6296c566062a2b0627706b5967ceaf183 +extcon 9e6ef3a25e5e13899381282dbd8d8d157a899262 +phy-next b4dc97ab0a629eda8bda20d96ef47dac08a505d9 +soundwire abd9a6049bb59a9bab8cc8b42ccbe4a46c307f92 +thunderbolt 0a0624a26f9ceb8aae16882d87dc3b12f17f4a49 +vfio 9cef73918e15d2284e71022291a8a07901e80bad +staging 3d34b180323b487cad6f1e7560f1ec653110c899 +iio 7b473ae754fec86cfa44f05f0882d1329d244e6c +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc dfe14674bf7b267c44eb91d66bad076af3827a47 +dmaengine 07c609cc987710a2874d41cf54802777b44b523b +cgroup 822bc9bac9e9a2f76a772a34f745962dfc223353 +scsi cfb34c044d8ed8a65a2c9131cfe90be887d6ee62 +scsi-mkp a1efc896cb8a2831de3cf5a9747e030b494f1a26 +vhost 06aff93f1842fa23ad079a1096d2f215da56032c +rpmsg 6ee5808de07417fce77167ed72da60f627f682bc +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl f4a20dfac88c06c9b529a41ff4cf9acba8f3fdff +gpio-intel 1649b83766944e320a6f087abf1e8a221f1cd8b0 +gpio-sim bb369f4373f5cda706048efe0e5ed9de552322d4 +pinctrl a0f160ffcb83de6a04fa75f9e7bdfe969f2863f7 +pinctrl-intel 176412f8674be8ba9a45bb61086e224e2118324a +pinctrl-renesas f4e260bffcf367523b77f936fe0dbd278581305e +pinctrl-samsung f9d8de699ac4a059e30cf0e84e7027f1058b9163 +pwm 3f2b16734914fa7c53ef7f8a10a63828890dbd37 +userns e9012e756d3097b663c67dc444a4220192ce81fc +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest dd40f44eabe1e122c6852fabb298aac05b083fce +livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc a5feda3b361e11b291786d5c4ff86d4b9a55498f +nvdimm e765f13ed126fe7e41d1a6e3c60d754cd6c2af93 +at24 7629254054820bead6e18f8c3ae65c2bb01a5ae2 +ntb f96cb827ce49627543b4aabe8d54d8ea9740ae4e +seccomp d9bbdbf324cda23aa44873f505be77ed4b61d79c +kspp 879f756fa9bf9025a3bae61557bcbf56ace0e2de +kspp-gustavo 704f6142a9033e76aaa054c7ecf93b4bb4bf0028 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 0f79ce970e79ffb771733f9634d5918d0eb3e30a +fsi 7cc2f34e1f4da07c791737cc6b3d965b31815ea0 +slimbus 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nvmem 413333fd6a88d023229cc121a5c65d48c4e9c7d6 +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 62b834d8972b84810b91486328c0b62bb45b55a3 +auxdisplay 97fbb29fc1ebde6ce362e3d0a9473d4c6dec7442 +kgdb f8416aa29185468e0d914ba4b2a330fd53ee263f +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 57b44817a8d63e75394bc21849f585ded53de8bb +kunit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +cfi ff1176468d368232b684f75e82563369208bc371 +kunit-next 2ab5d5e67f7ab2d2ecf67b8855ac65691f4e4b4d +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 8c61951b372d83b426a66dafc9c4ac24b3ce3335 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 988f45dfe7ea7deaeacd2fb528dbc76d05f7304f +cxl ed97afb53365cd03dde266c9644334a558fe5a16 +folio 121703c1c817b3c77f61002466d0bfca7e39f25d +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +zstd 464413496acb619a380364a26912f02c8b709d29 +efi 720dff78de360ad9742d5f438101cedcdb5dad84 +unicode e2a58d2d3416aceeae63dfc7bf680dd390ff331d +akpm-current 9748d08a885e0a3adb309cd96b5296c410db4b35 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..80ac6ecad1a8 --- /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.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +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..3d14e8571e1a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,15447 @@ +$ date -R +Thu, 28 Oct 2021 09:26:32 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 64% (6663/10324)
Updating files: 65% (6711/10324)
Updating files: 66% (6814/10324)
Updating files: 67% (6918/10324)
Updating files: 68% (7021/10324)
Updating files: 69% (7124/10324)
Updating files: 70% (7227/10324)
Updating files: 71% (7331/10324)
Updating files: 72% (7434/10324)
Updating files: 73% (7537/10324)
Updating files: 74% (7640/10324)
Updating files: 75% (7743/10324)
Updating files: 76% (7847/10324)
Updating files: 77% (7950/10324)
Updating files: 78% (8053/10324)
Updating files: 79% (8156/10324)
Updating files: 80% (8260/10324)
Updating files: 81% (8363/10324)
Updating files: 82% (8466/10324)
Updating files: 83% (8569/10324)
Updating files: 84% (8673/10324)
Updating files: 85% (8776/10324)
Updating files: 86% (8879/10324)
Updating files: 87% (8982/10324)
Updating files: 88% (9086/10324)
Updating files: 89% (9189/10324)
Updating files: 90% (9292/10324)
Updating files: 91% (9395/10324)
Updating files: 92% (9499/10324)
Updating files: 93% (9602/10324)
Updating files: 94% (9705/10324)
Updating files: 95% (9808/10324)
Updating files: 96% (9912/10324)
Updating files: 97% (10015/10324)
Updating files: 98% (10118/10324)
Updating files: 99% (10221/10324)
Updating files: 100% (10324/10324)
Updating files: 100% (10324/10324), done. +HEAD is now at 3906fe9bb7f1 Linux 5.15-rc7 +Merging origin/master (1fc596a56b33 Merge tag 'trace-v5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 3906fe9bb7f1..1fc596a56b33 +Fast-forward (no commit created; -m option ignored) + MAINTAINERS | 13 +++++++++ + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 +- + .../boot/dts/freescale/imx8mm-kontron-n801x-s.dts | 8 ++++-- + .../dts/freescale/imx8mm-kontron-n801x-som.dtsi | 8 ++++-- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 +- + arch/nds32/kernel/ftrace.c | 2 +- + arch/nios2/platform/Kconfig.platform | 1 + + drivers/infiniband/core/sa_query.c | 5 ++-- + drivers/infiniband/hw/hfi1/pio.c | 9 ++++-- + drivers/infiniband/hw/irdma/uk.c | 4 +-- + drivers/infiniband/hw/irdma/verbs.c | 8 ++++-- + drivers/infiniband/hw/irdma/ws.c | 13 +++++---- + drivers/infiniband/hw/mlx5/mr.c | 2 +- + drivers/infiniband/hw/mlx5/qp.c | 2 ++ + drivers/infiniband/hw/qedr/qedr.h | 1 + + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 5 +++- + drivers/infiniband/hw/qib/qib_user_sdma.c | 33 +++++++++++++++------- + drivers/infiniband/sw/rdmavt/qp.c | 2 +- + drivers/reset/Kconfig | 4 +-- + drivers/reset/reset-brcmstb-rescal.c | 2 +- + drivers/reset/reset-socfpga.c | 26 +++++++++++++++++ + drivers/reset/tegra/reset-bpmp.c | 9 +++++- + 24 files changed, 123 insertions(+), 43 deletions(-) +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 (3906fe9bb7f1 Linux 5.15-rc7) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (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 +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 (9fde03486402 m68k: Remove set_fs()) +$ 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 (d853adc7adf6 powerpc/pseries/iommu: Create huge DMA window if no MMIO32 is present) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/pseries/iommu.c | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) +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 (6f7c88691191 usbnet: fix error return code in usbnet_probe()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + arch/arm64/net/bpf_jit_comp.c | 5 + + arch/riscv/net/bpf_jit_core.c | 5 + + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 16 +-- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 33 +++-- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 30 +++-- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 65 +++++----- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 1 - + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 1 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 + + drivers/net/ethernet/intel/ice/ice_lag.c | 18 +-- + drivers/net/ethernet/intel/ice/ice_ptp.c | 3 + + drivers/net/ethernet/mellanox/mlxsw/pci.c | 25 ++-- + drivers/net/ethernet/microchip/lan743x_main.c | 22 ++++ + drivers/net/ethernet/nxp/lpc_eth.c | 5 +- + drivers/net/phy/phy.c | 140 ++++++++++++--------- + drivers/net/usb/lan78xx.c | 6 + + drivers/net/usb/usbnet.c | 1 + + drivers/net/xen-netfront.c | 8 ++ + drivers/nfc/port100.c | 4 +- + include/linux/bpf.h | 7 +- + include/linux/bpf_types.h | 8 +- + include/linux/filter.h | 1 + + include/linux/skmsg.h | 1 + + include/net/cfg80211.h | 2 - + include/net/sock.h | 8 +- + include/net/tls.h | 2 +- + include/net/udp.h | 5 +- + kernel/bpf/arraymap.c | 1 + + kernel/bpf/core.c | 24 ++-- + kernel/bpf/syscall.c | 11 +- + kernel/cgroup/cgroup.c | 4 +- + net/batman-adv/bridge_loop_avoidance.c | 8 +- + net/batman-adv/main.c | 56 ++++++--- + net/batman-adv/network-coding.c | 4 +- + net/batman-adv/translation-table.c | 4 +- + net/core/dev.c | 9 +- + net/core/net-sysfs.c | 4 +- + net/core/skbuff.c | 36 ++++-- + net/core/skmsg.c | 14 +++ + net/core/sock_destructor.h | 12 ++ + net/core/sysctl_net_core.c | 2 +- + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_bpf.c | 27 ++-- + net/ipv4/udp.c | 3 + + net/ipv4/udp_bpf.c | 1 + + net/mac80211/mesh.c | 9 +- + net/sctp/sm_statefuns.c | 139 ++++++++++++-------- + net/tipc/crypto.c | 32 +++-- + net/tls/tls_main.c | 4 +- + net/tls/tls_sw.c | 2 +- + net/unix/af_unix.c | 4 + + net/unix/unix_bpf.c | 2 + + net/wireless/core.c | 2 +- + net/wireless/core.h | 2 + + net/wireless/mlme.c | 26 ++-- + net/wireless/scan.c | 7 +- + net/wireless/util.c | 14 +-- + .../selftests/bpf/prog_tests/sockmap_listen.c | 75 +++-------- + tools/testing/selftests/net/fcnal-test.sh | 3 + + 63 files changed, 592 insertions(+), 386 deletions(-) + create mode 100644 net/core/sock_destructor.h +Merging bpf/master (440ffcdd9db4 Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +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 +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_ctl.c | 2 ++ + net/netfilter/nfnetlink_queue.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) +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 (689a0a9f505f cfg80211: correct bridge/4addr mode check) +$ 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 (64733956ebba RDMA/sa_query: Use strscpy_pad instead of memcpy to copy a string) +$ 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 (3ab799201845 ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/oss/mixer_oss.c | 44 ++++++++++++++++++++++++++++++++----------- + sound/pci/hda/patch_realtek.c | 17 +++++++++++++++++ + 2 files changed, 50 insertions(+), 11 deletions(-) +Merging sound-asoc-fixes/for-linus (a985f0eee470 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Removing sound/soc/rockchip/rockchip_pcm.h +Removing sound/soc/rockchip/rockchip_pcm.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/amlogic,t9015.yaml | 6 + + sound/soc/codecs/cs42l42.c | 218 ++++++++++++--------- + sound/soc/codecs/cs42l42.h | 3 + + sound/soc/rockchip/Makefile | 3 +- + sound/soc/rockchip/rockchip_i2s.c | 3 +- + sound/soc/rockchip/rockchip_pcm.c | 44 ----- + sound/soc/rockchip/rockchip_pcm.h | 11 -- + 7 files changed, 137 insertions(+), 151 deletions(-) + delete mode 100644 sound/soc/rockchip/rockchip_pcm.c + delete mode 100644 sound/soc/rockchip/rockchip_pcm.h +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 +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache-rbtree.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/spi/spi-altera-dfl.c | 2 +- + drivers/spi/spi-altera-platform.c | 2 +- + drivers/spi/spi-pl022.c | 5 +++-- + 3 files changed, 5 insertions(+), 4 deletions(-) +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 (519d81956ee2 Linux 5.15-rc6) +$ 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 (519d81956ee2 Linux 5.15-rc6) +$ 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 (519d81956ee2 Linux 5.15-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (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 (519d81956ee2 Linux 5.15-rc6) +$ 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 (486a25084155 iio: buffer: Fix memory leak in iio_buffers_alloc_sysfs_and_mask()) +$ 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. + .../devicetree/bindings/iio/dac/adi,ad5766.yaml | 2 +- + drivers/iio/adc/ti-tsc2046.c | 2 +- + drivers/iio/dac/ad5446.c | 9 ++++++- + drivers/iio/dac/ad5766.c | 6 ++--- + drivers/iio/industrialio-buffer.c | 28 +++++++++++++--------- + drivers/iio/industrialio-core.c | 9 ++++++- + drivers/iio/pressure/st_pressure_spi.c | 4 ++++ + 7 files changed, 42 insertions(+), 18 deletions(-) +Merging char-misc.current/char-misc-linus (519d81956ee2 Linux 5.15-rc6) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (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 (3906fe9bb7f1 Linux 5.15-rc7) +$ 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 (f8690a4b5a1b crypto: x86/sm4 - Fix invalid section entry size) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/sm4-aesni-avx-asm_64.S | 6 +++++- + arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) +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 (95e16b4792b0 KVM: SEV-ES: go over the sev_pio_data buffer in multiple passes if needed) +$ 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 +Merge made by the 'recursive' strategy. + arch/s390/kvm/interrupt.c | 5 +++-- + arch/s390/kvm/kvm-s390.c | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/hwmon/hwmon.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/nvdimm/pmem.c | 33 ++------------------------------- + 1 file changed, 2 insertions(+), 31 deletions(-) +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 (d7395f03c79c Merge branch 'misc-5.15' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +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 (282da7cef078 scsi: ufs: ufs-exynos: Correct timeout value setting registers) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/ibmvscsi/ibmvfc.c | 3 ++- + drivers/scsi/ufs/ufs-exynos.c | 6 +++--- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging drm-fixes/drm-fixes (defbbcd99fa6 Merge tag 'amd-drm-fixes-5.15-2021-10-21' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/nv.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 16 ++++++++-------- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 7 +++---- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 13 ++++++++++--- + .../drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c | 6 +++--- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 2 +- + 7 files changed, 27 insertions(+), 21 deletions(-) +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 (6e6f96630805 drm/i915/dp: Skip the HW readout of DPCD on disabled encoders) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_dp.c | 3 +++ + drivers/gpu/drm/i915/gt/intel_timeline.c | 4 ++-- + drivers/gpu/drm/i915/i915_reg.h | 8 -------- + drivers/gpu/drm/i915/intel_dram.c | 30 ++---------------------------- + 4 files changed, 7 insertions(+), 38 deletions(-) +Merging mmc-fixes/fixes (92b18252b91d mmc: cqhci: clear HALT state after CQE enable) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/cqhci-core.c | 3 +++ + drivers/mmc/host/dw_mmc-exynos.c | 14 ++++++++++++++ + drivers/mmc/host/sdhci-esdhc-imx.c | 16 ++++++++++++++++ + drivers/mmc/host/sdhci-pci-core.c | 29 ++++++++++++++++++++++++----- + drivers/mmc/host/sdhci.c | 6 ++++++ + drivers/mmc/host/vub300.c | 18 +++++++++--------- + 7 files changed, 73 insertions(+), 15 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'recursive' strategy. +Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (8017c99680fa hyperv/vmbus: include linux/bitops.h) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (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 +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 (64a19591a293 riscv: fix misalgned trap vector base address) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + arch/riscv/kernel/head.S | 1 + + 1 file changed, 1 insertion(+) +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 (2a2a79577dda fpga: ice40-spi: Add SPI device ID table) +$ 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 (519d81956ee2 Linux 5.15-rc6) +$ 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 +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-mlxbf2.c | 5 +++++ + drivers/gpio/gpio-xgs-iproc.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) +Merging gpio-intel-fixes/fixes (1649b8376694 gpio: pca953x: Improve bias setting) +$ 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 +Merge made by the 'recursive' strategy. +Merging pinctrl-intel-fixes/fixes (3906fe9bb7f1 Linux 5.15-rc7) +$ 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 (c40dd3ca2a45 erofs: clear compacted_2b if compacted_4b_initial > totalidx) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (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 (87066fdd2e30 Revert "mm/secretmem: use refcount_t instead of atomic_t") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (7d2a07b76933 Linux 5.14) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (b78f26926b17 irqchip/gic: Work around broken Renesas integration) +$ 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 +Already up to date. +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 (3ff6d64e68ab libperf tests: Fix test_stat_cpu) +$ 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 (61b1d445f3bf drm: panel-orientation-quirks: Add quirk for GPD Win3) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_panel_orientation_quirks.c | 12 ++++++++++++ + drivers/gpu/drm/selftests/test-drm_damage_helper.c | 1 + + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + + 3 files changed, 14 insertions(+) +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 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 (342cb7ebf5e2 perf jevents: Fix some would-be warnings) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Auto-merging tools/perf/util/session.c +CONFLICT (content): Merge conflict in tools/perf/util/session.c +Resolved 'tools/perf/util/session.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 922e5c299302] Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git +$ git diff -M --stat --summary HEAD^.. + tools/arch/powerpc/include/uapi/asm/perf_regs.h | 28 +- + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 4 + + 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/perf-intel-pt.txt | 7 +- + tools/perf/Documentation/perf-kmem.txt | 13 +- + tools/perf/Documentation/perf-list.txt | 4 + + tools/perf/Documentation/perf-record.txt | 16 + + tools/perf/MANIFEST | 1 + + tools/perf/Makefile.config | 21 + + tools/perf/Makefile.perf | 4 + + 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/perf_regs.c | 2 + + tools/perf/arch/riscv64/annotate/instructions.c | 34 + + tools/perf/arch/x86/annotate/instructions.c | 28 +- + tools/perf/bench/evlist-open-close.c | 7 +- + tools/perf/bench/synthesize.c | 4 +- + tools/perf/builtin-daemon.c | 15 +- + tools/perf/builtin-inject.c | 4 +- + tools/perf/builtin-kvm.c | 2 +- + tools/perf/builtin-list.c | 42 +- + tools/perf/builtin-record.c | 48 +- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-trace.c | 4 +- + tools/perf/check-headers.sh | 2 + + .../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/code-reading.c | 3 +- + tools/perf/tests/expand-cgroup.c | 2 +- + tools/perf/tests/expr.c | 163 ++- + tools/perf/tests/mmap-thread-lookup.c | 4 +- + tools/perf/tests/parse-events.c | 8 +- + tools/perf/tests/parse-metric.c | 2 +- + tools/perf/tests/pmu-events.c | 184 ++- + 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/vmlinux-kallsyms.c | 102 ++ + tools/perf/util/Build | 5 + + tools/perf/util/annotate.c | 6 +- + tools/perf/util/bpf_counter.c | 8 +- + tools/perf/util/bpf_counter_cgroup.c | 8 +- + tools/perf/util/debug.c | 19 + + tools/perf/util/dso.h | 2 +- + tools/perf/util/event.c | 18 + + tools/perf/util/event.h | 5 + + tools/perf/util/evsel.c | 17 + + tools/perf/util/evsel.h | 2 + + 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/intel-pt.c | 85 +- + tools/perf/util/machine.c | 10 + + tools/perf/util/machine.h | 2 + + tools/perf/util/metricgroup.c | 1450 ++++++++++++-------- + 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 | 256 ++-- + tools/perf/util/parse-events.h | 17 +- + 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 | 51 +- + tools/perf/util/pmu.h | 12 +- + tools/perf/util/python-ext-sources | 1 + + tools/perf/util/record.h | 1 + + 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 | 75 +- + tools/perf/util/synthetic-events.c | 73 +- + tools/perf/util/synthetic-events.h | 20 +- + tools/perf/util/tool.h | 1 + + 137 files changed, 3967 insertions(+), 1440 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/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 +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 +Merge made by the 'recursive' strategy. + include/linux/compiler_attributes.h | 1 - + include/linux/compiler_types.h | 8 +++++++- + 2 files changed, 7 insertions(+), 2 deletions(-) +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/mmc/host/Kconfig +Auto-merging drivers/iommu/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/riscv/include/asm/syscall.h +Auto-merging arch/riscv/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/include/asm/syscall.h | 10 ---------- + arch/arm64/include/asm/syscall.h | 10 ---------- + arch/csky/include/asm/syscall.h | 9 --------- + arch/ia64/include/asm/syscall.h | 17 ++--------------- + arch/ia64/kernel/ptrace.c | 31 ++++++++++++------------------- + arch/microblaze/include/asm/syscall.h | 33 --------------------------------- + arch/nds32/include/asm/syscall.h | 22 ---------------------- + arch/nios2/include/asm/syscall.h | 11 ----------- + arch/openrisc/include/asm/syscall.h | 7 ------- + arch/powerpc/include/asm/syscall.h | 10 ---------- + arch/riscv/include/asm/syscall.h | 9 --------- + arch/s390/include/asm/syscall.h | 12 ------------ + arch/sh/include/asm/syscall_32.h | 12 ------------ + arch/sparc/include/asm/syscall.h | 10 ---------- + arch/um/include/asm/syscall-generic.h | 14 -------------- + arch/x86/include/asm/syscall.h | 33 --------------------------------- + arch/xtensa/include/asm/syscall.h | 11 ----------- + include/asm-generic/syscall.h | 16 ---------------- + 18 files changed, 14 insertions(+), 263 deletions(-) +Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (61c96499021b 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/mach-imx/pm-imx6.c +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 19 ++-- + arch/arm/Makefile | 9 +- + arch/arm/boot/compressed/fdt_check_mem_start.c | 48 ++++++++-- + arch/arm/common/scoop.c | 3 - + arch/arm/include/asm/assembler.h | 29 ++++++ + arch/arm/include/asm/current.h | 50 +++++++++++ + arch/arm/include/asm/io.h | 1 + + arch/arm/include/asm/opcodes.h | 9 +- + arch/arm/include/asm/setup.h | 2 +- + arch/arm/include/asm/smp.h | 3 +- + arch/arm/include/asm/stackprotector.h | 2 - + arch/arm/include/asm/switch_to.h | 16 ++++ + arch/arm/include/asm/thread_info.h | 15 +++- + arch/arm/include/asm/tls.h | 10 ++- + arch/arm/kernel/asm-offsets.c | 6 +- + arch/arm/kernel/entry-armv.S | 5 ++ + arch/arm/kernel/entry-common.S | 1 + + arch/arm/kernel/entry-header.S | 8 ++ + arch/arm/kernel/head-common.S | 5 ++ + arch/arm/kernel/head-nommu.S | 1 + + arch/arm/kernel/head.S | 5 +- + arch/arm/kernel/process.c | 8 +- + arch/arm/kernel/smp.c | 13 ++- + arch/arm/kernel/vmlinux-xip.lds.S | 2 + + arch/arm/kernel/vmlinux.lds.S | 2 + + arch/arm/mach-imx/pm-imx6.c | 2 + + arch/arm/mach-sa1100/assabet.c | 24 ++--- + arch/arm/mm/Kconfig | 4 +- + arch/arm/mm/fault.c | 119 +++++++++++++------------ + arch/arm/mm/fault.h | 4 + + arch/arm/mm/ioremap.c | 6 ++ + arch/arm/mm/kasan_init.c | 2 +- + arch/arm/mm/proc-macros.S | 3 +- + arch/arm/probes/kprobes/test-core.h | 2 +- + drivers/amba/bus.c | 100 ++++++--------------- + drivers/of/platform.c | 6 +- + include/linux/amba/bus.h | 18 ---- + scripts/gcc-plugins/arm_ssp_per_task_plugin.c | 27 ++---- + 38 files changed, 355 insertions(+), 234 deletions(-) + create mode 100644 arch/arm/include/asm/current.h +Merging arm64/for-next/core (e3690c95157c 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 +Removing tools/testing/selftests/arm64/fp/sve-ptrace-asm.S +Auto-merging kernel/dma/mapping.c +Auto-merging arch/arm64/net/bpf_jit_comp.c +Removing arch/arm64/kernel/cpu-reset.h +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/arm64/cpu-feature-registers.rst | 12 +- + Documentation/arm64/elf_hwcaps.rst | 4 + + Documentation/arm64/silicon-errata.rst | 12 + + Documentation/dev-tools/kasan.rst | 7 +- + arch/arm/include/asm/arch_timer.h | 37 +- + arch/arm64/Kconfig | 121 ++++- + arch/arm64/include/asm/arch_timer.h | 78 ++-- + arch/arm64/include/asm/asm-extable.h | 95 ++++ + arch/arm64/include/asm/asm-uaccess.h | 7 +- + arch/arm64/include/asm/assembler.h | 78 ++-- + arch/arm64/include/asm/barrier.h | 16 +- + arch/arm64/include/asm/cputype.h | 4 + + arch/arm64/include/asm/esr.h | 6 + + arch/arm64/include/asm/extable.h | 23 +- + arch/arm64/include/asm/fpsimd.h | 118 ++++- + arch/arm64/include/asm/fpsimdmacros.h | 21 +- + arch/arm64/include/asm/ftrace.h | 2 +- + arch/arm64/include/asm/futex.h | 25 +- + arch/arm64/include/asm/gpr-num.h | 26 ++ + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/kexec.h | 12 + + arch/arm64/include/asm/kvm_asm.h | 7 +- + arch/arm64/include/asm/memory.h | 1 + + arch/arm64/include/asm/mmu_context.h | 24 + + arch/arm64/include/asm/mte-kasan.h | 5 + + arch/arm64/include/asm/mte.h | 8 +- + arch/arm64/include/asm/page.h | 1 - + arch/arm64/include/asm/pgtable.h | 5 + + arch/arm64/include/asm/processor.h | 49 ++- + arch/arm64/include/asm/sections.h | 1 + + arch/arm64/include/asm/setup.h | 6 + + arch/arm64/include/asm/sysreg.h | 31 +- + arch/arm64/include/asm/thread_info.h | 2 +- + arch/arm64/include/asm/trans_pgd.h | 14 +- + arch/arm64/include/asm/uaccess.h | 30 +- + arch/arm64/include/asm/vdso/compat_barrier.h | 7 - + arch/arm64/include/asm/virt.h | 7 + + arch/arm64/include/asm/vmalloc.h | 4 +- + arch/arm64/include/asm/word-at-a-time.h | 21 +- + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/kernel/armv8_deprecated.c | 12 +- + arch/arm64/kernel/asm-offsets.c | 11 + + arch/arm64/kernel/cpu-reset.S | 7 +- + arch/arm64/kernel/cpu-reset.h | 32 -- + arch/arm64/kernel/cpu_errata.c | 64 +++ + arch/arm64/kernel/cpufeature.c | 29 +- + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/entry-fpsimd.S | 34 +- + arch/arm64/kernel/entry.S | 10 +- + arch/arm64/kernel/fpsimd.c | 342 +++++++++------ + arch/arm64/kernel/hibernate-asm.S | 72 --- + arch/arm64/kernel/hibernate.c | 49 +-- + arch/arm64/kernel/machine_kexec.c | 177 ++++---- + arch/arm64/kernel/mte.c | 67 ++- + arch/arm64/kernel/ptrace.c | 6 +- + arch/arm64/kernel/relocate_kernel.S | 69 ++- + arch/arm64/kernel/sdei.c | 2 +- + arch/arm64/kernel/signal.c | 8 +- + arch/arm64/kernel/traps.c | 24 +- + arch/arm64/kernel/vdso32/Makefile | 36 +- + arch/arm64/kernel/vmlinux.lds.S | 22 +- + arch/arm64/kvm/hyp/fpsimd.S | 6 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 10 +- + arch/arm64/kvm/reset.c | 6 +- + arch/arm64/lib/clear_user.S | 10 +- + arch/arm64/lib/copy_from_user.S | 8 +- + arch/arm64/lib/copy_to_user.S | 8 +- + arch/arm64/mm/Makefile | 1 + + arch/arm64/mm/extable.c | 85 +++- + arch/arm64/mm/hugetlbpage.c | 27 +- + arch/arm64/mm/init.c | 39 -- + arch/arm64/mm/mmu.c | 5 + + arch/arm64/mm/trans_pgd-asm.S | 65 +++ + arch/arm64/mm/trans_pgd.c | 84 ++-- + arch/arm64/net/bpf_jit_comp.c | 9 +- + arch/arm64/tools/cpucaps | 5 + + drivers/clocksource/arm_arch_timer.c | 243 ++++++---- + drivers/perf/Kconfig | 12 +- + drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 2 +- + drivers/perf/thunderx2_pmu.c | 2 +- + include/clocksource/arm_arch_timer.h | 2 +- + include/linux/kasan.h | 9 +- + kernel/dma/mapping.c | 4 - + kernel/scs.c | 1 + + lib/test_kasan.c | 2 +- + mm/kasan/hw_tags.c | 29 +- + mm/kasan/kasan.h | 32 +- + mm/kasan/report.c | 2 +- + scripts/sorttable.c | 30 ++ + tools/testing/selftests/arm64/fp/Makefile | 6 +- + tools/testing/selftests/arm64/fp/TODO | 9 +- + tools/testing/selftests/arm64/fp/asm-utils.S | 172 ++++++++ + tools/testing/selftests/arm64/fp/assembler.h | 11 + + tools/testing/selftests/arm64/fp/fpsimd-test.S | 164 ------- + tools/testing/selftests/arm64/fp/sve-ptrace-asm.S | 33 -- + tools/testing/selftests/arm64/fp/sve-ptrace.c | 511 ++++++++++++++++------ + tools/testing/selftests/arm64/fp/sve-test.S | 163 ------- + tools/testing/selftests/arm64/fp/vec-syscfg.c | 95 +++- + 98 files changed, 2378 insertions(+), 1527 deletions(-) + create mode 100644 arch/arm64/include/asm/asm-extable.h + create mode 100644 arch/arm64/include/asm/gpr-num.h + delete mode 100644 arch/arm64/kernel/cpu-reset.h + create mode 100644 arch/arm64/mm/trans_pgd-asm.S + create mode 100644 tools/testing/selftests/arm64/fp/asm-utils.S + delete mode 100644 tools/testing/selftests/arm64/fp/sve-ptrace-asm.S +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 (fdf79096aec7 Merge branch 'arm/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Removing include/dt-bindings/power/qcom-aoss-qmp.h +Removing drivers/tee/optee/shm_pool.h +Removing drivers/tee/optee/shm_pool.c +Auto-merging drivers/soc/fsl/dpio/qbman-portal.c +Auto-merging drivers/of/platform.c +Removing arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi +Removing arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi +Removing arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +Removing arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +Removing arch/arm/mach-omap2/scrm54xx.h +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt +Removing Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.txt +Removing Documentation/devicetree/bindings/net/gpmc-eth.txt +Removing Documentation/devicetree/bindings/mtd/gpmc-onenand.txt +Removing Documentation/devicetree/bindings/mtd/gpmc-nor.txt +Removing Documentation/devicetree/bindings/mtd/gpmc-nand.txt +Removing Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt +Removing Documentation/devicetree/bindings/ddr/lpddr2.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + .../ABI/testing/sysfs-driver-aspeed-uart-routing | 27 + + Documentation/arm/index.rst | 1 + + Documentation/arm/microchip.rst | 20 + + Documentation/arm/stm32/stm32mp13-overview.rst | 37 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../devicetree/bindings/arm/atmel-at91.yaml | 24 + + .../devicetree/bindings/arm/bcm/bcm2835.yaml | 1 + + .../devicetree/bindings/arm/bcm/brcm,nsp.yaml | 65 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 8 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 99 +- + .../devicetree/bindings/arm/mediatek.yaml | 1 + + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 4 + + Documentation/devicetree/bindings/arm/qcom.yaml | 23 + + Documentation/devicetree/bindings/arm/renesas.yaml | 61 + + .../devicetree/bindings/arm/rockchip.yaml | 48 +- + .../devicetree/bindings/arm/rockchip/pmu.yaml | 4 + + .../bindings/arm/samsung/exynos-chipid.yaml | 5 +- + .../bindings/arm/samsung/samsung-boards.yaml | 6 + + .../devicetree/bindings/arm/sprd/sprd.yaml | 5 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 4 + + .../arm/sunxi/allwinner,sun4i-a10-mbus.yaml | 1 + + .../arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml | 38 + + .../arm/sunxi/allwinner,sun9i-a80-prcm.yaml | 33 + + Documentation/devicetree/bindings/arm/ti/k3.yaml | 15 +- + Documentation/devicetree/bindings/arm/toshiba.yaml | 1 + + Documentation/devicetree/bindings/arm/xilinx.yaml | 17 + + Documentation/devicetree/bindings/ddr/lpddr2.txt | 102 - + .../bindings/display/brcm,bcm2835-dsi0.yaml | 3 + + .../bindings/display/brcm,bcm2835-hdmi.yaml | 3 + + .../bindings/display/brcm,bcm2835-v3d.yaml | 3 + + .../bindings/display/brcm,bcm2835-vec.yaml | 3 + + .../bindings/display/mediatek/mediatek,dsi.txt | 6 + + .../bindings/display/msm/dp-controller.yaml | 1 - + .../devicetree/bindings/firmware/qcom,scm.txt | 4 +- + .../bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml | 106 + + .../memory-controllers/ddr/jedec,lpddr2.yaml | 223 ++ + .../ddr/lpddr2-timings.txt | 0 + .../ddr/lpddr3-timings.txt | 0 + .../{ => memory-controllers}/ddr/lpddr3.txt | 5 +- + .../memory-controllers/mediatek,smi-common.yaml | 34 +- + .../memory-controllers/mediatek,smi-larb.yaml | 3 + + .../memory-controllers/nvidia,tegra20-emc.yaml | 23 +- + .../bindings/memory-controllers/omap-gpmc.txt | 157 - + .../memory-controllers/renesas,rpc-if.yaml | 1 + + .../memory-controllers/samsung,exynos5422-dmc.yaml | 3 +- + .../bindings/memory-controllers/ti,gpmc-child.yaml | 245 ++ + .../bindings/memory-controllers/ti,gpmc.yaml | 172 + + .../devicetree/bindings/mtd/gpmc-nand.txt | 147 - + Documentation/devicetree/bindings/mtd/gpmc-nor.txt | 98 - + .../devicetree/bindings/mtd/gpmc-onenand.txt | 48 - + .../devicetree/bindings/mtd/ti,gpmc-nand.yaml | 121 + + .../devicetree/bindings/mtd/ti,gpmc-onenand.yaml | 81 + + Documentation/devicetree/bindings/net/gpmc-eth.txt | 97 - + .../bindings/pci/nvidia,tegra194-pcie.txt | 2 +- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 + + .../devicetree/bindings/reset/microchip,rst.yaml | 4 +- + .../reset/socionext,uniphier-glue-reset.yaml | 1 + + .../bindings/reset/socionext,uniphier-reset.yaml | 3 + + .../bindings/serial/fsl,s32-linflexuart.txt | 22 - + .../bindings/serial/fsl,s32-linflexuart.yaml | 48 + + .../bindings/soc/imx/fsl,imx8mm-disp-blk-ctrl.yaml | 94 + + .../bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml | 76 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 12 +- + .../devicetree/bindings/soc/qcom/qcom,apr.txt | 134 - + .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 177 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 3 + + .../devicetree/bindings/soc/qcom/qcom,smem.yaml | 34 +- + .../devicetree/bindings/soc/qcom/qcom,spm.yaml | 81 + + .../devicetree/bindings/soc/qcom/qcom-stats.yaml | 47 + + .../bindings/sound/allwinner,sun4i-a10-i2s.yaml | 3 + + Documentation/devicetree/bindings/sram/sram.yaml | 5 +- + .../devicetree/bindings/vendor-prefixes.yaml | 12 + + MAINTAINERS | 40 +- + arch/arm/Kconfig | 3 +- + arch/arm/arm-soc-for-next-contents.txt | 207 ++ + arch/arm/boot/dts/Makefile | 26 +- + arch/arm/boot/dts/am335x-pocketbeagle.dts | 1 + + arch/arm/boot/dts/arm-realview-eb.dtsi | 42 +- + arch/arm/boot/dts/arm-realview-pb1176.dts | 42 +- + arch/arm/boot/dts/arm-realview-pb11mp.dts | 48 +- + arch/arm/boot/dts/arm-realview-pbx.dtsi | 42 +- + arch/arm/boot/dts/armada-381-netgear-gs110emx.dts | 295 ++ + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 5 + + arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 21 +- + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 883 ++--- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 1287 +++++-- + arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 9 +- + .../boot/dts/aspeed-bmc-inventec-transformers.dts | 328 ++ + arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts | 488 +++ + arch/arm/boot/dts/aspeed-g4.dtsi | 6 + + arch/arm/boot/dts/aspeed-g5.dtsi | 6 + + arch/arm/boot/dts/aspeed-g6.dtsi | 26 + + arch/arm/boot/dts/at91-lmu5000.dts | 147 + + arch/arm/boot/dts/at91-q5xr5.dts | 199 ++ + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 12 +- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 23 +- + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 70 + + arch/arm/boot/dts/at91-sama5d2_icp.dts | 22 +- + arch/arm/boot/dts/at91-sama7g5ek.dts | 20 + + arch/arm/boot/dts/at91-tse850-3.dts | 2 +- + arch/arm/boot/dts/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/axp209.dtsi | 6 +- + arch/arm/boot/dts/axp22x.dtsi | 6 +- + arch/arm/boot/dts/axp81x.dtsi | 10 +- + arch/arm/boot/dts/bcm-nsp-ax.dtsi | 70 + + arch/arm/boot/dts/bcm-nsp.dtsi | 52 +- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 38 +- + arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts | 138 + + arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi | 113 + + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 31 +- + arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 36 +- + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 36 +- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 36 +- + arch/arm/boot/dts/bcm283x-rpi-wifi-bt.dtsi | 34 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 39 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 37 + + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 2 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 2 +- + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 2 +- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 2 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 44 +- + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 2 +- + arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 200 ++ + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 42 + + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 2 +- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 37 + + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 37 + + arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 2 +- + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 37 + + arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 35 +- + arch/arm/boot/dts/bcm5301x.dtsi | 10 +- + arch/arm/boot/dts/bcm53573.dtsi | 18 + + arch/arm/boot/dts/bcm94708.dts | 2 +- + arch/arm/boot/dts/bcm94709.dts | 2 +- + arch/arm/boot/dts/bcm958522er.dts | 3 +- + arch/arm/boot/dts/bcm958525er.dts | 3 +- + arch/arm/boot/dts/bcm958525xmc.dts | 3 +- + arch/arm/boot/dts/bcm958622hr.dts | 3 +- + arch/arm/boot/dts/bcm958623hr.dts | 3 +- + arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 281 ++ + arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi | 163 + + arch/arm/boot/dts/bcm958625-meraki-mx64-a0.dts | 25 + + arch/arm/boot/dts/bcm958625-meraki-mx64.dts | 24 + + arch/arm/boot/dts/bcm958625-meraki-mx64w-a0.dts | 33 + + arch/arm/boot/dts/bcm958625-meraki-mx64w.dts | 32 + + arch/arm/boot/dts/bcm958625-meraki-mx65.dts | 24 + + arch/arm/boot/dts/bcm958625-meraki-mx65w.dts | 32 + + .../arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi | 129 + + arch/arm/boot/dts/bcm958625hr.dts | 3 +- + arch/arm/boot/dts/bcm958625k.dts | 3 +- + arch/arm/boot/dts/bcm988312hr.dts | 7 +- + arch/arm/boot/dts/dra7.dtsi | 19 + + arch/arm/boot/dts/e60k02.dtsi | 2 +- + arch/arm/boot/dts/e70k02.dtsi | 320 ++ + arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 1 + + arch/arm/boot/dts/exynos4210-i9100.dts | 1 + + arch/arm/boot/dts/exynos4210-origen.dts | 24 +- + arch/arm/boot/dts/exynos4210-trats.dts | 1 + + arch/arm/boot/dts/exynos4210-universal_c210.dts | 1 + + arch/arm/boot/dts/exynos4412-i9300.dts | 1 + + arch/arm/boot/dts/exynos4412-i9305.dts | 1 + + arch/arm/boot/dts/exynos4412-n710x.dts | 1 + + arch/arm/boot/dts/exynos4412-origen.dts | 14 +- + arch/arm/boot/dts/exynos4412-p4note-n8010.dts | 1 + + arch/arm/boot/dts/exynos4412-trats2.dts | 1 + + arch/arm/boot/dts/exynos5250-arndale.dts | 3 - + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 1 + + arch/arm/boot/dts/exynos5250-snow.dts | 1 + + arch/arm/boot/dts/exynos5250-spring.dts | 1 + + arch/arm/boot/dts/exynos5250.dtsi | 1 - + arch/arm/boot/dts/exynos5420-peach-pit.dts | 1 + + arch/arm/boot/dts/exynos5800-peach-pi.dts | 1 + + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 18 - + arch/arm/boot/dts/gemini-ns2502.dts | 148 + + arch/arm/boot/dts/gemini-sl93512r.dts | 18 - + arch/arm/boot/dts/gemini-sq201.dts | 18 - + arch/arm/boot/dts/gemini-ssi1328.dts | 138 + + arch/arm/boot/dts/gemini-wbd111.dts | 18 - + arch/arm/boot/dts/gemini-wbd222.dts | 18 - + arch/arm/boot/dts/gemini.dtsi | 33 +- + arch/arm/boot/dts/imx6dl-alti6p.dts | 2 +- + arch/arm/boot/dts/imx6dl-b1x5v2.dtsi | 1 - + arch/arm/boot/dts/imx6dl-prtrvt.dts | 2 - + arch/arm/boot/dts/imx6dl-skov-revc-lt2.dts | 1 + + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 8 - + arch/arm/boot/dts/imx6q-skov-revc-lt2.dts | 1 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi | 31 +- + arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-skov-revc-lt2.dtsi | 99 + + arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 7 +- + arch/arm/boot/dts/imx6qp-prtwd3.dts | 4 +- + arch/arm/boot/dts/imx6qp.dtsi | 2 +- + arch/arm/boot/dts/imx6sl-tolino-vision5.dts | 349 ++ + arch/arm/boot/dts/imx6sl.dtsi | 18 +- + arch/arm/boot/dts/imx6sll-kobo-librah2o.dts | 339 ++ + arch/arm/boot/dts/imx6sll.dtsi | 22 +- + arch/arm/boot/dts/imx6sx.dtsi | 6 +- + arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 12 +- + arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 1 + + arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 + + .../arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi | 185 + + arch/arm/boot/dts/imx6ull-colibri.dtsi | 32 +- + arch/arm/boot/dts/imx7-mba7.dtsi | 42 +- + arch/arm/boot/dts/imx7-tqma7.dtsi | 47 +- + arch/arm/boot/dts/imx7d-mba7.dts | 6 +- + arch/arm/boot/dts/imx7d-sdb.dts | 2 +- + arch/arm/boot/dts/imx7d-tqma7.dtsi | 4 +- + arch/arm/boot/dts/imx7d.dtsi | 7 +- + arch/arm/boot/dts/imx7s-mba7.dts | 6 +- + arch/arm/boot/dts/imx7s-tqma7.dtsi | 4 +- + arch/arm/boot/dts/integrator.dtsi | 23 +- + arch/arm/boot/dts/integratorap-im-pd1.dts | 9 +- + arch/arm/boot/dts/integratorap.dts | 15 +- + arch/arm/boot/dts/integratorcp.dts | 9 +- + arch/arm/boot/dts/intel-ixp42x-adi-coyote.dts | 2 + + arch/arm/boot/dts/intel-ixp42x-arcom-vulcan.dts | 2 + + arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts | 2 + + arch/arm/boot/dts/intel-ixp42x-freecom-fsg-3.dts | 2 + + .../arm/boot/dts/intel-ixp42x-gateworks-gw2348.dts | 2 + + arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts | 2 + + arch/arm/boot/dts/intel-ixp42x-ixdpg425.dts | 2 + + arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts | 2 + + arch/arm/boot/dts/intel-ixp42x-linksys-wrv54g.dts | 2 + + arch/arm/boot/dts/intel-ixp42x-netgear-wg302v2.dts | 2 + + .../arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts | 2 + + arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi | 8 + + .../boot/dts/intel-ixp4xx-reference-design.dtsi | 2 + + arch/arm/boot/dts/intel-ixp4xx.dtsi | 2 - + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 + + arch/arm/boot/dts/ls1021a-qds.dts | 85 +- + arch/arm/boot/dts/ls1021a-tsn.dts | 4 +- + arch/arm/boot/dts/ls1021a-twr.dts | 63 +- + arch/arm/boot/dts/ls1021a.dtsi | 219 +- + arch/arm/boot/dts/mps2.dtsi | 10 +- + arch/arm/boot/dts/mstar-v7.dtsi | 9 + + arch/arm/boot/dts/mt7623.dtsi | 33 + + arch/arm/boot/dts/mt7623a.dtsi | 4 + + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 25 + + arch/arm/boot/dts/mt7629-rfb.dts | 3 +- + arch/arm/boot/dts/mt7629.dtsi | 45 +- + arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 4 +- + arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 2 +- + arch/arm/boot/dts/omap-zoom-common.dtsi | 4 +- + arch/arm/boot/dts/omap2430-sdp.dts | 4 +- + arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 23 +- + arch/arm/boot/dts/omap3-gta04a5.dts | 2 + + arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-sb-t35.dtsi | 4 +- + arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 237 ++ + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 10 +- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 2 +- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 6 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 6 +- + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 4 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 63 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 8 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 1 - + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c3.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c2.dts | 2 +- + arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 2 +- + arch/arm/boot/dts/qcom-ipq8064-rb3011.dts | 8 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 26 +- + arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi | 2 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 16 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 263 +- + arch/arm/boot/dts/qcom-msm8660-surf.dts | 4 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 27 +- + .../boot/dts/qcom-msm8916-samsung-serranove.dts | 3 + + arch/arm/boot/dts/qcom-msm8916-smp.dtsi | 62 + + arch/arm/boot/dts/qcom-msm8960-cdp.dts | 4 +- + arch/arm/boot/dts/qcom-msm8960.dtsi | 4 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 16 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 27 + + arch/arm/boot/dts/qcom-pm8841.dtsi | 7 +- + arch/arm/boot/dts/qcom-pm8941.dtsi | 11 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 11 +- + arch/arm/boot/dts/qcom-sdx55.dtsi | 1 - + arch/arm/boot/dts/r7s72100-genmai.dts | 2 + + arch/arm/boot/dts/r7s72100-gr-peach.dts | 2 + + arch/arm/boot/dts/r7s72100-rskrza1.dts | 2 + + arch/arm/boot/dts/r7s9210-rza2mevb.dts | 21 + + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 1 + + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 3 + + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 2 + + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 2 + + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 4 + + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 2 + + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 4 + + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 2 + + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 2 + + arch/arm/boot/dts/r8a7790-stout.dts | 2 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 2 + + arch/arm/boot/dts/r8a7791-porter.dts | 2 + + arch/arm/boot/dts/r8a7793-gose.dts | 2 + + arch/arm/boot/dts/r8a7794-alt.dts | 2 + + arch/arm/boot/dts/r8a7794-silk.dts | 2 + + arch/arm/boot/dts/rk3036.dtsi | 10 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 27 + + arch/arm/boot/dts/rk3066a.dtsi | 32 +- + arch/arm/boot/dts/rk3188.dtsi | 13 +- + arch/arm/boot/dts/rk3229.dtsi | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 14 +- + arch/arm/boot/dts/rk3288.dtsi | 22 +- + arch/arm/boot/dts/rv1108.dtsi | 16 +- + arch/arm/boot/dts/s5pv210-fascinate4g.dts | 1 + + arch/arm/boot/dts/s5pv210-galaxys.dts | 1 + + arch/arm/boot/dts/sama5d29.dtsi | 16 + + arch/arm/boot/dts/sama7g5.dtsi | 43 + + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts | 112 + + arch/arm/boot/dts/spear1310.dtsi | 6 - + arch/arm/boot/dts/spear1340.dtsi | 2 - + arch/arm/boot/dts/ste-ab8500.dtsi | 13 +- + arch/arm/boot/dts/ste-ab8505.dtsi | 13 +- + arch/arm/boot/dts/ste-href.dtsi | 6 + + arch/arm/boot/dts/ste-snowball.dts | 6 + + arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 4 + + arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 4 + + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 4 + + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 7 + + arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 4 + + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 38 +- + arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 64 + + arch/arm/boot/dts/stm32mp131.dtsi | 283 ++ + arch/arm/boot/dts/stm32mp133.dtsi | 37 + + arch/arm/boot/dts/stm32mp135.dtsi | 12 + + arch/arm/boot/dts/stm32mp135f-dk.dts | 56 + + arch/arm/boot/dts/stm32mp13xc.dtsi | 17 + + arch/arm/boot/dts/stm32mp13xf.dtsi | 17 + + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 8 +- + arch/arm/boot/dts/stm32mp151.dtsi | 18 +- + arch/arm/boot/dts/stm32mp157c-odyssey.dts | 6 + + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 +- + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 2 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 11 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 11 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 15 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 44 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 17 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 34 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 4 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 4 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 39 + + arch/arm/boot/dts/sun8i-v3-sl631.dtsi | 2 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +- + arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 8 +- + arch/arm/boot/dts/tegra124.dtsi | 12 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 7 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 - + arch/arm/boot/dts/tegra20.dtsi | 13 +- + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 30 +- + arch/arm/boot/dts/tegra30-ouya.dts | 5 +- + arch/arm/boot/dts/tegra30.dtsi | 12 +- + arch/arm/boot/dts/versatile-ab-ib2.dts | 6 +- + arch/arm/boot/dts/versatile-ab.dts | 27 +- + arch/arm/configs/aspeed_g4_defconfig | 1 + + arch/arm/configs/aspeed_g5_defconfig | 35 +- + arch/arm/configs/imx_v6_v7_defconfig | 47 +- + arch/arm/configs/multi_v7_defconfig | 86 +- + arch/arm/configs/mvebu_v7_defconfig | 18 +- + arch/arm/mach-at91/Kconfig | 9 + + arch/arm/mach-ep93xx/clock.c | 975 +++--- + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-ep93xx/soc.h | 42 +- + arch/arm/mach-exynos/Kconfig | 2 - + arch/arm/mach-omap2/cm-regbits-44xx.h | 101 - + arch/arm/mach-omap2/cm1_44xx.h | 174 - + arch/arm/mach-omap2/cm1_54xx.h | 168 - + arch/arm/mach-omap2/cm1_7xx.h | 263 -- + arch/arm/mach-omap2/cm2_44xx.h | 386 --- + arch/arm/mach-omap2/cm2_54xx.h | 325 -- + arch/arm/mach-omap2/cm2_7xx.h | 449 --- + arch/arm/mach-omap2/cm33xx.h | 280 -- + arch/arm/mach-omap2/omap_hwmod.c | 6 +- + arch/arm/mach-omap2/pdata-quirks.c | 36 - + arch/arm/mach-omap2/powerdomain.c | 6 +- + arch/arm/mach-omap2/prcm43xx.h | 94 - + arch/arm/mach-omap2/prm33xx.h | 40 - + arch/arm/mach-omap2/prm44xx.h | 630 ---- + arch/arm/mach-omap2/prm54xx.h | 358 -- + arch/arm/mach-omap2/prm7xx.h | 613 ---- + arch/arm/mach-omap2/scrm44xx.h | 141 - + arch/arm/mach-omap2/scrm54xx.h | 228 -- + arch/arm/mach-qcom/Kconfig | 10 + + arch/arm/mach-qcom/platsmp.c | 72 + + arch/arm/mach-s3c/irq-s3c24xx.c | 22 +- + arch/arm/mach-s3c/mach-mini6410.c | 2 +- + arch/arm/mach-s5pv210/Kconfig | 1 - + arch/arm/mach-stm32/Kconfig | 8 + + arch/arm/mach-stm32/board-dt.c | 3 + + arch/arm/mach-sunxi/platsmp.c | 4 +- + arch/arm/mach-sunxi/sunxi.c | 4 +- + arch/arm64/Kconfig.platforms | 2 - + arch/arm64/boot/dts/allwinner/axp803.dtsi | 10 +- + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 6 +- + .../boot/dts/allwinner/sun50i-a64-cpu-opp.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 28 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 3 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 17 + + .../boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 9 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 +- + arch/arm64/boot/dts/amlogic/Makefile | 3 + + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 362 ++ + .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 405 +++ + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 4 +- + .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 241 ++ + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 61 + + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 2 +- + .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 2 +- + arch/arm64/boot/dts/apple/t8103-j274.dts | 23 + + arch/arm64/boot/dts/apple/t8103.dtsi | 207 ++ + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 27 +- + arch/arm64/boot/dts/broadcom/Makefile | 1 + + .../arm64/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts | 2 + + arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 16 +- + arch/arm64/boot/dts/exynos/Makefile | 3 +- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 10 +- + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1 + + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 1 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +- + .../boot/dts/exynos/exynosautov9-pinctrl.dtsi | 1189 +++++++ + arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 56 + + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 306 ++ + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 1 + + .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 60 +- + .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 17 +- + .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 49 +- + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 31 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 19 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 72 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 40 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 40 +- + .../dts/freescale/fsl-lx2160a-bluebox3-rev-a.dts | 34 + + .../boot/dts/freescale/fsl-lx2160a-bluebox3.dts | 658 ++++ + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 24 +- + .../boot/dts/freescale/imx8mm-kontron-n801x-s.dts | 32 +- + .../dts/freescale/imx8mm-kontron-n801x-som.dtsi | 4 +- + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 24 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 180 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 46 +- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 1 + + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 10 +- + arch/arm64/boot/dts/freescale/s32g2.dtsi | 124 + + arch/arm64/boot/dts/freescale/s32g274a-evb.dts | 34 + + arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts | 40 + + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 8 +- + arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 22 +- + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 4 +- + arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi | 86 + + arch/arm64/boot/dts/marvell/Makefile | 1 + + .../boot/dts/marvell/armada-7040-mochabin.dts | 458 +++ + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 97 +- + arch/arm64/boot/dts/mediatek/mt6358.dtsi | 1 + + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 16 +- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 6 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 112 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 + + .../mt8183-kukui-audio-da7219-max98357a.dtsi | 13 + + .../mt8183-kukui-audio-da7219-rt1015p.dtsi | 13 + + .../dts/mediatek/mt8183-kukui-audio-da7219.dtsi | 54 + + .../dts/mediatek/mt8183-kukui-audio-max98357a.dtsi | 13 + + .../dts/mediatek/mt8183-kukui-audio-rt1015p.dtsi | 13 + + .../mt8183-kukui-audio-ts3a227e-max98357a.dtsi | 13 + + .../mt8183-kukui-audio-ts3a227e-rt1015p.dtsi | 13 + + .../dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi | 32 + + .../dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-damu.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 1 + + .../mt8183-kukui-jacuzzi-juniper-sku16.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-kakadu.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 1 + + .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 67 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 99 +- + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 163 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 2 - + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 12 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 1554 ++++++++- + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 506 ++- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 136 + + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 1495 +++++++- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 1522 ++++++++- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 209 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 876 +++++ + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 876 +++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 81 +- + arch/arm64/boot/dts/qcom/Makefile | 12 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 832 ++++- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 826 ----- + .../apq8094-sony-xperia-kitakami-karin_windy.dts | 1 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 1070 +++++- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 1105 ------ + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 3 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 93 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 6 + + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 92 +- + .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 1 + + arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 126 + + arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 1 + + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 63 +- + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 1 + + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 15 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 21 - + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 1 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 1 + + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 534 +++ + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 1 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 89 +- + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 2 + + .../qcom/msm8992-msft-lumia-octagon-talkman.dts | 1 + + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 2 + + .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 1 + + .../qcom/msm8994-msft-lumia-octagon-cityman.dts | 1 + + .../dts/qcom/msm8994-sony-xperia-kitakami-ivy.dts | 1 + + .../qcom/msm8994-sony-xperia-kitakami-karin.dts | 1 + + .../qcom/msm8994-sony-xperia-kitakami-satsuki.dts | 1 + + .../qcom/msm8994-sony-xperia-kitakami-sumire.dts | 1 + + .../qcom/msm8994-sony-xperia-kitakami-suzuran.dts | 1 + + arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 24 +- + arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 30 - + .../dts/qcom/msm8996-sony-xperia-tone-dora.dts | 1 + + .../dts/qcom/msm8996-sony-xperia-tone-kagura.dts | 1 + + .../dts/qcom/msm8996-sony-xperia-tone-keyaki.dts | 1 + + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 1 + + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 673 ++++ + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 465 +++ + .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 432 +++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 96 +- + .../boot/dts/qcom/msm8998-asus-novago-tp370ql.dts | 1 + + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 2 + + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 320 ++ + arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dts | 1 + + .../boot/dts/qcom/msm8998-lenovo-miix-630.dts | 1 + + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 4 - + .../boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 1 + + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 4 - + .../boot/dts/qcom/msm8998-oneplus-dumpling.dts | 1 + + .../dts/qcom/msm8998-sony-xperia-yoshino-lilac.dts | 31 + + .../dts/qcom/msm8998-sony-xperia-yoshino-maple.dts | 55 + + .../qcom/msm8998-sony-xperia-yoshino-poplar.dts | 36 + + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 670 ++++ + arch/arm64/boot/dts/qcom/msm8998.dtsi | 223 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 1 + + arch/arm64/boot/dts/qcom/pm6350.dtsi | 54 + + arch/arm64/boot/dts/qcom/pm660.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pm660l.dtsi | 7 - + arch/arm64/boot/dts/qcom/pm8916.dtsi | 18 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 13 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 12 + + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 1 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 7 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 12 +- + .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 14 + + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 3 +- + .../boot/dts/qcom/sc7180-trogdor-homestar-r2.dts | 20 + + .../boot/dts/qcom/sc7180-trogdor-homestar-r3.dts | 15 + + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 336 ++ + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 13 + + .../boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 11 + + .../dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 109 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 8 + + .../boot/dts/qcom/sc7180-trogdor-pompom-r2.dts | 8 + + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 9 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 90 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 101 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 85 +- + arch/arm64/boot/dts/qcom/sc7280-herobrine.dts | 14 + + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 1412 ++++++++ + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 12 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 271 +- + arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 8 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 3562 +++++++++++++++----- + .../dts/qcom/sdm630-sony-xperia-ganges-kirin.dts | 1 + + .../dts/qcom/sdm630-sony-xperia-nile-discovery.dts | 1 + + .../dts/qcom/sdm630-sony-xperia-nile-pioneer.dts | 1 + + .../dts/qcom/sdm630-sony-xperia-nile-voyager.dts | 1 + + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 58 +- + .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 1 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 17 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 16 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 18 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 26 +- + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 1 + + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 1 + + .../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 19 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 243 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 21 +- + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 1 + + arch/arm64/boot/dts/qcom/sm6125.dtsi | 59 +- + .../dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 58 + + arch/arm64/boot/dts/qcom/sm6350.dtsi | 965 ++++++ + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 320 ++ + arch/arm64/boot/dts/qcom/sm7225.dtsi | 16 + + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 2 - + .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 3 +- + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 2 - + .../dts/qcom/sm8150-sony-xperia-kumano-bahamut.dts | 1 + + .../dts/qcom/sm8150-sony-xperia-kumano-griffin.dts | 1 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 161 +- + arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 2 - + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 2 - + .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 1 + + .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 1 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 52 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 2 - + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 302 +- + arch/arm64/boot/dts/renesas/Makefile | 2 + + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 3 + + arch/arm64/boot/dts/renesas/cat875.dtsi | 2 + + arch/arm64/boot/dts/renesas/draak.dtsi | 686 ++++ + arch/arm64/boot/dts/renesas/ebisu.dtsi | 803 +++++ + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 11 + + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 4 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 4 + + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 4 + + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 4 + + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 788 +---- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 671 +--- + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 70 + + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 2 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 1458 ++++++++ + arch/arm64/boot/dts/renesas/r8a779m0.dtsi | 12 + + arch/arm64/boot/dts/renesas/r8a779m1.dtsi | 9 + + arch/arm64/boot/dts/renesas/r8a779m2.dtsi | 12 + + arch/arm64/boot/dts/renesas/r8a779m3.dtsi | 9 + + arch/arm64/boot/dts/renesas/r8a779m4.dtsi | 12 + + .../boot/dts/renesas/r8a779m5-salvator-xs.dts | 36 + + arch/arm64/boot/dts/renesas/r8a779m5.dtsi | 21 + + arch/arm64/boot/dts/renesas/r8a779m6.dtsi | 12 + + arch/arm64/boot/dts/renesas/r8a779m7.dtsi | 12 + + arch/arm64/boot/dts/renesas/r8a779m8.dtsi | 12 + + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 337 ++ + arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts | 7 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 275 ++ + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 292 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 56 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 + + arch/arm64/boot/dts/rockchip/Makefile | 6 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 52 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 126 +- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 49 +- + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 3 - + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 28 +- + arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 110 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 17 +- + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 47 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 191 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 1 + + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 176 + + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 1 + + .../boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts | 41 + + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 182 + + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 36 + + arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 6 +- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 7 +- + .../arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 218 ++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 54 + + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 + + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 47 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 29 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 116 +- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 548 +++ + arch/arm64/boot/dts/rockchip/rk3566.dtsi | 20 + + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 313 ++ + arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi | 9 + + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 644 +--- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1145 +++++++ + arch/arm64/boot/dts/ti/Makefile | 4 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 280 ++ + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am64.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 8 + + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 8 + + .../boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi | 46 + + .../boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 51 + + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 39 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 4 - + arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 + + .../dts/ti/k3-am6528-iot2050-basic-common.dtsi | 60 + + .../boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts | 24 + + arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 56 +- + arch/arm64/boot/dts/ti/k3-am654.dtsi | 4 + + .../dts/ti/k3-am6548-iot2050-advanced-common.dtsi | 56 + + .../boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts | 29 + + .../boot/dts/ti/k3-am6548-iot2050-advanced.dts | 50 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 3 + + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 7 +- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 2 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 3 + + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 16 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 1002 ++++++ + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 3 + + arch/arm64/boot/dts/toshiba/Makefile | 1 + + arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 6 + + .../boot/dts/toshiba/tmpv7708-visrobo-vrb.dts | 61 + + .../boot/dts/toshiba/tmpv7708-visrobo-vrc.dtsi | 44 + + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 59 + + arch/arm64/boot/dts/xilinx/Makefile | 14 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 +- + .../arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts | 315 ++ + .../arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts | 298 ++ + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 289 ++ + arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 21 + + arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 16 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 16 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts | 18 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 298 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 342 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 49 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 24 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 330 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 264 +- + .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 320 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 3 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 292 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 250 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 340 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 274 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 93 +- + arch/arm64/configs/defconfig | 27 +- + drivers/bus/Kconfig | 2 +- + drivers/bus/brcmstb_gisb.c | 7 +- + drivers/bus/sun50i-de2.c | 7 +- + drivers/bus/ti-sysc.c | 276 +- + drivers/cpuidle/Kconfig.arm | 3 +- + drivers/cpuidle/cpuidle-qcom-spm.c | 318 +- + drivers/cpuidle/cpuidle-tegra.c | 3 + + drivers/firmware/arm_ffa/driver.c | 53 +- + drivers/firmware/qcom_scm.c | 6 +- + drivers/firmware/tegra/bpmp-debugfs.c | 26 +- + drivers/firmware/tegra/bpmp-tegra210.c | 7 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 5 +- + drivers/memory/Kconfig | 5 +- + drivers/memory/fsl_ifc.c | 13 +- + drivers/memory/jedec_ddr.h | 47 + + drivers/memory/jedec_ddr_data.c | 41 + + drivers/memory/mtk-smi.c | 596 ++-- + drivers/memory/of_memory.c | 87 + + drivers/memory/of_memory.h | 9 + + drivers/memory/renesas-rpc-if.c | 159 +- + drivers/memory/samsung/Kconfig | 13 +- + drivers/memory/tegra/Kconfig | 1 + + drivers/memory/tegra/mc.c | 25 +- + drivers/memory/tegra/tegra186-emc.c | 5 + + drivers/memory/tegra/tegra20-emc.c | 200 +- + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 2 +- + drivers/memory/tegra/tegra210-emc-core.c | 6 +- + drivers/memory/tegra/tegra30-emc.c | 4 +- + drivers/of/platform.c | 1 + + drivers/reset/Kconfig | 4 +- + drivers/reset/reset-microchip-sparx5.c | 40 +- + drivers/reset/reset-uniphier-glue.c | 4 + + drivers/reset/reset-uniphier.c | 27 + + drivers/rtc/Kconfig | 10 +- + drivers/soc/amlogic/meson-canvas.c | 4 +- + drivers/soc/amlogic/meson-clk-measure.c | 4 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 1 + + drivers/soc/aspeed/Kconfig | 10 + + drivers/soc/aspeed/Makefile | 9 +- + drivers/soc/aspeed/aspeed-uart-routing.c | 603 ++++ + drivers/soc/bcm/bcm63xx/bcm-pmb.c | 4 +- + drivers/soc/bcm/bcm63xx/bcm63xx-power.c | 4 +- + drivers/soc/bcm/brcmstb/biuctrl.c | 2 + + drivers/soc/fsl/dpio/dpio-service.c | 2 +- + drivers/soc/fsl/dpio/qbman-portal.c | 8 +- + drivers/soc/fsl/guts.c | 4 +- + drivers/soc/fsl/rcpm.c | 7 +- + drivers/soc/imx/Kconfig | 1 + + drivers/soc/imx/Makefile | 1 + + drivers/soc/imx/gpcv2.c | 134 +- + drivers/soc/imx/imx8m-blk-ctrl.c | 523 +++ + drivers/soc/mediatek/mt8192-mmsys.h | 76 + + drivers/soc/mediatek/mtk-mmsys.c | 79 + + drivers/soc/mediatek/mtk-mmsys.h | 2 + + drivers/soc/mediatek/mtk-mutex.c | 35 + + drivers/soc/qcom/Kconfig | 21 +- + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/apr.c | 289 +- + drivers/soc/qcom/cpr.c | 4 +- + drivers/soc/qcom/llcc-qcom.c | 18 +- + drivers/soc/qcom/ocmem.c | 4 +- + drivers/soc/qcom/pdr_interface.c | 12 +- + drivers/soc/qcom/qcom-geni-se.c | 4 +- + drivers/soc/qcom/qcom_aoss.c | 165 +- + drivers/soc/qcom/qcom_gsbi.c | 4 +- + drivers/soc/qcom/qcom_stats.c | 277 ++ + drivers/soc/qcom/rpmh-rsc.c | 4 +- + drivers/soc/qcom/rpmhpd.c | 36 +- + drivers/soc/qcom/rpmpd.c | 24 + + drivers/soc/qcom/smd-rpm.c | 2 + + drivers/soc/qcom/smem.c | 57 +- + drivers/soc/qcom/smp2p.c | 154 +- + drivers/soc/qcom/socinfo.c | 18 +- + drivers/soc/qcom/spm.c | 279 ++ + drivers/soc/renesas/Kconfig | 7 +- + drivers/soc/renesas/renesas-soc.c | 7 + + drivers/soc/samsung/Kconfig | 5 +- + drivers/soc/samsung/Makefile | 3 +- + drivers/soc/samsung/exynos-chipid.c | 94 +- + drivers/soc/samsung/exynos5422-asv.c | 1 + + drivers/soc/samsung/pm_domains.c | 1 - + drivers/soc/sunxi/sunxi_sram.c | 4 +- + drivers/soc/tegra/Makefile | 1 + + drivers/soc/tegra/ari-tegra186.c | 80 + + drivers/soc/tegra/pmc.c | 28 +- + drivers/tee/optee/Makefile | 5 +- + drivers/tee/optee/call.c | 445 +-- + drivers/tee/optee/core.c | 719 +--- + drivers/tee/optee/ffa_abi.c | 911 +++++ + drivers/tee/optee/optee_ffa.h | 153 + + drivers/tee/optee/optee_msg.h | 27 +- + drivers/tee/optee/optee_private.h | 157 +- + drivers/tee/optee/rpc.c | 237 +- + drivers/tee/optee/shm_pool.c | 101 - + drivers/tee/optee/shm_pool.h | 14 - + drivers/tee/optee/smc_abi.c | 1362 ++++++++ + drivers/watchdog/mtk_wdt.c | 6 +- + include/dt-bindings/power/imx8mm-power.h | 9 + + include/dt-bindings/power/qcom-aoss-qmp.h | 14 - + include/dt-bindings/power/qcom-rpmpd.h | 17 + + .../{reset-controller => reset}/mt2712-resets.h | 0 + include/dt-bindings/reset/mt8173-resets.h | 2 + + .../{reset-controller => reset}/mt8183-resets.h | 3 + + .../{reset-controller => reset}/mt8192-resets.h | 0 + include/dt-bindings/soc/qcom,gpr.h | 19 + + include/linux/arm_ffa.h | 2 + + include/linux/clk/tegra.h | 24 +- + include/linux/platform_data/ti-sysc.h | 3 + + include/linux/soc/mediatek/mtk-mmsys.h | 3 + + include/linux/soc/qcom/apr.h | 70 +- + include/linux/soc/qcom/qcom_aoss.h | 38 + + include/linux/soc/samsung/exynos-chipid.h | 6 +- + include/linux/tee_drv.h | 7 +- + include/memory/renesas-rpc-if.h | 1 + + include/soc/qcom/spm.h | 43 + + include/soc/tegra/fuse.h | 31 +- + include/soc/tegra/irq.h | 9 +- + include/soc/tegra/pm.h | 2 +- + sound/soc/cirrus/ep93xx-i2s.c | 12 +- + 888 files changed, 58001 insertions(+), 16903 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing + create mode 100644 Documentation/arm/stm32/stm32mp13-overview.rst + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/allwinner,sun9i-a80-prcm.yaml + delete mode 100644 Documentation/devicetree/bindings/ddr/lpddr2.txt + create mode 100644 Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr2.yaml + rename Documentation/devicetree/bindings/{ => memory-controllers}/ddr/lpddr2-timings.txt (100%) + rename Documentation/devicetree/bindings/{ => memory-controllers}/ddr/lpddr3-timings.txt (100%) + rename Documentation/devicetree/bindings/{ => memory-controllers}/ddr/lpddr3.txt (94%) + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti,gpmc-child.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti,gpmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nor.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/gpmc-onenand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/ti,gpmc-nand.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/ti,gpmc-onenand.yaml + delete mode 100644 Documentation/devicetree/bindings/net/gpmc-eth.txt + delete mode 100644 Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.txt + create mode 100644 Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-disp-blk-ctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,spm.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom-stats.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/armada-381-netgear-gs110emx.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-inventec-transformers.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts + create mode 100644 arch/arm/boot/dts/at91-lmu5000.dts + create mode 100644 arch/arm/boot/dts/at91-q5xr5.dts + create mode 100644 arch/arm/boot/dts/bcm-nsp-ax.dtsi + create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts + create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-wifi-bt.dtsi + create mode 100644 arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts + create mode 100644 arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi + create mode 100644 arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi + create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64-a0.dts + create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64.dts + create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64w-a0.dts + create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64w.dts + create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx65.dts + create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx65w.dts + create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi + create mode 100644 arch/arm/boot/dts/e70k02.dtsi + create mode 100644 arch/arm/boot/dts/gemini-ns2502.dts + create mode 100644 arch/arm/boot/dts/gemini-ssi1328.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-skov-revc-lt2.dtsi + create mode 100644 arch/arm/boot/dts/imx6sl-tolino-vision5.dts + create mode 100644 arch/arm/boot/dts/imx6sll-kobo-librah2o.dts + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi + create mode 100644 arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8916-samsung-serranove.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8916-smp.dtsi + create mode 100644 arch/arm/boot/dts/qcom-pm8226.dtsi + create mode 100644 arch/arm/boot/dts/sama5d29.dtsi + create mode 100644 arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts + create mode 100644 arch/arm/boot/dts/stm32mp13-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp131.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp133.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp135.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp135f-dk.dts + create mode 100644 arch/arm/boot/dts/stm32mp13xc.dtsi + create mode 100644 arch/arm/boot/dts/stm32mp13xf.dtsi + delete mode 100644 arch/arm/mach-omap2/scrm54xx.h + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynosautov9-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynosautov9.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3-rev-a.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dts + create mode 100644 arch/arm64/boot/dts/freescale/s32g2.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/s32g274a-evb.dts + create mode 100644 arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-max98357a.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-rt1015p.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-max98357a.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015p.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-max98357a.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-rt1015p.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts + delete mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-lilac.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-poplar.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm6350.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm6350-sony-xperia-lena-pdx213.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm6350.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm7225.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/draak.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ebisu.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m0.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m4.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m5-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m5.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m6.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m7.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m8.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk356x.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-sk.dts + create mode 100644 arch/arm64/boot/dts/toshiba/tmpv7708-visrobo-vrb.dts + create mode 100644 arch/arm64/boot/dts/toshiba/tmpv7708-visrobo-vrc.dtsi + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts + create mode 100644 drivers/soc/aspeed/aspeed-uart-routing.c + create mode 100644 drivers/soc/imx/imx8m-blk-ctrl.c + create mode 100644 drivers/soc/mediatek/mt8192-mmsys.h + create mode 100644 drivers/soc/qcom/qcom_stats.c + create mode 100644 drivers/soc/qcom/spm.c + create mode 100644 drivers/soc/tegra/ari-tegra186.c + create mode 100644 drivers/tee/optee/ffa_abi.c + create mode 100644 drivers/tee/optee/optee_ffa.h + delete mode 100644 drivers/tee/optee/shm_pool.c + delete mode 100644 drivers/tee/optee/shm_pool.h + create mode 100644 drivers/tee/optee/smc_abi.c + delete mode 100644 include/dt-bindings/power/qcom-aoss-qmp.h + rename include/dt-bindings/{reset-controller => reset}/mt2712-resets.h (100%) + rename include/dt-bindings/{reset-controller => reset}/mt8183-resets.h (98%) + rename include/dt-bindings/{reset-controller => reset}/mt8192-resets.h (100%) + create mode 100644 include/dt-bindings/soc/qcom,gpr.h + create mode 100644 include/linux/soc/qcom/qcom_aoss.h + create mode 100644 include/soc/qcom/spm.h +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 (509d3f2b755f Merge branches 'defconfig-for-v5.16' and 'dt-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 +Merge made by the 'recursive' strategy. + drivers/clk/rockchip/clk-rk3399.c | 17 ++++++++++------- + drivers/clk/rockchip/clk-rk3568.c | 2 +- + 2 files changed, 11 insertions(+), 8 deletions(-) +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/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 +Merge made by the 'recursive' strategy. + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 2 +- + drivers/clk/sunxi-ng/Kconfig | 1 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun5i.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 8 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 7 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 2 +- + drivers/clk/sunxi-ng/ccu_common.c | 96 ++++++++++++++++++---- + drivers/clk/sunxi-ng/ccu_common.h | 6 +- + drivers/clk/sunxi-ng/ccu_mux.h | 1 - + drivers/clk/sunxi/clk-mod0.c | 4 +- + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 4 +- + drivers/clk/sunxi/clk-sun6i-apb0.c | 4 +- + drivers/clk/sunxi/clk-sun6i-ar100.c | 4 +- + drivers/clk/sunxi/clk-sun8i-apb0.c | 4 +- + 31 files changed, 127 insertions(+), 85 deletions(-) +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 +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 (9c4c7a13f4c8 Merge branch 'clk-debugfs' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Removing Documentation/devicetree/bindings/clock/ux500.txt +Removing Documentation/devicetree/bindings/clock/fixed-mmio-clock.txt +Merge made by the 'recursive' strategy. + .../arm/mediatek/mediatek,mt8195-clock.yaml | 254 ++ + .../arm/mediatek/mediatek,mt8195-sys-clock.yaml | 73 + + .../devicetree/bindings/clock/arm,syscon-icst.yaml | 5 + + .../devicetree/bindings/clock/fixed-mmio-clock.txt | 24 - + .../bindings/clock/fixed-mmio-clock.yaml | 47 + + .../bindings/clock/imx8ulp-cgc-clock.yaml | 43 + + .../bindings/clock/imx8ulp-pcc-clock.yaml | 50 + + .../bindings/clock/qcom,dispcc-sm8x50.yaml | 13 + + .../bindings/clock/qcom,gcc-msm8994.yaml | 70 + + .../bindings/clock/qcom,gcc-msm8998.yaml | 26 +- + .../bindings/clock/qcom,gcc-qcm2290.yaml | 72 + + .../devicetree/bindings/clock/qcom,gcc.yaml | 2 - + .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 + + .../bindings/clock/qcom,sc7280-camcc.yaml | 71 + + .../bindings/clock/qcom,sc7280-lpasscc.yaml | 68 + + .../devicetree/bindings/clock/qcom,videocc.yaml | 13 + + .../bindings/clock/samsung,exynos850-clock.yaml | 185 ++ + .../bindings/clock/stericsson,u8500-clks.yaml | 121 + + Documentation/devicetree/bindings/clock/ux500.txt | 64 - + arch/arm/mach-integrator/Kconfig | 2 +- + arch/arm/mach-realview/Kconfig | 2 +- + arch/arm/mach-ux500/Kconfig | 1 + + arch/arm/mach-versatile/Kconfig | 2 +- + arch/arm/mach-vexpress/Kconfig | 2 +- + drivers/clk/at91/at91rm9200.c | 2 +- + drivers/clk/at91/at91sam9260.c | 2 +- + drivers/clk/at91/at91sam9g45.c | 2 +- + drivers/clk/at91/at91sam9n12.c | 2 +- + drivers/clk/at91/at91sam9rl.c | 2 +- + drivers/clk/at91/at91sam9x5.c | 2 +- + drivers/clk/at91/clk-generated.c | 46 +- + drivers/clk/at91/clk-main.c | 66 + + drivers/clk/at91/clk-master.c | 463 ++- + drivers/clk/at91/clk-peripheral.c | 40 +- + drivers/clk/at91/clk-pll.c | 39 + + drivers/clk/at91/clk-programmable.c | 29 +- + drivers/clk/at91/clk-sam9x60-pll.c | 174 +- + drivers/clk/at91/clk-system.c | 20 + + drivers/clk/at91/clk-usb.c | 27 + + drivers/clk/at91/clk-utmi.c | 39 + + drivers/clk/at91/dt-compat.c | 2 +- + drivers/clk/at91/pmc.c | 178 +- + drivers/clk/at91/pmc.h | 29 +- + drivers/clk/at91/sam9x60.c | 6 +- + drivers/clk/at91/sama5d2.c | 2 +- + drivers/clk/at91/sama5d3.c | 2 +- + drivers/clk/at91/sama5d4.c | 2 +- + drivers/clk/at91/sama7g5.c | 29 +- + drivers/clk/clk-composite.c | 77 +- + drivers/clk/clk.c | 5 +- + drivers/clk/imx/Kconfig | 7 + + drivers/clk/imx/Makefile | 2 + + drivers/clk/imx/clk-composite-7ulp.c | 88 +- + drivers/clk/imx/clk-composite-8m.c | 4 +- + drivers/clk/imx/clk-imx6ul.c | 9 +- + drivers/clk/imx/clk-imx7ulp.c | 20 +- + drivers/clk/imx/clk-imx8ulp.c | 569 ++++ + drivers/clk/imx/clk-pfdv2.c | 23 +- + drivers/clk/imx/clk-pllv4.c | 35 +- + drivers/clk/imx/clk.h | 457 +-- + drivers/clk/mediatek/Kconfig | 28 +- + drivers/clk/mediatek/Makefile | 8 + + drivers/clk/mediatek/clk-apmixed.c | 3 + + drivers/clk/mediatek/clk-cpumux.c | 3 + + drivers/clk/mediatek/clk-gate.c | 8 + + drivers/clk/mediatek/clk-mt6779-aud.c | 4 +- + drivers/clk/mediatek/clk-mt6779-cam.c | 4 +- + drivers/clk/mediatek/clk-mt6779-img.c | 4 +- + drivers/clk/mediatek/clk-mt6779-ipe.c | 4 +- + drivers/clk/mediatek/clk-mt6779-mfg.c | 4 +- + drivers/clk/mediatek/clk-mt6779-mm.c | 4 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt6779-venc.c | 4 +- + drivers/clk/mediatek/clk-mt6779.c | 2 + + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 145 + + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 92 + + drivers/clk/mediatek/clk-mt8195-cam.c | 142 + + drivers/clk/mediatek/clk-mt8195-ccu.c | 50 + + drivers/clk/mediatek/clk-mt8195-img.c | 96 + + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 68 + + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 206 ++ + drivers/clk/mediatek/clk-mt8195-ipe.c | 51 + + drivers/clk/mediatek/clk-mt8195-mfg.c | 47 + + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 62 + + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 47 + + drivers/clk/mediatek/clk-mt8195-topckgen.c | 1273 ++++++++ + drivers/clk/mediatek/clk-mt8195-vdec.c | 104 + + drivers/clk/mediatek/clk-mt8195-vdo0.c | 123 + + drivers/clk/mediatek/clk-mt8195-vdo1.c | 140 + + drivers/clk/mediatek/clk-mt8195-venc.c | 69 + + drivers/clk/mediatek/clk-mt8195-vpp0.c | 110 + + drivers/clk/mediatek/clk-mt8195-vpp1.c | 108 + + drivers/clk/mediatek/clk-mt8195-wpe.c | 143 + + drivers/clk/mediatek/clk-mtk.c | 29 +- + drivers/clk/mediatek/clk-mtk.h | 1 + + drivers/clk/mediatek/clk-mux.c | 6 + + drivers/clk/mediatek/clk-pll.c | 6 +- + drivers/clk/mediatek/reset.c | 2 + + drivers/clk/meson/meson8b.c | 163 +- + drivers/clk/meson/meson8b.h | 26 +- + drivers/clk/mvebu/ap-cpu-clk.c | 14 +- + drivers/clk/qcom/Kconfig | 43 +- + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/a53-pll.c | 4 +- + drivers/clk/qcom/camcc-sc7280.c | 2484 ++++++++++++++++ + drivers/clk/qcom/clk-smd-rpm.c | 135 +- + drivers/clk/qcom/common.c | 8 +- + drivers/clk/qcom/dispcc-sm8250.c | 27 +- + drivers/clk/qcom/gcc-msm8953.c | 1 - + drivers/clk/qcom/gcc-msm8994.c | 1384 +++++---- + drivers/clk/qcom/gcc-msm8998.c | 705 ++--- + drivers/clk/qcom/gcc-qcm2290.c | 3044 ++++++++++++++++++++ + drivers/clk/qcom/gcc-sc7280.c | 85 - + drivers/clk/qcom/gcc-sdm660.c | 80 +- + drivers/clk/qcom/gdsc.c | 51 +- + drivers/clk/qcom/gdsc.h | 2 + + drivers/clk/qcom/gpucc-msm8998.c | 13 +- + drivers/clk/qcom/gpucc-sdm660.c | 15 +- + drivers/clk/qcom/kpss-xcc.c | 4 +- + drivers/clk/qcom/lpasscc-sc7280.c | 216 ++ + drivers/clk/qcom/mmcc-msm8998.c | 183 +- + drivers/clk/qcom/mmcc-sdm660.c | 75 +- + drivers/clk/qcom/videocc-sm8250.c | 27 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 191 ++ + drivers/clk/renesas/r9a07g044-cpg.c | 83 +- + drivers/clk/renesas/rcar-cpg-lib.c | 83 + + drivers/clk/renesas/rcar-cpg-lib.h | 7 + + drivers/clk/renesas/rcar-gen3-cpg.c | 89 +- + drivers/clk/renesas/rzg2l-cpg.c | 212 ++ + drivers/clk/renesas/rzg2l-cpg.h | 45 +- + drivers/clk/samsung/Kconfig | 30 +- + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-cpu.c | 18 + + drivers/clk/samsung/clk-exynos-audss.c | 4 +- + drivers/clk/samsung/clk-exynos4412-isp.c | 4 +- + drivers/clk/samsung/clk-exynos5433.c | 124 +- + drivers/clk/samsung/clk-exynos850.c | 835 ++++++ + drivers/clk/samsung/clk-pll.c | 196 ++ + drivers/clk/samsung/clk-pll.h | 2 + + drivers/clk/samsung/clk-s5pv210-audss.c | 4 +- + drivers/clk/samsung/clk.c | 2 + + drivers/clk/samsung/clk.h | 26 + + drivers/clk/ux500/Makefile | 3 + + drivers/clk/ux500/prcc.h | 19 + + drivers/clk/ux500/reset-prcc.c | 181 ++ + drivers/clk/ux500/reset-prcc.h | 23 + + drivers/clk/ux500/u8500_of_clk.c | 30 +- + drivers/clk/versatile/Kconfig | 3 +- + drivers/clk/versatile/Makefile | 2 +- + drivers/clk/versatile/clk-icst.c | 3 +- + include/dt-bindings/clock/exynos850.h | 141 + + include/dt-bindings/clock/imx8ulp-clock.h | 258 ++ + include/dt-bindings/clock/meson8b-clkc.h | 10 + + include/dt-bindings/clock/mt8195-clk.h | 864 ++++++ + include/dt-bindings/clock/qcom,camcc-sc7280.h | 127 + + include/dt-bindings/clock/qcom,gcc-msm8994.h | 13 + + include/dt-bindings/clock/qcom,gcc-qcm2290.h | 188 ++ + include/dt-bindings/clock/qcom,lpass-sc7280.h | 16 + + include/dt-bindings/clock/qcom,rpmcc.h | 6 + + include/dt-bindings/reset/imx8ulp-pcc-reset.h | 59 + + .../reset/stericsson,db8500-prcc-reset.h | 51 + + include/linux/soc/qcom/smd-rpm.h | 2 + + 165 files changed, 17292 insertions(+), 2374 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8195-clock.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8195-sys-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/fixed-mmio-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/fixed-mmio-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imx8ulp-cgc-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imx8ulp-pcc-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-qcm2290.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7280-camcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/stericsson,u8500-clks.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ux500.txt + create mode 100644 drivers/clk/imx/clk-imx8ulp.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-apusys_pll.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-ccu.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-infra_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-ipe.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-peri_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-scp_adsp.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vdo0.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vdo1.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vpp0.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vpp1.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-wpe.c + create mode 100644 drivers/clk/qcom/camcc-sc7280.c + create mode 100644 drivers/clk/qcom/gcc-qcm2290.c + create mode 100644 drivers/clk/qcom/lpasscc-sc7280.c + create mode 100644 drivers/clk/samsung/clk-exynos850.c + create mode 100644 drivers/clk/ux500/prcc.h + create mode 100644 drivers/clk/ux500/reset-prcc.c + create mode 100644 drivers/clk/ux500/reset-prcc.h + create mode 100644 include/dt-bindings/clock/exynos850.h + create mode 100644 include/dt-bindings/clock/imx8ulp-clock.h + create mode 100644 include/dt-bindings/clock/mt8195-clk.h + create mode 100644 include/dt-bindings/clock/qcom,camcc-sc7280.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-qcm2290.h + create mode 100644 include/dt-bindings/clock/qcom,lpass-sc7280.h + create mode 100644 include/dt-bindings/reset/imx8ulp-pcc-reset.h + create mode 100644 include/dt-bindings/reset/stericsson,db8500-prcc-reset.h +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/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 +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 7 +++++-- + arch/m68k/configs/apollo_defconfig | 7 +++++-- + arch/m68k/configs/atari_defconfig | 7 +++++-- + arch/m68k/configs/bvme6000_defconfig | 7 +++++-- + arch/m68k/configs/hp300_defconfig | 7 +++++-- + arch/m68k/configs/mac_defconfig | 7 +++++-- + arch/m68k/configs/multi_defconfig | 7 +++++-- + arch/m68k/configs/mvme147_defconfig | 7 +++++-- + arch/m68k/configs/mvme16x_defconfig | 7 +++++-- + arch/m68k/configs/q40_defconfig | 7 +++++-- + arch/m68k/configs/sun3_defconfig | 7 +++++-- + arch/m68k/configs/sun3x_defconfig | 7 +++++-- + arch/m68k/lib/muldi3.c | 2 +- + 13 files changed, 61 insertions(+), 25 deletions(-) +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 +Merge made by the 'recursive' strategy. + arch/microblaze/boot/dts/system.dts | 5 ----- + 1 file changed, 5 deletions(-) +Merging mips/mips-next (95b8a5e0111a MIPS: Remove NETLOGIC support) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Removing arch/mips/pci/pci-xlr.c +Removing arch/mips/pci/pci-xlp.c +Removing arch/mips/pci/msi-xlp.c +Removing arch/mips/netlogic/xlr/wakeup.c +Removing arch/mips/netlogic/xlr/setup.c +Removing arch/mips/netlogic/xlr/platform.c +Removing arch/mips/netlogic/xlr/platform-flash.c +Removing arch/mips/netlogic/xlr/fmn.c +Removing arch/mips/netlogic/xlr/fmn-config.c +Removing arch/mips/netlogic/xlr/Makefile +Removing arch/mips/netlogic/xlp/wakeup.c +Removing arch/mips/netlogic/xlp/usb-init.c +Removing arch/mips/netlogic/xlp/usb-init-xlp2.c +Removing arch/mips/netlogic/xlp/setup.c +Removing arch/mips/netlogic/xlp/nlm_hal.c +Removing arch/mips/netlogic/xlp/dt.c +Removing arch/mips/netlogic/xlp/cop2-ex.c +Removing arch/mips/netlogic/xlp/ahci-init.c +Removing arch/mips/netlogic/xlp/ahci-init-xlp2.c +Removing arch/mips/netlogic/xlp/Makefile +Removing arch/mips/netlogic/common/time.c +Removing arch/mips/netlogic/common/smpboot.S +Removing arch/mips/netlogic/common/smp.c +Removing arch/mips/netlogic/common/reset.S +Removing arch/mips/netlogic/common/irq.c +Removing arch/mips/netlogic/common/earlycons.c +Removing arch/mips/netlogic/common/Makefile +Removing arch/mips/netlogic/Platform +Removing arch/mips/netlogic/Makefile +Removing arch/mips/netlogic/Kconfig +Removing arch/mips/include/asm/netlogic/xlr/xlr.h +Removing arch/mips/include/asm/netlogic/xlr/pic.h +Removing arch/mips/include/asm/netlogic/xlr/msidef.h +Removing arch/mips/include/asm/netlogic/xlr/iomap.h +Removing arch/mips/include/asm/netlogic/xlr/gpio.h +Removing arch/mips/include/asm/netlogic/xlr/fmn.h +Removing arch/mips/include/asm/netlogic/xlr/flash.h +Removing arch/mips/include/asm/netlogic/xlr/bridge.h +Removing arch/mips/include/asm/netlogic/xlp-hal/xlp.h +Removing arch/mips/include/asm/netlogic/xlp-hal/uart.h +Removing arch/mips/include/asm/netlogic/xlp-hal/sys.h +Removing arch/mips/include/asm/netlogic/xlp-hal/pic.h +Removing arch/mips/include/asm/netlogic/xlp-hal/pcibus.h +Removing arch/mips/include/asm/netlogic/xlp-hal/iomap.h +Removing arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h +Removing arch/mips/include/asm/netlogic/xlp-hal/bridge.h +Removing arch/mips/include/asm/netlogic/psb-bootinfo.h +Removing arch/mips/include/asm/netlogic/mips-extns.h +Removing arch/mips/include/asm/netlogic/interrupt.h +Removing arch/mips/include/asm/netlogic/haldefs.h +Removing arch/mips/include/asm/netlogic/common.h +Removing arch/mips/include/asm/mach-netlogic/multi-node.h +Removing arch/mips/include/asm/mach-netlogic/irq.h +Removing arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h +Removing arch/mips/configs/nlm_xlr_defconfig +Removing arch/mips/configs/nlm_xlp_defconfig +Removing arch/mips/boot/dts/netlogic/xlp_svp.dts +Removing arch/mips/boot/dts/netlogic/xlp_rvp.dts +Removing arch/mips/boot/dts/netlogic/xlp_gvp.dts +Removing arch/mips/boot/dts/netlogic/xlp_fvp.dts +Removing arch/mips/boot/dts/netlogic/xlp_evp.dts +Removing arch/mips/boot/dts/netlogic/Makefile +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + 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/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/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/perf_event_mipsxx.c | 86 ---- + arch/mips/kernel/proc.c | 227 ++++++-- + arch/mips/kvm/entry.c | 8 +- + arch/mips/loongson64/init.c | 1 + + arch/mips/mm/c-r4k.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/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/sni/time.c | 4 +- + 93 files changed, 359 insertions(+), 11740 deletions(-) + 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 +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 91b342dec538] 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 (210893cad279 openrisc: signal: remove unused DEBUG_SIG macro) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/kernel/signal.c | 2 -- + arch/openrisc/kernel/time.c | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging parisc-hd/for-next (dd7bf3ebe9e6 parisc: Remove unused constants from asm-offsets.c) +$ 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. + .../core/thread-info-in-task/arch-support.txt | 2 +- + arch/parisc/Kconfig | 22 +++- + arch/parisc/include/asm/assembly.h | 32 ++++++ + arch/parisc/include/asm/bitops.h | 10 -- + arch/parisc/include/asm/current.h | 19 ++++ + arch/parisc/include/asm/futex.h | 3 - + arch/parisc/include/asm/ide.h | 4 - + arch/parisc/include/asm/kfence.h | 44 ++++++++ + arch/parisc/include/asm/mckinley.h | 2 - + arch/parisc/include/asm/pdc.h | 2 + + arch/parisc/include/asm/processor.h | 11 +- + arch/parisc/include/asm/ptrace.h | 6 +- + arch/parisc/include/asm/runway.h | 2 - + arch/parisc/include/asm/smp.h | 19 +++- + arch/parisc/include/asm/thread_info.h | 12 +-- + arch/parisc/include/asm/traps.h | 1 + + arch/parisc/include/asm/unaligned.h | 2 - + arch/parisc/include/uapi/asm/pdc.h | 28 +++++- + arch/parisc/kernel/Makefile | 1 + + arch/parisc/kernel/asm-offsets.c | 34 ++----- + arch/parisc/kernel/cache.c | 87 +++++++--------- + arch/parisc/kernel/entry.S | 90 ++++++----------- + arch/parisc/kernel/firmware.c | 32 ++++++ + arch/parisc/kernel/ftrace.c | 21 ++-- + arch/parisc/kernel/head.S | 40 ++++---- + arch/parisc/kernel/irq.c | 6 +- + arch/parisc/kernel/pdt.c | 4 +- + arch/parisc/kernel/process.c | 4 +- + arch/parisc/kernel/smp.c | 25 ++++- + arch/parisc/kernel/stacktrace.c | 30 +++--- + arch/parisc/kernel/sys_parisc.c | 10 +- + arch/parisc/kernel/syscall.S | 26 ++--- + arch/parisc/kernel/toc.c | 111 +++++++++++++++++++++ + arch/parisc/kernel/toc_asm.S | 88 ++++++++++++++++ + arch/parisc/kernel/traps.c | 9 +- + arch/parisc/kernel/unwind.c | 34 ++++--- + arch/parisc/lib/bitops.c | 12 +-- + arch/parisc/mm/fault.c | 2 +- + arch/parisc/mm/init.c | 4 +- + include/linux/sched/task_stack.h | 4 + + 40 files changed, 604 insertions(+), 291 deletions(-) + create mode 100644 arch/parisc/include/asm/current.h + create mode 100644 arch/parisc/include/asm/kfence.h + create mode 100644 arch/parisc/kernel/toc.c + create mode 100644 arch/parisc/kernel/toc_asm.S +Merging powerpc/next (44a8214de96b powerpc/bpf: Fix write protecting JIT code) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging arch/powerpc/platforms/pseries/iommu.c +Auto-merging arch/powerpc/net/bpf_jit_comp.c +Merge made by the 'recursive' strategy. + 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 | 1 - + 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/machdep.h | 13 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 +- + 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_asm.h | 4 +- + 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/eeh.c | 12 +- + arch/powerpc/kernel/firmware.c | 7 +- + arch/powerpc/kernel/hw_breakpoint_constraints.c | 15 +- + arch/powerpc/kernel/interrupt.c | 2 +- + arch/powerpc/kernel/setup-common.c | 3 - + 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/powerpc.c | 4 +- + 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/mem.c | 4 +- + arch/powerpc/mm/mmu_decl.h | 4 +- + arch/powerpc/mm/nohash/Makefile | 4 +- + .../mm/nohash/{fsl_booke.c => fsl_book3e.c} | 75 ++++-- + 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/pgtable.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/ppc476.c | 4 +- + 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/pci-sriov.c | 6 - + 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 | 3 +- + drivers/video/fbdev/chipsfb.c | 2 +- + .../powerpc/security/mitigation-patching.sh | 4 +- + 94 files changed, 686 insertions(+), 538 deletions(-) + 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%) +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 +Resolved 'arch/riscv/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 429c301335f2] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 1 + + 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/csr.h | 87 +++++++ + 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 +- + 20 files changed, 373 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 +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 12 ++ + 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/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 | 42 ++-- + arch/s390/kernel/syscall.c | 2 + + arch/s390/kernel/traps.c | 10 +- + 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/pageattr.c | 4 +- + arch/s390/mm/vmem.c | 10 +- + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/s390/pci/pci_dma.c | 25 ++- + arch/s390/pci/pci_event.c | 4 + + arch/s390/pci/pci_sysfs.c | 8 + + arch/x86/Kconfig | 1 + + 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 | 5 + + 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 +- + samples/Kconfig | 5 +- + samples/ftrace/ftrace-direct-modify.c | 44 ++++ + samples/ftrace/ftrace-direct-too.c | 28 +++ + samples/ftrace/ftrace-direct.c | 28 +++ + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 3 + + .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 4 + + 95 files changed, 1277 insertions(+), 652 deletions(-) + 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 +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 +Merge made by the 'recursive' strategy. + 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 +++- + 21 files changed, 541 insertions(+), 265 deletions(-) + create mode 100644 arch/xtensa/include/asm/sections.h +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 +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 +Auto-merging fs/ext4/super.c +Merge made by the 'recursive' strategy. + Documentation/block/inline-encryption.rst | 2 + + Documentation/filesystems/fscrypt.rst | 83 +++++++++++++++++++++++-------- + fs/crypto/bio.c | 32 ++++++------ + fs/crypto/fname.c | 3 +- + fs/crypto/fscrypt_private.h | 16 ++++-- + fs/crypto/hkdf.c | 11 ++-- + fs/crypto/keysetup.c | 62 +++++++++++++++++------ + fs/ext4/super.c | 1 - + fs/f2fs/super.c | 1 - + fs/ubifs/crypto.c | 1 - + include/linux/fscrypt.h | 3 -- + 11 files changed, 150 insertions(+), 65 deletions(-) +Merging fscache/fscache-next (d8daa20d7898 Merge branch 'fscache-remove-old-io' into fscache-next) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Removing fs/cachefiles/rdwr.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/caching/backend-api.rst | 138 +-- + Documentation/filesystems/caching/netfs-api.rst | 385 +------- + fs/9p/Kconfig | 1 + + fs/9p/cache.c | 137 --- + fs/9p/cache.h | 98 +- + fs/9p/v9fs.h | 9 + + fs/9p/vfs_addr.c | 195 ++-- + fs/9p/vfs_file.c | 21 +- + fs/afs/file.c | 2 +- + fs/cachefiles/Makefile | 1 - + fs/cachefiles/interface.c | 17 +- + fs/cachefiles/internal.h | 42 +- + fs/cachefiles/io.c | 85 +- + fs/cachefiles/main.c | 1 - + fs/cachefiles/rdwr.c | 972 ------------------- + fs/ceph/cache.h | 2 +- + fs/cifs/file.c | 64 +- + fs/cifs/fscache.c | 105 +- + fs/cifs/fscache.h | 74 +- + fs/fscache/cache.c | 6 - + fs/fscache/cookie.c | 10 - + fs/fscache/internal.h | 58 +- + fs/fscache/io.c | 170 +++- + fs/fscache/object.c | 2 - + fs/fscache/page.c | 1066 --------------------- + fs/fscache/stats.c | 73 +- + fs/netfs/read_helper.c | 8 +- + fs/nfs/file.c | 14 +- + fs/nfs/fscache-index.c | 26 - + fs/nfs/fscache.c | 170 +--- + fs/nfs/fscache.h | 84 +- + fs/nfs/read.c | 25 +- + fs/nfs/write.c | 7 +- + include/linux/fscache-cache.h | 137 +-- + include/linux/fscache.h | 460 +++------ + include/linux/netfs.h | 17 +- + 36 files changed, 617 insertions(+), 4065 deletions(-) + delete mode 100644 fs/cachefiles/rdwr.c +Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (23b461ade5ed Merge branch 'for-next-next-v5.15-20211026' into for-next-20211026) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/block-group.c | 242 +++++-- + fs/btrfs/block-group.h | 8 +- + fs/btrfs/btrfs_inode.h | 32 +- + fs/btrfs/check-integrity.c | 205 +++--- + fs/btrfs/compression.c | 681 +++++++++++-------- + fs/btrfs/compression.h | 4 +- + fs/btrfs/ctree.c | 156 +++-- + fs/btrfs/ctree.h | 84 ++- + fs/btrfs/delayed-inode.c | 41 +- + fs/btrfs/delayed-ref.c | 17 +- + fs/btrfs/delayed-ref.h | 51 +- + fs/btrfs/dev-replace.c | 16 +- + fs/btrfs/disk-io.c | 51 +- + fs/btrfs/disk-io.h | 5 +- + fs/btrfs/extent-tree.c | 326 +++++---- + fs/btrfs/extent_io.c | 334 +++++---- + fs/btrfs/extent_io.h | 10 +- + fs/btrfs/extent_map.c | 4 +- + fs/btrfs/file-item.c | 21 +- + fs/btrfs/file.c | 35 +- + fs/btrfs/free-space-cache.c | 106 ++- + fs/btrfs/free-space-cache.h | 2 + + fs/btrfs/inode.c | 611 +++++++++-------- + fs/btrfs/ioctl.c | 1001 +++++++++++++-------------- + fs/btrfs/locking.h | 7 +- + fs/btrfs/lzo.c | 270 ++++---- + fs/btrfs/raid56.c | 175 +++-- + fs/btrfs/raid56.h | 22 +- + fs/btrfs/reada.c | 26 +- + fs/btrfs/ref-verify.c | 4 +- + fs/btrfs/reflink.c | 4 +- + fs/btrfs/relocation.c | 81 +-- + fs/btrfs/scrub.c | 139 ++-- + fs/btrfs/send.c | 38 +- + fs/btrfs/send.h | 7 + + fs/btrfs/space-info.c | 28 +- + fs/btrfs/subpage.c | 290 ++++++-- + fs/btrfs/subpage.h | 56 +- + fs/btrfs/super.c | 28 +- + fs/btrfs/sysfs.c | 93 ++- + fs/btrfs/tests/extent-buffer-tests.c | 2 +- + fs/btrfs/tests/extent-io-tests.c | 12 +- + fs/btrfs/tests/inode-tests.c | 4 +- + fs/btrfs/transaction.c | 11 +- + fs/btrfs/tree-log.c | 1242 +++++++++++++++++++--------------- + fs/btrfs/tree-log.h | 18 +- + fs/btrfs/volumes.c | 592 +++++++++------- + fs/btrfs/volumes.h | 119 +++- + fs/btrfs/xattr.c | 2 +- + fs/btrfs/zoned.c | 531 +++++++++++++-- + fs/btrfs/zoned.h | 39 +- + fs/inode.c | 7 +- + include/linux/fs.h | 2 + + include/uapi/linux/btrfs.h | 12 +- + include/uapi/linux/btrfs_tree.h | 4 +- + 55 files changed, 4725 insertions(+), 3183 deletions(-) +$ git am -3 ../patches/0001-mark-btrfs-as-BROKEN-due-to-an-inconsistent-API-chan.patch +Applying: mark btrfs as BROKEN due to an inconsistent API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/btrfs/Kconfig +M lib/Kconfig.debug +$ git add -A . +$ git commit -v -a --amend +[master a3098b69e0b7] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git + Date: Thu Oct 28 10:43:13 2021 +1100 +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 (08e9f52e2dce cifs: for compound requests, use open handle if possible) +$ 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/connect.c | 19 +++++++++++-------- + fs/cifs/fs_context.c | 8 ++++++++ + fs/cifs/fs_context.h | 1 + + fs/cifs/smb2inode.c | 42 +++++++++++++++++++++++++++++++++--------- + 4 files changed, 53 insertions(+), 17 deletions(-) +Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (4e8bf1a67198 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 +Merge made by the 'recursive' strategy. + Documentation/filesystems/erofs.rst | 12 +- + fs/erofs/Kconfig | 40 +++-- + fs/erofs/Makefile | 1 + + fs/erofs/compress.h | 28 ++-- + fs/erofs/data.c | 73 +++++++-- + fs/erofs/decompressor.c | 139 ++++++----------- + fs/erofs/decompressor_lzma.c | 290 ++++++++++++++++++++++++++++++++++++ + fs/erofs/erofs_fs.h | 73 ++++++--- + fs/erofs/inode.c | 2 +- + fs/erofs/internal.h | 105 +++++++++++-- + fs/erofs/pcpubuf.c | 6 +- + fs/erofs/super.c | 231 ++++++++++++++++++++++------ + fs/erofs/utils.c | 19 ++- + fs/erofs/xattr.c | 4 +- + fs/erofs/zdata.c | 175 +++++++++++++++------- + fs/erofs/zdata.h | 7 - + fs/erofs/zmap.c | 65 +++++--- + include/linux/xz.h | 106 +++++++++++++ + include/trace/events/erofs.h | 2 +- + lib/decompress_unxz.c | 10 +- + lib/xz/Kconfig | 13 ++ + lib/xz/xz_dec_lzma2.c | 182 +++++++++++++++++++++- + lib/xz/xz_dec_stream.c | 6 +- + lib/xz/xz_dec_syms.c | 9 +- + lib/xz/xz_private.h | 3 + + 25 files changed, 1281 insertions(+), 320 deletions(-) + create mode 100644 fs/erofs/decompressor_lzma.c +Merging exfat/dev (efc7bd8527d0 exfat: fix incorrect loading of i_blocks for large files) +$ 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/inode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ext3/for_next (d1ccf9fdcfc9 Merge filesystem error notification series from Gabriel.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging samples/Kconfig +Auto-merging fs/ext4/super.c +Merge made by the 'recursive' strategy. + .../admin-guide/filesystem-monitoring.rst | 74 ++++++++++ + Documentation/admin-guide/index.rst | 1 + + 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/quota/quota_tree.c | 15 ++ + fs/reiserfs/super.c | 6 - + include/linux/fanotify.h | 9 +- + include/linux/fsnotify.h | 58 +++++--- + include/linux/fsnotify_backend.h | 96 +++++++++++-- + include/uapi/linux/fanotify.h | 8 ++ + kernel/audit_fsnotify.c | 3 +- + kernel/audit_watch.c | 3 +- + samples/Kconfig | 9 ++ + samples/Makefile | 1 + + samples/fanotify/Makefile | 5 + + samples/fanotify/fs-monitor.c | 142 +++++++++++++++++++ + 25 files changed, 703 insertions(+), 105 deletions(-) + create mode 100644 Documentation/admin-guide/filesystem-monitoring.rst + create mode 100644 samples/fanotify/Makefile + create mode 100644 samples/fanotify/fs-monitor.c +Merging ext4/dev (916ff8d5ea0e ext4: prevent partial update of the extent blocks) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/super.c +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 3 +- + fs/ext4/extents.c | 172 +++++++++++++++++++++++++++++++----------------------- + fs/ext4/inode.c | 15 ++--- + fs/ext4/page-io.c | 8 +-- + fs/ext4/super.c | 9 ++- + 5 files changed, 116 insertions(+), 91 deletions(-) +Merging f2fs/dev (02d58cd253d7 f2fs: compress: disallow disabling compress on non-empty compressed file) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 16 ++++++ + Documentation/filesystems/f2fs.rst | 18 +++++++ + fs/f2fs/checkpoint.c | 6 +-- + fs/f2fs/compress.c | 20 +++++++ + fs/f2fs/data.c | 93 +++++++++++++++++++++++++-------- + fs/f2fs/f2fs.h | 52 +++++++++++++++--- + fs/f2fs/gc.c | 5 +- + fs/f2fs/inode.c | 2 +- + fs/f2fs/namei.c | 2 +- + fs/f2fs/node.c | 1 + + fs/f2fs/node.h | 5 -- + fs/f2fs/recovery.c | 8 +-- + fs/f2fs/segment.c | 80 +++++++++++++++++++++------- + fs/f2fs/segment.h | 1 + + fs/f2fs/super.c | 19 ++++++- + fs/f2fs/sysfs.c | 24 ++++++++- + include/trace/events/f2fs.h | 33 ++++++++---- + 17 files changed, 306 insertions(+), 79 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 (85bf4c6df4e9 fuse: only update necessary attributes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dax.c | 5 +-- + fs/fuse/dev.c | 10 ++--- + fs/fuse/dir.c | 128 +++++++++++++++++++++++++----------------------------- + fs/fuse/file.c | 103 ++++++++++++++++++++++--------------------- + fs/fuse/fuse_i.h | 17 ++++++-- + fs/fuse/inode.c | 45 ++++++++++++++++--- + fs/fuse/ioctl.c | 4 +- + fs/fuse/readdir.c | 6 +-- + fs/fuse/xattr.c | 10 ++--- + 9 files changed, 181 insertions(+), 147 deletions(-) +Merging gfs2/for-next (e34e6f8133b8 gfs2: Fix unused value warning in do_gfs2_set_flags()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/ntfs3/file.c +Auto-merging fs/fuse/file.c +Auto-merging fs/erofs/data.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/file.c +Auto-merging arch/x86/kernel/fpu/signal.c +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/kvm.c | 3 +- + arch/powerpc/kernel/signal_32.c | 4 +- + arch/powerpc/kernel/signal_64.c | 2 +- + arch/x86/kernel/fpu/signal.c | 7 +- + drivers/gpu/drm/armada/armada_gem.c | 7 +- + fs/btrfs/file.c | 7 +- + fs/btrfs/ioctl.c | 5 +- + fs/erofs/data.c | 2 +- + fs/ext4/file.c | 5 +- + fs/f2fs/file.c | 2 +- + fs/fuse/file.c | 2 +- + fs/gfs2/bmap.c | 60 +---- + fs/gfs2/file.c | 263 +++++++++++++++++--- + fs/gfs2/glock.c | 471 ++++++++++++++++++++++++++---------- + fs/gfs2/glock.h | 34 ++- + fs/gfs2/glops.c | 29 +-- + fs/gfs2/incore.h | 10 +- + fs/gfs2/inode.c | 12 +- + fs/gfs2/rgrp.c | 70 +++--- + fs/gfs2/rgrp.h | 2 +- + fs/gfs2/super.c | 4 +- + fs/gfs2/trace_gfs2.h | 9 +- + fs/gfs2/util.c | 2 + + fs/iomap/buffered-io.c | 2 +- + fs/iomap/direct-io.c | 29 ++- + fs/ntfs/file.c | 2 +- + fs/ntfs3/file.c | 2 +- + fs/xfs/xfs_file.c | 6 +- + fs/zonefs/super.c | 4 +- + include/linux/iomap.h | 11 +- + include/linux/mm.h | 3 +- + include/linux/pagemap.h | 58 +---- + include/linux/uio.h | 4 +- + lib/iov_iter.c | 103 ++++++-- + mm/filemap.c | 4 +- + mm/gup.c | 139 ++++++++++- + 36 files changed, 968 insertions(+), 411 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 +Merge made by the 'recursive' strategy. + fs/jfs/jfs_mount.c | 51 ++++++++++++++++++++++----------------------------- + 1 file changed, 22 insertions(+), 29 deletions(-) +Merging ksmbd/ksmbd-for-next (0d994cd482ee ksmbd: add buffer validation in session setup) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (01d29f87fcfe NFSv4: Fix a regression in nfs_set_open_stateid_locked()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/write.c +Auto-merging fs/nfs/read.c +Merge made by the 'recursive' strategy. + fs/lockd/clntproc.c | 3 - + fs/lockd/svc4proc.c | 2 - + fs/lockd/svcproc.c | 2 - + fs/nfs/client.c | 37 +++-- + fs/nfs/delegation.c | 10 +- + fs/nfs/dir.c | 53 ++++-- + 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 | 59 ++++--- + fs/nfs/internal.h | 3 +- + fs/nfs/nfs3xdr.c | 2 +- + fs/nfs/nfs4client.c | 65 +++----- + fs/nfs/nfs4idmap.c | 2 +- + fs/nfs/nfs4proc.c | 116 +++++-------- + fs/nfs/nfs4state.c | 5 +- + fs/nfs/nfs4trace.h | 9 +- + fs/nfs/nfstrace.h | 266 ++++++++++++++++++++++-------- + fs/nfs/pagelist.c | 13 +- + fs/nfs/pnfs.h | 2 +- + 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 ++++---- + include/linux/nfs_fs.h | 54 +++--- + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/sched.h | 16 +- + 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/xprt.c | 36 ++-- + net/sunrpc/xprtrdma/frwr_ops.c | 35 ++++ + net/sunrpc/xprtrdma/rpc_rdma.c | 23 ++- + net/sunrpc/xprtrdma/verbs.c | 3 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 6 +- + 40 files changed, 682 insertions(+), 493 deletions(-) + 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 (291cd656da04 NFSD:fix boolreturn.cocci warning) +$ 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 +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 64b75fcda966] Merge branch 'nfsd-next' of git://git.linux-nfs.org/~bfields/linux.git +$ git diff -M --stat --summary HEAD^.. + 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 +- + 42 files changed, 1141 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 +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 (1dc1eed46f9f ovl: fix IOCB_DIRECT if underlying fs doesn't support direct IO) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (9a620291fc01 ubifs: Export filesystem error counters) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Merge made by the 'recursive' strategy. + 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 +++++++++++ + 8 files changed, 231 insertions(+), 11 deletions(-) + create mode 100644 fs/ubifs/sysfs.c +Merging v9fs/9p-next (9c4d94dc9a64 net/9p: increase default msize to 128k) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (5ca5916b6bc9 xfs: punch out data fork delalloc blocks on COW writeback failure) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/kmem.h | 4 - + fs/xfs/libxfs/xfs_ag.c | 2 +- + fs/xfs/libxfs/xfs_ag.h | 36 ++-- + fs/xfs/libxfs/xfs_ag_resv.c | 3 +- + fs/xfs/libxfs/xfs_alloc.c | 120 ++++++++++--- + fs/xfs/libxfs/xfs_alloc.h | 38 ++++- + fs/xfs/libxfs/xfs_alloc_btree.c | 63 +++++-- + fs/xfs/libxfs/xfs_alloc_btree.h | 5 + + fs/xfs/libxfs/xfs_attr_leaf.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 101 ++++------- + fs/xfs/libxfs/xfs_bmap.h | 35 +--- + fs/xfs/libxfs/xfs_bmap_btree.c | 62 +++++-- + fs/xfs/libxfs/xfs_bmap_btree.h | 5 + + fs/xfs/libxfs/xfs_btree.c | 333 +++++++++++++++++++++++-------------- + fs/xfs/libxfs/xfs_btree.h | 99 ++++++++--- + fs/xfs/libxfs/xfs_btree_staging.c | 8 +- + fs/xfs/libxfs/xfs_da_btree.c | 6 +- + fs/xfs/libxfs/xfs_da_btree.h | 3 +- + fs/xfs/libxfs/xfs_defer.c | 241 ++++++++++++++++++++------- + fs/xfs/libxfs/xfs_defer.h | 41 ++++- + fs/xfs/libxfs/xfs_dquot_buf.c | 4 +- + fs/xfs/libxfs/xfs_format.h | 12 +- + fs/xfs/libxfs/xfs_fs.h | 2 + + fs/xfs/libxfs/xfs_ialloc.c | 5 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 90 +++++++++- + fs/xfs/libxfs/xfs_ialloc_btree.h | 5 + + fs/xfs/libxfs/xfs_inode_buf.c | 6 +- + fs/xfs/libxfs/xfs_inode_fork.c | 24 +-- + fs/xfs/libxfs/xfs_inode_fork.h | 2 +- + fs/xfs/libxfs/xfs_refcount.c | 46 +++-- + fs/xfs/libxfs/xfs_refcount.h | 7 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 65 +++++++- + fs/xfs/libxfs/xfs_refcount_btree.h | 5 + + fs/xfs/libxfs/xfs_rmap.c | 21 ++- + fs/xfs/libxfs/xfs_rmap.h | 7 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 116 ++++++++++--- + fs/xfs/libxfs/xfs_rmap_btree.h | 5 + + fs/xfs/libxfs/xfs_sb.c | 4 +- + fs/xfs/libxfs/xfs_trans_resv.c | 18 +- + fs/xfs/libxfs/xfs_trans_space.h | 9 +- + fs/xfs/scrub/agheader.c | 13 +- + fs/xfs/scrub/agheader_repair.c | 8 +- + fs/xfs/scrub/bitmap.c | 22 +-- + fs/xfs/scrub/bmap.c | 2 +- + fs/xfs/scrub/btree.c | 121 +++++++------- + fs/xfs/scrub/btree.h | 17 +- + fs/xfs/scrub/dabtree.c | 62 +++---- + fs/xfs/scrub/repair.h | 3 + + fs/xfs/scrub/scrub.c | 64 +++---- + fs/xfs/scrub/trace.c | 11 +- + fs/xfs/scrub/trace.h | 10 +- + fs/xfs/xfs_aops.c | 15 +- + fs/xfs/xfs_attr_inactive.c | 2 +- + fs/xfs/xfs_bmap_item.c | 18 +- + fs/xfs/xfs_bmap_item.h | 6 +- + fs/xfs/xfs_buf.c | 14 +- + fs/xfs/xfs_buf_item.c | 8 +- + fs/xfs/xfs_buf_item.h | 2 +- + fs/xfs/xfs_buf_item_recover.c | 2 +- + fs/xfs/xfs_dquot.c | 28 ++-- + fs/xfs/xfs_extfree_item.c | 33 ++-- + fs/xfs/xfs_extfree_item.h | 6 +- + fs/xfs/xfs_icache.c | 10 +- + fs/xfs/xfs_icreate_item.c | 6 +- + fs/xfs/xfs_icreate_item.h | 2 +- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_inode_item.c | 6 +- + fs/xfs/xfs_inode_item.h | 2 +- + fs/xfs/xfs_ioctl.c | 6 +- + fs/xfs/xfs_log.c | 6 +- + fs/xfs/xfs_log_priv.h | 2 +- + fs/xfs/xfs_log_recover.c | 12 +- + fs/xfs/xfs_mount.c | 14 ++ + fs/xfs/xfs_mount.h | 5 +- + fs/xfs/xfs_mru_cache.c | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_qm.h | 2 +- + fs/xfs/xfs_refcount_item.c | 18 +- + fs/xfs/xfs_refcount_item.h | 6 +- + fs/xfs/xfs_reflink.c | 2 +- + fs/xfs/xfs_rmap_item.c | 18 +- + fs/xfs/xfs_rmap_item.h | 6 +- + fs/xfs/xfs_super.c | 234 +++++++++++++------------- + fs/xfs/xfs_sysfs.c | 24 +-- + fs/xfs/xfs_trace.h | 2 +- + fs/xfs/xfs_trans.c | 16 +- + fs/xfs/xfs_trans.h | 8 +- + fs/xfs/xfs_trans_dquot.c | 4 +- + 89 files changed, 1651 insertions(+), 895 deletions(-) +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 +Auto-merging fs/nfs/file.c +Auto-merging fs/namei.c +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/index.rst | 1 - + Documentation/filesystems/locks.rst | 17 ++-- + fs/ceph/locks.c | 3 - + fs/gfs2/file.c | 2 - + fs/locks.c | 161 ++++++------------------------------ + fs/namei.c | 4 +- + fs/nfs/file.c | 9 -- + fs/read_write.c | 4 - + include/uapi/asm-generic/fcntl.h | 4 + + 9 files changed, 36 insertions(+), 169 deletions(-) +Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging printk/for-next (ad7fea30c59e Merge branch 'for-5.16' 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 +Auto-merging mm/slub.c +Auto-merging mm/memory-failure.c +Auto-merging mm/debug.c +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + arch/ia64/Kconfig.debug | 2 +- + kernel/printk/index.c | 5 ++-- + kernel/printk/printk.c | 5 ++-- + lib/test_printf.c | 61 ++++++++++++++++++++----------------------------- + lib/vsprintf.c | 11 ++++++++- + mm/debug.c | 2 +- + mm/memory-failure.c | 8 +++---- + mm/page_owner.c | 4 ++-- + mm/slub.c | 4 ++-- + 9 files changed, 50 insertions(+), 52 deletions(-) +Merging pci/next (6de1dedb1db1 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 +Auto-merging kernel/irq/irqdomain.c +Auto-merging include/linux/irqdomain.h +Auto-merging drivers/usb/host/xhci-pci.c +Removing drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt +Removing drivers/staging/mt7621-pci/TODO +Removing drivers/staging/mt7621-pci/Makefile +Removing drivers/staging/mt7621-pci/Kconfig +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/pci.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +Auto-merging drivers/iommu/apple-dart.c +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/powerpc/platforms/powernv/pci-sriov.c +Auto-merging arch/powerpc/kernel/eeh.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 11 + + .../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 ++++ + MAINTAINERS | 23 +- + arch/microblaze/pci/pci-common.c | 3 +- + arch/mips/ralink/Kconfig | 3 +- + arch/powerpc/include/asm/ppc-pci.h | 5 - + arch/powerpc/kernel/eeh.c | 8 + + arch/powerpc/kernel/eeh_driver.c | 10 +- + arch/powerpc/kernel/pci-common.c | 2 +- + arch/powerpc/platforms/powernv/pci-sriov.c | 2 +- + arch/s390/pci/pci.c | 2 +- + arch/sparc/kernel/pci.c | 2 +- + arch/x86/events/intel/uncore.c | 2 +- + arch/x86/kernel/probe_roms.c | 2 +- + arch/x86/pci/common.c | 2 +- + drivers/acpi/pci_root.c | 161 ++-- + drivers/bcma/host_pci.c | 6 +- + 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/iommu/apple-dart.c | 27 + + drivers/message/fusion/mptbase.c | 7 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/message/fusion/mptctl.c | 4 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/misc/cxl/guest.c | 30 +- + drivers/misc/cxl/pci.c | 35 +- + 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/pci/controller/Kconfig | 28 +- + drivers/pci/controller/Makefile | 3 + + drivers/pci/controller/cadence/pci-j721e.c | 2 +- + drivers/pci/controller/dwc/Kconfig | 28 +- + 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-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 | 372 ++++++---- + drivers/pci/controller/pci-hyperv.c | 4 +- + drivers/pci/controller/pci-xgene-msi.c | 2 +- + drivers/pci/controller/pci-xgene.c | 3 +- + drivers/pci/controller/pcie-apple.c | 823 +++++++++++++++++++++ + 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 | 45 +- + 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_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/of.c | 10 +- + drivers/pci/p2pdma.c | 8 +- + drivers/pci/pci-driver.c | 57 +- + drivers/pci/pci-sysfs.c | 51 +- + drivers/pci/pci.c | 58 +- + 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 | 53 +- + drivers/pci/quirks.c | 59 +- + drivers/pci/setup-irq.c | 26 +- + drivers/pci/switch/switchtec.c | 95 ++- + drivers/pci/vpd.c | 93 ++- + drivers/pci/xen-pcifront.c | 58 +- + 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/usb/host/xhci-pci.c | 2 +- + include/linux/acpi.h | 2 - + include/linux/irqdomain.h | 4 + + include/linux/pci.h | 21 +- + include/linux/switchtec.h | 1 + + include/uapi/linux/pci_regs.h | 6 + + kernel/irq/irqdomain.c | 7 +- + 113 files changed, 3295 insertions(+), 1001 deletions(-) + 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 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%) + 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 +Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/blk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (05a194aaf5e4 Merge branch 'for-5.15/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/leds/well-known-leds.txt | 14 + + MAINTAINERS | 6 + + drivers/hid/Kconfig | 31 + + 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/input/joydev.c | 10 + + include/dt-bindings/leds/common.h | 7 + + 27 files changed, 2787 insertions(+), 81 deletions(-) + create mode 100644 drivers/hid/hid-nintendo.c + create mode 100644 drivers/hid/hid-xiaomi.c +Merging i2c/i2c/for-next (26701d49482a 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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/apple,i2c.yaml | 61 ++++++++ + drivers/i2c/busses/Kconfig | 16 +- + drivers/i2c/busses/Makefile | 3 + + drivers/i2c/busses/i2c-amd-mp2-pci.c | 4 +- + drivers/i2c/busses/i2c-bcm-kona.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 78 ++++------ + 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-rcar.c | 6 +- + drivers/i2c/busses/i2c-xiic.c | 161 +++++++++------------ + 17 files changed, 535 insertions(+), 250 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 (f4cbba74c3ec hwmon: (nct6775) add ProArt X570-CREATOR WIFI.) +$ 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 +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/hwmon/tmp108.txt +Removing Documentation/devicetree/bindings/hwmon/sht15.txt +Removing Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt +Removing Documentation/devicetree/bindings/hwmon/mcp3021.txt +Removing Documentation/devicetree/bindings/hwmon/ltc4151.txt +Removing Documentation/devicetree/bindings/hwmon/lm90.txt +Removing Documentation/devicetree/bindings/hwmon/lm70.txt +Removing Documentation/devicetree/bindings/hwmon/jc42.txt +Removing Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt +Removing Documentation/devicetree/bindings/hwmon/hih6130.txt +Removing Documentation/devicetree/bindings/hwmon/dps650ab.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/dps650ab.txt | 11 - + .../devicetree/bindings/hwmon/hih6130.txt | 12 - + .../devicetree/bindings/hwmon/ibm,cffps1.txt | 26 - + .../devicetree/bindings/hwmon/iio-hwmon.yaml | 37 ++ + Documentation/devicetree/bindings/hwmon/jc42.txt | 46 -- + .../devicetree/bindings/hwmon/jedec,jc42.yaml | 78 +++ + .../devicetree/bindings/hwmon/lltc,ltc4151.yaml | 41 ++ + Documentation/devicetree/bindings/hwmon/lm70.txt | 22 - + Documentation/devicetree/bindings/hwmon/lm90.txt | 51 -- + .../devicetree/bindings/hwmon/ltc4151.txt | 18 - + .../devicetree/bindings/hwmon/mcp3021.txt | 21 - + .../bindings/hwmon/microchip,mcp3021.yaml | 43 ++ + .../devicetree/bindings/hwmon/national,lm90.yaml | 78 +++ + .../devicetree/bindings/hwmon/ntc-thermistor.yaml | 141 ++++ + .../devicetree/bindings/hwmon/ntc_thermistor.txt | 44 -- + .../devicetree/bindings/hwmon/nuvoton,nct7802.yaml | 145 +++++ + .../bindings/hwmon/pmbus/ti,lm25066.yaml | 54 ++ + .../devicetree/bindings/hwmon/sensirion,sht15.yaml | 43 ++ + Documentation/devicetree/bindings/hwmon/sht15.txt | 19 - + .../devicetree/bindings/hwmon/ti,tmp102.yaml | 47 ++ + .../devicetree/bindings/hwmon/ti,tmp108.yaml | 50 ++ + .../devicetree/bindings/hwmon/ti,tmp421.yaml | 110 ++++ + Documentation/devicetree/bindings/hwmon/tmp108.txt | 18 - + .../devicetree/bindings/trivial-devices.yaml | 26 +- + Documentation/hwmon/dell-smm-hwmon.rst | 3 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/lm25066.rst | 2 + + Documentation/hwmon/max6620.rst | 46 ++ + Documentation/hwmon/tmp421.rst | 10 + + MAINTAINERS | 4 +- + drivers/acpi/scan.c | 1 + + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/abituguru3.c | 6 +- + drivers/hwmon/acpi_power_meter.c | 13 +- + drivers/hwmon/ad7414.c | 4 +- + drivers/hwmon/ad7418.c | 6 +- + drivers/hwmon/adm1021.c | 4 +- + drivers/hwmon/adm1025.c | 4 +- + drivers/hwmon/adm1026.c | 4 +- + drivers/hwmon/adm1029.c | 4 +- + drivers/hwmon/adm1031.c | 6 +- + drivers/hwmon/adt7310.c | 3 +- + drivers/hwmon/adt7410.c | 3 +- + drivers/hwmon/adt7x10.c | 3 +- + drivers/hwmon/adt7x10.h | 2 +- + drivers/hwmon/amc6821.c | 8 +- + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/asb100.c | 4 +- + drivers/hwmon/asc7621.c | 4 +- + drivers/hwmon/atxp1.c | 10 +- + drivers/hwmon/coretemp.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 103 ++- + drivers/hwmon/dme1737.c | 4 +- + drivers/hwmon/ds1621.c | 4 +- + drivers/hwmon/ds620.c | 4 +- + drivers/hwmon/emc6w201.c | 4 +- + drivers/hwmon/f71805f.c | 4 +- + drivers/hwmon/f71882fg.c | 4 +- + drivers/hwmon/f75375s.c | 4 +- + drivers/hwmon/fschmd.c | 4 +- + drivers/hwmon/g760a.c | 2 +- + drivers/hwmon/gl518sm.c | 4 +- + drivers/hwmon/gl520sm.c | 4 +- + drivers/hwmon/i5500_temp.c | 114 ++-- + drivers/hwmon/ibmaem.c | 2 +- + drivers/hwmon/ibmpex.c | 4 +- + drivers/hwmon/it87.c | 12 +- + drivers/hwmon/lineage-pem.c | 2 +- + drivers/hwmon/lm63.c | 6 +- + drivers/hwmon/lm77.c | 4 +- + drivers/hwmon/lm78.c | 4 +- + drivers/hwmon/lm80.c | 6 +- + drivers/hwmon/lm83.c | 4 +- + drivers/hwmon/lm85.c | 4 +- + drivers/hwmon/lm87.c | 4 +- + drivers/hwmon/lm92.c | 4 +- + drivers/hwmon/lm93.c | 4 +- + drivers/hwmon/lm95241.c | 8 +- + drivers/hwmon/ltc4151.c | 2 +- + drivers/hwmon/ltc4215.c | 2 +- + drivers/hwmon/ltc4261.c | 4 +- + drivers/hwmon/max16065.c | 2 +- + drivers/hwmon/max1619.c | 4 +- + drivers/hwmon/max1668.c | 4 +- + drivers/hwmon/max31722.c | 8 +- + drivers/hwmon/max6620.c | 514 +++++++++++++++ + drivers/hwmon/max6639.c | 4 +- + drivers/hwmon/max6642.c | 2 +- + drivers/hwmon/mlxreg-fan.c | 138 ++-- + drivers/hwmon/nct6683.c | 3 + + drivers/hwmon/nct6775.c | 717 ++++++++++++++------- + drivers/hwmon/nct7802.c | 129 +++- + drivers/hwmon/pc87360.c | 4 +- + drivers/hwmon/pmbus/ibm-cffps.c | 23 +- + drivers/hwmon/pmbus/lm25066.c | 88 ++- + drivers/hwmon/raspberrypi-hwmon.c | 2 +- + drivers/hwmon/sch5636.c | 4 +- + drivers/hwmon/sht21.c | 4 +- + drivers/hwmon/sis5595.c | 4 +- + drivers/hwmon/smm665.c | 2 +- + drivers/hwmon/smsc47b397.c | 4 +- + drivers/hwmon/smsc47m192.c | 4 +- + drivers/hwmon/thmc50.c | 4 +- + drivers/hwmon/tmp103.c | 105 ++- + drivers/hwmon/tmp401.c | 6 +- + drivers/hwmon/tmp421.c | 186 +++++- + drivers/hwmon/via686a.c | 4 +- + drivers/hwmon/vt1211.c | 4 +- + drivers/hwmon/vt8231.c | 4 +- + drivers/hwmon/w83627ehf.c | 8 +- + drivers/hwmon/w83627hf.c | 6 +- + drivers/hwmon/w83781d.c | 4 +- + drivers/hwmon/w83791d.c | 4 +- + drivers/hwmon/w83792d.c | 6 +- + drivers/hwmon/w83793.c | 6 +- + drivers/hwmon/w83795.c | 6 +- + drivers/hwmon/w83l785ts.c | 4 +- + drivers/hwmon/w83l786ng.c | 4 +- + 119 files changed, 2824 insertions(+), 888 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/dps650ab.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/hih6130.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/iio-hwmon.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/jc42.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/jedec,jc42.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/lltc,ltc4151.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/lm70.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/lm90.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/ltc4151.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/mcp3021.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/microchip,mcp3021.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/national,lm90.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ntc-thermistor.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,nct7802.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/ti,lm25066.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/sensirion,sht15.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/sht15.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tmp102.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tmp108.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tmp421.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/tmp108.txt + create mode 100644 Documentation/hwmon/max6620.rst + create mode 100644 drivers/hwmon/max6620.c +Merging jc_docs/docs-next (52ba072e110a docs: submitting-patches: make section about the Link: tag more explicit) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/filesystems/f2fs.rst +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-block | 16 + + Documentation/ABI/testing/sysfs-driver-xen-blkback | 4 +- + .../ABI/testing/sysfs-driver-xen-blkfront | 2 +- + Documentation/admin-guide/mm/pagemap.rst | 22 + + Documentation/arm/marvell.rst | 19 + + Documentation/asm-annotations.rst | 2 +- + Documentation/block/queue-sysfs.rst | 9 +- + Documentation/conf.py | 3 + + Documentation/dev-tools/checkpatch.rst | 81 +++ + Documentation/filesystems/ext4/orphan.rst | 44 +- + Documentation/filesystems/f2fs.rst | 2 +- + Documentation/filesystems/proc.rst | 26 +- + Documentation/kbuild/Kconfig.recursion-issue-02 | 2 +- + Documentation/maintainer/pull-requests.rst | 2 +- + Documentation/networking/msg_zerocopy.rst | 2 +- + Documentation/process/coding-style.rst | 39 +- + Documentation/process/deprecated.rst | 5 +- + Documentation/process/index.rst | 1 + + Documentation/process/maintainer-handbooks.rst | 18 + + Documentation/process/maintainer-tip.rst | 785 +++++++++++++++++++++ + Documentation/process/submitting-drivers.rst | 2 +- + Documentation/process/submitting-patches.rst | 42 +- + Documentation/timers/no_hz.rst | 8 +- + .../it_IT/process/submitting-patches.rst | 4 +- + .../translations/ko_KR/memory-barriers.txt | 8 +- + Documentation/translations/zh_CN/PCI/index.rst | 36 + + Documentation/translations/zh_CN/PCI/pci.rst | 514 ++++++++++++++ + .../translations/zh_CN/admin-guide/index.rst | 2 +- + .../translations/zh_CN/admin-guide/sysrq.rst | 280 ++++++++ + .../translations/zh_CN/core-api/boot-time-mm.rst | 49 ++ + .../translations/zh_CN/core-api/genalloc.rst | 109 +++ + .../zh_CN/core-api/gfp_mask-from-fs-io.rst | 66 ++ + .../translations/zh_CN/core-api/index.rst | 17 +- + .../zh_CN/core-api/irq/irq-affinity.rst | 2 +- + Documentation/translations/zh_CN/core-api/kref.rst | 311 ++++++++ + .../zh_CN/core-api/memory-allocation.rst | 138 ++++ + .../translations/zh_CN/core-api/memory-hotplug.rst | 2 +- + .../translations/zh_CN/core-api/mm-api.rst | 110 +++ + .../zh_CN/core-api/unaligned-memory-access.rst | 229 ++++++ + .../zh_CN/maintainer/pull-requests.rst | 2 +- + .../translations/zh_CN/process/5.Posting.rst | 8 +- + Documentation/translations/zh_CN/process/howto.rst | 10 +- + .../zh_CN/process/submitting-patches.rst | 8 +- + Documentation/translations/zh_TW/index.rst | 10 +- + .../zh_TW/process/submitting-patches.rst | 4 +- + .../virt/uml/user_mode_linux_howto_v2.rst | 119 ++-- + Documentation/vm/page_migration.rst | 2 +- + Documentation/x86/entry_64.rst | 2 +- + Documentation/x86/orc-unwinder.rst | 4 +- + scripts/documentation-file-ref-check | 4 + + scripts/kernel-doc | 1 + + 51 files changed, 3017 insertions(+), 170 deletions(-) + create mode 100644 Documentation/process/maintainer-handbooks.rst + create mode 100644 Documentation/process/maintainer-tip.rst + create mode 100644 Documentation/translations/zh_CN/PCI/index.rst + create mode 100644 Documentation/translations/zh_CN/PCI/pci.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/sysrq.rst + create mode 100644 Documentation/translations/zh_CN/core-api/boot-time-mm.rst + create mode 100644 Documentation/translations/zh_CN/core-api/genalloc.rst + create mode 100644 Documentation/translations/zh_CN/core-api/gfp_mask-from-fs-io.rst + create mode 100644 Documentation/translations/zh_CN/core-api/kref.rst + create mode 100644 Documentation/translations/zh_CN/core-api/memory-allocation.rst + create mode 100644 Documentation/translations/zh_CN/core-api/mm-api.rst + create mode 100644 Documentation/translations/zh_CN/core-api/unaligned-memory-access.rst +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 +Removing drivers/media/rc/sir_ir.c +Auto-merging drivers/media/platform/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/media/renesas,imr.txt +Removing Documentation/devicetree/bindings/media/i2c/mt9p031.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/admin-guide/media/i2c-cardlist.rst | 8 +- + Documentation/admin-guide/media/imx7.rst | 60 + + Documentation/admin-guide/media/ipu3.rst | 14 +- + Documentation/admin-guide/media/ivtv.rst | 2 +- + Documentation/admin-guide/media/vimc.rst | 20 +- + .../devicetree/bindings/media/i2c/adv7604.yaml | 13 +- + .../bindings/media/i2c/aptina,mt9p031.yaml | 108 + + .../devicetree/bindings/media/i2c/hynix,hi846.yaml | 120 ++ + .../devicetree/bindings/media/i2c/mt9p031.txt | 40 - + .../devicetree/bindings/media/mediatek-vcodec.txt | 2 + + .../bindings/media/qcom,sc7280-venus.yaml | 162 ++ + .../bindings/media/qcom,sdm660-venus.yaml | 186 ++ + .../devicetree/bindings/media/renesas,csi2.yaml | 1 + + .../devicetree/bindings/media/renesas,imr.txt | 31 - + .../devicetree/bindings/media/renesas,imr.yaml | 67 + + .../devicetree/bindings/media/rockchip-isp1.yaml | 114 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/media/drivers/rkisp1.rst | 43 + + .../driver-api/media/maintainer-entry-profile.rst | 2 +- + Documentation/driver-api/media/v4l2-subdev.rst | 14 +- + .../userspace-api/media/drivers/cx2341x-uapi.rst | 8 +- + Documentation/userspace-api/media/v4l/buffer.rst | 40 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 57 + + .../media/v4l/ext-ctrls-image-source.rst | 20 + + .../userspace-api/media/v4l/pixfmt-reserved.rst | 29 +- + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 50 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 7 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 3 + + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 3 + + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 6 + + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 16 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 2 + + MAINTAINERS | 24 +- + drivers/gpu/ipu-v3/ipu-csi.c | 31 +- + drivers/media/cec/Kconfig | 4 + + drivers/media/cec/core/cec-pin.c | 4 +- + drivers/media/cec/platform/meson/ao-cec-g12a.c | 4 +- + drivers/media/cec/platform/meson/ao-cec.c | 4 +- + drivers/media/cec/platform/s5p/s5p_cec.c | 4 +- + drivers/media/cec/platform/sti/stih-cec.c | 4 +- + drivers/media/cec/platform/stm32/stm32-cec.c | 4 +- + drivers/media/common/siano/smscoreapi.c | 7 +- + drivers/media/common/videobuf2/videobuf2-core.c | 149 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 198 +- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 39 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 59 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 30 +- + drivers/media/dvb-core/dvb_vb2.c | 2 +- + drivers/media/dvb-frontends/cxd2099.c | 9 - + drivers/media/dvb-frontends/cxd2099.h | 9 - + drivers/media/dvb-frontends/cxd2820r_priv.h | 2 +- + drivers/media/dvb-frontends/mb86a20s.c | 4 +- + drivers/media/dvb-frontends/mn88443x.c | 18 +- + drivers/media/dvb-frontends/mxl5xx.c | 9 - + drivers/media/dvb-frontends/mxl5xx.h | 9 - + drivers/media/dvb-frontends/mxl5xx_defs.h | 4 - + drivers/media/dvb-frontends/mxl5xx_regs.h | 10 - + drivers/media/dvb-frontends/mxl692.c | 9 - + drivers/media/dvb-frontends/mxl692.h | 9 - + drivers/media/dvb-frontends/mxl692_defs.h | 9 - + drivers/media/dvb-frontends/rtl2832_sdr.c | 5 +- + drivers/media/dvb-frontends/stv0910.c | 9 - + drivers/media/dvb-frontends/stv0910.h | 9 - + drivers/media/dvb-frontends/stv6111.c | 9 - + drivers/media/dvb-frontends/stv6111.h | 9 - + drivers/media/firewire/firedtv-avc.c | 14 +- + drivers/media/firewire/firedtv-ci.c | 2 + + drivers/media/i2c/Kconfig | 27 + + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/adv7604.c | 15 +- + drivers/media/i2c/dw9714.c | 14 +- + drivers/media/i2c/hi846.c | 2190 ++++++++++++++++++++ + drivers/media/i2c/imx258.c | 12 +- + drivers/media/i2c/ir-kbd-i2c.c | 1 + + drivers/media/i2c/max9286.c | 17 +- + drivers/media/i2c/mt9p031.c | 80 +- + drivers/media/i2c/ov13858.c | 11 +- + drivers/media/i2c/ov13b10.c | 1491 +++++++++++++ + drivers/media/i2c/ov5670.c | 11 +- + drivers/media/i2c/ov8856.c | 83 +- + drivers/media/i2c/st-mipid02.c | 22 +- + drivers/media/i2c/tda1997x.c | 131 +- + drivers/media/i2c/tda1997x_regs.h | 3 + + drivers/media/i2c/video-i2c.c | 21 +- + drivers/media/mc/Kconfig | 8 - + drivers/media/pci/cobalt/cobalt-driver.c | 4 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx18/cx18-ioctl.c | 4 +- + drivers/media/pci/cx18/cx18-queue.c | 13 +- + drivers/media/pci/cx18/cx18-streams.c | 24 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 3 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 4 +- + drivers/media/pci/intel/ipu3/cio2-bridge.c | 60 +- + drivers/media/pci/intel/ipu3/cio2-bridge.h | 9 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 274 ++- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 4 + + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 8 +- + drivers/media/pci/ivtv/ivtv-queue.c | 18 +- + drivers/media/pci/ivtv/ivtv-streams.c | 22 +- + drivers/media/pci/ivtv/ivtv-udma.c | 19 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 10 +- + drivers/media/pci/ivtv/ivtvfb.c | 12 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 29 +- + drivers/media/pci/pluto2/pluto2.c | 20 +- + drivers/media/pci/pt1/pt1.c | 2 +- + drivers/media/pci/saa7134/saa7134-cards.c | 53 + + drivers/media/pci/saa7134/saa7134-dvb.c | 29 + + drivers/media/pci/saa7134/saa7134.h | 1 + + drivers/media/pci/saa7164/saa7164-api.c | 2 - + drivers/media/pci/tw5864/tw5864-core.c | 2 +- + drivers/media/platform/Kconfig | 20 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/allegro-dvt/allegro-core.c | 311 ++- + drivers/media/platform/allegro-dvt/allegro-mail.c | 23 +- + drivers/media/platform/allegro-dvt/allegro-mail.h | 10 +- + drivers/media/platform/allegro-dvt/nal-h264.c | 74 - + drivers/media/platform/allegro-dvt/nal-h264.h | 200 +- + drivers/media/platform/allegro-dvt/nal-hevc.c | 202 +- + drivers/media/platform/allegro-dvt/nal-hevc.h | 189 +- + drivers/media/platform/am437x/am437x-vpfe.c | 23 +- + drivers/media/platform/aspeed-video.c | 133 +- + drivers/media/platform/atmel/atmel-isc-base.c | 29 +- + drivers/media/platform/atmel/atmel-isc.h | 2 + + drivers/media/platform/atmel/atmel-isi.c | 17 +- + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 54 +- + drivers/media/platform/atmel/atmel-sama7g5-isc.c | 37 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 18 +- + drivers/media/platform/cadence/cdns-csi2tx.c | 4 +- + drivers/media/platform/coda/imx-vdoa.c | 3 +- + drivers/media/platform/davinci/vpbe_venc.c | 9 +- + drivers/media/platform/davinci/vpif.c | 5 +- + drivers/media/platform/davinci/vpif_capture.c | 21 +- + drivers/media/platform/davinci/vpss.c | 10 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 3 +- + drivers/media/platform/exynos4-is/media-dev.c | 20 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 4 +- + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 109 +- + drivers/media/platform/imx-jpeg/mxc-jpeg.h | 2 + + drivers/media/platform/imx-pxp.c | 4 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 9 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 10 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 6 +- + drivers/media/platform/meson/ge2d/ge2d.c | 10 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/mtk-vcodec/Makefile | 3 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 820 ++------ + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 27 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 65 +- + .../platform/mtk-vcodec/mtk_vcodec_dec_stateful.c | 628 ++++++ + .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 360 ++++ + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 59 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 148 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 75 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 774 +++++++ + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 3 + + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 1 + + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 23 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 43 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 5 + + drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 +- + drivers/media/platform/mx2_emmaprp.c | 4 +- + drivers/media/platform/omap/omap_vout.c | 18 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 2 +- + drivers/media/platform/omap/omap_voutdef.h | 2 +- + drivers/media/platform/omap3isp/isp.c | 21 +- + drivers/media/platform/pxa_camera.c | 26 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 9 +- + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 28 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 18 +- + drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 17 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 4 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 2 +- + drivers/media/platform/qcom/camss/camss.c | 18 +- + drivers/media/platform/qcom/venus/core.c | 135 +- + drivers/media/platform/qcom/venus/core.h | 9 +- + drivers/media/platform/qcom/venus/firmware.c | 42 +- + drivers/media/platform/qcom/venus/helpers.c | 81 +- + drivers/media/platform/qcom/venus/helpers.h | 4 + + drivers/media/platform/qcom/venus/hfi.c | 48 +- + drivers/media/platform/qcom/venus/hfi_cmds.c | 7 + + drivers/media/platform/qcom/venus/hfi_helper.h | 14 + + drivers/media/platform/qcom/venus/hfi_msgs.c | 7 + + .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 6 +- + drivers/media/platform/qcom/venus/hfi_platform.c | 13 - + drivers/media/platform/qcom/venus/hfi_platform.h | 2 - + .../media/platform/qcom/venus/hfi_platform_v6.c | 6 - + drivers/media/platform/qcom/venus/hfi_venus.c | 4 + + drivers/media/platform/qcom/venus/hfi_venus_io.h | 2 + + drivers/media/platform/qcom/venus/pm_helpers.c | 13 +- + drivers/media/platform/qcom/venus/vdec.c | 67 +- + drivers/media/platform/qcom/venus/venc.c | 116 +- + drivers/media/platform/rcar-isp.c | 515 +++++ + drivers/media/platform/rcar-vin/rcar-core.c | 1077 +++++----- + drivers/media/platform/rcar-vin/rcar-csi2.c | 241 ++- + drivers/media/platform/rcar-vin/rcar-dma.c | 40 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 25 + + drivers/media/platform/rcar-vin/rcar-vin.h | 25 +- + drivers/media/platform/rcar_drif.c | 17 +- + drivers/media/platform/rcar_fdp1.c | 4 +- + drivers/media/platform/rcar_jpu.c | 4 +- + drivers/media/platform/renesas-ceu.c | 33 +- + drivers/media/platform/rockchip/rga/rga.c | 5 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 9 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 44 +- + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 98 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 29 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 557 ++++- + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 406 ++-- + .../media/platform/rockchip/rkisp1/rkisp1-stats.c | 107 +- + drivers/media/platform/s3c-camif/camif-core.c | 6 +- + drivers/media/platform/s5p-g2d/g2d.c | 4 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 9 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 1 - + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 1 - + drivers/media/platform/sti/hva/hva-hw.c | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 37 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 16 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 33 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 2 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 8 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 4 +- + drivers/media/platform/ti-vpe/cal.c | 16 +- + drivers/media/platform/via-camera.c | 6 +- + drivers/media/platform/video-mux.c | 17 +- + drivers/media/platform/vsp1/vsp1_drm.c | 8 +- + drivers/media/platform/vsp1/vsp1_drv.c | 18 +- + drivers/media/platform/vsp1/vsp1_regs.h | 11 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 2 +- + drivers/media/platform/xilinx/xilinx-vip.c | 4 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 17 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- + drivers/media/rc/Kconfig | 8 - + drivers/media/rc/Makefile | 1 - + drivers/media/rc/img-ir/img-ir-core.c | 4 +- + drivers/media/rc/imon.c | 2 + + drivers/media/rc/ir-hix5hd2.c | 4 +- + drivers/media/rc/ir_toy.c | 63 +- + drivers/media/rc/ite-cir.c | 2 +- + drivers/media/rc/mceusb.c | 2 + + drivers/media/rc/meson-ir-tx.c | 1 - + drivers/media/rc/meson-ir.c | 4 +- + drivers/media/rc/mtk-cir.c | 4 +- + drivers/media/rc/sir_ir.c | 438 ---- + drivers/media/rc/st_rc.c | 5 +- + drivers/media/rc/streamzap.c | 1 + + drivers/media/rc/sunxi-cir.c | 4 +- + drivers/media/spi/cxd2880-spi.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 4 + + drivers/media/test-drivers/vim2m.c | 5 - + drivers/media/test-drivers/vimc/vimc-scaler.c | 366 ++-- + drivers/media/test-drivers/vivid/vivid-cec.c | 341 +-- + drivers/media/test-drivers/vivid/vivid-cec.h | 9 +- + drivers/media/test-drivers/vivid/vivid-core.c | 52 +- + drivers/media/test-drivers/vivid/vivid-core.h | 23 +- + drivers/media/tuners/mxl5007t.c | 9 - + drivers/media/tuners/tuner-types.c | 4 + + drivers/media/usb/airspy/airspy.c | 5 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 16 +- + drivers/media/usb/dvb-usb/az6027.c | 1 + + drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- + drivers/media/usb/em28xx/em28xx-cards.c | 12 +- + drivers/media/usb/em28xx/em28xx-core.c | 5 +- + drivers/media/usb/gspca/gl860/gl860-mi1320.c | 87 +- + drivers/media/usb/gspca/gl860/gl860-ov9655.c | 169 +- + drivers/media/usb/gspca/gspca.c | 2 + + drivers/media/usb/gspca/m5602/m5602_ov7660.h | 1 - + drivers/media/usb/gspca/sn9c20x.c | 22 +- + drivers/media/usb/pvrusb2/pvrusb2-ctrl.c | 25 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 - + drivers/media/usb/stkwebcam/stk-webcam.c | 11 +- + drivers/media/usb/tm6000/tm6000-video.c | 3 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 10 +- + drivers/media/usb/uvc/uvc_ctrl.c | 260 ++- + drivers/media/usb/uvc/uvc_driver.c | 16 +- + drivers/media/usb/uvc/uvc_metadata.c | 2 +- + drivers/media/usb/uvc/uvc_v4l2.c | 103 +- + drivers/media/usb/uvc/uvc_video.c | 5 + + drivers/media/usb/uvc/uvcvideo.h | 17 +- + drivers/media/v4l2-core/v4l2-async.c | 168 +- + drivers/media/v4l2-core/v4l2-common.c | 3 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 9 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 6 + + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 5 + + drivers/media/v4l2-core/v4l2-fwnode.c | 83 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 77 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 37 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 + + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 70 +- + drivers/staging/media/hantro/hantro_drv.c | 12 +- + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 2 +- + drivers/staging/media/hantro/hantro_g1_regs.h | 2 + + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 3 +- + drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 52 + + drivers/staging/media/hantro/hantro_hevc.c | 21 + + drivers/staging/media/hantro/hantro_hw.h | 4 + + drivers/staging/media/imx/TODO | 5 - + drivers/staging/media/imx/imx-media-csi.c | 23 +- + drivers/staging/media/imx/imx-media-dev-common.c | 9 +- + drivers/staging/media/imx/imx-media-dev.c | 6 +- + drivers/staging/media/imx/imx-media-of.c | 6 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 17 +- + drivers/staging/media/imx/imx7-media-csi.c | 24 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 16 +- + drivers/staging/media/imx/imx8mq-mipi-csi2.c | 16 +- + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 7 +- + drivers/staging/media/ipu3/ipu3-css-fw.c | 7 +- + drivers/staging/media/ipu3/ipu3-css-fw.h | 2 +- + drivers/staging/media/ipu3/ipu3-css.c | 19 +- + drivers/staging/media/ipu3/ipu3-css.h | 1 - + drivers/staging/media/ipu3/ipu3-v4l2.c | 13 +- + drivers/staging/media/ipu3/ipu3.h | 12 + + drivers/staging/media/meson/vdec/esparser.h | 6 +- + drivers/staging/media/meson/vdec/vdec.c | 7 +- + drivers/staging/media/meson/vdec/vdec.h | 16 +- + drivers/staging/media/meson/vdec/vdec_helpers.h | 3 +- + drivers/staging/media/rkvdec/rkvdec-h264.c | 5 +- + drivers/staging/media/rkvdec/rkvdec.c | 44 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 56 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 113 +- + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 100 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 7 +- + drivers/staging/media/tegra-video/vi.c | 17 +- + include/media/hevc-ctrls.h | 11 + + include/media/i2c/mt9p031.h | 1 + + include/media/tuner.h | 1 + + include/media/v4l2-async.h | 105 +- + include/media/v4l2-dev.h | 3 +- + include/media/v4l2-fwnode.h | 12 +- + include/media/videobuf2-core.h | 59 +- + include/uapi/linux/v4l2-controls.h | 6 + + include/uapi/linux/videodev2.h | 31 +- + 341 files changed, 14209 insertions(+), 4856 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/hynix,hi846.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt + create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sdm660-venus.yaml + delete mode 100644 Documentation/devicetree/bindings/media/renesas,imr.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,imr.yaml + create mode 100644 Documentation/driver-api/media/drivers/rkisp1.rst + create mode 100644 drivers/media/i2c/hi846.c + create mode 100644 drivers/media/i2c/ov13b10.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c + create mode 100644 drivers/media/platform/rcar-isp.c + delete mode 100644 drivers/media/rc/sir_ir.c +Merging v4l-dvb-next/master (bdbbd511ef0c media: stm32-dma2d: STM32 DMA2D driver) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging drivers/media/platform/Kconfig +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 + + include/media/v4l2-mem2mem.h | 5 + + include/uapi/linux/v4l2-controls.h | 4 +- + 15 files changed, 1268 insertions(+), 7 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 (ba9410801460 Merge branches 'pm-sleep' and 'pm-cpufreq' 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 drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/acpi/scan.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-thermal | 259 +++++++++++++++++++++ + .../bindings/thermal/qcom-spmi-adc-tm-hc.yaml | 149 ++++++++++++ + .../bindings/thermal/rockchip-thermal.yaml | 23 +- + .../thermal/socionext,uniphier-thermal.yaml | 1 + + Documentation/driver-api/thermal/sysfs-api.rst | 225 +----------------- + Documentation/firmware-guide/acpi/osi.rst | 2 +- + MAINTAINERS | 22 +- + arch/x86/kernel/acpi/boot.c | 9 + + arch/x86/kernel/acpi/cstate.c | 15 ++ + drivers/acpi/Kconfig | 2 +- + drivers/acpi/ac.c | 19 ++ + drivers/acpi/acpi_lpss.c | 13 +- + drivers/acpi/acpi_pnp.c | 2 - + drivers/acpi/acpica/acglobal.h | 2 + + drivers/acpi/acpica/hwesleep.c | 8 +- + drivers/acpi/acpica/hwsleep.c | 11 +- + drivers/acpi/acpica/hwxfsleep.c | 7 + + drivers/acpi/acpica/utosi.c | 1 + + drivers/acpi/battery.c | 2 +- + drivers/acpi/dock.c | 8 +- + drivers/acpi/glue.c | 59 ++++- + drivers/acpi/internal.h | 1 + + drivers/acpi/power.c | 97 ++++---- + drivers/acpi/prmt.c | 35 ++- + drivers/acpi/processor_idle.c | 3 +- + drivers/acpi/resource.c | 56 ++++- + drivers/acpi/scan.c | 6 + + drivers/acpi/sleep.c | 10 +- + drivers/base/power/main.c | 14 +- + drivers/cpufreq/acpi-cpufreq.c | 3 +- + drivers/cpufreq/amd_freq_sensitivity.c | 3 +- + drivers/cpufreq/cpufreq.c | 19 +- + drivers/cpufreq/cpufreq_conservative.c | 6 +- + drivers/cpufreq/cpufreq_ondemand.c | 16 +- + drivers/cpufreq/intel_pstate.c | 120 +++++++++- + drivers/cpufreq/mediatek-cpufreq-hw.c | 2 +- + drivers/cpufreq/powernv-cpufreq.c | 4 +- + drivers/cpufreq/s5pv210-cpufreq.c | 2 +- + drivers/cpuidle/sysfs.c | 5 +- + drivers/gpio/gpio-amdpt.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 9 +- + drivers/idle/intel_idle.c | 13 +- + drivers/pci/pci-acpi.c | 74 ++---- + drivers/pci/pci-mid.c | 37 +-- + drivers/pci/pci.c | 154 ++++++------ + drivers/pci/pci.h | 96 ++++---- + drivers/pnp/system.c | 2 +- + drivers/powercap/dtpm.c | 78 +++---- + drivers/powercap/dtpm_cpu.c | 228 +++++++++--------- + drivers/thermal/gov_user_space.c | 9 + + .../intel/int340x_thermal/int3400_thermal.c | 9 +- + .../intel/int340x_thermal/int3401_thermal.c | 8 +- + .../int340x_thermal/processor_thermal_device.c | 36 ++- + .../int340x_thermal/processor_thermal_device.h | 1 + + .../int340x_thermal/processor_thermal_device_pci.c | 18 +- + .../processor_thermal_device_pci_legacy.c | 8 +- + drivers/thermal/intel/intel_powerclamp.c | 8 +- + drivers/thermal/qcom/Kconfig | 2 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 41 +++- + drivers/thermal/qcom/tsens.c | 29 ++- + drivers/thermal/rcar_gen3_thermal.c | 113 ++++++--- + drivers/thermal/rockchip_thermal.c | 2 +- + drivers/thermal/thermal_core.c | 22 +- + drivers/thermal/thermal_mmio.c | 2 +- + drivers/thermal/thermal_netlink.c | 11 +- + drivers/thermal/thermal_netlink.h | 8 +- + drivers/thermal/thermal_sysfs.c | 3 + + drivers/thermal/uniphier_thermal.c | 4 + + include/acpi/acpi_bus.h | 1 - + include/acpi/acpixf.h | 2 +- + include/acpi/actbl2.h | 251 +++++++++++++++++++- + include/acpi/actbl3.h | 9 +- + include/acpi/actypes.h | 1 + + include/linux/cpufreq.h | 167 ++++++++++--- + include/linux/cpuhotplug.h | 2 +- + include/linux/dtpm.h | 26 +-- + include/linux/energy_model.h | 68 +++++- + include/linux/pci-acpi.h | 8 + + kernel/power/energy_model.c | 86 +++++-- + kernel/power/hibernate.c | 12 +- + kernel/power/power.h | 14 ++ + kernel/power/suspend.c | 18 +- + kernel/power/swap.c | 21 +- + 83 files changed, 2005 insertions(+), 951 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-thermal + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm-hc.yaml +Merging cpufreq-arm/cpufreq/arm/linux-next (b3c08d1ad2bb 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 +Auto-merging include/linux/cpufreq.h +Merge made by the 'recursive' strategy. + drivers/cpufreq/cppc_cpufreq.c | 2 -- + drivers/cpufreq/s3c2440-cpufreq.c | 2 ++ + drivers/cpufreq/tegra186-cpufreq.c | 4 ++++ + drivers/cpufreq/tegra194-cpufreq.c | 8 +++++++- + include/linux/cpufreq.h | 2 +- + 5 files changed, 14 insertions(+), 4 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/devfreq/devfreq.c | 2 +- + drivers/devfreq/event/exynos-ppmu.c | 12 +++++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) +Merging opp/opp/linux-next (27ff8187f13e opp: Fix return in _opp_add_static_v2()) +$ 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. + 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 +++++-- + 6 files changed, 136 insertions(+), 78 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 (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (e058953c0ed1 RDMA/qedr: Remove unsupported qedr_resize_cq callback) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/infiniband/hw/qedr/verbs.c +Auto-merging drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/hw/irdma/verbs.c +Auto-merging drivers/infiniband/hw/irdma/uk.c +Auto-merging drivers/infiniband/core/sa_query.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 34 +- + drivers/infiniband/core/cma_priv.h | 11 +- + drivers/infiniband/core/counters.c | 40 ++- + drivers/infiniband/core/device.c | 1 + + drivers/infiniband/core/iwpm_util.c | 2 +- + drivers/infiniband/core/nldev.c | 278 ++++++++++++--- + drivers/infiniband/core/rw.c | 66 ++-- + drivers/infiniband/core/sa_query.c | 1 - + drivers/infiniband/core/sysfs.c | 56 +-- + drivers/infiniband/core/verbs.c | 48 +++ + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 19 +- + drivers/infiniband/hw/bnxt_re/hw_counters.c | 378 +++++++++++++-------- + drivers/infiniband/hw/bnxt_re/hw_counters.h | 30 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 35 +- + drivers/infiniband/hw/bnxt_re/main.c | 13 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 15 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 6 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 7 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 11 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 57 +++- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 33 +- + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 85 +++++ + drivers/infiniband/hw/cxgb4/cm.c | 1 - + drivers/infiniband/hw/cxgb4/device.c | 1 - + drivers/infiniband/hw/cxgb4/provider.c | 22 +- + drivers/infiniband/hw/efa/efa.h | 19 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 100 +++++- + drivers/infiniband/hw/efa/efa_admin_defs.h | 41 +++ + drivers/infiniband/hw/efa/efa_com.c | 164 +++++++++ + drivers/infiniband/hw/efa/efa_com.h | 38 ++- + drivers/infiniband/hw/efa/efa_com_cmd.c | 35 +- + drivers/infiniband/hw/efa/efa_com_cmd.h | 10 +- + drivers/infiniband/hw/efa/efa_main.c | 181 ++++++++-- + drivers/infiniband/hw/efa/efa_regs_defs.h | 7 +- + drivers/infiniband/hw/efa/efa_verbs.c | 86 ++++- + drivers/infiniband/hw/hfi1/efivar.c | 10 +- + drivers/infiniband/hw/hfi1/ipoib.h | 76 +++-- + drivers/infiniband/hw/hfi1/ipoib_main.c | 2 +- + drivers/infiniband/hw/hfi1/ipoib_tx.c | 314 ++++++++--------- + drivers/infiniband/hw/hfi1/trace_tx.h | 71 +++- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 5 +- + drivers/infiniband/hw/hfi1/verbs.c | 53 +-- + drivers/infiniband/hw/hns/hns_roce_device.h | 3 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 10 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 26 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 3 +- + drivers/infiniband/hw/irdma/cm.h | 12 +- + drivers/infiniband/hw/irdma/ctrl.c | 43 +-- + drivers/infiniband/hw/irdma/hw.c | 7 +- + drivers/infiniband/hw/irdma/main.h | 5 +- + drivers/infiniband/hw/irdma/osdep.h | 1 - + drivers/infiniband/hw/irdma/protos.h | 2 - + drivers/infiniband/hw/irdma/trace_cm.h | 8 +- + drivers/infiniband/hw/irdma/type.h | 2 +- + drivers/infiniband/hw/irdma/uk.c | 63 +--- + drivers/infiniband/hw/irdma/user.h | 9 +- + drivers/infiniband/hw/irdma/utils.c | 49 +-- + drivers/infiniband/hw/irdma/verbs.c | 103 +++--- + drivers/infiniband/hw/mlx4/alias_GUID.c | 4 +- + drivers/infiniband/hw/mlx4/main.c | 44 ++- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 4 +- + drivers/infiniband/hw/mlx5/cmd.c | 26 ++ + drivers/infiniband/hw/mlx5/cmd.h | 2 + + drivers/infiniband/hw/mlx5/counters.c | 283 ++++++++++++--- + drivers/infiniband/hw/mlx5/devx.c | 13 +- + drivers/infiniband/hw/mlx5/devx.h | 2 +- + drivers/infiniband/hw/mlx5/fs.c | 187 ++++++++++ + drivers/infiniband/hw/mlx5/main.c | 55 +-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 59 +++- + drivers/infiniband/hw/mlx5/mr.c | 109 +++--- + drivers/infiniband/hw/mlx5/odp.c | 78 ++--- + drivers/infiniband/hw/mlx5/wr.c | 10 +- + drivers/infiniband/hw/qedr/main.c | 1 - + drivers/infiniband/hw/qedr/verbs.c | 10 - + drivers/infiniband/hw/qedr/verbs.h | 1 - + drivers/infiniband/hw/usnic/usnic_fwd.c | 2 +- + drivers/infiniband/hw/usnic/usnic_fwd.h | 2 +- + drivers/infiniband/sw/rxe/rxe_av.c | 20 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 57 ++-- + drivers/infiniband/sw/rxe/rxe_cq.c | 28 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.c | 42 +-- + drivers/infiniband/sw/rxe/rxe_loc.h | 2 + + drivers/infiniband/sw/rxe/rxe_mr.c | 267 +++++++++++---- + drivers/infiniband/sw/rxe/rxe_mw.c | 36 +- + drivers/infiniband/sw/rxe/rxe_opcode.h | 6 +- + drivers/infiniband/sw/rxe/rxe_param.h | 34 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 4 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 16 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 30 +- + drivers/infiniband/sw/rxe/rxe_queue.h | 292 +++++++--------- + drivers/infiniband/sw/rxe/rxe_req.c | 65 ++-- + drivers/infiniband/sw/rxe/rxe_resp.c | 50 +-- + drivers/infiniband/sw/rxe/rxe_srq.c | 3 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 139 +++----- + drivers/infiniband/sw/rxe/rxe_verbs.h | 60 ++-- + drivers/infiniband/sw/siw/siw_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 18 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 49 +-- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 11 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 6 + + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 13 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-stats.c | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 6 + + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 3 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 31 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 6 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 2 +- + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 13 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 54 ++- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 27 +- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 10 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 11 +- + .../mellanox/mlx5/core/steering/dr_types.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 14 +- + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 8 +- + drivers/vdpa/mlx5/core/mr.c | 8 +- + drivers/vdpa/mlx5/core/resources.c | 13 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- + include/linux/mlx5/device.h | 2 + + include/linux/mlx5/driver.h | 32 +- + include/linux/mlx5/fs.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 26 +- + include/rdma/ib_hdrs.h | 1 + + include/rdma/ib_verbs.h | 65 ++-- + include/rdma/rdma_counter.h | 2 + + include/uapi/rdma/efa-abi.h | 18 +- + include/uapi/rdma/rdma_netlink.h | 5 + + include/uapi/rdma/rdma_user_rxe.h | 10 +- + 142 files changed, 3480 insertions(+), 1911 deletions(-) +Merging net-next/master (f25c0515c521 net: sched: gred: dynamically allocate tc_gred_qopt_offload) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging net/wireless/util.c +Auto-merging net/wireless/scan.c +Auto-merging net/wireless/core.c +Auto-merging net/tls/tls_sw.c +Auto-merging net/tls/tls_main.c +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/mac80211/mesh.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/net-sysfs.c +Auto-merging net/core/dev.c +Auto-merging net/batman-adv/bridge_loop_avoidance.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/arraymap.c +Auto-merging include/net/tls.h +Auto-merging include/net/sock.h +CONFLICT (content): Merge conflict in include/net/sock.h +Auto-merging include/net/cfg80211.h +Removing include/linux/netfilter_ingress.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/fs.h +CONFLICT (content): Merge conflict in include/linux/mlx5/fs.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/device.h +Auto-merging include/linux/filter.h +Auto-merging include/linux/bpf.h +Auto-merging drivers/soc/fsl/dpio/qbman-portal.c +Auto-merging drivers/soc/fsl/dpio/dpio-service.c +Removing drivers/ptp/idt8a340_reg.h +Auto-merging drivers/net/xen-netfront.c +Removing drivers/net/wireless/mediatek/mt76/mt7921/eeprom.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging drivers/net/usb/lan78xx.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/nxp/lpc_eth.c +Auto-merging drivers/net/ethernet/microchip/lan743x_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c +Auto-merging drivers/net/ethernet/intel/ice/ice_ptp.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hnae3.h +Auto-merging drivers/net/ethernet/chelsio/cxgb3/t3_hw.c +Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb3/common.h +Auto-merging drivers/infiniband/hw/qedr/main.c +Auto-merging drivers/infiniband/hw/mlx5/odp.c +Auto-merging drivers/infiniband/hw/mlx4/qp.c +Auto-merging drivers/infiniband/hw/mlx4/main.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt +Removing Documentation/devicetree/bindings/net/lantiq,xrx200-net.txt +Removing Documentation/devicetree/bindings/net/dsa/qca8k.txt +Recorded preimage for 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c' +Resolved 'include/linux/mlx5/fs.h' using previous resolution. +Resolved 'include/net/sock.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c'. +[master feab469fe3d1] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-timecard | 174 + + Documentation/bpf/bpf_licensing.rst | 92 + + Documentation/bpf/btf.rst | 29 +- + Documentation/bpf/index.rst | 9 + + .../devicetree/bindings/net/asix,ax88796c.yaml | 73 + + .../devicetree/bindings/net/brcm,bcmgenet.txt | 3 +- + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 12 +- + .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 43 + + .../devicetree/bindings/net/dsa/qca8k.txt | 215 - + .../devicetree/bindings/net/dsa/qca8k.yaml | 362 + + .../devicetree/bindings/net/dsa/realtek-smi.txt | 87 + + .../devicetree/bindings/net/lantiq,etop-xway.yaml | 69 + + .../devicetree/bindings/net/lantiq,xrx200-net.txt | 21 - + .../devicetree/bindings/net/lantiq,xrx200-net.yaml | 75 + + Documentation/devicetree/bindings/net/macb.txt | 4 + + .../devicetree/bindings/net/qcom,ipq8064-mdio.yaml | 5 +- + .../devicetree/bindings/net/renesas,ether.yaml | 17 +- + .../devicetree/bindings/net/renesas,etheravb.yaml | 3 + + .../bindings/net/socionext,uniphier-ave4.yaml | 1 + + .../bindings/net/wireless/mediatek,mt76.yaml | 5 + + .../devicetree/bindings/net/wireless/qca,ath9k.txt | 48 - + .../bindings/net/wireless/qca,ath9k.yaml | 90 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../device_drivers/ethernet/mellanox/mlx5.rst | 60 + + .../networking/devlink/devlink-region.rst | 4 +- + Documentation/networking/devlink/ice.rst | 4 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/devlink/iosm.rst | 162 + + Documentation/networking/ethtool-netlink.rst | 81 +- + Documentation/networking/ip-sysctl.rst | 8 - + Documentation/networking/ipvs-sysctl.rst | 11 + + Documentation/networking/mctp.rst | 59 + + MAINTAINERS | 20 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/m68k/emu/nfeth.c | 2 +- + arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 2 +- + arch/mips/include/uapi/asm/socket.h | 2 + + arch/mips/lantiq/xway/dma.c | 57 +- + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/s390/include/asm/qdio.h | 2 - + arch/sparc/include/uapi/asm/socket.h | 3 + + arch/x86/events/intel/core.c | 67 +- + arch/x86/events/intel/ds.c | 2 +- + arch/x86/events/intel/lbr.c | 20 +- + arch/x86/events/perf_event.h | 19 + + arch/x86/net/bpf_jit_comp.c | 53 +- + arch/xtensa/platforms/iss/network.c | 2 +- + drivers/base/property.c | 63 - + drivers/base/regmap/regmap-mdio.c | 6 +- + drivers/bcma/main.c | 2 +- + drivers/bluetooth/btintel.c | 239 +- + drivers/bluetooth/btintel.h | 11 + + drivers/bluetooth/btmrvl_main.c | 6 +- + drivers/bluetooth/btmtkuart.c | 13 +- + drivers/bluetooth/btrsi.c | 1 - + drivers/bluetooth/btrtl.c | 26 +- + drivers/bluetooth/btusb.c | 64 +- + drivers/bluetooth/hci_h5.c | 35 +- + drivers/bluetooth/hci_ldisc.c | 3 + + drivers/bluetooth/hci_qca.c | 5 +- + drivers/bluetooth/hci_vhci.c | 122 + + drivers/hsi/clients/ssi_protocol.c | 4 +- + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 2 +- + drivers/infiniband/hw/mlx5/odp.c | 1 + + drivers/infiniband/hw/qedr/main.c | 2 +- + drivers/net/Kconfig | 2 +- + drivers/net/appletalk/cops.c | 2 +- + drivers/net/appletalk/ltpc.c | 3 +- + drivers/net/arcnet/arc-rimi.c | 5 +- + drivers/net/arcnet/arcdevice.h | 5 + + drivers/net/arcnet/com20020-isa.c | 2 +- + drivers/net/arcnet/com20020-pci.c | 2 +- + drivers/net/arcnet/com20020.c | 4 +- + drivers/net/arcnet/com20020_cs.c | 2 +- + drivers/net/arcnet/com90io.c | 2 +- + drivers/net/arcnet/com90xx.c | 3 +- + drivers/net/bonding/bond_alb.c | 28 +- + drivers/net/bonding/bond_main.c | 4 +- + drivers/net/bonding/bond_sysfs.c | 4 +- + drivers/net/can/at91_can.c | 4 +- + drivers/net/can/dev/bittiming.c | 30 +- + drivers/net/can/dev/netlink.c | 221 +- + drivers/net/can/janz-ican3.c | 2 +- + drivers/net/can/mscan/mpc5xxx_can.c | 6 +- + drivers/net/can/rcar/Kconfig | 4 +- + drivers/net/can/usb/etas_es58x/es58x_fd.c | 7 +- + drivers/net/can/usb/gs_usb.c | 12 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 13 + + drivers/net/can/usb/peak_usb/pcan_usb_core.h | 1 + + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 9 +- + drivers/net/can/xilinx_can.c | 7 +- + drivers/net/dsa/Kconfig | 1 + + drivers/net/dsa/Makefile | 2 +- + drivers/net/dsa/b53/b53_common.c | 101 +- + drivers/net/dsa/b53/b53_priv.h | 2 +- + drivers/net/dsa/bcm_sf2.c | 12 +- + drivers/net/dsa/hirschmann/hellcreek.c | 6 +- + drivers/net/dsa/lantiq_gswip.c | 42 +- + drivers/net/dsa/microchip/ksz8795.c | 8 +- + drivers/net/dsa/mv88e6xxx/chip.c | 5 +- + drivers/net/dsa/ocelot/felix.c | 4 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 8 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 8 +- + drivers/net/dsa/qca/ar9331.c | 10 +- + drivers/net/dsa/qca8k.c | 435 +- + drivers/net/dsa/qca8k.h | 35 +- + drivers/net/dsa/realtek-smi-core.c | 4 + + drivers/net/dsa/realtek-smi-core.h | 4 +- + drivers/net/dsa/rtl8365mb.c | 1982 + + drivers/net/dsa/rtl8366.c | 96 +- + drivers/net/dsa/rtl8366rb.c | 301 +- + drivers/net/dsa/sja1105/sja1105.h | 29 +- + drivers/net/dsa/sja1105/sja1105_clocking.c | 35 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 91 +- + drivers/net/dsa/sja1105/sja1105_main.c | 144 +- + drivers/net/dsa/sja1105/sja1105_vl.c | 15 +- + drivers/net/dsa/xrs700x/xrs700x.c | 8 +- + drivers/net/dsa/xrs700x/xrs700x_mdio.c | 12 +- + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/3com/3c515.c | 5 +- + drivers/net/ethernet/3com/3c574_cs.c | 11 +- + drivers/net/ethernet/3com/3c589_cs.c | 10 +- + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/8390/apne.c | 3 +- + drivers/net/ethernet/8390/ax88796.c | 12 +- + drivers/net/ethernet/8390/axnet_cs.c | 7 +- + drivers/net/ethernet/8390/mcf8390.c | 3 +- + drivers/net/ethernet/8390/ne.c | 4 +- + drivers/net/ethernet/8390/ne2k-pci.c | 2 +- + drivers/net/ethernet/8390/pcnet_cs.c | 22 +- + drivers/net/ethernet/8390/stnic.c | 5 +- + drivers/net/ethernet/8390/zorro8390.c | 3 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/actions/owl-emac.c | 6 +- + drivers/net/ethernet/adaptec/starfire.c | 14 +- + drivers/net/ethernet/aeroflex/greth.c | 8 +- + drivers/net/ethernet/agere/et131x.c | 4 +- + drivers/net/ethernet/alacritech/slicoss.c | 4 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- + drivers/net/ethernet/alteon/acenic.c | 20 +- + drivers/net/ethernet/altera/altera_tse_main.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/amd/Kconfig | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 6 +- + drivers/net/ethernet/amd/atarilance.c | 4 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/nmclan_cs.c | 5 +- + drivers/net/ethernet/amd/pcnet32.c | 15 +- + drivers/net/ethernet/amd/sun3lance.c | 4 +- + drivers/net/ethernet/amd/sunlance.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +- + drivers/net/ethernet/apm/xgene-v2/mac.c | 2 +- + drivers/net/ethernet/apm/xgene-v2/main.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 2 +- + drivers/net/ethernet/apple/bmac.c | 15 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 6 +- + drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 8 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 4 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 2 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 4 +- + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 4 +- + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 2 +- + drivers/net/ethernet/arc/Kconfig | 4 +- + drivers/net/ethernet/arc/emac_main.c | 4 +- + drivers/net/ethernet/arc/emac_mdio.c | 9 +- + drivers/net/ethernet/asix/Kconfig | 35 + + drivers/net/ethernet/asix/Makefile | 6 + + drivers/net/ethernet/asix/ax88796c_ioctl.c | 239 + + drivers/net/ethernet/asix/ax88796c_ioctl.h | 26 + + drivers/net/ethernet/asix/ax88796c_main.c | 1164 + + drivers/net/ethernet/asix/ax88796c_main.h | 568 + + drivers/net/ethernet/asix/ax88796c_spi.c | 115 + + drivers/net/ethernet/asix/ax88796c_spi.h | 69 + + drivers/net/ethernet/atheros/ag71xx.c | 12 +- + drivers/net/ethernet/atheros/alx/main.c | 4 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 12 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 10 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 4 +- + drivers/net/ethernet/atheros/atlx/atlx.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 12 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 4 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c | 6 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 37 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.c | 4 +- + drivers/net/ethernet/broadcom/bnx2.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 22 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 9 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 15 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 50 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 13 - + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 87 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 10 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 202 +- + drivers/net/ethernet/broadcom/tg3.c | 60 +- + drivers/net/ethernet/brocade/bna/bnad.c | 5 +- + drivers/net/ethernet/cadence/macb.h | 7 +- + drivers/net/ethernet/cadence/macb_main.c | 42 +- + drivers/net/ethernet/cadence/macb_ptp.c | 13 +- + drivers/net/ethernet/calxeda/xgmac.c | 8 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 3 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 40 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 4 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + drivers/net/ethernet/cavium/thunder/nic_main.c | 3 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 11 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 9 +- + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/gmac.h | 2 +- + drivers/net/ethernet/chelsio/cxgb/pm3393.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/subr.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/vsc7326.c | 4 +- + drivers/net/ethernet/chelsio/cxgb3/common.h | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 4 +- + drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 3 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 8 +- + .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- + .../chelsio/inline_crypto/chtls/chtls_cm.h | 2 +- + drivers/net/ethernet/cirrus/cs89x0.c | 13 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- + drivers/net/ethernet/cirrus/mac89x0.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 4 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 9 +- + drivers/net/ethernet/cisco/enic/enic_pp.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 6 +- + drivers/net/ethernet/davicom/dm9000.c | 9 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 15 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 35 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 9 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 45 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 11 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 6 +- + drivers/net/ethernet/dec/tulip/xircom_cb.c | 4 +- + drivers/net/ethernet/dlink/dl2k.c | 5 +- + drivers/net/ethernet/dlink/sundance.c | 6 +- + drivers/net/ethernet/dnet.c | 8 +- + drivers/net/ethernet/ec_bhf.c | 4 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 7 +- + drivers/net/ethernet/ethoc.c | 28 +- + drivers/net/ethernet/ezchip/Kconfig | 2 +- + drivers/net/ethernet/ezchip/nps_enet.c | 4 +- + drivers/net/ethernet/faraday/ftgmac100.c | 9 +- + drivers/net/ethernet/fealnx.c | 8 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 6 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-devlink.c | 21 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 24 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 7 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 58 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 2 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 332 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 4 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 32 +- + drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 18 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 16 +- + drivers/net/ethernet/freescale/fec_main.c | 7 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 4 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 8 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.h | 2 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 8 +- + drivers/net/ethernet/freescale/fman/fman_memac.h | 2 +- + drivers/net/ethernet/freescale/fman/fman_tgec.c | 8 +- + drivers/net/ethernet/freescale/fman/fman_tgec.h | 2 +- + drivers/net/ethernet/freescale/fman/mac.h | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 4 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 14 +- + drivers/net/ethernet/google/gve/gve.h | 52 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 61 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 15 + + drivers/net/ethernet/google/gve/gve_desc.h | 13 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 7 +- + drivers/net/ethernet/google/gve/gve_main.c | 109 +- + drivers/net/ethernet/google/gve/gve_rx.c | 413 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 68 +- + drivers/net/ethernet/google/gve/gve_tx.c | 117 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 84 +- + drivers/net/ethernet/google/gve/gve_utils.c | 37 +- + drivers/net/ethernet/google/gve/gve_utils.h | 2 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 6 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 4 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 7 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 2 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 11 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 199 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 3 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 1 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 6 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 3 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 18 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 14 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 4 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 555 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 34 +- + .../hisilicon/hns3/hns3vf/hclgevf_devlink.c | 18 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_devlink.h | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 10 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 13 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 12 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 7 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +- + drivers/net/ethernet/ibm/emac/core.c | 14 +- + drivers/net/ethernet/ibm/ibmveth.c | 46 +- + drivers/net/ethernet/ibm/ibmvnic.c | 645 +- + drivers/net/ethernet/ibm/ibmvnic.h | 10 +- + drivers/net/ethernet/intel/Kconfig | 14 + + drivers/net/ethernet/intel/e100.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 + + drivers/net/ethernet/intel/e1000e/netdev.c | 5 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 52 +- + drivers/net/ethernet/intel/iavf/iavf.h | 12 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 194 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 6 +- + drivers/net/ethernet/intel/ice/Makefile | 5 +- + drivers/net/ethernet/intel/ice/ice.h | 206 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 92 +- + drivers/net/ethernet/intel/ice/ice_arfs.c | 4 +- + drivers/net/ethernet/intel/ice/ice_base.c | 121 +- + drivers/net/ethernet/intel/ice/ice_base.h | 8 +- + drivers/net/ethernet/intel/ice/ice_common.c | 129 +- + drivers/net/ethernet/intel/ice/ice_common.h | 7 + + drivers/net/ethernet/intel/ice/ice_dcb.c | 225 +- + drivers/net/ethernet/intel/ice/ice_dcb.h | 18 + + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 216 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 32 +- + drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 192 +- + drivers/net/ethernet/intel/ice/ice_devids.h | 2 + + drivers/net/ethernet/intel/ice/ice_devlink.c | 256 +- + drivers/net/ethernet/intel/ice/ice_devlink.h | 8 +- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 649 + + drivers/net/ethernet/intel/ice/ice_eswitch.h | 83 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 235 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 4 +- + drivers/net/ethernet/intel/ice/ice_fdir.c | 2 +- + drivers/net/ethernet/intel/ice/ice_fdir.h | 2 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 275 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 14 + + drivers/net/ethernet/intel/ice/ice_flex_type.h | 13 + + drivers/net/ethernet/intel/ice/ice_fltr.c | 80 + + drivers/net/ethernet/intel/ice/ice_fltr.h | 3 + + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 1 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 43 + + drivers/net/ethernet/intel/ice/ice_lib.c | 847 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 36 +- + drivers/net/ethernet/intel/ice/ice_main.c | 1383 +- + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 169 + + drivers/net/ethernet/intel/ice/ice_ptp.c | 372 +- + drivers/net/ethernet/intel/ice/ice_ptp.h | 24 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 151 + + drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 22 + + drivers/net/ethernet/intel/ice/ice_repr.c | 386 + + drivers/net/ethernet/intel/ice/ice_repr.h | 28 + + drivers/net/ethernet/intel/ice/ice_sched.c | 184 + + drivers/net/ethernet/intel/ice/ice_sched.h | 8 + + drivers/net/ethernet/intel/ice/ice_switch.c | 2531 +- + drivers/net/ethernet/intel/ice/ice_switch.h | 149 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 1056 + + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 152 + + drivers/net/ethernet/intel/ice/ice_trace.h | 28 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 326 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 147 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 102 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 14 +- + drivers/net/ethernet/intel/ice/ice_type.h | 19 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 403 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 74 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 158 +- + drivers/net/ethernet/intel/ice/ice_xsk.h | 20 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 8 +- + drivers/net/ethernet/intel/igc/igc_main.c | 4 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 23 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 54 +- + .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 16 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 +- + drivers/net/ethernet/jme.c | 4 +- + drivers/net/ethernet/korina.c | 4 +- + drivers/net/ethernet/lantiq_etop.c | 21 +- + drivers/net/ethernet/lantiq_xrx200.c | 87 +- + drivers/net/ethernet/litex/Kconfig | 2 +- + drivers/net/ethernet/litex/litex_liteeth.c | 2 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 16 +- + drivers/net/ethernet/marvell/mvneta.c | 75 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 20 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 11 +- + drivers/net/ethernet/marvell/octeontx2/af/common.h | 1 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 5 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 138 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 16 +- + .../ethernet/marvell/octeontx2/af/npc_profile.h | 994 +- + drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 133 +- + drivers/net/ethernet/marvell/octeontx2/af/ptp.h | 1 + + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 + + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 3 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 76 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 19 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 13 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 601 +- + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 16 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 222 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 96 + + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 4 + + .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 18 + + .../net/ethernet/marvell/octeontx2/nic/Makefile | 6 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 52 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 18 +- + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 21 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 43 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 234 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 133 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 273 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 16 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 8 +- + .../ethernet/marvell/prestera/prestera_devlink.c | 35 +- + .../ethernet/marvell/prestera/prestera_devlink.h | 4 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 17 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 21 +- + drivers/net/ethernet/marvell/skge.c | 6 +- + drivers/net/ethernet/marvell/sky2.c | 97 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- + drivers/net/ethernet/mediatek/mtk_star_emac.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/cq.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 29 +- + drivers/net/ethernet/mellanox/mlx4/en_main.c | 1 - + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 40 +- + drivers/net/ethernet/mellanox/mlx4/en_port.c | 4 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 15 + + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 12 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 + + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 30 +- + .../mellanox/mlx5/core/diag/fs_tracepoint.c | 3 + + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en.h | 85 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 8 +- + .../net/ethernet/mellanox/mlx5/core/en/health.h | 1 - + .../net/ethernet/mellanox/mlx5/core/en/params.c | 163 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 102 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.h | 9 + + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 20 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 7 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 50 +- + drivers/net/ethernet/mellanox/mlx5/core/en/rss.h | 7 +- + .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 25 +- + .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 38 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.h | 27 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 15 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 1 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 9 + + drivers/net/ethernet/mellanox/mlx5/core/en/tir.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tir.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 6 + + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 4 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 409 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 646 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 92 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 15 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 10 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 398 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 293 +- + .../ethernet/mellanox/mlx5/core/esw/bridge_priv.h | 1 + + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 10 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 28 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 66 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 72 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 12 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 17 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 147 +- + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 30 + + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 12 +- + .../ethernet/mellanox/mlx5/core/{ => lag}/lag.c | 102 +- + .../ethernet/mellanox/mlx5/core/{ => lag}/lag.h | 9 +- + .../mellanox/mlx5/core/{lag_mp.c => lag/mp.c} | 4 +- + .../mellanox/mlx5/core/{lag_mp.h => lag/mp.h} | 2 +- + .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 611 + + .../net/ethernet/mellanox/mlx5/core/lag/port_sel.h | 52 + + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 4 + + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c | 162 + + drivers/net/ethernet/mellanox/mlx5/core/lib/tout.h | 41 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 88 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 24 + + drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h | 2 - + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 36 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.h | 1 + + .../mlx5/core/sf/dev/diag/dev_tracepoint.h | 58 + + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 10 +- + .../mellanox/mlx5/core/sf/diag/sf_tracepoint.h | 173 + + .../mellanox/mlx5/core/sf/diag/vhca_tracepoint.h | 40 + + .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 4 + + .../ethernet/mellanox/mlx5/core/sf/vhca_event.c | 3 + + .../mellanox/mlx5/core/steering/dr_action.c | 27 +- + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 6 +- + .../mellanox/mlx5/core/steering/dr_domain.c | 212 +- + .../ethernet/mellanox/mlx5/core/steering/dr_fw.c | 2 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 4 +- + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 13 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 20 +- + .../mellanox/mlx5/core/steering/dr_types.h | 47 +- + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 17 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 21 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw.h | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 90 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 2 - + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 372 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 23 + + drivers/net/ethernet/mellanox/mlxsw/item.h | 56 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 66 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 357 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 8 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 390 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 10 +- + .../net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c | 1 + + .../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 8 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 15 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c | 9 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 45 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 432 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 27 +- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 540 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 662 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 9 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 16 + + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 1 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 11 +- + drivers/net/ethernet/micrel/ks8842.c | 15 +- + drivers/net/ethernet/micrel/ks8851.h | 2 +- + drivers/net/ethernet/micrel/ks8851_common.c | 14 +- + drivers/net/ethernet/micrel/ks8851_par.c | 4 +- + drivers/net/ethernet/micrel/ks8851_spi.c | 4 +- + drivers/net/ethernet/micrel/ksz884x.c | 16 +- + drivers/net/ethernet/microchip/enc28j60.c | 7 +- + drivers/net/ethernet/microchip/encx24j600.c | 7 +- + drivers/net/ethernet/microchip/lan743x_main.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.h | 1 + + drivers/net/ethernet/microchip/lan743x_ptp.c | 91 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 3 +- + .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 6 +- + .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 7 +- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 4 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 21 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 3 - + drivers/net/ethernet/moxa/moxart_ether.c | 2 +- + drivers/net/ethernet/mscc/Kconfig | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 327 +- + drivers/net/ethernet/mscc/ocelot.h | 1 + + drivers/net/ethernet/mscc/ocelot_flower.c | 125 +- + drivers/net/ethernet/mscc/ocelot_mrp.c | 8 +- + drivers/net/ethernet/mscc/ocelot_net.c | 24 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 9 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 9 +- + drivers/net/ethernet/natsemi/natsemi.c | 6 +- + drivers/net/ethernet/natsemi/ns83820.c | 11 +- + drivers/net/ethernet/neterion/s2io.c | 6 +- + drivers/net/ethernet/neterion/s2io.h | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 6 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 2 +- + drivers/net/ethernet/netronome/nfp/abm/qdisc.c | 2 +- + drivers/net/ethernet/netronome/nfp/devlink_param.c | 9 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 6 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 11 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 3 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 2 +- + drivers/net/ethernet/ni/nixge.c | 2 +- + drivers/net/ethernet/nvidia/forcedeth.c | 51 +- + drivers/net/ethernet/nxp/lpc_eth.c | 10 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 4 +- + drivers/net/ethernet/packetengines/hamachi.c | 5 +- + drivers/net/ethernet/packetengines/yellowfin.c | 6 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 8 +- + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 48 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 1 - + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 4 - + .../net/ethernet/pensando/ionic/ionic_devlink.c | 10 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 41 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 264 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 49 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 92 +- + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 8 +- + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 241 +- + .../net/ethernet/pensando/ionic/ionic_rx_filter.h | 2 + + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 121 - + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 14 - + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed.h | 44 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 16 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 143 +- + drivers/net/ethernet/qlogic/qed/qed_dbg_hsi.h | 1491 + + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 11 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 1389 +- + drivers/net/ethernet/qlogic/qed/qed_debug.h | 7 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 126 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 347 +- + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 12 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 25 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 12643 ++--- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 222 +- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 405 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 98 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.h | 60 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_int.h | 286 +- + drivers/net/ethernet/qlogic/qed/qed_iro_hsi.h | 500 + + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 15 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.h | 9 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 + + drivers/net/ethernet/qlogic/qed/qed_l2.c | 43 +- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 135 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 167 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 131 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 23 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 66 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 765 +- + drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h | 2474 + + drivers/net/ethernet/qlogic/qed/qed_ooo.c | 20 +- + drivers/net/ethernet/qlogic/qed/qed_ptp.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.h | 7 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 95 +- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 1 - + drivers/net/ethernet/qlogic/qed/qed_selftest.h | 30 +- + drivers/net/ethernet/qlogic/qed/qed_sp.h | 223 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 63 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 201 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 138 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 13 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 311 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 53 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 21 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 12 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 5 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 24 +- + drivers/net/ethernet/realtek/8139cp.c | 7 +- + drivers/net/ethernet/realtek/8139too.c | 7 +- + drivers/net/ethernet/realtek/atp.c | 4 +- + drivers/net/ethernet/realtek/r8169.h | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 44 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 59 - + drivers/net/ethernet/renesas/ravb.h | 52 +- + drivers/net/ethernet/renesas/ravb_main.c | 728 +- + drivers/net/ethernet/renesas/sh_eth.c | 18 +- + drivers/net/ethernet/rocker/rocker_main.c | 10 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c | 3 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 9 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 2 +- + drivers/net/ethernet/seeq/sgiseeq.c | 4 +- + drivers/net/ethernet/sfc/ef10.c | 4 +- + drivers/net/ethernet/sfc/ef100_nic.c | 2 +- + drivers/net/ethernet/sfc/ef10_sriov.c | 4 +- + drivers/net/ethernet/sfc/ef10_sriov.h | 6 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/efx_common.c | 4 +- + drivers/net/ethernet/sfc/ethtool_common.c | 10 +- + drivers/net/ethernet/sfc/falcon/efx.c | 6 +- + drivers/net/ethernet/sfc/net_driver.h | 2 +- + drivers/net/ethernet/sfc/siena_sriov.c | 2 +- + drivers/net/ethernet/sfc/siena_sriov.h | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 4 +- + drivers/net/ethernet/sgi/meth.c | 2 +- + drivers/net/ethernet/silan/sc92031.c | 14 +- + drivers/net/ethernet/sis/sis190.c | 10 +- + drivers/net/ethernet/sis/sis900.c | 19 +- + drivers/net/ethernet/smsc/epic100.c | 4 +- + drivers/net/ethernet/smsc/smc911x.c | 4 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 15 +- + drivers/net/ethernet/smsc/smc91x.c | 4 +- + drivers/net/ethernet/smsc/smsc911x.c | 22 +- + drivers/net/ethernet/smsc/smsc9420.c | 26 +- + drivers/net/ethernet/socionext/netsec.c | 46 +- + drivers/net/ethernet/socionext/sni_ave.c | 17 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 7 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 8 +- + drivers/net/ethernet/sun/cassini.c | 7 +- + drivers/net/ethernet/sun/ldmvsw.c | 7 +- + drivers/net/ethernet/sun/niu.c | 46 +- + drivers/net/ethernet/sun/sunbmac.c | 6 +- + drivers/net/ethernet/sun/sungem.c | 15 +- + drivers/net/ethernet/sun/sunhme.c | 23 +- + drivers/net/ethernet/sun/sunqe.c | 4 +- + drivers/net/ethernet/sun/sunvnet.c | 4 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac.h | 2 +- + drivers/net/ethernet/tehuti/tehuti.c | 8 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 2 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 26 +- + drivers/net/ethernet/ti/cpmac.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 6 +- + drivers/net/ethernet/ti/cpsw_new.c | 17 +- + drivers/net/ethernet/ti/cpts.c | 6 +- + drivers/net/ethernet/ti/davinci_emac.c | 8 +- + drivers/net/ethernet/ti/netcp_core.c | 8 +- + drivers/net/ethernet/ti/tlan.c | 14 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 11 +- + drivers/net/ethernet/via/via-rhine.c | 4 +- + drivers/net/ethernet/via/via-velocity.c | 4 +- + drivers/net/ethernet/wiznet/w5100-spi.c | 4 +- + drivers/net/ethernet/wiznet/w5100.c | 11 +- + drivers/net/ethernet/wiznet/w5100.h | 2 +- + drivers/net/ethernet/wiznet/w5300.c | 4 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 10 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 11 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 14 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 7 +- + drivers/net/fddi/defxx.c | 12 +- + drivers/net/fddi/defza.c | 2 +- + drivers/net/fddi/skfp/h/smc.h | 2 +- + drivers/net/fddi/skfp/skfddi.c | 9 +- + drivers/net/fddi/skfp/smtinit.c | 4 +- + drivers/net/fjes/fjes_hw.c | 3 +- + drivers/net/fjes/fjes_hw.h | 2 +- + drivers/net/fjes/fjes_main.c | 14 +- + drivers/net/gtp.c | 2 +- + drivers/net/hamradio/6pack.c | 6 +- + drivers/net/hamradio/baycom_epp.c | 4 +- + drivers/net/hamradio/bpqether.c | 7 +- + drivers/net/hamradio/dmascc.c | 5 +- + drivers/net/hamradio/hdlcdrv.c | 4 +- + drivers/net/hamradio/mkiss.c | 6 +- + drivers/net/hamradio/scc.c | 7 +- + drivers/net/hamradio/yam.c | 4 +- + drivers/net/hippi/rrunner.c | 6 +- + drivers/net/hyperv/netvsc_drv.c | 6 +- + drivers/net/ieee802154/ca8210.c | 2 - + drivers/net/ifb.c | 3 + + drivers/net/ipvlan/ipvlan_main.c | 4 +- + drivers/net/ipvlan/ipvtap.c | 2 +- + drivers/net/macsec.c | 4 +- + drivers/net/macvlan.c | 7 +- + drivers/net/macvtap.c | 2 +- + drivers/net/net_failover.c | 3 +- + drivers/net/netdevsim/dev.c | 14 +- + drivers/net/netdevsim/ethtool.c | 28 + + drivers/net/netdevsim/health.c | 32 - + drivers/net/netdevsim/netdevsim.h | 1 + + drivers/net/ntb_netdev.c | 2 +- + drivers/net/pcs/pcs-xpcs.c | 2 +- + drivers/net/phy/at803x.c | 776 +- + drivers/net/phy/bcm7xxx.c | 203 + + drivers/net/phy/broadcom.c | 106 +- + drivers/net/phy/dp83867.c | 23 +- + drivers/net/phy/dp83869.c | 4 +- + drivers/net/phy/marvell10g.c | 107 +- + drivers/net/phy/mdio_bus.c | 28 + + drivers/net/phy/micrel.c | 107 +- + drivers/net/phy/mscc/mscc_main.c | 2 +- + drivers/net/phy/phy-c45.c | 35 + + drivers/net/phy/phy_device.c | 10 + + drivers/net/phy/phylink.c | 140 +- + drivers/net/phy/realtek.c | 8 + + drivers/net/phy/sfp-bus.c | 2 +- + drivers/net/plip/plip.c | 8 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/rionet.c | 14 +- + drivers/net/sb1000.c | 12 +- + drivers/net/team/team.c | 2 +- + drivers/net/usb/aqc111.c | 4 +- + drivers/net/usb/asix_common.c | 2 +- + drivers/net/usb/asix_devices.c | 2 +- + drivers/net/usb/ax88172a.c | 2 +- + drivers/net/usb/ax88179_178a.c | 12 +- + drivers/net/usb/catc.c | 24 +- + drivers/net/usb/cdc-phonet.c | 4 +- + drivers/net/usb/ch9200.c | 4 +- + drivers/net/usb/cx82310_eth.c | 5 +- + drivers/net/usb/dm9601.c | 7 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kalmia.c | 2 +- + drivers/net/usb/kaweth.c | 3 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/mcs7830.c | 9 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/net/usb/qmi_wwan.c | 7 +- + drivers/net/usb/r8152.c | 4 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/rtl8150.c | 4 +- + drivers/net/usb/sierra_net.c | 6 +- + drivers/net/usb/smsc75xx.c | 9 +- + drivers/net/usb/smsc95xx.c | 9 +- + drivers/net/usb/sr9700.c | 9 +- + drivers/net/usb/sr9800.c | 7 +- + drivers/net/usb/usbnet.c | 6 +- + drivers/net/virtio_net.c | 40 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 8 +- + drivers/net/vrf.c | 28 +- + drivers/net/wan/hdlc_fr.c | 4 +- + drivers/net/wan/lapbether.c | 2 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- + drivers/net/wireless/ath/ath10k/core.c | 5 +- + drivers/net/wireless/ath/ath10k/mac.c | 37 +- + drivers/net/wireless/ath/ath10k/qmi.c | 3 +- + drivers/net/wireless/ath/ath10k/sdio.c | 6 +- + drivers/net/wireless/ath/ath10k/snoc.c | 77 + + drivers/net/wireless/ath/ath10k/snoc.h | 5 + + drivers/net/wireless/ath/ath10k/wmi.c | 4 + + drivers/net/wireless/ath/ath10k/wmi.h | 3 + + drivers/net/wireless/ath/ath11k/core.c | 68 +- + drivers/net/wireless/ath/ath11k/core.h | 49 +- + drivers/net/wireless/ath/ath11k/dbring.c | 16 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 27 +- + drivers/net/wireless/ath/ath11k/debugfs.h | 4 + + .../net/wireless/ath/ath11k/debugfs_htt_stats.c | 4344 +- + .../net/wireless/ath/ath11k/debugfs_htt_stats.h | 226 + + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 8 +- + drivers/net/wireless/ath/ath11k/dp.c | 10 +- + drivers/net/wireless/ath/ath11k/dp.h | 9 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 253 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 36 +- + drivers/net/wireless/ath/ath11k/dp_tx.h | 2 +- + drivers/net/wireless/ath/ath11k/hal_desc.h | 2 + + drivers/net/wireless/ath/ath11k/hw.c | 45 + + drivers/net/wireless/ath/ath11k/hw.h | 15 +- + drivers/net/wireless/ath/ath11k/mac.c | 1445 +- + drivers/net/wireless/ath/ath11k/mac.h | 3 + + drivers/net/wireless/ath/ath11k/pci.c | 45 +- + drivers/net/wireless/ath/ath11k/peer.c | 11 + + drivers/net/wireless/ath/ath11k/qmi.c | 349 +- + drivers/net/wireless/ath/ath11k/qmi.h | 18 +- + drivers/net/wireless/ath/ath11k/reg.c | 18 +- + drivers/net/wireless/ath/ath11k/reg.h | 2 +- + drivers/net/wireless/ath/ath11k/spectral.c | 42 +- + drivers/net/wireless/ath/ath11k/trace.h | 11 +- + drivers/net/wireless/ath/ath11k/wmi.c | 162 +- + drivers/net/wireless/ath/ath11k/wmi.h | 107 +- + drivers/net/wireless/ath/ath5k/sysfs.c | 8 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 9 +- + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 105 +- + drivers/net/wireless/ath/ath9k/debug.c | 57 +- + drivers/net/wireless/ath/ath9k/debug.h | 1 + + drivers/net/wireless/ath/ath9k/eeprom.c | 12 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 + + drivers/net/wireless/ath/ath9k/init.c | 58 + + drivers/net/wireless/ath/ath9k/main.c | 4 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 10 +- + drivers/net/wireless/ath/spectral_common.h | 1 - + drivers/net/wireless/ath/wcn36xx/debug.c | 2 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 6 +- + drivers/net/wireless/ath/wcn36xx/main.c | 11 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 99 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 3 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 10 +- + drivers/net/wireless/ath/wil6210/main.c | 6 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 2 +- + drivers/net/wireless/ath/wil6210/wmi.c | 2 +- + drivers/net/wireless/atmel/atmel.c | 19 +- + drivers/net/wireless/broadcom/b43/phy_g.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/radio.c | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 12 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 6 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 10 + + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 4 +- + drivers/net/wireless/cisco/airo.c | 27 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 12 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 2 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 1 - + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 1 - + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 1 - + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 5 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 6 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 5 +- + drivers/net/wireless/intersil/hostap/hostap_main.c | 4 +- + drivers/net/wireless/intersil/orinoco/main.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 163 +- + drivers/net/wireless/marvell/libertas/cmd.c | 5 +- + drivers/net/wireless/marvell/libertas/main.c | 4 +- + drivers/net/wireless/marvell/mwifiex/11n.c | 7 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 384 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 21 + + drivers/net/wireless/marvell/mwifiex/main.c | 22 +- + drivers/net/wireless/marvell/mwifiex/main.h | 1 + + drivers/net/wireless/marvell/mwifiex/pcie.c | 36 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 4 + + drivers/net/wireless/marvell/mwifiex/uap_event.c | 3 +- + drivers/net/wireless/marvell/mwl8k.c | 2 +- + drivers/net/wireless/mediatek/mt76/Makefile | 2 +- + drivers/net/wireless/mediatek/mt76/debugfs.c | 22 +- + drivers/net/wireless/mediatek/mt76/eeprom.c | 14 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 242 +- + drivers/net/wireless/mediatek/mt76/mcu.c | 8 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 126 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 11 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 3 + + drivers/net/wireless/mediatek/mt76/mt7603/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/Makefile | 2 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 29 +- + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 62 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 68 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 20 +- + drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 4 +- + .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7615/sdio.c | 296 +- + .../net/wireless/mediatek/mt76/mt7615/sdio_mcu.c | 11 +- + .../net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 7 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 355 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 37 +- + drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 3 + + drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 5 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 381 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 170 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 646 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 11 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 334 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 1046 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 105 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 144 +- + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 149 +- + .../net/wireless/mediatek/mt76/mt7915/testmode.c | 23 + + .../net/wireless/mediatek/mt76/mt7915/testmode.h | 6 + + drivers/net/wireless/mediatek/mt76/mt7921/Kconfig | 19 +- + drivers/net/wireless/mediatek/mt76/mt7921/Makefile | 7 +- + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 99 +- + drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 74 +- + drivers/net/wireless/mediatek/mt76/mt7921/eeprom.c | 100 - + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 93 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 776 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.h | 32 + + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 328 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 448 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 63 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 179 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 66 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 348 + + .../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 115 + + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 58 +- + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 317 + + .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 220 + + .../net/wireless/mediatek/mt76/mt7921/sdio_mcu.c | 135 + + .../net/wireless/mediatek/mt76/mt7921/testmode.c | 197 + + drivers/net/wireless/mediatek/mt76/sdio.c | 303 +- + .../net/wireless/mediatek/mt76/{mt7615 => }/sdio.h | 33 +- + .../mediatek/mt76/{mt7615 => }/sdio_txrx.c | 134 +- + drivers/net/wireless/mediatek/mt76/testmode.c | 4 +- + drivers/net/wireless/mediatek/mt76/testmode.h | 7 + + drivers/net/wireless/mediatek/mt76/tx.c | 84 +- + drivers/net/wireless/mediatek/mt76/usb.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/dma.c | 2 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 11 +- + drivers/net/wireless/microchip/wilc1000/hif.c | 31 +- + drivers/net/wireless/microchip/wilc1000/hif.h | 1 + + drivers/net/wireless/microchip/wilc1000/netdev.c | 14 +- + drivers/net/wireless/microchip/wilc1000/netdev.h | 5 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 1 + + drivers/net/wireless/microchip/wilc1000/spi.c | 91 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 134 +- + drivers/net/wireless/microchip/wilc1000/wlan.h | 5 +- + drivers/net/wireless/microchip/wilc1000/wlan_cfg.c | 1 + + drivers/net/wireless/microchip/wilc1000/wlan_if.h | 7 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 6 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 2 - + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 - + drivers/net/wireless/ray_cs.c | 2 +- + drivers/net/wireless/realtek/Kconfig | 1 + + drivers/net/wireless/realtek/Makefile | 1 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 2 + + drivers/net/wireless/realtek/rtlwifi/pci.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 2 +- + drivers/net/wireless/realtek/rtw88/debug.c | 46 +- + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 54 +- + drivers/net/wireless/realtek/rtw88/fw.h | 24 + + drivers/net/wireless/realtek/rtw88/main.c | 22 +- + drivers/net/wireless/realtek/rtw88/main.h | 49 +- + drivers/net/wireless/realtek/rtw88/phy.c | 119 +- + drivers/net/wireless/realtek/rtw88/phy.h | 2 + + drivers/net/wireless/realtek/rtw88/reg.h | 6 + + drivers/net/wireless/realtek/rtw88/regd.c | 753 +- + drivers/net/wireless/realtek/rtw88/regd.h | 8 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 19 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 46 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 8 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 47 + + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 3 + + drivers/net/wireless/realtek/rtw89/Kconfig | 50 + + drivers/net/wireless/realtek/rtw89/Makefile | 25 + + drivers/net/wireless/realtek/rtw89/cam.c | 695 + + drivers/net/wireless/realtek/rtw89/cam.h | 165 + + drivers/net/wireless/realtek/rtw89/coex.c | 5716 +++ + drivers/net/wireless/realtek/rtw89/coex.h | 181 + + drivers/net/wireless/realtek/rtw89/core.c | 2502 + + drivers/net/wireless/realtek/rtw89/core.h | 3384 ++ + drivers/net/wireless/realtek/rtw89/debug.c | 2489 + + drivers/net/wireless/realtek/rtw89/debug.h | 77 + + drivers/net/wireless/realtek/rtw89/efuse.c | 188 + + drivers/net/wireless/realtek/rtw89/efuse.h | 13 + + drivers/net/wireless/realtek/rtw89/fw.c | 1641 + + drivers/net/wireless/realtek/rtw89/fw.h | 1378 + + drivers/net/wireless/realtek/rtw89/mac.c | 3836 ++ + drivers/net/wireless/realtek/rtw89/mac.h | 860 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 676 + + drivers/net/wireless/realtek/rtw89/pci.c | 3060 ++ + drivers/net/wireless/realtek/rtw89/pci.h | 635 + + drivers/net/wireless/realtek/rtw89/phy.c | 2868 ++ + drivers/net/wireless/realtek/rtw89/phy.h | 311 + + drivers/net/wireless/realtek/rtw89/ps.c | 150 + + drivers/net/wireless/realtek/rtw89/ps.h | 16 + + drivers/net/wireless/realtek/rtw89/reg.h | 2159 + + drivers/net/wireless/realtek/rtw89/regd.c | 353 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2036 + + drivers/net/wireless/realtek/rtw89/rtw8852a.h | 109 + + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 3911 ++ + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.h | 24 + + .../wireless/realtek/rtw89/rtw8852a_rfk_table.c | 1607 + + .../wireless/realtek/rtw89/rtw8852a_rfk_table.h | 133 + + .../net/wireless/realtek/rtw89/rtw8852a_table.c | 48725 +++++++++++++++++++ + .../net/wireless/realtek/rtw89/rtw8852a_table.h | 28 + + drivers/net/wireless/realtek/rtw89/sar.c | 190 + + drivers/net/wireless/realtek/rtw89/sar.h | 26 + + drivers/net/wireless/realtek/rtw89/ser.c | 491 + + drivers/net/wireless/realtek/rtw89/ser.h | 15 + + drivers/net/wireless/realtek/rtw89/txrx.h | 358 + + drivers/net/wireless/realtek/rtw89/util.h | 17 + + drivers/net/wireless/rndis_wlan.c | 2 - + drivers/net/wireless/rsi/rsi_91x_core.c | 2 + + drivers/net/wireless/rsi/rsi_91x_hal.c | 10 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 74 +- + drivers/net/wireless/rsi/rsi_91x_main.c | 17 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 24 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 5 +- + drivers/net/wireless/rsi/rsi_hal.h | 11 + + drivers/net/wireless/rsi/rsi_main.h | 15 +- + drivers/net/wireless/st/cw1200/bh.c | 2 - + drivers/net/wireless/wl3501_cs.c | 3 +- + drivers/net/wireless/zydas/zd1201.c | 9 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 1 - + drivers/net/wwan/Kconfig | 1 + + drivers/net/wwan/iosm/Makefile | 5 +- + drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c | 6 +- + drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.h | 1 + + drivers/net/wwan/iosm/iosm_ipc_coredump.c | 125 + + drivers/net/wwan/iosm/iosm_ipc_coredump.h | 59 + + drivers/net/wwan/iosm/iosm_ipc_devlink.c | 321 + + drivers/net/wwan/iosm/iosm_ipc_devlink.h | 205 + + drivers/net/wwan/iosm/iosm_ipc_flash.c | 594 + + drivers/net/wwan/iosm/iosm_ipc_flash.h | 229 + + drivers/net/wwan/iosm/iosm_ipc_imem.c | 107 +- + drivers/net/wwan/iosm/iosm_ipc_imem.h | 18 +- + drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 317 + + drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 49 +- + drivers/net/xen-netback/interface.c | 6 +- + drivers/net/xen-netback/netback.c | 2 +- + drivers/net/xen-netfront.c | 4 +- + drivers/nfc/fdp/i2c.c | 1 - + drivers/nfc/microread/i2c.c | 4 - + drivers/nfc/microread/mei.c | 6 +- + drivers/nfc/nfcmrvl/fw_dnld.c | 4 +- + drivers/nfc/pn533/i2c.c | 6 +- + drivers/nfc/pn533/pn533.c | 6 +- + drivers/nfc/pn533/pn533.h | 4 +- + drivers/nfc/pn533/uart.c | 4 +- + drivers/nfc/pn533/usb.c | 2 +- + drivers/nfc/pn544/mei.c | 8 +- + drivers/nfc/s3fwrn5/firmware.c | 29 +- + drivers/nfc/s3fwrn5/nci.c | 18 +- + drivers/nfc/st-nci/i2c.c | 4 - + drivers/nfc/st-nci/ndlc.c | 4 - + drivers/nfc/st-nci/se.c | 6 - + drivers/nfc/st-nci/spi.c | 4 - + drivers/nfc/st21nfca/i2c.c | 4 - + drivers/nfc/st21nfca/se.c | 4 - + drivers/nfc/trf7970a.c | 8 - + drivers/of/Kconfig | 4 - + drivers/of/Makefile | 1 - + drivers/pcmcia/pcmcia_cis.c | 5 +- + drivers/phy/broadcom/phy-bcm-ns-usb3.c | 2 +- + drivers/phy/broadcom/phy-bcm-ns2-pcie.c | 6 +- + drivers/ptp/idt8a340_reg.h | 720 - + drivers/ptp/ptp_clockmatrix.c | 1588 +- + drivers/ptp/ptp_clockmatrix.h | 109 +- + drivers/ptp/ptp_ocp.c | 1354 +- + drivers/s390/cio/qdio_setup.c | 34 +- + drivers/s390/net/ctcm_fsms.c | 60 +- + drivers/s390/net/ctcm_main.c | 38 +- + drivers/s390/net/ctcm_mpc.c | 8 +- + drivers/s390/net/fsm.c | 2 +- + drivers/s390/net/ism_drv.c | 2 +- + drivers/s390/net/lcs.c | 123 +- + drivers/s390/net/netiucv.c | 104 +- + drivers/s390/net/qeth_core.h | 4 +- + drivers/s390/net/qeth_core_main.c | 63 +- + drivers/s390/net/qeth_l2_main.c | 33 +- + drivers/s390/net/qeth_l3_main.c | 15 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 8 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.h | 2 +- + drivers/scsi/qedf/qedf.h | 4 +- + drivers/scsi/qedf/qedf_els.c | 2 +- + drivers/scsi/qedf/qedf_io.c | 12 +- + drivers/scsi/qedf/qedf_main.c | 10 +- + drivers/scsi/qedi/qedi_debugfs.c | 4 +- + drivers/scsi/qedi/qedi_fw.c | 40 +- + drivers/scsi/qedi/qedi_fw_api.c | 22 +- + drivers/scsi/qedi/qedi_fw_iscsi.h | 2 +- + drivers/scsi/qedi/qedi_iscsi.h | 2 +- + drivers/scsi/qedi/qedi_main.c | 11 +- + drivers/soc/fsl/Kconfig | 1 + + drivers/soc/fsl/dpio/dpio-cmd.h | 3 + + drivers/soc/fsl/dpio/dpio-driver.c | 1 + + drivers/soc/fsl/dpio/dpio-service.c | 117 + + drivers/soc/fsl/dpio/dpio.c | 1 + + drivers/soc/fsl/dpio/dpio.h | 2 + + drivers/soc/fsl/dpio/qbman-portal.c | 58 + + drivers/soc/fsl/dpio/qbman-portal.h | 13 + + drivers/staging/qlge/qlge_main.c | 12 +- + drivers/usb/gadget/function/f_phonet.c | 5 +- + include/linux/bitmap.h | 2 + + include/linux/bpf.h | 7 +- + include/linux/brcmphy.h | 11 + + include/linux/can/bittiming.h | 89 +- + include/linux/can/dev.h | 34 + + include/linux/dsa/8021q.h | 5 +- + include/linux/dsa/ocelot.h | 4 +- + include/linux/dsa/sja1105.h | 1 - + include/linux/etherdevice.h | 37 +- + include/linux/ethtool.h | 23 + + include/linux/filter.h | 7 +- + include/linux/ieee80211.h | 39 + + include/linux/ipv6.h | 1 - + include/linux/mdio.h | 26 + + include/linux/mfd/idt8a340_reg.h | 31 +- + include/linux/micrel_phy.h | 1 + + include/linux/mlx4/device.h | 2 +- + include/linux/mlx4/driver.h | 22 - + include/linux/mlx5/device.h | 61 +- + include/linux/mlx5/driver.h | 29 +- + include/linux/mlx5/eq.h | 1 - + include/linux/mlx5/eswitch.h | 9 + + include/linux/mlx5/fs.h | 9 + + include/linux/mlx5/mlx5_ifc.h | 424 +- + include/linux/mm_types.h | 13 +- + include/linux/netdevice.h | 17 +- + include/linux/netfilter_arp/arp_tables.h | 5 +- + include/linux/netfilter_bridge/ebtables.h | 5 +- + include/linux/netfilter_ingress.h | 58 - + include/linux/netfilter_ipv4/ip_tables.h | 6 +- + include/linux/netfilter_ipv6/ip6_tables.h | 5 +- + include/linux/netfilter_netdev.h | 146 + + include/linux/netlink.h | 4 - + include/linux/of_net.h | 8 +- + include/linux/perf_event.h | 23 + + include/linux/phy.h | 35 + + include/linux/phylink.h | 14 +- + include/linux/platform_data/brcmfmac.h | 2 +- + include/linux/property.h | 5 +- + include/linux/qed/common_hsi.h | 141 +- + include/linux/qed/eth_common.h | 1 + + include/linux/qed/fcoe_common.h | 362 +- + include/linux/qed/iscsi_common.h | 360 +- + include/linux/qed/nvmetcp_common.h | 18 +- + include/linux/qed/qed_chain.h | 97 +- + include/linux/qed/qed_eth_if.h | 23 +- + include/linux/qed/qed_if.h | 265 +- + include/linux/qed/qed_iscsi_if.h | 2 +- + include/linux/qed/qed_ll2_if.h | 42 +- + include/linux/qed/qed_nvmetcp_if.h | 17 + + include/linux/qed/qed_rdma_if.h | 3 +- + include/linux/qed/rdma_common.h | 1 + + include/linux/skbuff.h | 4 + + include/linux/soc/marvell/octeontx2/asm.h | 15 + + include/linux/socket.h | 2 + + include/linux/u64_stats_sync.h | 10 + + include/net/act_api.h | 10 +- + include/net/ax25.h | 13 +- + include/net/bluetooth/bluetooth.h | 90 + + include/net/bluetooth/hci.h | 117 + + include/net/bluetooth/hci_core.h | 75 +- + include/net/busy_poll.h | 3 +- + include/net/cfg80211.h | 79 +- + include/net/codel.h | 5 + + include/net/codel_impl.h | 18 +- + include/net/datalink.h | 2 +- + include/net/devlink.h | 108 +- + include/net/dn.h | 2 +- + include/net/dsa.h | 44 +- + include/net/gen_stats.h | 59 +- + include/net/inet_connection_sock.h | 2 +- + include/net/inet_ecn.h | 17 + + include/net/inet_sock.h | 3 +- + include/net/ioam6.h | 3 +- + include/net/ip.h | 8 +- + include/net/ip_vs.h | 11 + + include/net/ipv6.h | 1 + + include/net/llc.h | 2 +- + include/net/llc_if.h | 3 +- + include/net/mac80211.h | 11 + + include/net/mctp.h | 69 +- + include/net/mctpdevice.h | 5 + + include/net/mptcp.h | 4 + + include/net/ndisc.h | 2 +- + include/net/neighbour.h | 45 +- + include/net/netfilter/xt_rateest.h | 2 +- + include/net/page_pool.h | 12 +- + include/net/pkt_cls.h | 6 +- + include/net/rose.h | 8 +- + include/net/sch_generic.h | 84 +- + include/net/sock.h | 95 +- + include/net/switchdev.h | 48 +- + include/net/tcp.h | 43 +- + include/net/tls.h | 5 +- + include/net/xdp.h | 8 +- + include/net/xdp_sock_drv.h | 22 + + include/net/xsk_buff_pool.h | 48 +- + include/soc/fsl/dpaa2-io.h | 9 + + include/soc/mscc/ocelot.h | 27 +- + include/soc/mscc/ocelot_vcap.h | 10 + + include/trace/events/devlink.h | 72 +- + include/trace/events/mctp.h | 75 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 42 +- + include/uapi/linux/btf.h | 55 +- + include/uapi/linux/can/netlink.h | 31 +- + include/uapi/linux/devlink.h | 2 + + include/uapi/linux/ethtool.h | 29 + + include/uapi/linux/ethtool_netlink.h | 17 + + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/ioam6_iptunnel.h | 29 + + include/uapi/linux/mctp.h | 11 + + include/uapi/linux/mdio.h | 9 + + include/uapi/linux/mptcp.h | 35 + + include/uapi/linux/neighbour.h | 35 +- + include/uapi/linux/netfilter.h | 1 + + include/uapi/linux/nl80211-vnd-intel.h | 29 + + include/uapi/linux/nl80211.h | 115 +- + include/uapi/linux/pkt_sched.h | 2 + + include/uapi/linux/smc.h | 44 +- + include/uapi/linux/tls.h | 30 + + include/uapi/linux/vm_sockets.h | 13 +- + kernel/bpf/arraymap.c | 7 +- + kernel/bpf/btf.c | 128 + + kernel/bpf/core.c | 5 + + kernel/bpf/hashtab.c | 13 +- + kernel/bpf/helpers.c | 11 +- + kernel/bpf/trampoline.c | 3 +- + kernel/bpf/verifier.c | 123 +- + kernel/events/core.c | 2 + + kernel/trace/bpf_trace.c | 84 +- + lib/bitmap.c | 13 + + lib/test_bpf.c | 17182 ++++--- + net/802/hippi.c | 2 +- + net/802/p8022.c | 2 +- + net/802/psnap.c | 2 +- + net/8021q/vlan_dev.c | 6 +- + net/Kconfig | 2 +- + net/atm/br2684.c | 6 +- + net/atm/lec.c | 8 +- + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_dev.c | 2 +- + net/ax25/ax25_iface.c | 6 +- + net/ax25/ax25_in.c | 4 +- + net/ax25/ax25_out.c | 2 +- + net/batman-adv/bridge_loop_avoidance.c | 14 +- + net/batman-adv/multicast.c | 2 +- + net/batman-adv/routing.c | 3 +- + net/batman-adv/soft-interface.c | 2 +- + net/batman-adv/tp_meter.c | 2 +- + net/batman-adv/tvlv.c | 4 +- + net/batman-adv/tvlv.h | 4 +- + net/bluetooth/6lowpan.c | 4 +- + net/bluetooth/Makefile | 3 +- + net/bluetooth/bnep/core.c | 2 +- + net/bluetooth/eir.c | 335 + + net/bluetooth/eir.h | 72 + + net/bluetooth/hci_codec.c | 238 + + net/bluetooth/hci_codec.h | 7 + + net/bluetooth/hci_conn.c | 168 +- + net/bluetooth/hci_core.c | 320 +- + net/bluetooth/hci_debugfs.c | 123 + + net/bluetooth/hci_debugfs.h | 5 + + net/bluetooth/hci_event.c | 135 +- + net/bluetooth/hci_request.c | 478 +- + net/bluetooth/hci_request.h | 25 +- + net/bluetooth/hci_sock.c | 214 +- + net/bluetooth/l2cap_core.c | 2 +- + net/bluetooth/l2cap_sock.c | 10 +- + net/bluetooth/mgmt.c | 445 +- + net/bluetooth/msft.c | 172 +- + net/bluetooth/msft.h | 9 + + net/bluetooth/rfcomm/core.c | 50 +- + net/bluetooth/rfcomm/sock.c | 46 +- + net/bluetooth/sco.c | 209 +- + net/bpf/test_run.c | 22 +- + net/bridge/br.c | 4 +- + net/bridge/br_fdb.c | 439 +- + net/bridge/br_if.c | 4 +- + net/bridge/br_ioctl.c | 10 +- + net/bridge/br_mdb.c | 4 +- + net/bridge/br_netfilter_hooks.c | 2 +- + net/bridge/br_netlink.c | 4 +- + net/bridge/br_private.h | 6 +- + net/bridge/br_stp_if.c | 2 +- + net/bridge/br_switchdev.c | 79 +- + net/bridge/br_vlan.c | 5 +- + net/bridge/netfilter/ebtable_broute.c | 2 +- + net/bridge/netfilter/ebtable_filter.c | 13 +- + net/bridge/netfilter/ebtable_nat.c | 12 +- + net/bridge/netfilter/ebtables.c | 6 +- + net/caif/caif_usb.c | 2 +- + net/can/bcm.c | 2 +- + net/core/Makefile | 1 + + net/core/dev.c | 92 +- + net/core/devlink.c | 619 +- + net/core/filter.c | 21 + + net/core/flow_dissector.c | 3 +- + net/core/gen_estimator.c | 52 +- + net/core/gen_stats.c | 186 +- + net/core/neighbour.c | 204 +- + net/core/net-sysfs.c | 57 +- + net/core/net_namespace.c | 4 + + {drivers/of => net/core}/of_net.c | 25 + + net/core/page_pool.c | 10 +- + net/core/rtnetlink.c | 13 +- + net/core/selftests.c | 8 +- + net/core/skbuff.c | 27 +- + net/core/sock.c | 104 +- + net/core/stream.c | 5 +- + net/dccp/dccp.h | 2 +- + net/dccp/proto.c | 14 +- + net/dsa/Kconfig | 20 +- + net/dsa/Makefile | 3 +- + net/dsa/dsa.c | 22 +- + net/dsa/dsa2.c | 77 +- + net/dsa/port.c | 23 +- + net/dsa/slave.c | 86 +- + net/dsa/switch.c | 249 +- + net/dsa/tag_8021q.c | 114 +- + net/dsa/tag_ksz.c | 1 - + net/dsa/tag_ocelot.c | 39 + + net/dsa/tag_ocelot_8021q.c | 2 +- + net/dsa/tag_rtl4_a.c | 2 +- + net/dsa/tag_rtl8_4.c | 178 + + net/dsa/tag_sja1105.c | 9 +- + net/ethernet/eth.c | 102 +- + net/ethtool/Makefile | 2 +- + net/ethtool/ioctl.c | 23 +- + net/ethtool/module.c | 180 + + net/ethtool/netlink.c | 19 + + net/ethtool/netlink.h | 4 + + net/hsr/hsr_device.c | 10 +- + net/hsr/hsr_forward.c | 54 +- + net/hsr/hsr_framereg.c | 65 +- + net/hsr/hsr_framereg.h | 4 +- + net/hsr/hsr_main.c | 2 +- + net/hsr/hsr_main.h | 16 +- + net/ieee802154/6lowpan/core.c | 2 +- + net/ipv4/af_inet.c | 12 +- + net/ipv4/cipso_ipv4.c | 2 +- + net/ipv4/datagram.c | 1 - + net/ipv4/fib_notifier.c | 1 - + net/ipv4/inet_connection_sock.c | 4 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_sockglue.c | 11 +- + net/ipv4/ip_tunnel.c | 2 +- + net/ipv4/ip_vti.c | 2 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 7 +- + net/ipv4/netfilter/arptable_filter.c | 10 +- + net/ipv4/netfilter/ip_tables.c | 7 +- + net/ipv4/netfilter/iptable_filter.c | 9 +- + net/ipv4/netfilter/iptable_mangle.c | 8 +- + net/ipv4/netfilter/iptable_nat.c | 15 +- + net/ipv4/netfilter/iptable_raw.c | 10 +- + net/ipv4/netfilter/iptable_security.c | 9 +- + net/ipv4/proc.c | 2 +- + net/ipv4/route.c | 8 - + net/ipv4/syncookies.c | 2 - + net/ipv4/sysctl_net_ipv4.c | 21 - + net/ipv4/tcp.c | 97 +- + net/ipv4/tcp_fastopen.c | 6 - + net/ipv4/tcp_input.c | 37 +- + net/ipv4/tcp_ipv4.c | 31 +- + net/ipv4/tcp_minisocks.c | 7 - + net/ipv4/tcp_nv.c | 1 - + net/ipv4/tcp_output.c | 15 +- + net/ipv4/tcp_rate.c | 6 + + net/ipv4/udp_tunnel_core.c | 3 - + net/ipv6/Kconfig | 6 +- + net/ipv6/Makefile | 11 +- + net/ipv6/addrconf.c | 7 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/ila/ila_xlat.c | 6 +- + net/ipv6/ioam6.c | 11 +- + net/ipv6/ioam6_iptunnel.c | 300 +- + net/ipv6/ip6_gre.c | 4 +- + net/ipv6/ip6_tunnel.c | 2 +- + net/ipv6/ip6_vti.c | 2 +- + net/ipv6/ipv6_sockglue.c | 11 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/netfilter/ip6_tables.c | 6 +- + net/ipv6/netfilter/ip6table_filter.c | 10 +- + net/ipv6/netfilter/ip6table_mangle.c | 8 +- + net/ipv6/netfilter/ip6table_nat.c | 15 +- + net/ipv6/netfilter/ip6table_raw.c | 10 +- + net/ipv6/netfilter/ip6table_security.c | 9 +- + net/ipv6/seg6.c | 8 +- + net/ipv6/seg6_hmac.c | 4 +- + net/ipv6/sit.c | 4 +- + net/ipv6/tcp_ipv6.c | 41 +- + net/ipv6/udp.c | 4 +- + net/llc/llc_c_ac.c | 2 +- + net/llc/llc_if.c | 2 +- + net/llc/llc_output.c | 2 +- + net/llc/llc_proc.c | 2 +- + net/mac80211/agg-rx.c | 14 +- + net/mac80211/cfg.c | 38 + + net/mac80211/debugfs_sta.c | 123 +- + net/mac80211/fils_aead.c | 22 +- + net/mac80211/ibss.c | 33 +- + net/mac80211/ieee80211_i.h | 35 +- + net/mac80211/iface.c | 39 +- + net/mac80211/mesh.c | 87 +- + net/mac80211/mesh_hwmp.c | 44 +- + net/mac80211/mesh_plink.c | 11 +- + net/mac80211/mesh_sync.c | 26 +- + net/mac80211/mlme.c | 355 +- + net/mac80211/pm.c | 4 + + net/mac80211/rx.c | 12 +- + net/mac80211/s1g.c | 8 +- + net/mac80211/scan.c | 16 +- + net/mac80211/sta_info.c | 3 + + net/mac80211/tdls.c | 63 +- + net/mac80211/tx.c | 206 +- + net/mac80211/util.c | 40 +- + net/mac802154/iface.c | 17 +- + net/mctp/Kconfig | 5 + + net/mctp/Makefile | 3 + + net/mctp/af_mctp.c | 152 +- + net/mctp/device.c | 53 +- + net/mctp/neigh.c | 4 +- + net/mctp/route.c | 289 +- + net/mctp/test/route-test.c | 544 + + net/mctp/test/utils.c | 67 + + net/mctp/test/utils.h | 20 + + net/mptcp/mib.c | 17 +- + net/mptcp/mptcp_diag.c | 26 +- + net/mptcp/options.c | 15 +- + net/mptcp/pm_netlink.c | 9 +- + net/mptcp/protocol.c | 212 +- + net/mptcp/protocol.h | 4 - + net/mptcp/sockopt.c | 279 + + net/netfilter/Kconfig | 11 + + net/netfilter/core.c | 38 +- + net/netfilter/ipvs/ip_vs_core.c | 166 +- + net/netfilter/ipvs/ip_vs_ctl.c | 8 + + net/netfilter/ipvs/ip_vs_est.c | 5 + + net/netfilter/nf_conntrack_proto.c | 16 + + net/netfilter/nf_nat_core.c | 12 +- + net/netfilter/nfnetlink_hook.c | 16 +- + net/netfilter/nft_chain_filter.c | 4 +- + net/netfilter/nft_dynset.c | 11 +- + net/netfilter/xt_RATEEST.c | 7 +- + net/netlink/af_netlink.c | 23 +- + net/netrom/af_netrom.c | 4 +- + net/netrom/nr_dev.c | 8 +- + net/netrom/nr_route.c | 4 +- + net/nfc/hci/command.c | 16 - + net/nfc/hci/llc_shdlc.c | 35 +- + net/nfc/llcp_commands.c | 8 - + net/nfc/llcp_core.c | 5 +- + net/nfc/nci/core.c | 4 - + net/nfc/nci/hci.c | 4 - + net/nfc/nci/ntf.c | 9 - + net/nfc/nci/uart.c | 16 +- + net/packet/af_packet.c | 35 + + net/qrtr/Makefile | 3 +- + net/qrtr/{qrtr.c => af_qrtr.c} | 0 + net/rose/af_rose.c | 5 +- + net/rose/rose_dev.c | 8 +- + net/rose/rose_link.c | 8 +- + net/rose/rose_route.c | 10 +- + net/rxrpc/rtt.c | 2 +- + net/sched/act_api.c | 21 +- + net/sched/act_bpf.c | 2 +- + net/sched/act_ife.c | 4 +- + net/sched/act_mpls.c | 2 +- + net/sched/act_police.c | 4 +- + net/sched/act_sample.c | 2 +- + net/sched/act_simple.c | 3 +- + net/sched/act_skbedit.c | 2 +- + net/sched/act_skbmod.c | 2 +- + net/sched/sch_api.c | 25 +- + net/sched/sch_atm.c | 6 +- + net/sched/sch_cbq.c | 15 +- + net/sched/sch_drr.c | 13 +- + net/sched/sch_ets.c | 17 +- + net/sched/sch_fq_codel.c | 20 +- + net/sched/sch_generic.c | 46 +- + net/sched/sch_gred.c | 65 +- + net/sched/sch_hfsc.c | 11 +- + net/sched/sch_htb.c | 43 +- + net/sched/sch_mq.c | 31 +- + net/sched/sch_mqprio.c | 64 +- + net/sched/sch_multiq.c | 3 +- + net/sched/sch_netem.c | 2 +- + net/sched/sch_prio.c | 4 +- + net/sched/sch_qfq.c | 13 +- + net/sched/sch_taprio.c | 2 +- + net/sched/sch_tbf.c | 16 + + net/smc/af_smc.c | 447 +- + net/smc/smc.h | 23 +- + net/smc/smc_clc.c | 463 +- + net/smc/smc_clc.h | 72 +- + net/smc/smc_core.c | 183 +- + net/smc/smc_core.h | 51 +- + net/smc/smc_ib.c | 160 +- + net/smc/smc_ib.h | 16 +- + net/smc/smc_ism.c | 16 +- + net/smc/smc_ism.h | 2 +- + net/smc/smc_llc.c | 623 +- + net/smc/smc_llc.h | 12 +- + net/smc/smc_netlink.c | 47 +- + net/smc/smc_netlink.h | 2 + + net/smc/smc_pnet.c | 41 +- + net/smc/smc_wr.c | 237 +- + net/smc/smc_wr.h | 8 + + net/switchdev/switchdev.c | 156 +- + net/tipc/bearer.c | 4 +- + net/tipc/bearer.h | 2 +- + net/tipc/eth_media.c | 2 +- + net/tipc/ib_media.c | 2 +- + net/tls/tls_main.c | 88 + + net/tls/tls_sw.c | 54 +- + net/vmw_vsock/af_vsock.c | 80 +- + net/wireless/Makefile | 4 +- + net/wireless/core.c | 10 + + net/wireless/nl80211.c | 452 +- + net/wireless/rdev-ops.h | 14 + + net/wireless/scan.c | 59 +- + net/wireless/trace.h | 31 + + net/wireless/util.c | 2 + + net/xdp/xsk.c | 15 - + net/xdp/xsk_buff_pool.c | 132 +- + net/xdp/xsk_queue.h | 12 +- + samples/bpf/xdp_router_ipv4_user.c | 39 +- + tools/bpf/bpftool/Makefile | 3 + + tools/bpf/bpftool/btf.c | 12 + + tools/bpf/bpftool/feature.c | 1 + + tools/bpf/bpftool/gen.c | 36 +- + tools/bpf/resolve_btfids/Makefile | 5 +- + tools/include/uapi/linux/bpf.h | 42 +- + tools/include/uapi/linux/btf.h | 55 +- + tools/lib/bpf/.gitignore | 1 - + tools/lib/bpf/Makefile | 39 +- + tools/lib/bpf/bpf_helpers.h | 51 +- + tools/lib/bpf/btf.c | 84 +- + tools/lib/bpf/btf.h | 87 + + tools/lib/bpf/btf_dump.c | 3 + + tools/lib/bpf/gen_loader.c | 7 +- + tools/lib/bpf/libbpf.c | 1091 +- + tools/lib/bpf/libbpf.h | 108 +- + tools/lib/bpf/libbpf.map | 5 + + tools/lib/bpf/libbpf_common.h | 24 + + tools/lib/bpf/libbpf_internal.h | 34 +- + tools/lib/bpf/libbpf_legacy.h | 9 + + tools/lib/bpf/libbpf_version.h | 9 + + tools/lib/bpf/skel_internal.h | 6 +- + tools/lib/bpf/xsk.c | 4 +- + tools/testing/selftests/bpf/.gitignore | 5 +- + tools/testing/selftests/bpf/Makefile | 7 +- + tools/testing/selftests/bpf/README.rst | 27 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 19 +- + tools/testing/selftests/bpf/btf_helpers.c | 7 +- + .../selftests/bpf/prog_tests/attach_probe.c | 24 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 6 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 441 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 27 +- + tools/testing/selftests/bpf/prog_tests/btf_tag.c | 20 + + tools/testing/selftests/bpf/prog_tests/btf_write.c | 21 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 17 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 43 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 4 +- + .../selftests/bpf/prog_tests/get_branch_snapshot.c | 99 + + .../selftests/bpf/prog_tests/module_attach.c | 39 - + .../testing/selftests/bpf/prog_tests/probe_user.c | 4 +- + .../selftests/bpf/prog_tests/reference_tracking.c | 52 +- + tools/testing/selftests/bpf/prog_tests/sk_assign.c | 2 +- + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 6 + + tools/testing/selftests/bpf/prog_tests/skeleton.c | 6 + + .../selftests/bpf/prog_tests/sockopt_multi.c | 30 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 83 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- + .../selftests/bpf/prog_tests/trace_printk.c | 24 +- + .../selftests/bpf/prog_tests/trace_vprintk.c | 68 + + tools/testing/selftests/bpf/prog_tests/xdpwall.c | 15 + + tools/testing/selftests/bpf/progs/bpf_cubic.c | 12 +- + tools/testing/selftests/bpf/progs/bpf_flow.c | 3 +- + .../bpf/progs/cg_storage_multi_isolated.c | 4 +- + .../selftests/bpf/progs/cg_storage_multi_shared.c | 4 +- + .../selftests/bpf/progs/for_each_array_map_elem.c | 2 +- + .../selftests/bpf/progs/for_each_hash_map_elem.c | 2 +- + .../selftests/bpf/progs/get_branch_snapshot.c | 40 + + tools/testing/selftests/bpf/progs/kfree_skb.c | 4 +- + .../testing/selftests/bpf/progs/kfunc_call_test.c | 4 +- + .../selftests/bpf/progs/kfunc_call_test_subprog.c | 2 +- + .../selftests/bpf/progs/perf_event_stackmap.c | 4 +- + tools/testing/selftests/bpf/progs/skb_pkt_end.c | 2 +- + .../selftests/bpf/progs/sockmap_verdict_prog.c | 12 +- + tools/testing/selftests/bpf/progs/sockopt_multi.c | 5 +- + tools/testing/selftests/bpf/progs/tag.c | 49 + + tools/testing/selftests/bpf/progs/tailcall1.c | 7 +- + tools/testing/selftests/bpf/progs/tailcall2.c | 23 +- + tools/testing/selftests/bpf/progs/tailcall3.c | 7 +- + tools/testing/selftests/bpf/progs/tailcall4.c | 7 +- + tools/testing/selftests/bpf/progs/tailcall5.c | 7 +- + tools/testing/selftests/bpf/progs/tailcall6.c | 34 + + .../selftests/bpf/progs/tailcall_bpf2bpf1.c | 7 +- + .../selftests/bpf/progs/tailcall_bpf2bpf2.c | 7 +- + .../selftests/bpf/progs/tailcall_bpf2bpf3.c | 11 +- + .../selftests/bpf/progs/tailcall_bpf2bpf4.c | 15 +- + .../selftests/bpf/progs/test_btf_map_in_map.c | 14 +- + .../selftests/bpf/progs/test_btf_skc_cls_ingress.c | 2 +- + .../testing/selftests/bpf/progs/test_cgroup_link.c | 4 +- + tools/testing/selftests/bpf/progs/test_check_mtu.c | 12 +- + .../selftests/bpf/progs/test_cls_redirect.c | 2 +- + .../testing/selftests/bpf/progs/test_global_data.c | 2 +- + .../selftests/bpf/progs/test_global_func1.c | 2 +- + .../selftests/bpf/progs/test_global_func3.c | 2 +- + .../selftests/bpf/progs/test_global_func5.c | 2 +- + .../selftests/bpf/progs/test_global_func6.c | 2 +- + .../selftests/bpf/progs/test_global_func7.c | 2 +- + .../testing/selftests/bpf/progs/test_map_in_map.c | 12 +- + .../selftests/bpf/progs/test_map_in_map_invalid.c | 2 +- + .../bpf/progs/test_misc_tcp_hdr_options.c | 2 +- + .../selftests/bpf/progs/test_pe_preserve_elems.c | 8 +- + .../testing/selftests/bpf/progs/test_perf_buffer.c | 4 +- + .../testing/selftests/bpf/progs/test_pkt_access.c | 2 +- + .../selftests/bpf/progs/test_pkt_md_access.c | 4 +- + .../testing/selftests/bpf/progs/test_probe_user.c | 28 +- + .../bpf/progs/test_select_reuseport_kern.c | 4 +- + tools/testing/selftests/bpf/progs/test_sk_assign.c | 3 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 44 +- + .../selftests/bpf/progs/test_sk_lookup_kern.c | 37 +- + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 6 + + .../testing/selftests/bpf/progs/test_skb_helpers.c | 2 +- + .../selftests/bpf/progs/test_sockmap_listen.c | 2 +- + .../bpf/progs/test_sockmap_skb_verdict_attach.c | 2 +- + .../selftests/bpf/progs/test_sockmap_update.c | 2 +- + .../selftests/bpf/progs/test_stacktrace_build_id.c | 4 +- + .../selftests/bpf/progs/test_stacktrace_map.c | 4 +- + tools/testing/selftests/bpf/progs/test_tc_bpf.c | 2 +- + tools/testing/selftests/bpf/progs/test_tc_neigh.c | 6 +- + .../selftests/bpf/progs/test_tc_neigh_fib.c | 6 +- + tools/testing/selftests/bpf/progs/test_tc_peer.c | 10 +- + .../bpf/progs/test_tcp_check_syncookie_kern.c | 4 +- + .../selftests/bpf/progs/test_tcp_hdr_options.c | 2 +- + .../selftests/bpf/progs/test_tcpnotify_kern.c | 4 +- + tools/testing/selftests/bpf/progs/test_xdp.c | 2 +- + .../bpf/progs/test_xdp_adjust_tail_grow.c | 2 +- + .../bpf/progs/test_xdp_adjust_tail_shrink.c | 4 +- + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 4 +- + .../selftests/bpf/progs/test_xdp_devmap_helpers.c | 2 +- + tools/testing/selftests/bpf/progs/test_xdp_link.c | 2 +- + tools/testing/selftests/bpf/progs/test_xdp_loop.c | 2 +- + .../selftests/bpf/progs/test_xdp_noinline.c | 4 +- + .../bpf/progs/test_xdp_with_cpumap_helpers.c | 4 +- + .../bpf/progs/test_xdp_with_devmap_helpers.c | 4 +- + tools/testing/selftests/bpf/progs/trace_vprintk.c | 33 + + tools/testing/selftests/bpf/progs/xdp_dummy.c | 2 +- + .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 4 +- + tools/testing/selftests/bpf/progs/xdping_kern.c | 4 +- + tools/testing/selftests/bpf/progs/xdpwall.c | 365 + + tools/testing/selftests/bpf/test_bpftool.py | 22 +- + tools/testing/selftests/bpf/test_btf.h | 3 + + tools/testing/selftests/bpf/test_progs.c | 39 + + tools/testing/selftests/bpf/test_progs.h | 2 + + .../selftests/bpf/test_tcp_check_syncookie.sh | 4 +- + tools/testing/selftests/bpf/test_tunnel.sh | 5 +- + tools/testing/selftests/bpf/test_xdp_meta.sh | 5 +- + tools/testing/selftests/bpf/test_xdp_redirect.sh | 4 +- + .../selftests/bpf/test_xdp_redirect_multi.sh | 2 +- + tools/testing/selftests/bpf/test_xdp_veth.sh | 4 +- + tools/testing/selftests/bpf/test_xdp_vlan.sh | 7 +- + tools/testing/selftests/bpf/trace_helpers.c | 37 + + tools/testing/selftests/bpf/trace_helpers.h | 5 + + tools/testing/selftests/bpf/verifier/ctx_skb.c | 60 + + tools/testing/selftests/bpf/verifier/jit.c | 22 +- + tools/testing/selftests/bpf/verifier/spill_fill.c | 161 + + tools/testing/selftests/bpf/xdping.c | 5 +- + tools/testing/selftests/bpf/xdpxceiver.c | 961 +- + tools/testing/selftests/bpf/xdpxceiver.h | 75 +- + .../drivers/net/dsa/test_bridge_fdb_stress.sh | 47 + + .../drivers/net/mlxsw/devlink_trap_control.sh | 7 +- + .../drivers/net/mlxsw/devlink_trap_policer.sh | 32 +- + .../drivers/net/mlxsw/devlink_trap_tunnel_ipip.sh | 50 +- + .../selftests/drivers/net/mlxsw/mlxsw_lib.sh | 50 + + .../drivers/net/mlxsw/rif_mac_profile_scale.sh | 72 + + .../drivers/net/mlxsw/rif_mac_profiles.sh | 213 + + .../drivers/net/mlxsw/rif_mac_profiles_occ.sh | 117 + + .../selftests/drivers/net/mlxsw/rtnetlink.sh | 112 +- + .../selftests/drivers/net/mlxsw/sch_offload.sh | 276 + + .../selftests/drivers/net/mlxsw/sch_red_core.sh | 129 +- + .../selftests/drivers/net/mlxsw/sch_red_ets.sh | 64 +- + .../selftests/drivers/net/mlxsw/sch_red_root.sh | 8 + + .../mlxsw/spectrum-2/devlink_trap_tunnel_ipip6.sh | 250 + + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 9 +- + .../net/mlxsw/spectrum-2/rif_mac_profile_scale.sh | 16 + + .../net/mlxsw/spectrum/devlink_lib_spectrum.sh | 6 +- + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 2 +- + .../net/mlxsw/spectrum/rif_mac_profile_scale.sh | 16 + + .../selftests/drivers/net/mlxsw/tc_restrictions.sh | 3 +- + .../selftests/drivers/net/mlxsw/tc_sample.sh | 13 +- + .../drivers/net/netdevsim/ethtool-common.sh | 2 +- + .../drivers/net/netdevsim/tc-mq-visibility.sh | 77 + + .../drivers/net/ocelot/tc_flower_chains.sh | 50 +- + tools/testing/selftests/net/fib_nexthops.sh | 1 + + .../selftests/net/forwarding/devlink_lib.sh | 6 - + .../net/forwarding/forwarding.config.sample | 4 + + .../selftests/net/forwarding/ip6gre_flat.sh | 65 + + .../selftests/net/forwarding/ip6gre_flat_key.sh | 65 + + .../selftests/net/forwarding/ip6gre_flat_keys.sh | 65 + + .../selftests/net/forwarding/ip6gre_hier.sh | 65 + + .../selftests/net/forwarding/ip6gre_hier_key.sh | 65 + + .../selftests/net/forwarding/ip6gre_hier_keys.sh | 65 + + .../testing/selftests/net/forwarding/ip6gre_lib.sh | 438 + + tools/testing/selftests/net/forwarding/lib.sh | 19 +- + .../testing/selftests/net/forwarding/tc_common.sh | 10 + + tools/testing/selftests/net/ioam6.sh | 208 +- + tools/testing/selftests/net/mptcp/.gitignore | 1 + + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +- + tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 683 + + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 31 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 6 +- + tools/testing/selftests/net/tls.c | 28 +- + 1843 files changed, 188182 insertions(+), 39783 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-timecard + create mode 100644 Documentation/bpf/bpf_licensing.rst + create mode 100644 Documentation/devicetree/bindings/net/asix,ax88796c.yaml + delete mode 100644 Documentation/devicetree/bindings/net/dsa/qca8k.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/qca8k.yaml + create mode 100644 Documentation/devicetree/bindings/net/lantiq,etop-xway.yaml + delete mode 100644 Documentation/devicetree/bindings/net/lantiq,xrx200-net.txt + create mode 100644 Documentation/devicetree/bindings/net/lantiq,xrx200-net.yaml + delete mode 100644 Documentation/devicetree/bindings/net/wireless/qca,ath9k.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml + create mode 100644 Documentation/networking/devlink/iosm.rst + create mode 100644 drivers/net/dsa/rtl8365mb.c + create mode 100644 drivers/net/ethernet/asix/Kconfig + create mode 100644 drivers/net/ethernet/asix/Makefile + create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.c + create mode 100644 drivers/net/ethernet/asix/ax88796c_ioctl.h + create mode 100644 drivers/net/ethernet/asix/ax88796c_main.c + create mode 100644 drivers/net/ethernet/asix/ax88796c_main.h + create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.c + create mode 100644 drivers/net/ethernet/asix/ax88796c_spi.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_eswitch.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_eswitch.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_repr.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_repr.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_tc_lib.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_tc_lib.h + rename drivers/net/ethernet/mellanox/mlx5/core/{ => lag}/lag.c (92%) + rename drivers/net/ethernet/mellanox/mlx5/core/{ => lag}/lag.h (89%) + rename drivers/net/ethernet/mellanox/mlx5/core/{lag_mp.c => lag/mp.c} (99%) + rename drivers/net/ethernet/mellanox/mlx5/core/{lag_mp.h => lag/mp.h} (91%) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/tout.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag/dev_tracepoint.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/diag/sf_tracepoint.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sf/diag/vhca_tracepoint.h + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_dbg_hsi.h + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_iro_hsi.h + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/eeprom.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/sdio.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/testmode.c + rename drivers/net/wireless/mediatek/mt76/{mt7615 => }/sdio.h (72%) + rename drivers/net/wireless/mediatek/mt76/{mt7615 => }/sdio_txrx.c (67%) + create mode 100644 drivers/net/wireless/realtek/rtw89/Kconfig + create mode 100644 drivers/net/wireless/realtek/rtw89/Makefile + create mode 100644 drivers/net/wireless/realtek/rtw89/cam.c + create mode 100644 drivers/net/wireless/realtek/rtw89/cam.h + create mode 100644 drivers/net/wireless/realtek/rtw89/coex.c + create mode 100644 drivers/net/wireless/realtek/rtw89/coex.h + create mode 100644 drivers/net/wireless/realtek/rtw89/core.c + create mode 100644 drivers/net/wireless/realtek/rtw89/core.h + create mode 100644 drivers/net/wireless/realtek/rtw89/debug.c + create mode 100644 drivers/net/wireless/realtek/rtw89/debug.h + create mode 100644 drivers/net/wireless/realtek/rtw89/efuse.c + create mode 100644 drivers/net/wireless/realtek/rtw89/efuse.h + create mode 100644 drivers/net/wireless/realtek/rtw89/fw.c + create mode 100644 drivers/net/wireless/realtek/rtw89/fw.h + create mode 100644 drivers/net/wireless/realtek/rtw89/mac.c + create mode 100644 drivers/net/wireless/realtek/rtw89/mac.h + create mode 100644 drivers/net/wireless/realtek/rtw89/mac80211.c + create mode 100644 drivers/net/wireless/realtek/rtw89/pci.c + create mode 100644 drivers/net/wireless/realtek/rtw89/pci.h + create mode 100644 drivers/net/wireless/realtek/rtw89/phy.c + create mode 100644 drivers/net/wireless/realtek/rtw89/phy.h + create mode 100644 drivers/net/wireless/realtek/rtw89/ps.c + create mode 100644 drivers/net/wireless/realtek/rtw89/ps.h + create mode 100644 drivers/net/wireless/realtek/rtw89/reg.h + create mode 100644 drivers/net/wireless/realtek/rtw89/regd.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852a.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852a.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.h + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852a_table.c + create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852a_table.h + create mode 100644 drivers/net/wireless/realtek/rtw89/sar.c + create mode 100644 drivers/net/wireless/realtek/rtw89/sar.h + create mode 100644 drivers/net/wireless/realtek/rtw89/ser.c + create mode 100644 drivers/net/wireless/realtek/rtw89/ser.h + create mode 100644 drivers/net/wireless/realtek/rtw89/txrx.h + create mode 100644 drivers/net/wireless/realtek/rtw89/util.h + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_coredump.c + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_coredump.h + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_devlink.c + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_devlink.h + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_flash.c + create mode 100644 drivers/net/wwan/iosm/iosm_ipc_flash.h + delete mode 100644 drivers/ptp/idt8a340_reg.h + delete mode 100644 include/linux/netfilter_ingress.h + create mode 100644 include/linux/netfilter_netdev.h + create mode 100644 include/trace/events/mctp.h + create mode 100644 net/bluetooth/eir.c + create mode 100644 net/bluetooth/eir.h + create mode 100644 net/bluetooth/hci_codec.c + create mode 100644 net/bluetooth/hci_codec.h + rename {drivers/of => net/core}/of_net.c (85%) + create mode 100644 net/dsa/tag_rtl8_4.c + create mode 100644 net/ethtool/module.c + create mode 100644 net/mctp/test/route-test.c + create mode 100644 net/mctp/test/utils.c + create mode 100644 net/mctp/test/utils.h + rename net/qrtr/{qrtr.c => af_qrtr.c} (100%) + create mode 100644 tools/lib/bpf/libbpf_version.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_tag.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/get_branch_snapshot.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/trace_vprintk.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdpwall.c + create mode 100644 tools/testing/selftests/bpf/progs/get_branch_snapshot.c + create mode 100644 tools/testing/selftests/bpf/progs/tag.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall6.c + create mode 100644 tools/testing/selftests/bpf/progs/trace_vprintk.c + create mode 100644 tools/testing/selftests/bpf/progs/xdpwall.c + create mode 100755 tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/rif_mac_profile_scale.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/rif_mac_profiles.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/rif_mac_profiles_occ.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/sch_offload.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/devlink_trap_tunnel_ipip6.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/rif_mac_profile_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/rif_mac_profile_scale.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_flat.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_flat_key.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_flat_keys.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_hier.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_hier_key.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_hier_keys.sh + create mode 100644 tools/testing/selftests/net/forwarding/ip6gre_lib.sh + create mode 100644 tools/testing/selftests/net/mptcp/mptcp_sockopt.c +$ git am -3 ../patches/0001-fixup-for-RDMA-mlx5-Replace-struct-mlx5_core_mkey-by.patch +Applying: fixup for "RDMA/mlx5: Replace struct mlx5_core_mkey by u32 key" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/mellanox/mlx5/core/en.h +M drivers/net/ethernet/mellanox/mlx5/core/en_main.c +M drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +$ git add -A . +$ git commit -v -a --amend +[master c30eb0084783] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git + Date: Thu Oct 28 11:54:18 2021 +1100 +Merging bpf-next/for-next (252c765bd764 riscv, bpf: Add BPF exception tables) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging samples/bpf/Makefile +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/core.c +Auto-merging include/linux/filter.h +Auto-merging include/linux/bpf.h +Auto-merging arch/riscv/net/bpf_jit_core.c +Removing arch/mips/net/ebpf_jit.c +Removing arch/mips/net/bpf_jit_asm.S +Removing arch/mips/net/bpf_jit.h +Removing arch/mips/net/bpf_jit.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm/net/bpf_jit_32.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/bpf/btf.rst | 28 +- + .../bpf/libbpf/libbpf_naming_convention.rst | 40 + + MAINTAINERS | 1 + + arch/arm/net/bpf_jit_32.c | 5 - + arch/mips/Kconfig | 15 +- + arch/mips/include/asm/uasm.h | 5 + + arch/mips/mm/uasm-mips.c | 4 +- + arch/mips/mm/uasm.c | 3 +- + arch/mips/net/Makefile | 9 +- + arch/mips/net/bpf_jit.c | 1299 ------------- + arch/mips/net/bpf_jit.h | 81 - + arch/mips/net/bpf_jit_asm.S | 285 --- + arch/mips/net/bpf_jit_comp.c | 1034 +++++++++++ + arch/mips/net/bpf_jit_comp.h | 235 +++ + arch/mips/net/bpf_jit_comp32.c | 1899 +++++++++++++++++++ + arch/mips/net/bpf_jit_comp64.c | 1060 +++++++++++ + arch/mips/net/ebpf_jit.c | 1938 -------------------- + arch/riscv/mm/extable.c | 19 +- + arch/riscv/net/bpf_jit.h | 1 + + arch/riscv/net/bpf_jit_comp64.c | 185 +- + arch/riscv/net/bpf_jit_core.c | 19 +- + arch/x86/net/bpf_jit_comp.c | 130 +- + include/linux/bpf.h | 10 +- + include/linux/bpf_verifier.h | 2 + + include/linux/bpfptr.h | 1 + + include/linux/btf.h | 39 + + include/linux/filter.h | 15 +- + include/trace/bpf_probe.h | 19 +- + include/uapi/linux/bpf.h | 8 + + include/uapi/linux/btf.h | 8 +- + kernel/bpf/btf.c | 103 +- + kernel/bpf/core.c | 4 + + kernel/bpf/preload/.gitignore | 4 +- + kernel/bpf/preload/Makefile | 26 +- + kernel/bpf/preload/iterators/Makefile | 38 +- + kernel/bpf/syscall.c | 26 +- + kernel/bpf/trampoline.c | 12 +- + kernel/bpf/verifier.c | 227 ++- + kernel/trace/bpf_trace.c | 2 + + lib/test_bpf.c | 120 +- + net/bpf/test_run.c | 28 +- + net/core/filter.c | 23 + + net/ipv4/bpf_tcp_ca.c | 36 +- + net/ipv4/tcp_bbr.c | 28 +- + net/ipv4/tcp_cubic.c | 26 +- + net/ipv4/tcp_dctcp.c | 26 +- + samples/bpf/.gitignore | 4 + + samples/bpf/Makefile | 47 +- + samples/bpf/xdp1_user.c | 2 +- + samples/bpf/xdp_redirect_cpu_user.c | 6 +- + samples/bpf/xdp_sample_pkts_user.c | 2 +- + samples/seccomp/bpf-helper.h | 8 +- + scripts/Makefile.modfinal | 1 + + scripts/bpf_doc.py | 2 + + tools/bpf/bpftool/Makefile | 60 +- + tools/bpf/bpftool/btf.c | 150 +- + tools/bpf/bpftool/common.c | 50 +- + tools/bpf/bpftool/gen.c | 161 +- + tools/bpf/bpftool/iter.c | 2 +- + tools/bpf/bpftool/link.c | 45 +- + tools/bpf/bpftool/main.c | 17 +- + tools/bpf/bpftool/main.h | 54 +- + tools/bpf/bpftool/map.c | 45 +- + tools/bpf/bpftool/map_perf_ring.c | 1 - + tools/bpf/bpftool/pids.c | 90 +- + tools/bpf/bpftool/prog.c | 64 +- + tools/bpf/resolve_btfids/Makefile | 16 +- + tools/bpf/resolve_btfids/main.c | 36 +- + tools/bpf/runqslower/Makefile | 22 +- + tools/include/uapi/linux/bpf.h | 8 + + tools/include/uapi/linux/btf.h | 8 +- + tools/lib/bpf/Makefile | 35 +- + tools/lib/bpf/bpf.c | 1 + + tools/lib/bpf/bpf_core_read.h | 2 +- + tools/lib/bpf/bpf_gen_internal.h | 16 +- + tools/lib/bpf/btf.c | 319 ++-- + tools/lib/bpf/btf.h | 39 +- + tools/lib/bpf/btf_dump.c | 64 +- + tools/lib/bpf/gen_loader.c | 314 +++- + tools/lib/bpf/libbpf.c | 1192 +++++++----- + tools/lib/bpf/libbpf.h | 82 +- + tools/lib/bpf/libbpf.map | 11 +- + tools/lib/bpf/libbpf_internal.h | 15 +- + tools/lib/bpf/libbpf_legacy.h | 9 + + tools/lib/bpf/linker.c | 41 +- + tools/lib/bpf/relo_core.c | 2 +- + tools/perf/util/bpf-event.c | 2 +- + tools/testing/selftests/bpf/Makefile | 42 +- + tools/testing/selftests/bpf/README.rst | 4 +- + .../selftests/bpf/bpf_testmod/bpf_testmod-events.h | 15 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 33 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 5 + + tools/testing/selftests/bpf/btf_helpers.c | 12 +- + tools/testing/selftests/bpf/cgroup_helpers.c | 5 +- + tools/testing/selftests/bpf/cgroup_helpers.h | 2 +- + tools/testing/selftests/bpf/flow_dissector_load.c | 18 +- + tools/testing/selftests/bpf/flow_dissector_load.h | 10 +- + tools/testing/selftests/bpf/prog_tests/atomics.c | 1 + + .../selftests/bpf/prog_tests/attach_probe.c | 9 +- + .../selftests/bpf/prog_tests/bpf_iter_setsockopt.c | 2 +- + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 2 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 220 ++- + tools/testing/selftests/bpf/prog_tests/btf.c | 247 ++- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 12 +- + .../testing/selftests/bpf/prog_tests/btf_endian.c | 18 +- + tools/testing/selftests/bpf/prog_tests/btf_split.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf_write.c | 159 +- + .../selftests/bpf/prog_tests/cg_storage_multi.c | 2 +- + .../bpf/prog_tests/cgroup_attach_autodetach.c | 2 +- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 2 +- + .../bpf/prog_tests/cgroup_attach_override.c | 2 +- + .../testing/selftests/bpf/prog_tests/cgroup_link.c | 2 +- + .../testing/selftests/bpf/prog_tests/cgroup_v1v2.c | 2 +- + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 2 +- + .../selftests/bpf/prog_tests/core_autosize.c | 4 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 4 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 9 +- + .../bpf/prog_tests/flow_dissector_load_bytes.c | 2 +- + .../bpf/prog_tests/flow_dissector_reattach.c | 2 +- + .../selftests/bpf/prog_tests/get_branch_snapshot.c | 39 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 11 +- + .../selftests/bpf/prog_tests/global_data_init.c | 2 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 5 +- + .../selftests/bpf/prog_tests/ksyms_module.c | 29 +- + .../selftests/bpf/prog_tests/ksyms_module_libbpf.c | 28 + + .../selftests/bpf/prog_tests/migrate_reuseport.c | 2 +- + .../selftests/bpf/prog_tests/modify_return.c | 3 +- + .../selftests/bpf/prog_tests/module_attach.c | 35 + + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 3 +- + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 24 +- + tools/testing/selftests/bpf/prog_tests/perf_link.c | 3 +- + .../testing/selftests/bpf/prog_tests/probe_user.c | 3 +- + .../bpf/prog_tests/raw_tp_writable_test_run.c | 3 +- + .../testing/selftests/bpf/prog_tests/rdonly_maps.c | 2 +- + tools/testing/selftests/bpf/prog_tests/recursion.c | 10 +- + .../selftests/bpf/prog_tests/resolve_btfids.c | 14 +- + .../selftests/bpf/prog_tests/select_reuseport.c | 4 +- + .../bpf/prog_tests/send_signal_sched_switch.c | 3 +- + .../selftests/bpf/prog_tests/signal_pending.c | 2 +- + .../selftests/bpf/prog_tests/sk_storage_tracing.c | 2 +- + .../selftests/bpf/prog_tests/skc_to_unix_sock.c | 54 + + tools/testing/selftests/bpf/prog_tests/skeleton.c | 29 + + tools/testing/selftests/bpf/prog_tests/snprintf.c | 4 +- + .../selftests/bpf/prog_tests/snprintf_btf.c | 2 +- + .../testing/selftests/bpf/prog_tests/sock_fields.c | 2 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 2 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 16 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 2 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 3 +- + tools/testing/selftests/bpf/prog_tests/timer_mim.c | 2 +- + .../selftests/bpf/prog_tests/tp_attach_query.c | 2 +- + .../selftests/bpf/prog_tests/trace_printk.c | 2 +- + .../selftests/bpf/prog_tests/trace_vprintk.c | 2 +- + .../selftests/bpf/prog_tests/trampoline_count.c | 3 +- + .../testing/selftests/bpf/prog_tests/verif_stats.c | 28 + + .../selftests/bpf/prog_tests/xdp_adjust_tail.c | 6 +- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 2 +- + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 2 +- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 2 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 6 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp_link.c | 2 +- + tools/testing/selftests/bpf/progs/atomics.c | 16 + + .../bpf/progs/btf_dump_test_case_bitfields.c | 10 +- + .../bpf/progs/btf_dump_test_case_packing.c | 4 +- + .../bpf/progs/btf_dump_test_case_padding.c | 2 +- + .../bpf/progs/btf_dump_test_case_syntax.c | 2 +- + .../bpf/progs/cgroup_skb_sk_lookup_kern.c | 1 - + .../testing/selftests/bpf/progs/connect4_dropper.c | 2 +- + tools/testing/selftests/bpf/progs/connect4_prog.c | 2 - + tools/testing/selftests/bpf/progs/connect6_prog.c | 2 - + .../selftests/bpf/progs/connect_force_port4.c | 1 - + .../selftests/bpf/progs/connect_force_port6.c | 1 - + tools/testing/selftests/bpf/progs/dev_cgroup.c | 1 - + tools/testing/selftests/bpf/progs/fexit_sleep.c | 4 +- + .../selftests/bpf/progs/get_cgroup_id_kern.c | 1 - + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 1 - + tools/testing/selftests/bpf/progs/netcnt_prog.c | 1 - + tools/testing/selftests/bpf/progs/recursion.c | 9 +- + tools/testing/selftests/bpf/progs/sendmsg4_prog.c | 2 - + tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 2 - + .../selftests/bpf/progs/sockmap_parse_prog.c | 2 - + .../selftests/bpf/progs/sockmap_tcp_msg_prog.c | 2 - + .../selftests/bpf/progs/sockmap_verdict_prog.c | 2 - + .../testing/selftests/bpf/progs/sockopt_inherit.c | 1 - + tools/testing/selftests/bpf/progs/tag.c | 15 +- + tools/testing/selftests/bpf/progs/tcp_rtt.c | 1 - + tools/testing/selftests/bpf/progs/test_btf_haskv.c | 2 - + tools/testing/selftests/bpf/progs/test_btf_newkv.c | 2 - + tools/testing/selftests/bpf/progs/test_btf_nokv.c | 2 - + .../selftests/bpf/progs/test_core_reloc_mods.c | 9 + + .../selftests/bpf/progs/test_enable_stats.c | 2 +- + .../selftests/bpf/progs/test_ksyms_module.c | 46 +- + tools/testing/selftests/bpf/progs/test_l4lb.c | 2 - + .../testing/selftests/bpf/progs/test_map_in_map.c | 1 - + .../selftests/bpf/progs/test_module_attach.c | 14 + + .../testing/selftests/bpf/progs/test_perf_buffer.c | 18 +- + tools/testing/selftests/bpf/progs/test_pinning.c | 2 - + .../selftests/bpf/progs/test_pinning_invalid.c | 2 - + .../testing/selftests/bpf/progs/test_pkt_access.c | 1 - + .../selftests/bpf/progs/test_queue_stack_map.h | 2 - + .../bpf/progs/test_select_reuseport_kern.c | 2 - + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 1 - + .../selftests/bpf/progs/test_skb_cgroup_id_kern.c | 2 - + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 1 - + .../selftests/bpf/progs/test_skc_to_unix_sock.c | 40 + + tools/testing/selftests/bpf/progs/test_skeleton.c | 18 + + .../selftests/bpf/progs/test_sockmap_kern.h | 1 - + .../selftests/bpf/progs/test_sockmap_listen.c | 1 - + .../selftests/bpf/progs/test_stacktrace_build_id.c | 1 - + .../testing/selftests/bpf/progs/test_tcp_estats.c | 1 - + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 1 - + .../selftests/bpf/progs/test_tcpnotify_kern.c | 2 - + .../testing/selftests/bpf/progs/test_tracepoint.c | 1 - + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 2 - + tools/testing/selftests/bpf/progs/test_xdp.c | 2 - + tools/testing/selftests/bpf/progs/test_xdp_loop.c | 2 - + .../selftests/bpf/progs/test_xdp_redirect.c | 2 - + tools/testing/selftests/bpf/test_bpftool_build.sh | 4 + + tools/testing/selftests/bpf/test_btf.h | 4 +- + tools/testing/selftests/bpf/test_flow_dissector.sh | 10 +- + tools/testing/selftests/bpf/test_progs.c | 671 ++++++- + tools/testing/selftests/bpf/test_progs.h | 38 +- + tools/testing/selftests/bpf/test_sysctl.c | 4 +- + tools/testing/selftests/bpf/test_verifier.c | 12 +- + tools/testing/selftests/bpf/trace_helpers.c | 36 - + tools/testing/selftests/bpf/trace_helpers.h | 5 - + .../selftests/bpf/verifier/atomic_cmpxchg.c | 38 + + .../testing/selftests/bpf/verifier/atomic_fetch.c | 57 + + .../selftests/bpf/verifier/atomic_invalid.c | 25 + + tools/testing/selftests/bpf/verifier/calls.c | 23 + + tools/testing/selftests/bpf/verifier/ctx_skb.c | 14 +- + tools/testing/selftests/bpf/verifier/jit.c | 47 + + tools/testing/selftests/bpf/verifier/lwt.c | 2 +- + .../bpf/verifier/perf_event_sample_period.c | 6 +- + tools/testing/selftests/bpf/vmtest.sh | 6 +- + tools/testing/selftests/bpf/xdping.c | 2 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 6 +- + 238 files changed, 9164 insertions(+), 5544 deletions(-) + delete mode 100644 arch/mips/net/bpf_jit.c + delete mode 100644 arch/mips/net/bpf_jit.h + delete mode 100644 arch/mips/net/bpf_jit_asm.S + create mode 100644 arch/mips/net/bpf_jit_comp.c + create mode 100644 arch/mips/net/bpf_jit_comp.h + create mode 100644 arch/mips/net/bpf_jit_comp32.c + create mode 100644 arch/mips/net/bpf_jit_comp64.c + delete mode 100644 arch/mips/net/ebpf_jit.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksyms_module_libbpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/skc_to_unix_sock.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/verif_stats.c + create mode 100644 tools/testing/selftests/bpf/progs/test_skc_to_unix_sock.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_fetch.c + create mode 100644 tools/testing/selftests/bpf/verifier/atomic_invalid.c +Merging ipsec-next/master (83688aec17bf net/ipv4/xfrm4_tunnel.c: remove superfluous header files from xfrm4_tunnel.c) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_tunnel.c | 2 -- + 1 file changed, 2 deletions(-) +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. +Merge made by the 'recursive' strategy. +Merging netfilter-next/master (241eb3f3ee42 netfilter: ebtables: use array_size() helper in copy_{from,to}_user()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Auto-merging net/bridge/netfilter/ebtables.c +Merge made by the 'recursive' strategy. + net/bridge/netfilter/ebtables.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging ipvs-next/master (241eb3f3ee42 netfilter: ebtables: use array_size() helper in copy_{from,to}_user()) +$ 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 (a427aca0a931 Merge tag 'mt76-for-kvalo-2021-10-23' of https://github.com/nbd168/wireless) +$ 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 +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/1000.c | 5 - + drivers/net/wireless/intel/iwlwifi/cfg/2000.c | 5 - + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 31 +++ + drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 5 - + drivers/net/wireless/intel/iwlwifi/cfg/6000.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 11 +- + drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/led.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/led.h | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 6 - + drivers/net/wireless/intel/iwlwifi/dvm/power.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/power.h | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/scan.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/tt.c | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/tt.h | 4 - + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 5 - + drivers/net/wireless/intel/iwlwifi/dvm/ucode.c | 5 - + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 57 +++++ + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 18 ++ + .../net/wireless/intel/iwlwifi/fw/api/location.h | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 3 + + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 23 ++ + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 234 ++++++++++++++++--- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 31 +-- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 40 +++- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 46 +++- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 9 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 4 - + drivers/net/wireless/intel/iwlwifi/fw/file.h | 10 + + drivers/net/wireless/intel/iwlwifi/fw/img.c | 58 +---- + drivers/net/wireless/intel/iwlwifi/fw/img.h | 12 + + drivers/net/wireless/intel/iwlwifi/fw/init.c | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/paging.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/rs.c | 252 +++++++++++++++++++++ + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 5 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 8 +- + .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 7 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 166 +++++++++++++- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-debug.c | 24 +- + drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 26 ++- + .../net/wireless/intel/iwlwifi/iwl-devtrace-data.h | 5 - + .../net/wireless/intel/iwlwifi/iwl-devtrace-io.h | 5 - + .../wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 5 - + .../net/wireless/intel/iwlwifi/iwl-devtrace-msg.h | 5 - + .../wireless/intel/iwlwifi/iwl-devtrace-ucode.h | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h | 5 - + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 44 +++- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 3 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-read.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 17 ++ + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 36 +++ + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 30 ++- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 19 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 15 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 36 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 38 +++- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 204 ++++++++++------- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 184 ++++++++++++++- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 28 +-- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 182 +++++---------- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 17 -- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 39 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 119 ++++++---- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 117 +++++++--- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 54 +++-- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 4 + + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 151 ++++++++++++ + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 38 +--- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 45 ++-- + drivers/net/wireless/marvell/libertas/if_usb.c | 2 + + drivers/net/wireless/marvell/libertas/mesh.c | 18 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 + + drivers/net/wireless/mediatek/mt76/eeprom.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 22 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 1 + + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 167 ++++++++++++-- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 8 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 34 +-- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 204 +++++++++++++---- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 23 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 3 + + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 17 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 17 ++ + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 3 +- + drivers/net/wireless/mediatek/mt76/util.h | 10 +- + drivers/net/wireless/realtek/rtw89/core.c | 6 +- + drivers/net/wireless/realtek/rtw89/mac.c | 2 +- + drivers/net/wireless/realtek/rtw89/pci.h | 5 - + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 +- + drivers/net/wireless/ti/wlcore/spi.c | 9 +- + 113 files changed, 2395 insertions(+), 906 deletions(-) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/rs.c +Merging bluetooth/master (c603bf1f94d0 Bluetooth: btmtksdio: add MT7921s Bluetooth support) +$ 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 | 336 +--------------------------- + 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 + + net/bluetooth/cmtp/core.c | 4 +- + net/bluetooth/hci_codec.c | 18 +- + net/bluetooth/hci_core.c | 1 + + net/bluetooth/hci_event.c | 16 +- + net/bluetooth/hci_sock.c | 11 +- + net/bluetooth/hci_sysfs.c | 2 + + net/bluetooth/l2cap_sock.c | 19 ++ + net/bluetooth/mgmt.c | 15 +- + 21 files changed, 860 insertions(+), 617 deletions(-) + create mode 100644 drivers/bluetooth/btmtk.c + create mode 100644 drivers/bluetooth/btmtk.h +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 (c13de2386c78 mtd: core: don't remove debugfs directory if device is in use) +$ 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 MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +-- + 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 - + 6 files changed, 27 insertions(+), 14 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++++++++ + 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 ++++++++++------ + include/linux/mtd/mtd.h | 2 -- + 36 files changed, 169 insertions(+), 149 deletions(-) +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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 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 +++- + 4 files changed, 8 insertions(+), 12 deletions(-) +Merging crypto/master (3ae88f676aa6 crypto: tcrypt - fix skcipher multi-buffer tests for 1420B blocks) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging drivers/crypto/qat/qat_common/adf_common_drv.h +Auto-merging drivers/crypto/hisilicon/qm.c +Merge made by the 'recursive' strategy. + arch/arm64/crypto/Kconfig | 6 - + arch/arm64/crypto/aes-ce-ccm-core.S | 24 +-- + arch/arm64/crypto/aes-ce-ccm-glue.c | 203 ++++++------------ + arch/arm64/crypto/aes-glue.c | 102 ++------- + arch/arm64/crypto/aes-neonbs-glue.c | 122 +---------- + arch/arm64/crypto/ghash-ce-glue.c | 209 +++++------------- + arch/x86/crypto/aesni-intel_glue.c | 2 +- + crypto/Kconfig | 2 +- + crypto/algapi.c | 73 +++++-- + crypto/api.c | 53 ++++- + crypto/drbg.c | 2 +- + crypto/internal.h | 10 + + crypto/jitterentropy.c | 24 +-- + crypto/tcrypt.c | 5 +- + crypto/testmgr.c | 4 +- + drivers/char/hw_random/Kconfig | 12 +- + drivers/char/hw_random/ixp4xx-rng.c | 4 +- + drivers/char/hw_random/meson-rng.c | 5 +- + drivers/char/hw_random/mtk-rng.c | 9 +- + drivers/char/hw_random/s390-trng.c | 4 +- + drivers/crypto/caam/caampkc.c | 19 +- + drivers/crypto/caam/regs.h | 3 + + drivers/crypto/ccp/sev-dev.c | 2 +- + drivers/crypto/ccree/cc_driver.c | 3 +- + drivers/crypto/hisilicon/qm.c | 74 ++++++- + drivers/crypto/hisilicon/zip/zip_main.c | 2 +- + drivers/crypto/img-hash.c | 7 +- + drivers/crypto/marvell/cesa/cesa.c | 1 - + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 1 + + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 35 ++- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 10 + + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 89 +------- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 13 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 87 +------- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 12 -- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 29 ++- + drivers/crypto/qat/qat_common/adf_common_drv.h | 9 +- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.c | 98 +++++++++ + drivers/crypto/qat/qat_common/adf_gen2_hw_data.h | 27 +++ + drivers/crypto/qat/qat_common/adf_init.c | 5 + + drivers/crypto/qat/qat_common/adf_isr.c | 190 +++++++--------- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 238 ++++++++++++--------- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.h | 9 - + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 4 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 30 +-- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 123 +++++------ + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 14 +- + lib/crypto/sm4.c | 4 +- + 48 files changed, 899 insertions(+), 1114 deletions(-) +Merging drm/drm-next (27f4432577e4 Merge tag 'topic/amdgpu-dp2.0-mst-2021-10-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Removing include/linux/seqno-fence.h +Removing drivers/gpu/drm/zte/zx_vou_regs.h +Removing drivers/gpu/drm/zte/zx_vou.h +Removing drivers/gpu/drm/zte/zx_vou.c +Removing drivers/gpu/drm/zte/zx_vga_regs.h +Removing drivers/gpu/drm/zte/zx_vga.c +Removing drivers/gpu/drm/zte/zx_tvenc_regs.h +Removing drivers/gpu/drm/zte/zx_tvenc.c +Removing drivers/gpu/drm/zte/zx_plane_regs.h +Removing drivers/gpu/drm/zte/zx_plane.h +Removing drivers/gpu/drm/zte/zx_plane.c +Removing drivers/gpu/drm/zte/zx_hdmi_regs.h +Removing drivers/gpu/drm/zte/zx_hdmi.c +Removing drivers/gpu/drm/zte/zx_drm_drv.h +Removing drivers/gpu/drm/zte/zx_drm_drv.c +Removing drivers/gpu/drm/zte/zx_common_regs.h +Removing drivers/gpu/drm/zte/Makefile +Removing drivers/gpu/drm/zte/Kconfig +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +Auto-merging drivers/gpu/drm/rcar-du/rcar_lvds.c +Auto-merging drivers/gpu/drm/rcar-du/rcar_du_encoder.c +Auto-merging drivers/gpu/drm/r128/ati_pcigart.c +Auto-merging drivers/gpu/drm/panel/Kconfig +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging drivers/gpu/drm/msm/Kconfig +Removing drivers/gpu/drm/i915/intel_sideband.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_dram.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gt/intel_context.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c +Removing drivers/gpu/drm/i915/gt/debugfs_gt_pm.h +Removing drivers/gpu/drm/i915/gt/debugfs_gt.c +Removing drivers/gpu/drm/i915/gt/debugfs_engines.h +Removing drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_ttm.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_bw.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_audio.c +Auto-merging drivers/gpu/drm/i915/display/intel_acpi.c +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/drm_panel_orientation_quirks.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_panel_orientation_quirks.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/amd/display/include/dal_asic_id.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device.c +Removing drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Removing drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Removing drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Removing drivers/dma-buf/seqno-fence.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/shmobile_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging MAINTAINERS +Removing Documentation/gpu/rfc/i915_parallel_execbuf.h +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_migrate.c' using previous resolution. +Resolved 'drivers/gpu/drm/drm_panel_orientation_quirks.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_ttm.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gt/intel_context.c' using previous resolution. +Resolved 'drivers/gpu/drm/msm/msm_gem_submit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 95b16e3dcc92] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 7 + + .../bindings/display/panel/panel-edp.yaml | 188 + + .../bindings/display/panel/samsung,s6d27a1.yaml | 98 + + .../devicetree/bindings/display/renesas,du.yaml | 51 + + Documentation/driver-api/dma-buf.rst | 6 - + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/drm-mm.rst | 84 +- + Documentation/gpu/i915.rst | 35 +- + Documentation/gpu/rfc/i915_parallel_execbuf.h | 122 - + Documentation/gpu/rfc/i915_scheduler.rst | 4 +- + Documentation/gpu/todo.rst | 17 - + Documentation/locking/ww-mutex-design.rst | 2 +- + MAINTAINERS | 15 + + arch/arm/configs/at91_dt_defconfig | 1 + + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/configs/lpc32xx_defconfig | 1 + + arch/arm/configs/multi_v5_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/configs/qcom_defconfig | 1 + + arch/arm/configs/realview_defconfig | 1 + + arch/arm/configs/sama5_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/configs/tegra_defconfig | 1 + + arch/arm/configs/versatile_defconfig | 1 + + arch/arm/configs/vexpress_defconfig | 1 + + arch/arm64/configs/defconfig | 1 + + arch/x86/include/asm/mce.h | 2 +- + arch/x86/kernel/cpu/mce/amd.c | 3 +- + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf.c | 153 +- + drivers/dma-buf/dma-fence.c | 13 +- + drivers/dma-buf/dma-resv.c | 442 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/dma-buf/seqno-fence.c | 71 - + drivers/gpu/drm/Kconfig | 11 +- + drivers/gpu/drm/Makefile | 1 - + drivers/gpu/drm/amd/amdgpu/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 143 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 256 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 120 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 854 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 663 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 57 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 755 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 394 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 175 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h | 51 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 119 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 191 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 7 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 9 +- + drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c | 54 - + .../gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c | 51 - + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 31 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 403 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 227 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 91 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 136 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 20 - + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 20 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 40 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 73 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 6 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 13 +- + drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 55 - + drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 52 - + drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 53 - + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 31 + + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 66 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 380 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 12 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 93 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 100 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 59 +- + .../gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c | 54 - + drivers/gpu/drm/amd/amdgpu/soc15.c | 346 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 5 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 51 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 34 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 - + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 52 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 44 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 62 +- + drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c | 51 - + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 17 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 267 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 153 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 192 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 19 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 968 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 103 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 14 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 16 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 71 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 2 +- + drivers/gpu/drm/amd/display/dc/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 100 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 14 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 55 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 + + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 12 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 258 + + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.h | 34 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 16 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 314 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 963 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1476 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 953 + + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 496 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 361 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 151 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 8 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 + + drivers/gpu/drm/amd/display/dc/dc.h | 80 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 297 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 25 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 13 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 23 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 16 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 15 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 39 + + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 2 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 21 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 164 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 122 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 33 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 9 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 31 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 34 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 49 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 5 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 38 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 17 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 36 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_dccg.c | 84 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_dccg.h | 37 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 316 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.h | 83 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c | 107 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.h | 45 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubp.c | 150 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubp.h | 132 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 630 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.h | 46 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_init.c | 131 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_init.h | 33 + + .../amd/display/dc/dcn201/dcn201_link_encoder.c | 209 + + .../amd/display/dc/dcn201/dcn201_link_encoder.h | 59 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.c | 125 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.h | 86 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c | 72 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.h | 74 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_optc.c | 203 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_optc.h | 74 + + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 1307 ++ + .../drm/amd/display/dc/dcn201/dcn201_resource.h | 50 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 24 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 4 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 18 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 59 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 6 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 17 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 8 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c | 200 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h | 15 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 102 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 8 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.c | 92 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.h | 126 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 173 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h | 115 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 383 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 52 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 136 +- + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 616 + + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 222 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 752 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 101 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 3 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 321 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c | 87 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h | 162 + + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 11 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 +- + .../dc/dml/{dcn2x/dcn2x.c => dcn20/dcn20_fpu.c} | 2 +- + .../dc/dml/{dcn2x/dcn2x.h => dcn20/dcn20_fpu.h} | 6 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 158 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.h | 4 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 156 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 4 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 236 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 156 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.h | 4 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 132 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.h | 4 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 166 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.h | 4 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 4 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 5 +- + .../amd/display/dc/dml/display_rq_dlg_helpers.c | 256 +- + .../amd/display/dc/dml/display_rq_dlg_helpers.h | 20 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 246 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.h | 10 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 195 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 36 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 29 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 99 + + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 1 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 13 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 32 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 4 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 97 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 87 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 2 +- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 26 +- + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 19 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 25 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.h | 2 + + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 374 + + .../amd/display/dc/irq/dcn201/irq_service_dcn201.h | 34 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 25 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.h | 2 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 4 + + drivers/gpu/drm/amd/display/dc/os_types.h | 2 + + .../display/dc/virtual/virtual_stream_encoder.c | 5 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 8 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 201 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 9 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 20 +- + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 16 + + .../drm/amd/display/include/bios_parser_types.h | 8 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 1 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 17 + + .../gpu/drm/amd/display/include/grph_object_defs.h | 12 + + .../gpu/drm/amd/display/include/grph_object_id.h | 8 + + .../drm/amd/display/include/link_service_types.h | 57 +- + drivers/gpu/drm/amd/display/include/logger_types.h | 6 + + .../drm/amd/display/modules/color/color_gamma.c | 32 +- + drivers/gpu/drm/amd/include/amd_shared.h | 5 +- + .../amd/include/asic_reg/clk/clk_11_0_1_offset.h | 32 + + .../amd/include/asic_reg/clk/clk_11_0_1_sh_mask.h | 37 + + .../amd/include/asic_reg/dcn/dcn_2_0_3_offset.h | 6193 ++++++ + .../amd/include/asic_reg/dcn/dcn_2_0_3_sh_mask.h | 22091 +++++++++++++++++++ + .../amd/include/asic_reg/dcn/dcn_3_1_2_offset.h | 2 + + .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 8 + + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 5 + + .../drm/amd/include/asic_reg/df/df_3_6_sh_mask.h | 132 + + .../amd/include/asic_reg/dpcs/dpcs_2_0_3_offset.h | 151 + + .../amd/include/asic_reg/dpcs/dpcs_2_0_3_sh_mask.h | 952 + + .../amd/include/asic_reg/mp/mp_11_0_8_sh_mask.h | 355 + + drivers/gpu/drm/amd/include/atombios.h | 2 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 4 + + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 2 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 18 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 4 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 135 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 14 + + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 17 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 64 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 119 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 117 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 96 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 6 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 33 +- + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 2 - + drivers/gpu/drm/ast/ast_mm.c | 27 +- + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 15 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 27 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 4 +- + drivers/gpu/drm/bridge/ite-it66121.c | 21 +- + drivers/gpu/drm/bridge/panel.c | 37 + + drivers/gpu/drm/bridge/parade-ps8640.c | 292 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 6 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 25 +- + drivers/gpu/drm/drm_bridge.c | 78 +- + drivers/gpu/drm/drm_connector.c | 83 +- + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_dp_helper.c | 42 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 42 +- + drivers/gpu/drm/drm_edid.c | 367 +- + drivers/gpu/drm/drm_format_helper.c | 88 + + drivers/gpu/drm/drm_fourcc.c | 1 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 23 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 1 - + drivers/gpu/drm/drm_ioctl.c | 21 +- + drivers/gpu/drm/drm_kms_helper_common.c | 11 - + drivers/gpu/drm/drm_lease.c | 39 +- + drivers/gpu/drm/drm_mipi_dsi.c | 81 + + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + drivers/gpu/drm/drm_of.c | 3 + + drivers/gpu/drm/drm_panel_orientation_quirks.c | 49 +- + drivers/gpu/drm/drm_probe_helper.c | 119 +- + drivers/gpu/drm/drm_property.c | 9 +- + drivers/gpu/drm/drm_sysfs.c | 87 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +- + drivers/gpu/drm/gma500/backlight.c | 12 +- + drivers/gpu/drm/gma500/cdv_device.c | 24 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 10 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 12 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 22 +- + drivers/gpu/drm/gma500/framebuffer.c | 16 +- + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/gma500/gma_device.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 14 +- + drivers/gpu/drm/gma500/gtt.c | 18 +- + drivers/gpu/drm/gma500/intel_bios.c | 10 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 12 +- + drivers/gpu/drm/gma500/mid_bios.c | 11 +- + drivers/gpu/drm/gma500/mmu.c | 12 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 20 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 18 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 14 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 2 +- + drivers/gpu/drm/gma500/opregion.c | 14 +- + drivers/gpu/drm/gma500/power.c | 20 +- + drivers/gpu/drm/gma500/psb_device.c | 16 +- + drivers/gpu/drm/gma500/psb_drv.c | 147 +- + drivers/gpu/drm/gma500/psb_drv.h | 24 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 10 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 31 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 10 +- + drivers/gpu/drm/gma500/psb_irq.c | 26 +- + drivers/gpu/drm/gma500/psb_lid.c | 2 +- + drivers/gpu/drm/gud/Kconfig | 2 +- + drivers/gpu/drm/gud/gud_drv.c | 6 + + drivers/gpu/drm/gud/gud_internal.h | 12 + + drivers/gpu/drm/gud/gud_pipe.c | 6 + + drivers/gpu/drm/i915/Kconfig | 11 + + drivers/gpu/drm/i915/Makefile | 36 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 90 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 165 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 46 + + drivers/gpu/drm/i915/display/intel_acpi.h | 3 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 209 + + drivers/gpu/drm/i915/display/intel_audio.c | 43 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 1776 ++ + drivers/gpu/drm/i915/display/intel_backlight.h | 52 + + drivers/gpu/drm/i915/display/intel_bios.c | 420 +- + drivers/gpu/drm/i915/display/intel_bw.c | 2 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 348 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 4 +- + drivers/gpu/drm/i915/display/intel_color.c | 140 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 8 +- + drivers/gpu/drm/i915/display/intel_connector.c | 6 +- + drivers/gpu/drm/i915/display/intel_crt.c | 4 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 11 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 535 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 7 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 672 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 23 +- + drivers/gpu/drm/i915/display/intel_display.c | 2523 +-- + drivers/gpu/drm/i915/display/intel_display.h | 47 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 127 +- + .../gpu/drm/i915/display/intel_display_debugfs.h | 10 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 15 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 4 + + drivers/gpu/drm/i915/display/intel_display_types.h | 48 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 20 +- + drivers/gpu/drm/i915/display/intel_dp.c | 777 +- + drivers/gpu/drm/i915/display/intel_dp.h | 22 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 6 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 12 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 78 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 467 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 49 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 4 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 33 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 5 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 674 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 26 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 46 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 11 - + drivers/gpu/drm/i915/display/intel_dpt.c | 239 + + drivers/gpu/drm/i915/display/intel_dpt.h | 19 + + drivers/gpu/drm/i915/display/intel_drrs.c | 437 + + drivers/gpu/drm/i915/display/intel_drrs.h | 36 + + drivers/gpu/drm/i915/display/intel_dsi.c | 16 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 3 + + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 33 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 3 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 24 +- + drivers/gpu/drm/i915/display/intel_fb.c | 606 +- + drivers/gpu/drm/i915/display/intel_fb.h | 20 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 274 + + drivers/gpu/drm/i915/display/intel_fb_pin.h | 28 + + drivers/gpu/drm/i915/display/intel_fbc.c | 292 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 321 +- + drivers/gpu/drm/i915/display/intel_fdi.h | 17 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 5 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 70 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 20 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 4 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 33 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 5 +- + drivers/gpu/drm/i915/display/intel_panel.c | 1835 +- + drivers/gpu/drm/i915/display/intel_panel.h | 48 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 283 + + drivers/gpu/drm/i915/display/intel_plane_initial.h | 13 + + drivers/gpu/drm/i915/display/intel_pps.c | 59 + + drivers/gpu/drm/i915/display/intel_pps.h | 3 + + drivers/gpu/drm/i915/display/intel_psr.c | 476 +- + drivers/gpu/drm/i915/display/intel_psr.h | 13 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 19 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 225 +- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 4 +- + drivers/gpu/drm/i915/display/intel_tc.c | 290 +- + drivers/gpu/drm/i915/display/intel_tc.h | 6 +- + drivers/gpu/drm/i915/display/intel_tv.c | 2 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 77 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 6 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 58 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 53 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 25 +- + drivers/gpu/drm/i915/gem/i915_gem_busy.c | 57 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 514 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 19 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 58 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 75 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 9 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 823 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 + + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 33 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 4 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 70 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 29 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 57 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 91 + + drivers/gpu/drm/i915/gem/i915_gem_pm.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_region.c | 70 + + drivers/gpu/drm/i915/gem/i915_gem_region.h | 37 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 29 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 201 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 14 + + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 206 + + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.h | 26 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 22 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 48 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 29 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 36 +- + .../drm/i915/gem/selftests/i915_gem_execbuffer.c | 190 - + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 + + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 5 +- + drivers/gpu/drm/i915/gt/debugfs_engines.h | 14 - + drivers/gpu/drm/i915/gt/debugfs_gt.c | 47 - + drivers/gpu/drm/i915/gt/debugfs_gt_pm.h | 14 - + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 7 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 4 +- + drivers/gpu/drm/i915/gt/intel_context.c | 64 +- + drivers/gpu/drm/i915/gt/intel_context.h | 56 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 153 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 19 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 150 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 36 + + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 39 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 31 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 17 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 52 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 22 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 22 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 2 - + drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 104 + + .../i915/gt/{debugfs_gt.h => intel_gt_debugfs.h} | 18 +- + ...ebugfs_engines.c => intel_gt_engines_debugfs.c} | 10 +- + drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.h | 14 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 7 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 22 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.h | 14 + + .../gt/{debugfs_gt_pm.c => intel_gt_pm_debugfs.c} | 197 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h | 20 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 12 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 9 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 11 +- + drivers/gpu/drm/i915/gt/intel_llc.c | 3 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 93 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 2 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 176 +- + drivers/gpu/drm/i915/gt/intel_mocs.h | 1 + + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 13 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 3 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 7 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 22 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 1 + + drivers/gpu/drm/i915/gt/intel_sseu.c | 65 +- + drivers/gpu/drm/i915/gt/intel_sseu.h | 11 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 10 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 262 +- + drivers/gpu/drm/i915/gt/intel_workarounds.h | 2 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 2 + + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 28 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 10 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 2 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 39 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 119 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 28 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 60 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 18 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 13 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 34 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2298 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 14 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 93 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 9 + + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 127 + + .../gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c | 179 + + drivers/gpu/drm/i915/gvt/gtt.c | 17 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- + drivers/gpu/drm/i915/i915_buddy.c | 45 + + drivers/gpu/drm/i915/i915_buddy.h | 8 + + drivers/gpu/drm/i915/i915_config.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 286 +- + drivers/gpu/drm/i915/i915_drv.c | 17 +- + drivers/gpu/drm/i915/i915_drv.h | 168 +- + drivers/gpu/drm/i915/i915_gem.c | 2 - + drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +- + drivers/gpu/drm/i915/i915_gem_ww.h | 25 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 42 +- + drivers/gpu/drm/i915/i915_irq.c | 94 +- + drivers/gpu/drm/i915/i915_irq.h | 51 +- + drivers/gpu/drm/i915/i915_module.c | 4 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 14 +- + drivers/gpu/drm/i915/i915_pci.h | 12 +- + drivers/gpu/drm/i915/i915_query.c | 5 +- + drivers/gpu/drm/i915/i915_reg.h | 172 +- + drivers/gpu/drm/i915/i915_request.c | 157 +- + drivers/gpu/drm/i915/i915_request.h | 49 +- + drivers/gpu/drm/i915/i915_sysfs.c | 1 - + drivers/gpu/drm/i915/i915_trace.h | 14 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 20 +- + drivers/gpu/drm/i915/i915_utils.h | 13 - + drivers/gpu/drm/i915/i915_vma.c | 21 +- + drivers/gpu/drm/i915/i915_vma.h | 13 +- + drivers/gpu/drm/i915/i915_vma_types.h | 7 +- + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_dram.c | 6 +- + drivers/gpu/drm/i915/intel_memory_region.c | 12 + + drivers/gpu/drm/i915/intel_memory_region.h | 4 + + drivers/gpu/drm/i915/intel_pcode.c | 235 + + drivers/gpu/drm/i915/intel_pcode.h | 26 + + drivers/gpu/drm/i915/intel_pm.c | 307 +- + drivers/gpu/drm/i915/intel_pm.h | 3 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 - + drivers/gpu/drm/i915/intel_sbi.c | 73 + + drivers/gpu/drm/i915/intel_sbi.h | 23 + + drivers/gpu/drm/i915/intel_sideband.c | 577 - + drivers/gpu/drm/i915/intel_uncore.c | 447 +- + drivers/gpu/drm/i915/intel_uncore.h | 20 +- + drivers/gpu/drm/i915/intel_wakeref.h | 12 + + drivers/gpu/drm/i915/pxp/intel_pxp.c | 299 + + drivers/gpu/drm/i915/pxp/intel_pxp.h | 64 + + drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c | 141 + + drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h | 15 + + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 78 + + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.h | 21 + + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 101 + + drivers/gpu/drm/i915/pxp/intel_pxp_irq.h | 32 + + drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 46 + + drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 24 + + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 175 + + drivers/gpu/drm/i915/pxp/intel_pxp_session.h | 15 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 172 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee.h | 17 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee_interface.h | 36 + + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 83 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 8 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 + + drivers/gpu/drm/i915/selftests/i915_vma.c | 4 +- + .../drm/i915/selftests/intel_scheduler_helpers.c | 12 + + .../drm/i915/selftests/intel_scheduler_helpers.h | 2 + + drivers/gpu/drm/i915/selftests/intel_uncore.c | 34 +- + drivers/gpu/drm/i915/selftests/mock_region.c | 2 - + drivers/gpu/drm/i915/vlv_sideband.c | 266 + + .../drm/i915/{intel_sideband.h => vlv_sideband.h} | 34 +- + drivers/gpu/drm/lima/lima_gem.c | 9 +- + drivers/gpu/drm/lima/lima_sched.c | 28 +- + drivers/gpu/drm/lima/lima_sched.h | 6 +- + drivers/gpu/drm/mcde/mcde_drv.c | 4 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 4 +- + drivers/gpu/drm/meson/meson_drv.c | 3 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 - + drivers/gpu/drm/mgag200/mgag200_mm.c | 35 +- + drivers/gpu/drm/msm/Kconfig | 4 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/msm/msm_gem.h | 5 - + drivers/gpu/drm/msm/msm_gem_submit.c | 35 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 12 - + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 - + drivers/gpu/drm/omapdrm/Kconfig | 3 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 27 +- + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 743 +- + drivers/gpu/drm/panel/panel-edp.c | 1896 ++ + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 85 +- + drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 320 + + drivers/gpu/drm/panel/panel-simple.c | 1098 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 33 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 48 +- + drivers/gpu/drm/panfrost/panfrost_job.h | 5 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 42 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 1 - + drivers/gpu/drm/r128/ati_pcigart.c | 11 +- + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/gpu/drm/radeon/ci_dpm.c | 3 +- + drivers/gpu/drm/radeon/r600_dpm.c | 10 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +- + drivers/gpu/drm/radeon/radeon_fence.c | 24 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 15 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 11 - + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 108 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 26 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 50 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.h | 7 + + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 36 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 4 +- + drivers/gpu/drm/rockchip/Kconfig | 1 - + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 3 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 14 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 - + drivers/gpu/drm/rockchip/rockchip_lvds.c | 33 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 26 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 140 +- + drivers/gpu/drm/scheduler/sched_fence.c | 62 +- + drivers/gpu/drm/scheduler/sched_main.c | 199 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 4 +- + drivers/gpu/drm/stm/ltdc.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 18 +- + drivers/gpu/drm/sun4i/sun8i_csc.h | 4 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 21 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 4 +- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/plane.c | 2 +- + drivers/gpu/drm/tiny/Kconfig | 4 +- + drivers/gpu/drm/tiny/bochs.c | 8 + + drivers/gpu/drm/ttm/ttm_bo.c | 71 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 21 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 15 +- + drivers/gpu/drm/ttm/ttm_device.c | 48 + + drivers/gpu/drm/ttm/ttm_module.c | 12 + + drivers/gpu/drm/ttm/ttm_pool.c | 42 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 8 +- + drivers/gpu/drm/ttm/ttm_resource.c | 49 + + drivers/gpu/drm/ttm/ttm_tt.c | 69 +- + drivers/gpu/drm/udl/Kconfig | 1 + + drivers/gpu/drm/v3d/Kconfig | 2 +- + drivers/gpu/drm/v3d/v3d_drv.c | 15 +- + drivers/gpu/drm/v3d/v3d_drv.h | 30 +- + drivers/gpu/drm/v3d/v3d_gem.c | 473 +- + drivers/gpu/drm/v3d/v3d_sched.c | 44 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 1 - + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 17 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 15 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 28 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +- + drivers/gpu/drm/vgem/vgem_drv.c | 342 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 1 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 44 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 36 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 30 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 195 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 26 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 32 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 27 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 61 + + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +- + drivers/gpu/drm/zte/Kconfig | 10 - + drivers/gpu/drm/zte/Makefile | 10 - + drivers/gpu/drm/zte/zx_common_regs.h | 28 - + drivers/gpu/drm/zte/zx_drm_drv.c | 184 - + drivers/gpu/drm/zte/zx_drm_drv.h | 34 - + drivers/gpu/drm/zte/zx_hdmi.c | 760 - + drivers/gpu/drm/zte/zx_hdmi_regs.h | 66 - + drivers/gpu/drm/zte/zx_plane.c | 537 - + drivers/gpu/drm/zte/zx_plane.h | 26 - + drivers/gpu/drm/zte/zx_plane_regs.h | 120 - + drivers/gpu/drm/zte/zx_tvenc.c | 400 - + drivers/gpu/drm/zte/zx_tvenc_regs.h | 27 - + drivers/gpu/drm/zte/zx_vga.c | 527 - + drivers/gpu/drm/zte/zx_vga_regs.h | 33 - + drivers/gpu/drm/zte/zx_vou.c | 921 - + drivers/gpu/drm/zte/zx_vou.h | 64 - + drivers/gpu/drm/zte/zx_vou_regs.h | 212 - + drivers/misc/mei/Kconfig | 2 + + drivers/misc/mei/Makefile | 1 + + drivers/misc/mei/pxp/Kconfig | 13 + + drivers/misc/mei/pxp/Makefile | 7 + + drivers/misc/mei/pxp/mei_pxp.c | 229 + + drivers/misc/mei/pxp/mei_pxp.h | 18 + + drivers/regulator/core.c | 2 +- + drivers/usb/typec/altmodes/Kconfig | 1 + + drivers/usb/typec/altmodes/displayport.c | 58 +- + drivers/video/fbdev/efifb.c | 21 +- + include/drm/amd_asic_type.h | 1 + + include/drm/drm_bridge.h | 23 +- + include/drm/drm_connector.h | 37 + + include/drm/drm_displayid.h | 101 +- + include/drm/drm_dp_helper.h | 26 + + include/drm/drm_dp_mst_helper.h | 5 +- + include/drm/drm_edid.h | 47 + + include/drm/drm_format_helper.h | 4 + + include/drm/drm_ioctl.h | 1 - + include/drm/drm_mipi_dsi.h | 4 + + include/drm/drm_mode_config.h | 13 +- + include/drm/drm_plane.h | 2 +- + include/drm/drm_print.h | 30 + + include/drm/drm_probe_helper.h | 1 + + include/drm/gpu_scheduler.h | 188 +- + include/drm/gud.h | 6 +- + include/drm/i915_component.h | 1 + + include/drm/i915_pciids.h | 8 +- + include/drm/i915_pxp_tee_interface.h | 42 + + include/drm/ttm/ttm_bo_api.h | 12 - + include/drm/ttm/ttm_bo_driver.h | 2 +- + include/drm/ttm/ttm_caching.h | 17 + + include/drm/ttm/ttm_device.h | 79 +- + include/drm/ttm/ttm_placement.h | 1 + + include/drm/ttm/ttm_pool.h | 5 +- + include/drm/ttm/ttm_range_manager.h | 18 +- + include/drm/ttm/ttm_resource.h | 9 +- + include/drm/ttm/ttm_tt.h | 98 +- + include/linux/dma-buf.h | 9 +- + include/linux/dma-fence.h | 32 +- + include/linux/dma-resv.h | 201 +- + include/linux/io.h | 5 + + include/linux/seqno-fence.h | 109 - + include/linux/shrinker.h | 1 + + include/linux/ww_mutex.h | 15 +- + include/uapi/drm/drm_fourcc.h | 6 + + include/uapi/drm/drm_mode.h | 4 + + include/uapi/drm/i915_drm.h | 242 +- + include/uapi/drm/v3d_drm.h | 78 + + include/uapi/drm/virtgpu_drm.h | 27 + + include/uapi/linux/virtio_gpu.h | 18 +- + kernel/locking/mutex.c | 41 + + kernel/locking/test-ww_mutex.c | 86 +- + kernel/locking/ww_rt_mutex.c | 25 + + lib/devres.c | 82 + + lib/locking-selftest.c | 2 +- + mm/vmscan.c | 15 + + 888 files changed, 78410 insertions(+), 24034 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-edp.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml + delete mode 100644 Documentation/gpu/rfc/i915_parallel_execbuf.h + delete mode 100644 drivers/dma-buf/seqno-fence.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h + delete mode 100644 drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h + rename drivers/gpu/drm/amd/display/dc/dml/{dcn2x/dcn2x.c => dcn20/dcn20_fpu.c} (99%) + rename drivers/gpu/drm/amd/display/dc/dml/{dcn2x/dcn2x.h => dcn20/dcn20_fpu.h} (94%) + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_1_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_1_sh_mask.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_3_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_3_sh_mask.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_3_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_8_sh_mask.h + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight.c + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.h + create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.c + create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_fb_pin.c + create mode 100644 drivers/gpu/drm/i915/display/intel_fb_pin.h + create mode 100644 drivers/gpu/drm/i915/display/intel_plane_initial.c + create mode 100644 drivers/gpu/drm/i915/display/intel_plane_initial.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.h + delete mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c + delete mode 100644 drivers/gpu/drm/i915/gt/debugfs_engines.h + delete mode 100644 drivers/gpu/drm/i915/gt/debugfs_gt.c + delete mode 100644 drivers/gpu/drm/i915/gt/debugfs_gt_pm.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_debugfs.c + rename drivers/gpu/drm/i915/gt/{debugfs_gt.h => intel_gt_debugfs.h} (58%) + rename drivers/gpu/drm/i915/gt/{debugfs_engines.c => intel_gt_engines_debugfs.c} (70%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.h + rename drivers/gpu/drm/i915/gt/{debugfs_gt_pm.c => intel_gt_pm_debugfs.c} (79%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c + create mode 100644 drivers/gpu/drm/i915/intel_pcode.c + create mode 100644 drivers/gpu/drm/i915/intel_pcode.h + create mode 100644 drivers/gpu/drm/i915/intel_sbi.c + create mode 100644 drivers/gpu/drm/i915/intel_sbi.h + delete mode 100644 drivers/gpu/drm/i915/intel_sideband.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_irq.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_irq.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_session.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_session.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee_interface.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_types.h + create mode 100644 drivers/gpu/drm/i915/vlv_sideband.c + rename drivers/gpu/drm/i915/{intel_sideband.h => vlv_sideband.h} (77%) + create mode 100644 drivers/gpu/drm/panel/panel-edp.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6d27a1.c + delete mode 100644 drivers/gpu/drm/zte/Kconfig + delete mode 100644 drivers/gpu/drm/zte/Makefile + delete mode 100644 drivers/gpu/drm/zte/zx_common_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.c + delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.h + delete mode 100644 drivers/gpu/drm/zte/zx_hdmi.c + delete mode 100644 drivers/gpu/drm/zte/zx_hdmi_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_plane.c + delete mode 100644 drivers/gpu/drm/zte/zx_plane.h + delete mode 100644 drivers/gpu/drm/zte/zx_plane_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_tvenc.c + delete mode 100644 drivers/gpu/drm/zte/zx_tvenc_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_vga.c + delete mode 100644 drivers/gpu/drm/zte/zx_vga_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_vou.c + delete mode 100644 drivers/gpu/drm/zte/zx_vou.h + delete mode 100644 drivers/gpu/drm/zte/zx_vou_regs.h + create mode 100644 drivers/misc/mei/pxp/Kconfig + create mode 100644 drivers/misc/mei/pxp/Makefile + create mode 100644 drivers/misc/mei/pxp/mei_pxp.c + create mode 100644 drivers/misc/mei/pxp/mei_pxp.h + create mode 100644 include/drm/i915_pxp_tee_interface.h + delete mode 100644 include/linux/seqno-fence.h +Merging drm-misc/for-linux-next (099afadc533f drm/kmb: Enable support for framebuffer console) +$ 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/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c +Auto-merging drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +Auto-merging drivers/gpu/drm/panel/panel-abt-y030xx067a.c +Auto-merging drivers/gpu/drm/panel/Kconfig +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi.c +Auto-merging drivers/gpu/drm/kmb/kmb_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/kmb/kmb_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/bridge/sii9234.txt +Removing Documentation/devicetree/bindings/display/bridge/ptn3460.txt +Recorded preimage for 'drivers/gpu/drm/kmb/kmb_drv.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/kmb/kmb_drv.c'. +[master 17306eac6ded] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/lvds-codec.yaml | 33 +- + .../bindings/display/bridge/nxp,ptn3460.yaml | 106 ++++ + .../devicetree/bindings/display/bridge/ps8640.yaml | 19 +- + .../devicetree/bindings/display/bridge/ptn3460.txt | 39 -- + .../devicetree/bindings/display/bridge/sii9234.txt | 49 -- + .../bindings/display/bridge/sil,sii9234.yaml | 110 ++++ + .../bindings/display/panel/boe,bf060y8m-aj0.yaml | 81 +++ + .../bindings/display/panel/ilitek,ili9163.yaml | 69 ++ + .../bindings/display/panel/ilitek,ili9881c.yaml | 6 +- + .../bindings/display/panel/novatek,nt35950.yaml | 106 ++++ + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 5 + + .../bindings/display/panel/sharp,ls060t1sx01.yaml | 56 ++ + .../display/panel/sony,tulip-truly-nt35521.yaml | 72 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/gpu/drm-kms-helpers.rst | 15 + + Documentation/gpu/drm-kms.rst | 2 + + Documentation/gpu/todo.rst | 13 +- + MAINTAINERS | 8 + + drivers/clk/bcm/clk-bcm2835.c | 13 +- + drivers/dma-buf/Makefile | 3 +- + drivers/dma-buf/dma-buf.c | 64 +- + drivers/dma-buf/dma-resv.c | 69 +- + drivers/dma-buf/selftests.h | 1 + + drivers/dma-buf/st-dma-resv.c | 371 +++++++++++ + drivers/gpu/drm/Kconfig | 23 +- + drivers/gpu/drm/Makefile | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 26 +- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 - + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 15 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 20 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 40 +- + drivers/gpu/drm/bridge/display-connector.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 31 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 62 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 74 +-- + drivers/gpu/drm/bridge/lvds-codec.c | 69 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 35 + + drivers/gpu/drm/bridge/parade-ps8640.c | 105 +-- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 + + drivers/gpu/drm/bridge/tc358768.c | 94 ++- + drivers/gpu/drm/bridge/tc358775.c | 50 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 127 ++-- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 466 ++++++++++++-- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_connector.c | 235 ++++++- + drivers/gpu/drm/drm_dp_helper.c | 153 ++++- + drivers/gpu/drm/drm_drv.c | 13 +- + drivers/gpu/drm/drm_gem.c | 26 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 14 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 4 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 4 + + drivers/gpu/drm/drm_irq.c | 2 - + drivers/gpu/drm/drm_modeset_lock.c | 49 +- + drivers/gpu/drm/drm_of.c | 33 + + drivers/gpu/drm/drm_plane_helper.c | 1 - + drivers/gpu/drm/drm_privacy_screen.c | 467 ++++++++++++++ + drivers/gpu/drm/drm_privacy_screen_x86.c | 86 +++ + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 31 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 52 +- + drivers/gpu/drm/gma500/gem.c | 234 +++++-- + drivers/gpu/drm/gma500/gem.h | 28 +- + drivers/gpu/drm/gma500/gma_display.c | 51 +- + drivers/gpu/drm/gma500/gtt.c | 326 ++-------- + drivers/gpu/drm/gma500/gtt.h | 29 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 3 +- + drivers/gpu/drm/gma500/psb_drv.c | 12 + + drivers/gpu/drm/gma500/psb_intel_display.c | 17 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 52 +- + drivers/gpu/drm/i915/i915_request.c | 34 +- + drivers/gpu/drm/kmb/kmb_drv.c | 4 + + drivers/gpu/drm/msm/dsi/dsi.c | 48 +- + drivers/gpu/drm/msm/dsi/dsi.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 22 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 6 +- + drivers/gpu/drm/msm/msm_drv.h | 2 + + drivers/gpu/drm/msm/msm_gem.c | 19 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 4 - + drivers/gpu/drm/nouveau/nouveau_fence.c | 48 +- + 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 | 51 ++ + drivers/gpu/drm/panel/Makefile | 5 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 14 +- + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 445 +++++++++++++ + drivers/gpu/drm/panel/panel-dsi-cm.c | 4 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 13 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 29 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 265 +++++++- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 14 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 10 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 323 ++++++++++ + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 8 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 8 +- + drivers/gpu/drm/panel/panel-lvds.c | 18 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 9 + + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 702 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 10 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 20 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 8 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 8 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 21 +- + 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 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 1 + + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 17 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 21 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 8 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 333 ++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 91 +++ + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 8 + + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 552 ++++++++++++++++ + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 14 +- + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 25 +- + drivers/gpu/drm/radeon/radeon_sync.c | 22 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 82 ++- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 44 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 7 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +- + drivers/gpu/drm/scheduler/sched_main.c | 29 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/tiny/Kconfig | 13 + + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/ili9163.c | 225 +++++++ + drivers/gpu/drm/ttm/ttm_bo.c | 16 +- + drivers/gpu/drm/v3d/v3d_gem.c | 17 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 19 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 208 ++++-- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 6 + + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- + drivers/platform/x86/Kconfig | 2 + + drivers/platform/x86/thinkpad_acpi.c | 137 ++-- + drivers/pwm/core.c | 26 + + drivers/pwm/pwm-pxa.c | 16 +- + 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/fbsysfs.c | 14 +- + drivers/video/fbdev/core/tileblit.c | 16 - + drivers/video/fbdev/omap/omapfb_main.c | 1 + + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 14 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 18 +- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 20 +- + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 12 +- + drivers/video/fbdev/skeletonfb.c | 12 +- + include/drm/drm_connector.h | 55 ++ + include/drm/drm_dp_helper.h | 21 +- + include/drm/drm_modeset_lock.h | 8 + + include/drm/drm_of.h | 7 + + include/drm/drm_privacy_screen_consumer.h | 65 ++ + include/drm/drm_privacy_screen_driver.h | 84 +++ + include/drm/drm_privacy_screen_machine.h | 46 ++ + include/drm/ttm/ttm_bo_api.h | 6 +- + include/linux/dma-buf.h | 4 +- + include/linux/dma-resv.h | 25 +- + include/linux/fb.h | 2 +- + include/linux/pwm.h | 2 + + 173 files changed, 7496 insertions(+), 2366 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ptn3460.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/sii9234.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/sil,sii9234.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,bf060y8m-aj0.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9163.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt35950.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls060t1sx01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sony,tulip-truly-nt35521.yaml + create mode 100644 drivers/dma-buf/st-dma-resv.c + create mode 100644 drivers/gpu/drm/drm_privacy_screen.c + create mode 100644 drivers/gpu/drm/drm_privacy_screen_x86.c + create mode 100644 drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c + create mode 100644 drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt35950.c + create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c + create mode 100644 drivers/gpu/drm/panel/panel-sony-tulip-truly-nt35521.c + create mode 100644 drivers/gpu/drm/tiny/ili9163.c + create mode 100644 include/drm/drm_privacy_screen_consumer.h + create mode 100644 include/drm/drm_privacy_screen_driver.h + create mode 100644 include/drm/drm_privacy_screen_machine.h +Merging amdgpu/drm-next (6a806feef1d2 drm/amdgpu/display: fix build when CONFIG_DRM_AMD_DC_DCN is not set) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc_link.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/Kconfig +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/core/dc_link.c' +Recorded preimage for 'drivers/gpu/drm/drm_dp_mst_topology.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard HEAD +Merging drm-intel/for-linux-next (5740211ea442 drm/i915/dmabuf: fix broken build) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_bios.c | 47 ----------------------- + 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 +- + drivers/gpu/drm/i915/i915_trace.h | 7 +--- + 6 files changed, 55 insertions(+), 84 deletions(-) +Merging drm-intel-gt/for-linux-next-gt (5740211ea442 drm/i915/dmabuf: fix broken build) +$ 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 +Merge made by the 'recursive' strategy. + 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 +Auto-merging drivers/gpu/drm/msm/msm_gpu_devfreq.c +Auto-merging drivers/gpu/drm/msm/msm_gpu.h +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/msm/dsi/dsi_manager.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi.h +Removing drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c +Auto-merging drivers/gpu/drm/msm/Kconfig +Removing Documentation/devicetree/bindings/display/msm/gpu.txt +Auto-merging Documentation/devicetree/bindings/display/msm/dp-controller.yaml +Merge made by the 'recursive' strategy. + .../bindings/display/msm/dp-controller.yaml | 15 +- + .../bindings/display/msm/dpu-sc7280.yaml | 232 ++++++++++++++++ + .../bindings/display/msm/dsi-phy-14nm.yaml | 1 + + .../devicetree/bindings/display/msm/gpu.txt | 157 ----------- + .../devicetree/bindings/display/msm/gpu.yaml | 288 ++++++++++++++++++++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 1 - + drivers/gpu/drm/msm/Kconfig | 2 + + drivers/gpu/drm/msm/Makefile | 1 - + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 6 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 10 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 256 ------------------ + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 147 ++++++++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 19 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 39 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 8 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 267 ++++++++++++++----- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 92 +------ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 56 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 13 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 70 +++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 13 - + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 18 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 89 +++++++ + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 18 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 12 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 8 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 64 ++--- + drivers/gpu/drm/msm/dp/dp_debug.c | 294 +++++---------------- + drivers/gpu/drm/msm/dp/dp_debug.h | 4 +- + drivers/gpu/drm/msm/dp/dp_display.c | 143 +++++----- + drivers/gpu/drm/msm/dp/dp_display.h | 2 + + drivers/gpu/drm/msm/dp/dp_drm.c | 13 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 2 +- + drivers/gpu/drm/msm/dp/dp_parser.c | 138 ++++++---- + drivers/gpu/drm/msm/dp/dp_parser.h | 14 +- + drivers/gpu/drm/msm/dsi/dsi.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 147 +++++------ + drivers/gpu/drm/msm/dsi/dsi_manager.c | 66 ++++- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 25 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 4 +- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 5 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 38 +-- + drivers/gpu/drm/msm/hdmi/hdmi.h | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 20 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 24 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 33 +-- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 4 +- + drivers/gpu/drm/msm/msm_atomic.c | 21 +- + drivers/gpu/drm/msm/msm_drv.c | 33 ++- + drivers/gpu/drm/msm/msm_drv.h | 31 ++- + drivers/gpu/drm/msm/msm_gem.c | 6 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 + + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.h | 7 + + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 38 ++- + drivers/gpu/drm/msm/msm_kms.h | 3 +- + drivers/gpu/drm/msm/msm_submitqueue.c | 1 + + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/ttm_memory.c | 1 - + 68 files changed, 1748 insertions(+), 1321 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml + delete mode 100644 Documentation/devicetree/bindings/display/msm/gpu.txt + create mode 100644 Documentation/devicetree/bindings/display/msm/gpu.yaml + delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c +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 +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-spi.c | 36 ++++++++++++++++++++++++++++++++---- + 1 file changed, 32 insertions(+), 4 deletions(-) +Merging sound/for-next (f4000b58b643 ALSA: line6: fix control and interrupt message timeouts) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/usb/quirks-table.h +Auto-merging sound/usb/mixer.c +Removing sound/core/sgbuf.c +Merge made by the 'recursive' strategy. + include/sound/hdaudio_ext.h | 2 + + include/sound/memalloc.h | 58 ++- + include/uapi/sound/asound.h | 2 +- + include/uapi/sound/firewire.h | 145 +++++++ + sound/core/Makefile | 3 +- + sound/core/memalloc.c | 207 +++++++++- + sound/core/memalloc_local.h | 1 + + sound/core/pcm_compat.c | 4 + + sound/core/pcm_lib.c | 5 + + sound/core/pcm_local.h | 7 + + sound/core/pcm_memory.c | 13 +- + sound/core/pcm_native.c | 66 +++- + sound/core/sgbuf.c | 201 ---------- + sound/firewire/motu/Makefile | 3 +- + sound/firewire/motu/amdtp-motu.c | 9 + + .../motu/motu-command-dsp-message-parser.c | 178 +++++++++ + sound/firewire/motu/motu-hwdep.c | 113 +++++- + sound/firewire/motu/motu-protocol-v2.c | 14 +- + sound/firewire/motu/motu-protocol-v3.c | 14 +- + .../motu/motu-register-dsp-message-parser.c | 416 +++++++++++++++++++++ + sound/firewire/motu/motu-stream.c | 10 + + sound/firewire/motu/motu.c | 10 + + sound/firewire/motu/motu.h | 23 ++ + sound/hda/ext/hdac_ext_stream.c | 46 ++- + sound/hda/hdac_stream.c | 4 +- + sound/isa/Kconfig | 2 +- + sound/isa/gus/gus_dma.c | 2 + + sound/pci/Kconfig | 1 + + sound/pci/hda/hda_intel.c | 49 ++- + sound/soc/sof/intel/hda-dai.c | 7 +- + sound/usb/6fire/comm.c | 2 +- + sound/usb/6fire/firmware.c | 6 +- + sound/usb/card.h | 11 +- + sound/usb/clock.c | 8 +- + sound/usb/endpoint.c | 230 ++++++++---- + sound/usb/endpoint.h | 13 +- + sound/usb/implicit.c | 2 - + sound/usb/line6/driver.c | 14 +- + sound/usb/line6/driver.h | 2 +- + sound/usb/line6/podhd.c | 6 +- + sound/usb/line6/toneport.c | 2 +- + sound/usb/mixer.c | 42 ++- + sound/usb/mixer_quirks.c | 34 ++ + sound/usb/pcm.c | 164 ++++++-- + sound/usb/quirks-table.h | 58 +++ + sound/usb/usx2y/usbusx2yaudio.c | 11 +- + sound/virtio/virtio_pcm_msg.c | 5 +- + 47 files changed, 1766 insertions(+), 459 deletions(-) + delete mode 100644 sound/core/sgbuf.c + create mode 100644 sound/firewire/motu/motu-command-dsp-message-parser.c + create mode 100644 sound/firewire/motu/motu-register-dsp-message-parser.c +Merging sound-asoc/for-next (6f19a44bbe1d Merge remote-tracking branch 'asoc/for-5.16' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Removing sound/soc/sof/probe.h +Auto-merging sound/soc/sof/intel/hda-dai.c +Removing sound/soc/sof/compress.h +Auto-merging sound/soc/cirrus/ep93xx-i2s.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/wm8962.txt +Removing Documentation/devicetree/bindings/sound/spdif-transmitter.txt +Removing Documentation/devicetree/bindings/sound/simple-amplifier.txt +Removing Documentation/devicetree/bindings/sound/rockchip,pdm.txt +Removing Documentation/devicetree/bindings/sound/name-prefix.txt +Removing Documentation/devicetree/bindings/sound/bt-sco.txt +Merge made by the 'recursive' strategy. + .../bindings/sound/audio-graph-card2.yaml | 57 + + Documentation/devicetree/bindings/sound/bt-sco.txt | 13 - + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 157 + + .../devicetree/bindings/sound/linux,bt-sco.yaml | 38 + + .../devicetree/bindings/sound/linux,spdif-dit.yaml | 32 + + .../devicetree/bindings/sound/max9892x.txt | 3 + + .../devicetree/bindings/sound/maxim,max98520.yaml | 36 + + .../devicetree/bindings/sound/mt8192-afe-pcm.yaml | 100 + + .../devicetree/bindings/sound/name-prefix.txt | 24 - + .../devicetree/bindings/sound/name-prefix.yaml | 21 + + .../devicetree/bindings/sound/nau8821.txt | 55 + + .../bindings/sound/nvidia,tegra186-dspk.yaml | 9 +- + .../bindings/sound/nvidia,tegra210-adx.yaml | 76 + + .../bindings/sound/nvidia,tegra210-ahub.yaml | 20 + + .../bindings/sound/nvidia,tegra210-amx.yaml | 76 + + .../bindings/sound/nvidia,tegra210-dmic.yaml | 9 +- + .../bindings/sound/nvidia,tegra210-i2s.yaml | 9 +- + .../bindings/sound/nvidia,tegra210-mixer.yaml | 74 + + .../bindings/sound/nvidia,tegra210-mvc.yaml | 76 + + .../bindings/sound/nvidia,tegra210-sfc.yaml | 73 + + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 9 +- + .../bindings/sound/qcom,lpass-rx-macro.yaml | 4 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 4 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 4 +- + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 4 +- + .../devicetree/bindings/sound/qcom,q6afe.txt | 181 - + .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 53 + + .../devicetree/bindings/sound/qcom,q6asm.txt | 2 +- + .../bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 77 + + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 205 ++ + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 117 + + .../devicetree/bindings/sound/richtek,rt9120.yaml | 59 + + .../bindings/sound/rockchip,i2s-tdm.yaml | 182 + + .../devicetree/bindings/sound/rockchip,pdm.txt | 46 - + .../devicetree/bindings/sound/rockchip,pdm.yaml | 120 + + Documentation/devicetree/bindings/sound/rt5659.txt | 2 +- + .../devicetree/bindings/sound/simple-amplifier.txt | 17 - + .../bindings/sound/simple-audio-amplifier.yaml | 45 + + .../bindings/sound/simple-audio-mux.yaml | 9 +- + .../bindings/sound/socionext,uniphier-aio.yaml | 22 +- + .../bindings/sound/socionext,uniphier-evea.yaml | 6 +- + .../bindings/sound/spdif-transmitter.txt | 10 - + .../devicetree/bindings/sound/test-component.yaml | 33 + + .../devicetree/bindings/sound/wlf,wm8962.yaml | 118 + + .../devicetree/bindings/sound/wlf,wm8978.yaml | 58 + + Documentation/devicetree/bindings/sound/wm8962.txt | 43 - + Documentation/sound/alsa-configuration.rst | 9 + + Documentation/sound/soc/codec.rst | 8 +- + MAINTAINERS | 18 + + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 2 +- + drivers/firmware/Kconfig | 1 + + drivers/firmware/Makefile | 1 + + drivers/firmware/cirrus/Kconfig | 5 + + drivers/firmware/cirrus/Makefile | 3 + + drivers/firmware/cirrus/cs_dsp.c | 3109 +++++++++++++++++ + include/dt-bindings/sound/qcom,lpass.h | 31 + + include/dt-bindings/sound/qcom,q6afe.h | 203 +- + include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 208 ++ + include/linux/firmware/cirrus/cs_dsp.h | 242 ++ + .../linux/firmware/cirrus}/wmfw.h | 8 +- + include/sound/cs35l41.h | 34 + + include/sound/graph_card.h | 21 + + include/sound/rt5682s.h | 48 + + include/sound/simple_card_utils.h | 6 +- + include/sound/soc-component.h | 21 +- + include/sound/soc-dpcm.h | 1 + + include/sound/soc-topology.h | 5 +- + include/sound/sof.h | 5 - + include/sound/sof/dai-intel.h | 4 + + include/sound/sof/dai.h | 10 +- + include/uapi/sound/snd_ar_tokens.h | 208 ++ + include/uapi/sound/sof/tokens.h | 1 + + sound/hda/intel-dsp-config.c | 22 +- + sound/soc/amd/Kconfig | 36 + + sound/soc/amd/Makefile | 2 + + sound/soc/amd/acp-da7219-max98357a.c | 6 +- + sound/soc/amd/acp-pcm-dma.c | 6 +- + sound/soc/amd/acp-rt5645.c | 2 +- + sound/soc/amd/acp.h | 2 + + sound/soc/amd/acp/Kconfig | 60 + + sound/soc/amd/acp/Makefile | 26 + + sound/soc/amd/acp/acp-i2s.c | 340 ++ + sound/soc/amd/acp/acp-legacy-mach.c | 104 + + sound/soc/amd/acp/acp-mach-common.c | 600 ++++ + sound/soc/amd/acp/acp-mach.h | 57 + + sound/soc/amd/acp/acp-platform.c | 315 ++ + sound/soc/amd/acp/acp-renoir.c | 163 + + sound/soc/amd/acp/acp-sof-mach.c | 131 + + sound/soc/amd/acp/amd.h | 145 + + sound/soc/amd/acp/chip_offset_byte.h | 76 + + sound/soc/amd/vangogh/Makefile | 2 + + sound/soc/amd/vangogh/acp5x-i2s.c | 2 +- + sound/soc/amd/vangogh/acp5x-mach.c | 386 +++ + sound/soc/amd/vangogh/acp5x.h | 2 +- + sound/soc/amd/vangogh/pci-acp5x.c | 3 + + sound/soc/amd/yc/Makefile | 9 + + sound/soc/amd/yc/acp6x-mach.c | 194 ++ + sound/soc/amd/yc/acp6x-pdm-dma.c | 448 +++ + sound/soc/amd/yc/acp6x.h | 107 + + sound/soc/amd/yc/acp6x_chip_offset_byte.h | 444 +++ + sound/soc/amd/yc/pci-acp6x.c | 338 ++ + sound/soc/atmel/atmel-i2s.c | 6 +- + sound/soc/atmel/atmel_ssc_dai.c | 26 +- + sound/soc/atmel/atmel_wm8904.c | 2 +- + sound/soc/atmel/mchp-i2s-mcc.c | 10 +- + sound/soc/atmel/mikroe-proto.c | 4 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/atmel/sam9x5_wm8731.c | 2 +- + sound/soc/atmel/tse850-pcm5142.c | 2 +- + sound/soc/au1x/db1200.c | 6 +- + sound/soc/au1x/i2sc.c | 6 +- + sound/soc/au1x/psc-i2s.c | 10 +- + sound/soc/bcm/bcm2835-i2s.c | 56 +- + sound/soc/bcm/cygnus-ssp.c | 6 +- + sound/soc/cirrus/edb93xx.c | 2 +- + sound/soc/cirrus/ep93xx-i2s.c | 10 +- + sound/soc/cirrus/snappercl15.c | 2 +- + sound/soc/codecs/88pm860x-codec.c | 18 +- + sound/soc/codecs/Kconfig | 45 + + sound/soc/codecs/Makefile | 12 + + sound/soc/codecs/ab8500-codec.c | 20 +- + sound/soc/codecs/ad1836.c | 6 +- + sound/soc/codecs/ad193x.c | 10 +- + sound/soc/codecs/adau1372.c | 14 +- + sound/soc/codecs/adau1373.c | 14 +- + sound/soc/codecs/adau1701.c | 6 +- + sound/soc/codecs/adau17x1.c | 6 +- + sound/soc/codecs/adau1977.c | 31 +- + sound/soc/codecs/adav80x.c | 6 +- + sound/soc/codecs/ak4104.c | 4 +- + sound/soc/codecs/ak4118.c | 20 +- + sound/soc/codecs/ak4458.c | 12 +- + sound/soc/codecs/ak4642.c | 8 +- + sound/soc/codecs/ak4671.c | 6 +- + sound/soc/codecs/ak5558.c | 10 +- + sound/soc/codecs/alc5623.c | 8 +- + sound/soc/codecs/alc5632.c | 8 +- + sound/soc/codecs/cpcap.c | 18 +- + sound/soc/codecs/cros_ec_codec.c | 4 +- + sound/soc/codecs/cs35l41-i2c.c | 115 + + sound/soc/codecs/cs35l41-spi.c | 140 + + sound/soc/codecs/cs35l41-tables.c | 594 ++++ + sound/soc/codecs/cs35l41.c | 1445 ++++++++ + sound/soc/codecs/cs35l41.h | 775 +++++ + sound/soc/codecs/cs42l42.c | 256 +- + sound/soc/codecs/cs42l42.h | 61 +- + sound/soc/codecs/cs47l15.c | 26 +- + sound/soc/codecs/cs47l24.c | 20 +- + sound/soc/codecs/cs47l35.c | 26 +- + sound/soc/codecs/cs47l85.c | 34 +- + sound/soc/codecs/cs47l90.c | 36 +- + sound/soc/codecs/cs47l92.c | 20 +- + sound/soc/codecs/es8316.c | 7 +- + sound/soc/codecs/lpass-rx-macro.c | 3 +- + sound/soc/codecs/lpass-tx-macro.c | 25 +- + sound/soc/codecs/lpass-va-macro.c | 3 +- + sound/soc/codecs/lpass-wsa-macro.c | 1 + + sound/soc/codecs/madera.c | 18 +- + sound/soc/codecs/max98390.c | 2 +- + sound/soc/codecs/max98520.c | 769 +++++ + sound/soc/codecs/max98520.h | 159 + + sound/soc/codecs/max98927.c | 25 + + sound/soc/codecs/max98927.h | 1 + + sound/soc/codecs/mt6359.c | 2 +- + sound/soc/codecs/nau8821.c | 1714 ++++++++++ + sound/soc/codecs/nau8821.h | 533 +++ + sound/soc/codecs/nau8824.c | 70 + + sound/soc/codecs/nau8824.h | 3 +- + sound/soc/codecs/nau8825.c | 48 +- + sound/soc/codecs/pcm5102a.c | 2 +- + sound/soc/codecs/rt1011.c | 10 + + sound/soc/codecs/rt1015.c | 2 +- + sound/soc/codecs/rt1016.c | 2 +- + sound/soc/codecs/rt1019.c | 2 +- + sound/soc/codecs/rt1305.c | 2 +- + sound/soc/codecs/rt1308.c | 2 +- + sound/soc/codecs/rt5514.c | 2 +- + sound/soc/codecs/rt5616.c | 2 +- + sound/soc/codecs/rt5640.c | 2 +- + sound/soc/codecs/rt5645.c | 2 +- + sound/soc/codecs/rt5651.c | 9 +- + sound/soc/codecs/rt5659.c | 2 +- + sound/soc/codecs/rt5660.c | 2 +- + sound/soc/codecs/rt5663.c | 2 +- + sound/soc/codecs/rt5665.c | 2 +- + sound/soc/codecs/rt5668.c | 2 +- + sound/soc/codecs/rt5670.c | 2 +- + sound/soc/codecs/rt5677.c | 2 +- + sound/soc/codecs/rt5682-i2c.c | 17 + + sound/soc/codecs/rt5682.c | 132 +- + sound/soc/codecs/rt5682.h | 23 + + sound/soc/codecs/rt5682s.c | 3197 ++++++++++++++++++ + sound/soc/codecs/rt5682s.h | 1474 ++++++++ + sound/soc/codecs/rt9120.c | 495 +++ + sound/soc/codecs/tlv320aic32x4-i2c.c | 4 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 4 +- + sound/soc/codecs/tlv320aic32x4.c | 4 +- + sound/soc/codecs/tlv320aic32x4.h | 2 +- + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wm2200.c | 30 +- + sound/soc/codecs/wm5102.c | 16 +- + sound/soc/codecs/wm5110.c | 24 +- + sound/soc/codecs/wm8731.c | 6 - + sound/soc/codecs/wm8900.c | 6 - + sound/soc/codecs/wm8962.c | 13 +- + sound/soc/codecs/wm_adsp.c | 3303 ++---------------- + sound/soc/codecs/wm_adsp.h | 105 +- + sound/soc/codecs/zl38060.c | 4 +- + sound/soc/dwc/dwc-i2s.c | 12 +- + sound/soc/fsl/eukrea-tlv320.c | 2 +- + sound/soc/fsl/fsl-asoc-card.c | 54 +- + sound/soc/fsl/fsl_audmix.c | 8 +- + sound/soc/fsl/fsl_esai.c | 28 +- + sound/soc/fsl/fsl_mqs.c | 4 +- + sound/soc/fsl/fsl_rpmsg.c | 47 +- + sound/soc/fsl/fsl_rpmsg.h | 12 + + sound/soc/fsl/fsl_sai.c | 34 +- + sound/soc/fsl/fsl_sai.h | 2 +- + sound/soc/fsl/fsl_spdif.c | 85 + + sound/soc/fsl/fsl_ssi.c | 38 +- + sound/soc/fsl/imx-audmix.c | 12 +- + sound/soc/fsl/imx-card.c | 6 +- + sound/soc/fsl/imx-es8328.c | 2 +- + sound/soc/fsl/imx-hdmi.c | 6 +- + sound/soc/fsl/imx-rpmsg.c | 2 +- + sound/soc/fsl/imx-sgtl5000.c | 2 +- + sound/soc/fsl/mpc8610_hpcd.c | 16 +- + sound/soc/fsl/p1022_ds.c | 16 +- + sound/soc/fsl/p1022_rdk.c | 2 +- + sound/soc/generic/Kconfig | 20 + + sound/soc/generic/Makefile | 6 + + sound/soc/generic/audio-graph-card.c | 4 +- + .../soc/generic/audio-graph-card2-custom-sample.c | 183 + + .../generic/audio-graph-card2-custom-sample.dtsi | 227 ++ + sound/soc/generic/audio-graph-card2.c | 1281 +++++++ + sound/soc/generic/simple-card-utils.c | 50 +- + sound/soc/generic/test-component.c | 659 ++++ + sound/soc/intel/boards/Kconfig | 17 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bdw-rt5650.c | 2 +- + sound/soc/intel/boards/bdw-rt5677.c | 2 +- + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 4 +- + sound/soc/intel/boards/bxt_rt298.c | 2 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 4 +- + sound/soc/intel/boards/bytcht_da7213.c | 4 +- + sound/soc/intel/boards/bytcht_es8316.c | 4 +- + sound/soc/intel/boards/bytcht_nocodec.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 120 +- + sound/soc/intel/boards/bytcr_rt5651.c | 122 +- + sound/soc/intel/boards/bytcr_wm5102.c | 4 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 4 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 4 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 4 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 6 +- + sound/soc/intel/boards/kbl_rt5660.c | 2 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 6 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 +- + sound/soc/intel/boards/skl_rt286.c | 2 +- + sound/soc/intel/boards/sof_es8336.c | 569 ++++ + sound/soc/intel/boards/sof_rt5682.c | 122 +- + sound/soc/intel/boards/sof_sdw.c | 10 + + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 15 +- + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 6 + + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 7 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 32 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 49 +- + sound/soc/intel/skylake/skl-topology.c | 6 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 3 +- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 2 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 2 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 10 +- + sound/soc/mediatek/mt8195/mt8195-audsys-clk.c | 152 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 8 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 4 +- + .../mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 54 +- + sound/soc/meson/aiu-encoder-spdif.c | 2 +- + sound/soc/meson/axg-card.c | 1 + + sound/soc/meson/axg-tdm-interface.c | 26 +- + sound/soc/meson/meson-card-utils.c | 1 + + sound/soc/meson/meson-codec-glue.c | 3 - + sound/soc/qcom/Kconfig | 25 +- + sound/soc/qcom/apq8096.c | 2 +- + sound/soc/qcom/common.c | 4 +- + sound/soc/qcom/qdsp6/Makefile | 11 +- + sound/soc/qcom/qdsp6/audioreach.c | 1130 +++++++ + sound/soc/qcom/qdsp6/audioreach.h | 726 ++++ + sound/soc/qcom/qdsp6/q6afe-clocks.c | 187 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 689 +--- + sound/soc/qcom/qdsp6/q6apm-dai.c | 416 +++ + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 260 ++ + sound/soc/qcom/qdsp6/q6apm.c | 822 +++++ + sound/soc/qcom/qdsp6/q6apm.h | 152 + + sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.c | 186 + + sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.h | 30 + + sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 627 ++++ + sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h | 22 + + sound/soc/qcom/qdsp6/q6prm-clocks.c | 85 + + sound/soc/qcom/qdsp6/q6prm.c | 202 ++ + sound/soc/qcom/qdsp6/q6prm.h | 78 + + sound/soc/qcom/qdsp6/topology.c | 1113 ++++++ + sound/soc/qcom/sm8250.c | 79 + + sound/soc/rockchip/Kconfig | 11 + + sound/soc/rockchip/Makefile | 2 + + sound/soc/rockchip/rockchip_i2s_tdm.c | 1762 ++++++++++ + sound/soc/rockchip/rockchip_i2s_tdm.h | 398 +++ + sound/soc/rockchip/rockchip_pdm.c | 112 +- + sound/soc/rockchip/rockchip_pdm.h | 6 + + sound/soc/samsung/s3c-i2s-v2.c | 2 + + sound/soc/soc-component.c | 87 +- + sound/soc/soc-compress.c | 43 +- + sound/soc/soc-core.c | 51 +- + sound/soc/soc-dapm.c | 2 + + sound/soc/soc-generic-dmaengine-pcm.c | 6 +- + sound/soc/soc-pcm.c | 27 +- + sound/soc/soc-topology.c | 18 +- + sound/soc/sof/Kconfig | 6 +- + sound/soc/sof/Makefile | 6 +- + sound/soc/sof/compress.c | 158 +- + sound/soc/sof/compress.h | 32 - + sound/soc/sof/control.c | 192 +- + sound/soc/sof/core.c | 35 +- + sound/soc/sof/debug.c | 87 +- + sound/soc/sof/imx/Kconfig | 2 + + sound/soc/sof/imx/imx-ops.h | 10 + + sound/soc/sof/imx/imx8.c | 47 +- + sound/soc/sof/imx/imx8m.c | 41 +- + sound/soc/sof/intel/Makefile | 5 +- + sound/soc/sof/intel/apl.c | 7 +- + sound/soc/sof/intel/atom.c | 5 +- + sound/soc/sof/intel/bdw.c | 19 +- + sound/soc/sof/intel/byt.c | 30 +- + sound/soc/sof/intel/cnl.c | 7 +- + sound/soc/sof/intel/hda-dai.c | 262 +- + sound/soc/sof/intel/hda-dsp.c | 61 +- + sound/soc/sof/intel/hda-ipc.c | 15 +- + sound/soc/sof/intel/hda-loader.c | 11 +- + .../soc/sof/intel/{hda-compress.c => hda-probes.c} | 0 + sound/soc/sof/intel/hda-stream.c | 92 +- + sound/soc/sof/intel/hda.c | 232 +- + sound/soc/sof/intel/hda.h | 52 +- + sound/soc/sof/intel/icl.c | 7 +- + sound/soc/sof/intel/pci-apl.c | 2 - + sound/soc/sof/intel/pci-cnl.c | 3 - + sound/soc/sof/intel/pci-icl.c | 2 - + sound/soc/sof/intel/pci-tgl.c | 5 - + sound/soc/sof/intel/pci-tng.c | 16 +- + sound/soc/sof/intel/tgl.c | 7 +- + sound/soc/sof/ipc.c | 217 +- + sound/soc/sof/loader.c | 161 +- + sound/soc/sof/ops.c | 3 + + sound/soc/sof/ops.h | 77 +- + sound/soc/sof/pcm.c | 71 +- + sound/soc/sof/pm.c | 12 +- + sound/soc/sof/probe.h | 85 - + sound/soc/sof/sof-audio.c | 715 +++- + sound/soc/sof/sof-audio.h | 52 +- + sound/soc/sof/sof-of-dev.c | 24 +- + sound/soc/sof/sof-priv.h | 154 +- + sound/soc/sof/{probe.c => sof-probes.c} | 280 +- + sound/soc/sof/sof-probes.h | 38 + + sound/soc/sof/{intel/intel-ipc.c => stream-ipc.c} | 56 +- + sound/soc/sof/topology.c | 417 +-- + sound/soc/sof/trace.c | 5 +- + sound/soc/sof/utils.c | 28 +- + sound/soc/sof/xtensa/core.c | 2 +- + sound/soc/tegra/Kconfig | 48 + + sound/soc/tegra/Makefile | 10 + + sound/soc/tegra/tegra210_adx.c | 531 +++ + sound/soc/tegra/tegra210_adx.h | 72 + + sound/soc/tegra/tegra210_ahub.c | 511 ++- + sound/soc/tegra/tegra210_amx.c | 600 ++++ + sound/soc/tegra/tegra210_amx.h | 93 + + sound/soc/tegra/tegra210_mixer.c | 674 ++++ + sound/soc/tegra/tegra210_mixer.h | 100 + + sound/soc/tegra/tegra210_mvc.c | 645 ++++ + sound/soc/tegra/tegra210_mvc.h | 117 + + sound/soc/tegra/tegra210_sfc.c | 3549 ++++++++++++++++++++ + sound/soc/tegra/tegra210_sfc.h | 78 + + sound/soc/tegra/tegra_asoc_machine.c | 62 +- + sound/soc/tegra/tegra_asoc_machine.h | 1 + + sound/soc/ti/Kconfig | 2 +- + sound/soc/ti/davinci-evm.c | 2 +- + sound/soc/ti/omap-abe-twl6040.c | 2 +- + sound/soc/ux500/mop500_ab8500.c | 2 +- + sound/soc/ux500/mop500_ab8500.h | 2 +- + 394 files changed, 44394 insertions(+), 7099 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card2.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/bt-sco.txt + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs35l41.yaml + create mode 100644 Documentation/devicetree/bindings/sound/linux,bt-sco.yaml + create mode 100644 Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98520.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/name-prefix.txt + create mode 100644 Documentation/devicetree/bindings/sound/name-prefix.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nau8821.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6apm-dai.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-clocks.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6dsp-lpass-ports.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/richtek,rt9120.yaml + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/simple-amplifier.txt + create mode 100644 Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt + create mode 100644 Documentation/devicetree/bindings/sound/test-component.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8962.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8978.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8962.txt + create mode 100644 drivers/firmware/cirrus/Kconfig + create mode 100644 drivers/firmware/cirrus/Makefile + create mode 100644 drivers/firmware/cirrus/cs_dsp.c + create mode 100644 include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h + create mode 100644 include/linux/firmware/cirrus/cs_dsp.h + rename {sound/soc/codecs => include/linux/firmware/cirrus}/wmfw.h (91%) + create mode 100644 include/sound/cs35l41.h + create mode 100644 include/sound/rt5682s.h + create mode 100644 include/uapi/sound/snd_ar_tokens.h + create mode 100644 sound/soc/amd/acp/Kconfig + create mode 100644 sound/soc/amd/acp/Makefile + create mode 100644 sound/soc/amd/acp/acp-i2s.c + create mode 100644 sound/soc/amd/acp/acp-legacy-mach.c + create mode 100644 sound/soc/amd/acp/acp-mach-common.c + create mode 100644 sound/soc/amd/acp/acp-mach.h + create mode 100644 sound/soc/amd/acp/acp-platform.c + create mode 100644 sound/soc/amd/acp/acp-renoir.c + create mode 100644 sound/soc/amd/acp/acp-sof-mach.c + create mode 100644 sound/soc/amd/acp/amd.h + create mode 100644 sound/soc/amd/acp/chip_offset_byte.h + create mode 100644 sound/soc/amd/vangogh/acp5x-mach.c + create mode 100644 sound/soc/amd/yc/Makefile + create mode 100644 sound/soc/amd/yc/acp6x-mach.c + create mode 100644 sound/soc/amd/yc/acp6x-pdm-dma.c + create mode 100644 sound/soc/amd/yc/acp6x.h + create mode 100644 sound/soc/amd/yc/acp6x_chip_offset_byte.h + create mode 100644 sound/soc/amd/yc/pci-acp6x.c + create mode 100644 sound/soc/codecs/cs35l41-i2c.c + create mode 100644 sound/soc/codecs/cs35l41-spi.c + create mode 100644 sound/soc/codecs/cs35l41-tables.c + create mode 100644 sound/soc/codecs/cs35l41.c + create mode 100644 sound/soc/codecs/cs35l41.h + create mode 100644 sound/soc/codecs/max98520.c + create mode 100644 sound/soc/codecs/max98520.h + create mode 100644 sound/soc/codecs/nau8821.c + create mode 100644 sound/soc/codecs/nau8821.h + create mode 100644 sound/soc/codecs/rt5682s.c + create mode 100644 sound/soc/codecs/rt5682s.h + create mode 100644 sound/soc/codecs/rt9120.c + create mode 100644 sound/soc/generic/audio-graph-card2-custom-sample.c + create mode 100644 sound/soc/generic/audio-graph-card2-custom-sample.dtsi + create mode 100644 sound/soc/generic/audio-graph-card2.c + create mode 100644 sound/soc/generic/test-component.c + create mode 100644 sound/soc/intel/boards/sof_es8336.c + create mode 100644 sound/soc/qcom/qdsp6/audioreach.c + create mode 100644 sound/soc/qcom/qdsp6/audioreach.h + create mode 100644 sound/soc/qcom/qdsp6/q6apm-dai.c + create mode 100644 sound/soc/qcom/qdsp6/q6apm-lpass-dais.c + create mode 100644 sound/soc/qcom/qdsp6/q6apm.c + create mode 100644 sound/soc/qcom/qdsp6/q6apm.h + create mode 100644 sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.c + create mode 100644 sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.h + create mode 100644 sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c + create mode 100644 sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h + create mode 100644 sound/soc/qcom/qdsp6/q6prm-clocks.c + create mode 100644 sound/soc/qcom/qdsp6/q6prm.c + create mode 100644 sound/soc/qcom/qdsp6/q6prm.h + create mode 100644 sound/soc/qcom/qdsp6/topology.c + create mode 100644 sound/soc/rockchip/rockchip_i2s_tdm.c + create mode 100644 sound/soc/rockchip/rockchip_i2s_tdm.h + delete mode 100644 sound/soc/sof/compress.h + create mode 100644 sound/soc/sof/imx/imx-ops.h + rename sound/soc/sof/intel/{hda-compress.c => hda-probes.c} (100%) + delete mode 100644 sound/soc/sof/probe.h + rename sound/soc/sof/{probe.c => sof-probes.c} (52%) + create mode 100644 sound/soc/sof/sof-probes.h + rename sound/soc/sof/{intel/intel-ipc.c => stream-ipc.c} (56%) + create mode 100644 sound/soc/tegra/tegra210_adx.c + create mode 100644 sound/soc/tegra/tegra210_adx.h + create mode 100644 sound/soc/tegra/tegra210_amx.c + create mode 100644 sound/soc/tegra/tegra210_amx.h + create mode 100644 sound/soc/tegra/tegra210_mixer.c + create mode 100644 sound/soc/tegra/tegra210_mixer.h + create mode 100644 sound/soc/tegra/tegra210_mvc.c + create mode 100644 sound/soc/tegra/tegra210_mvc.h + create mode 100644 sound/soc/tegra/tegra210_sfc.c + create mode 100644 sound/soc/tegra/tegra210_sfc.h +Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules/modules-next +Already up to date. +Merging input/next (c6ac8f0b4ca9 Input: ili210x - add ili251x firmware update support) +$ 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 +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 +Merge made by the 'recursive' strategy. + .../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/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/spi/ads7846.h | 15 - + kernel/reboot.c | 1 + + 37 files changed, 1736 insertions(+), 421 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 +Merging block/for-next (47af7468b7e0 Merge branch 'for-5.16/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging mm/filemap.c +Auto-merging kernel/sched/core.c +Removing include/linux/keyslot-manager.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/fs.h +Auto-merging fs/zonefs/super.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/pstore/blk.c +Auto-merging fs/orangefs/super.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs/file.c +Auto-merging fs/nfs/direct.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/io_uring.c +CONFLICT (content): Merge conflict in fs/io_uring.c +Auto-merging fs/io-wq.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/fuse/file.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/file.c +Auto-merging fs/cifs/file.c +Auto-merging fs/ceph/file.c +Auto-merging fs/cachefiles/io.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/dev-replace.c +Auto-merging fs/btrfs/ctree.c +Auto-merging fs/btrfs/compression.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/s390/block/dcssblk.c +Auto-merging drivers/s390/block/dasd_genhd.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/gpu/drm/i915/i915_utils.h +Removing drivers/block/cryptoloop.c +Auto-merging block/partitions/core.c +Removing block/keyslot-manager.c +Auto-merging block/blk-cgroup.c +Auto-merging Makefile +Auto-merging Documentation/block/queue-sysfs.rst +Auto-merging Documentation/block/inline-encryption.rst +Resolved 'fs/io_uring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d83d03a91a81] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + Documentation/block/inline-encryption.rst | 451 +++---- + Documentation/block/queue-sysfs.rst | 33 +- + Documentation/cdrom/cdrom-standard.rst | 11 + + Documentation/userspace-api/ioctl/cdrom.rst | 113 +- + Makefile | 3 +- + arch/m68k/emu/nfblock.c | 12 +- + arch/mips/rb532/prom.c | 1 - + arch/mips/sibyte/common/cfe.c | 1 - + arch/mips/sibyte/swarm/setup.c | 1 - + arch/openrisc/mm/init.c | 1 - + arch/powerpc/platforms/cell/spufs/inode.c | 1 + + arch/um/drivers/ubd_kern.c | 14 +- + arch/xtensa/platforms/iss/simdisk.c | 16 +- + block/Kconfig | 28 +- + block/Kconfig.iosched | 4 - + block/Makefile | 6 +- + block/bdev.c | 46 +- + block/bfq-cgroup.c | 14 +- + block/bfq-iosched.c | 6 +- + block/bio-integrity.c | 4 +- + block/bio.c | 171 ++- + block/blk-cgroup.c | 27 +- + block/blk-core.c | 413 +++---- + block/blk-crypto-fallback.c | 119 +- + block/blk-crypto-internal.h | 2 +- + block/blk-crypto-profile.c | 565 +++++++++ + block/blk-crypto.c | 29 +- + block/blk-exec.c | 10 +- + block/blk-flush.c | 12 +- + block/blk-ia-ranges.c | 348 ++++++ + block/blk-integrity.c | 6 +- + block/blk-iocost.c | 12 +- + block/blk-iolatency.c | 1 + + block/blk-merge.c | 127 +- + block/blk-mq-debugfs.c | 132 +- + block/blk-mq-sched.c | 129 +- + block/blk-mq-sched.h | 49 +- + block/blk-mq-tag.c | 163 ++- + block/blk-mq-tag.h | 38 +- + block/blk-mq.c | 1034 ++++++++++------ + block/blk-mq.h | 79 +- + block/blk-rq-qos.h | 5 +- + block/blk-sysfs.c | 50 +- + block/blk-throttle.c | 163 +-- + block/blk-throttle.h | 182 +++ + block/blk-wbt.c | 3 + + block/blk.h | 131 +- + block/bounce.c | 1 + + block/bsg-lib.c | 32 +- + block/elevator.c | 4 +- + {include/linux => block}/elevator.h | 21 +- + block/fops.c | 286 +++-- + block/genhd.c | 36 +- + block/holder.c | 1 + + block/ioctl.c | 37 +- + block/keyslot-manager.c | 578 --------- + block/kyber-iosched.c | 6 +- + block/mq-deadline.c | 224 ++-- + block/partitions/Kconfig | 4 + + block/partitions/core.c | 6 +- + block/partitions/efi.c | 2 +- + block/partitions/ibm.c | 19 +- + block/t10-pi.c | 2 +- + crypto/af_alg.c | 2 +- + drivers/ata/libata-core.c | 57 +- + drivers/ata/libata-scsi.c | 48 +- + drivers/block/Kconfig | 25 +- + drivers/block/Makefile | 1 - + drivers/block/amiflop.c | 9 +- + drivers/block/aoe/aoeblk.c | 19 +- + drivers/block/ataflop.c | 107 +- + drivers/block/brd.c | 12 +- + drivers/block/cryptoloop.c | 206 ---- + drivers/block/drbd/drbd_int.h | 5 +- + drivers/block/drbd/drbd_main.c | 6 +- + drivers/block/drbd/drbd_req.c | 3 +- + drivers/block/floppy.c | 35 +- + drivers/block/loop.c | 420 +------ + drivers/block/loop.h | 30 - + drivers/block/mtip32xx/mtip32xx.c | 6 +- + drivers/block/n64cart.c | 24 +- + drivers/block/nbd.c | 176 ++- + drivers/block/null_blk/main.c | 111 +- + drivers/block/null_blk/null_blk.h | 4 + + drivers/block/paride/pcd.c | 312 +++-- + drivers/block/paride/pd.c | 144 +-- + drivers/block/paride/pf.c | 236 ++-- + drivers/block/pktcdvd.c | 18 +- + drivers/block/ps3vram.c | 6 +- + drivers/block/rbd.c | 8 +- + drivers/block/rnbd/rnbd-clt.c | 15 +- + drivers/block/rnbd/rnbd-proto.h | 2 +- + drivers/block/rsxx/core.c | 4 +- + drivers/block/rsxx/dev.c | 19 +- + drivers/block/swim.c | 36 +- + drivers/block/swim3.c | 5 +- + drivers/block/sx8.c | 15 +- + drivers/block/virtio_blk.c | 12 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/xen-blkfront.c | 9 +- + drivers/block/zram/zram_drv.c | 10 +- + drivers/cdrom/cdrom.c | 63 +- + drivers/cdrom/gdrom.c | 7 +- + drivers/gpu/drm/i915/i915_utils.h | 1 + + drivers/md/bcache/bcache.h | 4 - + drivers/md/bcache/btree.c | 2 +- + drivers/md/bcache/debug.c | 15 +- + drivers/md/bcache/io.c | 16 +- + drivers/md/bcache/request.c | 19 +- + drivers/md/bcache/request.h | 4 +- + drivers/md/bcache/super.c | 91 +- + drivers/md/bcache/sysfs.c | 2 +- + drivers/md/bcache/util.h | 12 - + drivers/md/bcache/writeback.c | 2 +- + drivers/md/dm-bio-record.h | 1 + + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-cache-metadata.c | 2 +- + drivers/md/dm-cache-target.c | 2 +- + drivers/md/dm-clone-target.c | 2 +- + drivers/md/dm-core.h | 4 +- + drivers/md/dm-crypt.c | 1 + + drivers/md/dm-dust.c | 5 +- + drivers/md/dm-ebs-target.c | 2 +- + drivers/md/dm-era-target.c | 2 +- + drivers/md/dm-exception-store.h | 2 +- + drivers/md/dm-flakey.c | 3 +- + drivers/md/dm-ima.c | 1 + + drivers/md/dm-integrity.c | 6 +- + drivers/md/dm-linear.c | 3 +- + drivers/md/dm-log-writes.c | 4 +- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 2 +- + drivers/md/dm-ps-historical-service-time.c | 1 + + drivers/md/dm-raid.c | 6 +- + drivers/md/dm-rq.c | 1 - + drivers/md/dm-switch.c | 2 +- + drivers/md/dm-table.c | 172 ++- + drivers/md/dm-thin-metadata.c | 2 +- + drivers/md/dm-thin.c | 2 +- + drivers/md/dm-verity-target.c | 4 +- + drivers/md/dm-writecache.c | 2 +- + drivers/md/dm-zoned-target.c | 2 +- + drivers/md/dm.c | 42 +- + drivers/md/md.c | 130 +- + drivers/md/md.h | 2 +- + drivers/md/raid1.c | 13 +- + drivers/md/raid10.c | 2 +- + drivers/md/raid5.c | 7 +- + drivers/mmc/core/crypto.c | 11 +- + drivers/mmc/core/sd.c | 1 + + drivers/mmc/host/cqhci-crypto.c | 33 +- + drivers/mtd/mtd_blkdevs.c | 6 +- + drivers/mtd/mtdsuper.c | 1 + + drivers/nvdimm/blk.c | 5 +- + drivers/nvdimm/btt.c | 5 +- + drivers/nvdimm/core.c | 1 + + drivers/nvdimm/pmem.c | 3 +- + drivers/nvme/host/core.c | 140 ++- + drivers/nvme/host/fabrics.c | 6 +- + drivers/nvme/host/fabrics.h | 8 + + drivers/nvme/host/fc.c | 34 +- + drivers/nvme/host/multipath.c | 52 +- + drivers/nvme/host/nvme.h | 19 + + drivers/nvme/host/pci.c | 58 +- + drivers/nvme/host/rdma.c | 28 +- + drivers/nvme/host/tcp.c | 20 +- + drivers/nvme/host/zns.c | 2 + + drivers/nvme/target/admin-cmd.c | 16 +- + drivers/nvme/target/configfs.c | 41 + + drivers/nvme/target/core.c | 17 +- + drivers/nvme/target/discovery.c | 2 + + drivers/nvme/target/fabrics-cmd.c | 3 +- + drivers/nvme/target/io-cmd-bdev.c | 5 +- + drivers/nvme/target/io-cmd-file.c | 4 +- + drivers/nvme/target/loop.c | 6 +- + drivers/nvme/target/nvmet.h | 6 + + drivers/nvme/target/rdma.c | 31 + + drivers/nvme/target/tcp.c | 16 + + drivers/s390/block/dasd.c | 9 +- + drivers/s390/block/dasd_3990_erp.c | 6 +- + drivers/s390/block/dasd_eckd.c | 294 +++-- + drivers/s390/block/dasd_eckd.h | 13 +- + drivers/s390/block/dasd_erp.c | 8 +- + drivers/s390/block/dasd_genhd.c | 1 + + drivers/s390/block/dasd_int.h | 11 +- + drivers/s390/block/dasd_ioctl.c | 4 +- + drivers/s390/block/dcssblk.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 + + drivers/scsi/lpfc/lpfc.h | 1 + + drivers/scsi/qla2xxx/qla_nvme.c | 15 + + drivers/scsi/scsi_bsg.c | 4 +- + drivers/scsi/scsi_debug.c | 10 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/scsi/scsi_ioctl.c | 4 +- + drivers/scsi/scsi_lib.c | 30 +- + drivers/scsi/scsi_scan.c | 1 - + drivers/scsi/sd.c | 121 ++ + drivers/scsi/sd.h | 1 + + drivers/scsi/sd_dif.c | 2 +- + drivers/scsi/sg.c | 5 +- + drivers/scsi/sr.c | 3 +- + drivers/scsi/st.c | 3 +- + drivers/scsi/ufs/ufshcd-crypto.c | 32 +- + drivers/scsi/ufs/ufshcd-crypto.h | 9 +- + drivers/scsi/ufs/ufshcd.c | 2 +- + drivers/scsi/ufs/ufshcd.h | 6 +- + drivers/scsi/virtio_scsi.c | 1 + + drivers/target/target_core_file.c | 5 +- + drivers/target/target_core_iblock.c | 6 +- + drivers/target/target_core_pscsi.c | 3 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 7 +- + fs/affs/super.c | 2 +- + fs/aio.c | 6 +- + fs/btrfs/compression.c | 1 + + fs/btrfs/ctree.c | 1 + + fs/btrfs/dev-replace.c | 3 +- + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/inode.c | 9 +- + fs/btrfs/ioctl.c | 4 +- + fs/btrfs/volumes.c | 10 +- + fs/buffer.c | 4 +- + fs/cachefiles/io.c | 12 +- + fs/ceph/file.c | 2 +- + fs/cifs/file.c | 4 +- + fs/cramfs/inode.c | 2 +- + fs/direct-io.c | 16 +- + fs/ext4/file.c | 2 +- + fs/ext4/super.c | 2 +- + fs/f2fs/compress.c | 1 + + fs/fat/inode.c | 11 +- + fs/fs-writeback.c | 5 +- + fs/fuse/file.c | 2 +- + fs/gfs2/file.c | 4 +- + fs/hfs/mdb.c | 2 +- + fs/hfsplus/wrapper.c | 2 +- + fs/internal.h | 11 - + fs/io-wq.c | 12 +- + fs/io-wq.h | 59 +- + fs/io_uring.c | 1735 ++++++++++++++------------- + fs/iomap/direct-io.c | 59 +- + fs/jfs/resize.c | 5 +- + fs/jfs/super.c | 5 +- + fs/nfs/blocklayout/dev.c | 4 +- + fs/nfs/direct.c | 2 +- + fs/nfsd/Kconfig | 1 - + fs/nfsd/blocklayout.c | 158 +-- + fs/nfsd/nfs4layouts.c | 5 +- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/super.c | 2 +- + fs/nilfs2/the_nilfs.c | 2 +- + fs/ntfs/file.c | 1 + + fs/ntfs/super.c | 8 +- + fs/ntfs3/file.c | 1 + + fs/ntfs3/inode.c | 2 +- + fs/ntfs3/super.c | 2 +- + fs/orangefs/inode.c | 2 +- + fs/orangefs/super.c | 1 + + fs/overlayfs/file.c | 4 +- + fs/pstore/blk.c | 8 +- + fs/quota/quota.c | 1 + + fs/ramfs/inode.c | 1 + + fs/reiserfs/super.c | 8 +- + fs/squashfs/super.c | 5 +- + fs/sync.c | 62 +- + fs/udf/lowlevel.c | 5 +- + fs/udf/super.c | 9 +- + fs/xfs/xfs_file.c | 2 +- + fs/zonefs/super.c | 2 +- + include/linux/ata.h | 1 + + include/linux/backing-dev.h | 19 +- + include/linux/bio.h | 147 +-- + include/linux/blk-crypto-profile.h | 166 +++ + include/linux/blk-integrity.h | 183 +++ + include/linux/blk-mq.h | 586 ++++++++- + include/linux/blk_types.h | 55 +- + include/linux/blkdev.h | 949 +++------------ + include/linux/blktrace_api.h | 2 +- + include/linux/bvec.h | 2 +- + include/linux/cdrom.h | 1 + + include/linux/device-mapper.h | 4 +- + include/linux/fs.h | 12 +- + include/linux/genhd.h | 38 +- + include/linux/iomap.h | 5 +- + include/linux/keyslot-manager.h | 120 -- + include/linux/libata.h | 15 + + include/linux/mmc/host.h | 4 +- + include/linux/nvme-fc-driver.h | 7 + + include/linux/nvme-rdma.h | 2 + + include/linux/nvme.h | 11 +- + include/linux/part_stat.h | 1 + + include/linux/percpu-refcount.h | 33 +- + include/linux/sbitmap.h | 24 + + include/linux/sched.h | 2 - + include/linux/t10-pi.h | 2 +- + include/linux/writeback.h | 14 +- + include/scsi/scsi_cmnd.h | 3 + + include/scsi/scsi_device.h | 2 +- + include/trace/events/block.h | 6 +- + include/trace/events/io_uring.h | 61 + + include/uapi/linux/bcache.h | 4 +- + include/uapi/linux/cdrom.h | 19 + + include/uapi/linux/io_uring.h | 1 + + init/main.c | 1 - + kernel/acct.c | 1 - + kernel/exit.c | 1 - + kernel/fork.c | 1 - + kernel/sched/core.c | 7 +- + kernel/sched/sched.h | 1 - + kernel/trace/blktrace.c | 7 +- + lib/random32.c | 1 + + lib/sbitmap.c | 95 +- + mm/backing-dev.c | 19 +- + mm/filemap.c | 1 - + mm/highmem.c | 1 - + mm/mempool.c | 1 - + mm/nommu.c | 1 - + mm/page_io.c | 10 +- + mm/readahead.c | 1 - + mm/shmem.c | 1 - + mm/swapfile.c | 2 +- + 321 files changed, 8122 insertions(+), 6893 deletions(-) + create mode 100644 block/blk-crypto-profile.c + create mode 100644 block/blk-ia-ranges.c + create mode 100644 block/blk-throttle.h + rename {include/linux => block}/elevator.h (92%) + delete mode 100644 block/keyslot-manager.c + delete mode 100644 drivers/block/cryptoloop.c + create mode 100644 include/linux/blk-crypto-profile.h + create mode 100644 include/linux/blk-integrity.h + delete mode 100644 include/linux/keyslot-manager.h +Merging device-mapper/for-next (54d97aac0bb9 dm: Remove redundant flush_workqueue() calls) +$ 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 drivers/md/dm-zoned-target.c +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-bufio.c +Auto-merging drivers/md/bcache/writeback.c +Merge made by the 'recursive' strategy. + drivers/md/Kconfig | 10 ++++++ + drivers/md/Makefile | 4 +++ + drivers/md/bcache/writeback.c | 4 +-- + drivers/md/dm-audit.c | 84 +++++++++++++++++++++++++++++++++++++++++++ + drivers/md/dm-audit.h | 66 ++++++++++++++++++++++++++++++++++ + drivers/md/dm-bufio.c | 1 - + drivers/md/dm-crypt.c | 22 +++++++++--- + drivers/md/dm-integrity.c | 25 ++++++++++--- + drivers/md/dm-zoned-target.c | 1 - + include/uapi/linux/audit.h | 2 ++ + 10 files changed, 206 insertions(+), 13 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 +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/libata-core.c +Merge made by the 'recursive' strategy. + drivers/ata/ahci.c | 13 +++++-------- + drivers/ata/libata-core.c | 2 +- + drivers/ata/libata-scsi.c | 4 ++-- + drivers/ata/pata_ali.c | 4 ++-- + drivers/ata/pata_amd.c | 2 +- + drivers/ata/pata_optidma.c | 4 ++-- + drivers/ata/pata_radisys.c | 4 ++-- + 7 files changed, 15 insertions(+), 18 deletions(-) +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 (88b950ce58f7 MAINTAINERS: drop obsolete file pattern in SDHCI DRIVER section) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Removing include/linux/mmc/sdhci-pci-data.h +Auto-merging include/linux/mmc/host.h +Removing drivers/mmc/host/sdhci-pci-data.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mmc/mmc-card.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 26 +- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 1 + + Documentation/devicetree/bindings/mmc/mmc-card.txt | 30 -- + .../devicetree/bindings/mmc/mmc-card.yaml | 48 +++ + .../devicetree/bindings/mmc/mmc-controller.yaml | 6 - + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 12 + + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + .../devicetree/bindings/mmc/sdhci-omap.txt | 9 +- + MAINTAINERS | 1 - + drivers/memstick/core/ms_block.c | 8 +- + drivers/memstick/core/mspro_block.c | 6 +- + drivers/memstick/host/jmb38x_ms.c | 5 +- + drivers/memstick/host/r592.c | 8 +- + drivers/mmc/core/block.c | 7 +- + drivers/mmc/core/mmc.c | 8 + + drivers/mmc/core/mmc_ops.h | 1 - + drivers/mmc/core/slot-gpio.c | 42 +-- + drivers/mmc/host/Kconfig | 8 +- + drivers/mmc/host/Makefile | 1 - + drivers/mmc/host/cqhci-core.c | 4 +- + drivers/mmc/host/dw_mmc.c | 42 ++- + drivers/mmc/host/mmci.c | 4 + + drivers/mmc/host/moxart-mmc.c | 29 +- + drivers/mmc/host/mtk-sd.c | 99 ++++++- + drivers/mmc/host/mxs-mmc.c | 10 + + drivers/mmc/host/omap_hsmmc.c | 12 +- + drivers/mmc/host/sdhci-acpi.c | 14 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +- + drivers/mmc/host/sdhci-of-arasan.c | 29 +- + drivers/mmc/host/sdhci-omap.c | 322 ++++++++++++++++----- + drivers/mmc/host/sdhci-pci-core.c | 152 +--------- + drivers/mmc/host/sdhci-pci-data.c | 6 - + drivers/mmc/host/sdhci-pci-o2micro.c | 2 +- + drivers/mmc/host/sdhci-pci.h | 5 - + drivers/mmc/host/sdhci-s3c.c | 1 - + drivers/mmc/host/sdhci-sprd.c | 13 + + drivers/mmc/host/sdhci.c | 42 ++- + drivers/mmc/host/sdhci.h | 2 +- + include/linux/mmc/host.h | 4 + + include/linux/mmc/sdhci-pci-data.h | 18 -- + 40 files changed, 657 insertions(+), 398 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-card.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-card.yaml + delete mode 100644 drivers/mmc/host/sdhci-pci-data.c + delete mode 100644 include/linux/mmc/sdhci-pci-data.h +Merging mfd/for-mfd-next (818ed35d6425 mfd: tps80031: Remove driver) +$ 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 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/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 e67e9e2a4d77] 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 +- + 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 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 3 + + .../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 +- + drivers/mfd/Kconfig | 22 +- + 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 | 2 +- + 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/linux/mfd/da9063/core.h | 1 + + include/linux/mfd/hi6421-spmi-pmic.h | 25 - + include/linux/mfd/max77686-private.h | 26 +- + include/linux/mfd/tps65912.h | 2 +- + include/linux/mfd/tps80031.h | 637 --------------------- + 64 files changed, 903 insertions(+), 1765 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-axp209.txt + create mode 100644 Documentation/devicetree/bindings/gpio/x-powers,axp209-gpio.yaml + 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/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 (172d0ccea55c power: bq25890: add return values to error messages) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 13 ++ + .../bindings/power/supply/maxim,max17040.yaml | 2 +- + .../bindings/power/supply/samsung,battery.yaml | 56 +++++++ + .../power/supply/stericsson,ab8500-btemp.yaml | 10 +- + .../power/supply/stericsson,ab8500-chargalg.yaml | 10 +- + .../power/supply/stericsson,ab8500-charger.yaml | 10 +- + .../power/supply/stericsson,ab8500-fg.yaml | 10 +- + MAINTAINERS | 21 +++ + drivers/power/reset/at91-reset.c | 4 +- + drivers/power/reset/ltc2952-poweroff.c | 4 +- + drivers/power/supply/Kconfig | 23 +-- + drivers/power/supply/ab8500_bmdata.c | 3 +- + drivers/power/supply/axp288_charger.c | 178 ++++++++++++--------- + drivers/power/supply/bq25890_charger.c | 34 ++-- + drivers/power/supply/cpcap-battery.c | 15 +- + drivers/power/supply/max17040_battery.c | 2 + + drivers/power/supply/max17042_battery.c | 14 +- + drivers/power/supply/power_supply_core.c | 65 ++++---- + drivers/power/supply/rt5033_battery.c | 2 +- + drivers/power/supply/wm831x_power.c | 12 +- + include/linux/power/max17042_battery.h | 4 +- + 21 files changed, 318 insertions(+), 174 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/samsung,battery.yaml +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 +Removing drivers/regulator/tps80031-regulator.c +Auto-merging drivers/regulator/core.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt +Removing Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt +Removing Documentation/devicetree/bindings/regulator/samsung,s2mps11.txt +Removing Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt +Removing Documentation/devicetree/bindings/regulator/max8997-regulator.txt +Removing Documentation/devicetree/bindings/regulator/max8973-regulator.txt +Removing Documentation/devicetree/bindings/regulator/max8952.txt +Removing Documentation/devicetree/bindings/clock/samsung,s2mps11.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/samsung,s2mps11.txt | 49 -- + .../devicetree/bindings/clock/samsung,s2mps11.yaml | 45 ++ + .../devicetree/bindings/regulator/max8952.txt | 52 -- + .../bindings/regulator/max8973-regulator.txt | 52 -- + .../bindings/regulator/max8997-regulator.txt | 145 ---- + .../bindings/regulator/maxim,max8952.yaml | 109 +++ + .../bindings/regulator/maxim,max8973.yaml | 139 ++++ + .../bindings/regulator/maxim,max8997.yaml | 445 ++++++++++++ + .../bindings/regulator/qcom,rpmh-regulator.yaml | 2 + + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 4 + + .../bindings/regulator/samsung,s2mpa01.txt | 79 --- + .../bindings/regulator/samsung,s2mpa01.yaml | 62 ++ + .../bindings/regulator/samsung,s2mps11.txt | 102 --- + .../bindings/regulator/samsung,s2mps11.yaml | 44 ++ + .../bindings/regulator/samsung,s2mps13.yaml | 44 ++ + .../bindings/regulator/samsung,s2mps14.yaml | 44 ++ + .../bindings/regulator/samsung,s2mps15.yaml | 44 ++ + .../bindings/regulator/samsung,s2mpu02.yaml | 44 ++ + .../bindings/regulator/samsung,s5m8767.txt | 145 ---- + .../bindings/regulator/samsung,s5m8767.yaml | 74 ++ + .../bindings/regulator/silergy,sy8106a.yaml | 52 ++ + .../regulator/socionext,uniphier-regulator.yaml | 1 + + .../bindings/regulator/sy8106a-regulator.txt | 23 - + MAINTAINERS | 6 +- + drivers/regulator/Kconfig | 15 +- + drivers/regulator/Makefile | 1 - + drivers/regulator/bd71815-regulator.c | 4 +- + drivers/regulator/core.c | 12 +- + drivers/regulator/dummy.c | 3 +- + drivers/regulator/lp872x.c | 52 +- + drivers/regulator/max8973-regulator.c | 4 +- + drivers/regulator/pwm-regulator.c | 12 +- + drivers/regulator/qcom-rpmh-regulator.c | 32 + + drivers/regulator/qcom_smd-regulator.c | 49 ++ + drivers/regulator/rtq6752-regulator.c | 18 +- + drivers/regulator/s5m8767.c | 21 +- + drivers/regulator/sy7636a-regulator.c | 2 +- + drivers/regulator/ti-abb-regulator.c | 31 +- + drivers/regulator/tps62360-regulator.c | 59 +- + drivers/regulator/tps80031-regulator.c | 753 --------------------- + drivers/regulator/uniphier-regulator.c | 4 + + drivers/regulator/vqmmc-ipq4019-regulator.c | 4 +- + drivers/spi/spi.c | 41 ++ + include/linux/regulator/lp872x.h | 17 +- + include/linux/regulator/tps62360.h | 6 - + 45 files changed, 1382 insertions(+), 1564 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s2mps11.txt + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/max8952.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/max8973-regulator.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/max8997-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max8952.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max8973.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max8997.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpa01.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps11.txt + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps11.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps13.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps14.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps15.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpu02.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt + delete mode 100644 drivers/regulator/tps80031-regulator.c +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Already up to date. +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (cc4299ea0399 ima: Use strscpy instead of strlcpy) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 8 +- + security/integrity/ima/ima_api.c | 2 +- + security/integrity/ima/ima_policy.c | 243 ++++++++++++++++++++++++++++------- + 3 files changed, 207 insertions(+), 46 deletions(-) +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +Resolved 'certs/system_keyring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ef7d0227bcb7] 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 +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit_watch.c +Auto-merging include/uapi/linux/audit.h +CONFLICT (content): Merge conflict in include/uapi/linux/audit.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/io_uring.c +CONFLICT (content): Merge conflict in fs/io_uring.c +Auto-merging fs/io-wq.c +CONFLICT (content): Merge conflict in fs/io-wq.c +Auto-merging drivers/android/binder_internal.h +Auto-merging drivers/android/binder.c +Resolved 'fs/io-wq.c' using previous resolution. +Resolved 'fs/io_uring.c' using previous resolution. +Recorded preimage for 'include/uapi/linux/audit.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/uapi/linux/audit.h'. +[master 3dad8b01b459] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git +$ git diff -M --stat --summary HEAD^.. + drivers/android/binder.c | 27 +-- + drivers/android/binder_internal.h | 4 + + fs/anon_inodes.c | 29 +++ + fs/ceph/xattr.c | 3 +- + fs/io-wq.c | 4 + + fs/io_uring.c | 69 +++++- + fs/nfs/nfs4proc.c | 3 +- + include/linux/anon_inodes.h | 4 + + include/linux/audit.h | 26 ++ + include/linux/lsm_hook_defs.h | 22 +- + include/linux/lsm_hooks.h | 30 ++- + include/linux/security.h | 55 +++-- + include/uapi/linux/audit.h | 4 +- + kernel/audit.h | 7 +- + kernel/audit_tree.c | 3 +- + kernel/audit_watch.c | 3 +- + kernel/auditfilter.c | 15 +- + kernel/auditsc.c | 468 ++++++++++++++++++++++++++++-------- + security/security.c | 35 ++- + security/selinux/avc.c | 13 +- + security/selinux/hooks.c | 239 +++++++----------- + security/selinux/include/classmap.h | 4 +- + security/selinux/netlabel.c | 7 +- + security/selinux/netport.c | 2 +- + security/selinux/ss/hashtab.c | 1 + + security/selinux/ss/mls.c | 4 + + security/selinux/ss/services.c | 176 +++++++------- + security/smack/smack_lsm.c | 46 ++++ + 28 files changed, 882 insertions(+), 421 deletions(-) +$ git am -3 ../patches/0001-fixup-for-io_uring-init-opcode-in-io_init_req.patch +Applying: fixup for "io_uring: init opcode in io_init_req()" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/io_uring.c +$ git add -A . +$ git commit -v -a --amend +[master 33b0d844ee93] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git + Date: Thu Oct 28 15:11:02 2021 +1100 +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 +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. + security/smack/smack_lsm.c | 41 ++++++++++++++++++++++++---------------- + security/smack/smack_netfilter.c | 26 +++---------------------- + security/smack/smackfs.c | 11 ++++++----- + 3 files changed, 34 insertions(+), 44 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/char/tpm/Kconfig | 2 +- + drivers/char/tpm/tpm2-space.c | 3 +++ + drivers/char/tpm/tpm_tis_core.c | 26 ++++++++++++++++++-------- + drivers/char/tpm/tpm_tis_core.h | 4 ++++ + drivers/char/tpm/tpm_tis_spi_main.c | 1 + + include/linux/tpm.h | 1 + + 6 files changed, 28 insertions(+), 9 deletions(-) +Merging watchdog/master (ee1a0696934a watchdog: bcm63xx_wdt: fix fallthrough warning) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +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/watchdog/Kconfig | 27 +- + drivers/watchdog/Makefile | 1 - + 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/f71808e_wdt.c | 615 +++++++-------------- + drivers/watchdog/iTCO_wdt.c | 31 +- + drivers/watchdog/iop_wdt.c | 250 --------- + drivers/watchdog/ixp4xx_wdt.c | 2 +- + drivers/watchdog/meson_gxbb_wdt.c | 12 + + drivers/watchdog/mlx_wdt.c | 5 +- + drivers/watchdog/mtk_wdt.c | 7 + + drivers/watchdog/omap_wdt.c | 6 +- + drivers/watchdog/rti_wdt.c | 4 +- + drivers/watchdog/rza_wdt.c | 4 +- + drivers/watchdog/sbsa_gwdt.c | 5 +- + drivers/watchdog/sp5100_tco.c | 9 + + drivers/watchdog/stm32_iwdg.c | 4 +- + drivers/watchdog/sunxi_wdt.c | 20 +- + 22 files changed, 349 insertions(+), 725 deletions(-) + delete mode 100644 drivers/watchdog/iop_wdt.c +Merging iommu/next (6a0df9df4c64 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/smmu', 'arm/tegra', '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 +Auto-merging drivers/iommu/apple-dart.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/arm,smmu.yaml | 2 + + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + + arch/x86/include/asm/fpu/api.h | 2 - + drivers/iommu/amd/amd_iommu_types.h | 2 + + drivers/iommu/amd/iommu.c | 21 ++ + drivers/iommu/apple-dart.c | 10 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 21 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 3 + + drivers/iommu/dma-iommu.c | 197 ++++++++----------- + drivers/iommu/intel/Kconfig | 4 + + drivers/iommu/intel/cap_audit.c | 13 ++ + drivers/iommu/intel/cap_audit.h | 1 + + drivers/iommu/intel/dmar.c | 10 +- + drivers/iommu/intel/iommu.c | 213 ++++++++++++++------- + drivers/iommu/intel/svm.c | 24 +-- + drivers/iommu/iommu.c | 3 +- + drivers/iommu/ipmmu-vmsa.c | 32 +++- + drivers/iommu/mtk_iommu.c | 4 +- + drivers/iommu/tegra-smmu.c | 5 +- + drivers/xen/swiotlb-xen.c | 2 +- + include/linux/dmar.h | 8 + + include/linux/intel-iommu.h | 13 +- + include/linux/swiotlb.h | 3 +- + kernel/dma/swiotlb.c | 13 +- + 24 files changed, 365 insertions(+), 242 deletions(-) +$ git am -3 ../patches/0001-fix-for-iommu-dart-Exclude-MSI-doorbell-from-PCIe-de.patch +Applying: fix for "iommu/dart: Exclude MSI doorbell from PCIe device IOVA range" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iommu/apple-dart.c +$ git add -A . +$ git commit -v -a --amend +[master f69240265be9] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git + Date: Thu Oct 28 15:24:00 2021 +1100 +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 +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit_tree.c +Auto-merging kernel/audit.h +Auto-merging include/uapi/linux/audit.h +CONFLICT (content): Merge conflict in include/uapi/linux/audit.h +Auto-merging include/linux/audit.h +Auto-merging MAINTAINERS +Recorded preimage for 'include/uapi/linux/audit.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/uapi/linux/audit.h'. +[master 10bea6b11505] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/alpha/kernel/audit.c | 10 +++++--- + arch/ia64/kernel/audit.c | 10 +++++--- + arch/parisc/kernel/audit.c | 10 +++++--- + arch/parisc/kernel/compat_audit.c | 11 +++++--- + arch/powerpc/kernel/audit.c | 12 +++++---- + arch/powerpc/kernel/compat_audit.c | 13 ++++++---- + arch/s390/kernel/audit.c | 12 +++++---- + arch/s390/kernel/compat_audit.c | 13 ++++++---- + arch/sparc/kernel/audit.c | 12 +++++---- + arch/sparc/kernel/compat_audit.c | 13 ++++++---- + arch/x86/ia32/audit.c | 13 ++++++---- + arch/x86/kernel/audit_64.c | 10 +++++--- + fs/open.c | 2 ++ + include/linux/audit.h | 11 ++++++++ + include/linux/audit_arch.h | 24 ++++++++++++++++++ + include/uapi/linux/audit.h | 1 + + kernel/audit.h | 2 ++ + kernel/audit_tree.c | 20 +++++++-------- + kernel/auditsc.c | 51 ++++++++++++++++++++++---------------- + lib/audit.c | 14 +++++++---- + lib/compat_audit.c | 15 +++++++---- + security/lsm_audit.c | 2 +- + 23 files changed, 184 insertions(+), 98 deletions(-) + create mode 100644 include/linux/audit_arch.h +Merging devicetree/for-next (9065b969c53f dt-bindings: bus: ti-sysc: Update to use yaml binding) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging scripts/Makefile.lib +Auto-merging drivers/of/base.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/arm/boot/dts/omap3-gta04a5.dts +Auto-merging Makefile +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/w1/w1-gpio.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/usb/udc-xilinx.txt +Auto-merging Documentation/devicetree/bindings/sram/sram.yaml +Removing Documentation/devicetree/bindings/rng/omap_rng.txt +Removing Documentation/devicetree/bindings/reserved-memory/ramoops.txt +Removing Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt +Removing Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt +Removing Documentation/devicetree/bindings/net/wireless/esp,esp8089.txt +Removing Documentation/devicetree/bindings/net/ti-bluetooth.txt +Auto-merging Documentation/devicetree/bindings/net/snps,dwmac.yaml +Removing Documentation/devicetree/bindings/net/nfc/trf7970a.txt +Removing Documentation/devicetree/bindings/net/nfc/st95hf.txt +Removing Documentation/devicetree/bindings/net/nfc/st21nfca.txt +Removing Documentation/devicetree/bindings/net/nfc/st-nci-spi.txt +Removing Documentation/devicetree/bindings/net/nfc/st-nci-i2c.txt +Removing Documentation/devicetree/bindings/net/nfc/pn532.txt +Removing Documentation/devicetree/bindings/net/nfc/nxp-nci.txt +Removing Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt +Removing Documentation/devicetree/bindings/net/marvell-bluetooth.txt +Auto-merging Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml +Removing Documentation/devicetree/bindings/mfd/aspeed-lpc.txt +Removing Documentation/devicetree/bindings/memory-controllers/fsl/ddr.txt +Removing Documentation/devicetree/bindings/media/i2c/ov5640.txt +Removing Documentation/devicetree/bindings/leds/register-bit-led.txt +Removing Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt +Removing Documentation/devicetree/bindings/input/elan_i2c.txt +Removing Documentation/devicetree/bindings/gnss/u-blox.txt +Removing Documentation/devicetree/bindings/bus/ti-sysc.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Removing Documentation/devicetree/bindings/arm/cci.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/ramoops.rst | 2 +- + Documentation/devicetree/bindings/Makefile | 15 +- + .../devicetree/bindings/arm/arm,cci-400.yaml | 216 +++++++++++++++ + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 46 ++-- + .../devicetree/bindings/arm/cci-control-port.yaml | 38 +++ + Documentation/devicetree/bindings/arm/cci.txt | 224 --------------- + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + Documentation/devicetree/bindings/bus/palmbus.yaml | 79 ++++++ + Documentation/devicetree/bindings/bus/ti-sysc.txt | 139 ---------- + Documentation/devicetree/bindings/bus/ti-sysc.yaml | 216 +++++++++++++++ + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 2 +- + .../bindings/display/xylon,logicvc-display.yaml | 301 +++++++++++++++++++++ + .../devicetree/bindings/example-schema.yaml | 14 +- + .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 62 +++++ + Documentation/devicetree/bindings/gnss/u-blox.txt | 45 --- + .../devicetree/bindings/input/elan,ekth3000.yaml | 81 ++++++ + .../devicetree/bindings/input/elan_i2c.txt | 44 --- + .../bindings/input/touchscreen/silead,gsl1680.yaml | 91 +++++++ + .../bindings/input/touchscreen/silead_gsl1680.txt | 44 --- + .../interrupt-controller/msi-controller.yaml | 46 ++++ + .../devicetree/bindings/leds/register-bit-led.txt | 94 ------- + .../devicetree/bindings/leds/register-bit-led.yaml | 95 +++++++ + .../devicetree/bindings/mailbox/mtk-gce.txt | 4 +- + .../devicetree/bindings/media/i2c/ov5640.txt | 92 ------- + .../devicetree/bindings/media/i2c/ovti,ov5640.yaml | 154 +++++++++++ + .../devicetree/bindings/media/ti,cal.yaml | 4 +- + .../bindings/memory-controllers/fsl/ddr.txt | 29 -- + .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 83 ++++++ + .../memory-controllers/mediatek,mt7621-memc.yaml | 30 ++ + .../devicetree/bindings/mfd/aspeed-lpc.txt | 157 ----------- + .../devicetree/bindings/mfd/aspeed-lpc.yaml | 199 ++++++++++++++ + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 4 +- + .../bindings/net/broadcom-bluetooth.yaml | 17 +- + .../devicetree/bindings/net/marvell-bluetooth.txt | 25 -- + .../devicetree/bindings/net/marvell-bluetooth.yaml | 31 +++ + .../devicetree/bindings/net/nfc/marvell,nci.yaml | 170 ++++++++++++ + .../devicetree/bindings/net/nfc/nfcmrvl.txt | 84 ------ + .../devicetree/bindings/net/nfc/nxp,nci.yaml | 61 +++++ + .../devicetree/bindings/net/nfc/nxp,pn532.yaml | 65 +++++ + .../devicetree/bindings/net/nfc/nxp-nci.txt | 33 --- + .../devicetree/bindings/net/nfc/pn532.txt | 46 ---- + .../devicetree/bindings/net/nfc/st,st-nci.yaml | 106 ++++++++ + .../devicetree/bindings/net/nfc/st,st21nfca.yaml | 64 +++++ + .../devicetree/bindings/net/nfc/st,st95hf.yaml | 57 ++++ + .../devicetree/bindings/net/nfc/st-nci-i2c.txt | 38 --- + .../devicetree/bindings/net/nfc/st-nci-spi.txt | 36 --- + .../devicetree/bindings/net/nfc/st21nfca.txt | 37 --- + .../devicetree/bindings/net/nfc/st95hf.txt | 45 --- + .../devicetree/bindings/net/nfc/ti,trf7970a.yaml | 98 +++++++ + .../devicetree/bindings/net/nfc/trf7970a.txt | 43 --- + .../devicetree/bindings/net/realtek-bluetooth.yaml | 2 + + .../devicetree/bindings/net/snps,dwmac.yaml | 6 +- + .../devicetree/bindings/net/ti,bluetooth.yaml | 91 +++++++ + .../devicetree/bindings/net/ti-bluetooth.txt | 60 ---- + .../bindings/net/wireless/esp,esp8089.txt | 30 -- + .../bindings/net/wireless/esp,esp8089.yaml | 43 +++ + .../bindings/net/wireless/ti,wlcore,spi.txt | 57 ---- + .../devicetree/bindings/net/wireless/ti,wlcore.txt | 45 --- + .../bindings/net/wireless/ti,wlcore.yaml | 134 +++++++++ + Documentation/devicetree/bindings/numa.txt | 46 +++- + .../devicetree/bindings/pci/apple,pcie.yaml | 160 +++++++++++ + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 1 + + .../bindings/pci/microchip,pcie-host.yaml | 1 + + .../bindings/reserved-memory/memory-region.yaml | 40 +++ + .../bindings/reserved-memory/ramoops.txt | 66 ----- + .../bindings/reserved-memory/ramoops.yaml | 145 ++++++++++ + .../bindings/reserved-memory/reserved-memory.txt | 172 +----------- + .../bindings/reserved-memory/reserved-memory.yaml | 100 +++++++ + .../bindings/reserved-memory/shared-dma-pool.yaml | 87 ++++++ + Documentation/devicetree/bindings/riscv/cpus.yaml | 8 +- + Documentation/devicetree/bindings/rng/omap_rng.txt | 38 --- + .../devicetree/bindings/rng/omap_rng.yaml | 92 +++++++ + .../bindings/soc/aspeed/uart-routing.yaml | 56 ++++ + Documentation/devicetree/bindings/sram/sram.yaml | 2 +- + .../devicetree/bindings/submitting-patches.rst | 3 + + .../devicetree/bindings/usb/udc-xilinx.txt | 18 -- + .../devicetree/bindings/usb/xlnx,usb2.yaml | 47 ++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/devicetree/bindings/w1/w1-gpio.txt | 27 -- + Documentation/devicetree/bindings/w1/w1-gpio.yaml | 43 +++ + .../devicetree/bindings/writing-bindings.rst | 2 +- + .../devicetree/bindings/writing-schema.rst | 29 +- + Documentation/w1/masters/w1-gpio.rst | 2 +- + MAINTAINERS | 24 +- + Makefile | 10 +- + arch/arm/boot/dts/omap3-gta04a5.dts | 2 +- + arch/arm/kernel/devtree.c | 22 +- + arch/arm/mach-bcm/bcm63xx_pmb.c | 6 +- + arch/arm64/kernel/smp.c | 31 +-- + arch/csky/kernel/smp.c | 6 +- + arch/openrisc/kernel/smp.c | 6 +- + arch/powerpc/kernel/smp.c | 7 +- + arch/riscv/kernel/cpu.c | 3 +- + arch/sh/boards/of-generic.c | 5 +- + arch/x86/kernel/devicetree.c | 5 +- + drivers/of/base.c | 22 ++ + drivers/of/kobj.c | 4 +- + drivers/of/of_numa.c | 2 + + drivers/of/of_private.h | 10 +- + drivers/of/unittest-data/Makefile | 4 +- + drivers/of/unittest.c | 2 + + include/linux/of.h | 3 +- + scripts/Makefile.lib | 1 - + scripts/dtc/checks.c | 222 +++++++++++---- + scripts/dtc/dtc-lexer.l | 2 +- + scripts/dtc/dtc.c | 6 +- + scripts/dtc/dtc.h | 40 ++- + scripts/dtc/flattree.c | 11 +- + scripts/dtc/libfdt/fdt.c | 4 + + scripts/dtc/libfdt/fdt_rw.c | 18 +- + scripts/dtc/libfdt/fdt_strerror.c | 1 + + scripts/dtc/libfdt/libfdt.h | 7 + + scripts/dtc/livetree.c | 6 +- + scripts/dtc/treesource.c | 48 ++-- + scripts/dtc/util.h | 6 +- + scripts/dtc/version_gen.h | 2 +- + scripts/dtc/yamltree.c | 16 +- + 117 files changed, 3879 insertions(+), 2048 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/arm,cci-400.yaml + create mode 100644 Documentation/devicetree/bindings/arm/cci-control-port.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/cci.txt + create mode 100644 Documentation/devicetree/bindings/bus/palmbus.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/ti-sysc.txt + create mode 100644 Documentation/devicetree/bindings/bus/ti-sysc.yaml + create mode 100644 Documentation/devicetree/bindings/display/xylon,logicvc-display.yaml + create mode 100644 Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml + delete mode 100644 Documentation/devicetree/bindings/gnss/u-blox.txt + create mode 100644 Documentation/devicetree/bindings/input/elan,ekth3000.yaml + delete mode 100644 Documentation/devicetree/bindings/input/elan_i2c.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/silead,gsl1680.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/msi-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/register-bit-led.txt + create mode 100644 Documentation/devicetree/bindings/leds/register-bit-led.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ov5640.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov5640.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ddr.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,mt7621-memc.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/aspeed-lpc.txt + create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-lpc.yaml + delete mode 100644 Documentation/devicetree/bindings/net/marvell-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/marvell-bluetooth.yaml + create mode 100644 Documentation/devicetree/bindings/net/nfc/marvell,nci.yaml + delete mode 100644 Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt + create mode 100644 Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml + create mode 100644 Documentation/devicetree/bindings/net/nfc/nxp,pn532.yaml + delete mode 100644 Documentation/devicetree/bindings/net/nfc/nxp-nci.txt + delete mode 100644 Documentation/devicetree/bindings/net/nfc/pn532.txt + create mode 100644 Documentation/devicetree/bindings/net/nfc/st,st-nci.yaml + create mode 100644 Documentation/devicetree/bindings/net/nfc/st,st21nfca.yaml + create mode 100644 Documentation/devicetree/bindings/net/nfc/st,st95hf.yaml + delete mode 100644 Documentation/devicetree/bindings/net/nfc/st-nci-i2c.txt + delete mode 100644 Documentation/devicetree/bindings/net/nfc/st-nci-spi.txt + delete mode 100644 Documentation/devicetree/bindings/net/nfc/st21nfca.txt + delete mode 100644 Documentation/devicetree/bindings/net/nfc/st95hf.txt + create mode 100644 Documentation/devicetree/bindings/net/nfc/ti,trf7970a.yaml + delete mode 100644 Documentation/devicetree/bindings/net/nfc/trf7970a.txt + create mode 100644 Documentation/devicetree/bindings/net/ti,bluetooth.yaml + delete mode 100644 Documentation/devicetree/bindings/net/ti-bluetooth.txt + delete mode 100644 Documentation/devicetree/bindings/net/wireless/esp,esp8089.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/esp,esp8089.yaml + delete mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt + delete mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore.yaml + create mode 100644 Documentation/devicetree/bindings/pci/apple,pcie.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/memory-region.yaml + delete mode 100644 Documentation/devicetree/bindings/reserved-memory/ramoops.txt + create mode 100644 Documentation/devicetree/bindings/reserved-memory/ramoops.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/reserved-memory.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/shared-dma-pool.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/omap_rng.txt + create mode 100644 Documentation/devicetree/bindings/rng/omap_rng.yaml + create mode 100644 Documentation/devicetree/bindings/soc/aspeed/uart-routing.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/udc-xilinx.txt + create mode 100644 Documentation/devicetree/bindings/usb/xlnx,usb2.yaml + delete mode 100644 Documentation/devicetree/bindings/w1/w1-gpio.txt + create mode 100644 Documentation/devicetree/bindings/w1/w1-gpio.yaml +Merging mailbox/mailbox-for-next (0a5ad4322927 mailbox: mtk-cmdq: Fix local clock ID usage) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 3 ++- + MAINTAINERS | 2 +- + drivers/mailbox/bcm2835-mailbox.c | 4 +-- + drivers/mailbox/hi3660-mailbox.c | 4 +-- + drivers/mailbox/hi6220-mailbox.c | 7 ++--- + drivers/mailbox/mailbox-altera.c | 5 +--- + drivers/mailbox/mailbox-sti.c | 4 +-- + drivers/mailbox/mailbox-xgene-slimpro.c | 4 +-- + drivers/mailbox/mtk-cmdq-mailbox.c | 15 ++++------- + drivers/mailbox/omap-mailbox.c | 4 +-- + drivers/mailbox/platform_mhu.c | 4 +-- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 31 +++++----------------- + drivers/mailbox/stm32-ipcc.c | 4 +-- + drivers/mailbox/sun6i-msgbox.c | 9 +------ + 14 files changed, 26 insertions(+), 74 deletions(-) +Merging spi/for-next (f2c05cbd6670 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 +Auto-merging drivers/spi/spi.c +Auto-merging drivers/spi/spi-tegra20-slink.c +CONFLICT (content): Merge conflict in drivers/spi/spi-tegra20-slink.c +Auto-merging drivers/firmware/xilinx/zynqmp.c +Resolved 'drivers/spi/spi-tegra20-slink.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 84295f2f4cec] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 12 + + .../devicetree/bindings/spi/cdns,xspi.yaml | 77 +++ + .../devicetree/bindings/spi/ingenic,spi.yaml | 72 +++ + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 6 +- + Documentation/spi/spi-summary.rst | 8 - + arch/mips/boot/dts/ingenic/ci20.dts | 9 +- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 44 +- + drivers/firmware/xilinx/zynqmp.c | 17 + + drivers/spi/Kconfig | 26 +- + drivers/spi/Makefile | 2 + + drivers/spi/atmel-quadspi.c | 2 +- + drivers/spi/spi-amd.c | 113 ++-- + drivers/spi/spi-at91-usart.c | 27 +- + drivers/spi/spi-bcm-qspi.c | 193 ++++++- + drivers/spi/spi-cadence-quadspi.c | 214 +++++++ + drivers/spi/spi-cadence-xspi.c | 642 +++++++++++++++++++++ + drivers/spi/spi-fsi.c | 121 ++-- + drivers/spi/spi-ingenic.c | 482 ++++++++++++++++ + drivers/spi/spi-mtk-nor.c | 2 +- + drivers/spi/spi-orion.c | 1 + + drivers/spi/spi-rpc-if.c | 4 +- + drivers/spi/spi-rspi.c | 1 - + drivers/spi/spi-sh-msiof.c | 1 - + drivers/spi/spi-stm32-qspi.c | 2 +- + drivers/spi/spi-tegra20-slink.c | 4 +- + drivers/spi/spi-tegra210-quad.c | 4 +- + drivers/spi/spi-tle62x0.c | 2 +- + drivers/spi/spi.c | 237 +++----- + include/linux/firmware/xlnx-zynqmp.h | 12 + + include/linux/spi/spi.h | 55 -- + 30 files changed, 1999 insertions(+), 393 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/cdns,xspi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/ingenic,spi.yaml + create mode 100644 drivers/spi/spi-cadence-xspi.c + create mode 100644 drivers/spi/spi-ingenic.c +Merging tip/auto-latest (34d813e44ba4 Merge x86/fpu into tip/master) +$ 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 tools/include/uapi/linux/perf_event.h +Auto-merging scripts/sorttable.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core_sched.c +Auto-merging kernel/sched/core.c +Removing kernel/futex.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/events/core.c +Auto-merging kernel/dma/swiotlb.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging arch/xtensa/kernel/process.c +Auto-merging arch/xtensa/include/asm/processor.h +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/x86/kernel/fpu/signal.c +CONFLICT (content): Merge conflict in arch/x86/kernel/fpu/signal.c +Auto-merging arch/x86/kernel/devicetree.c +Auto-merging arch/x86/kernel/cpu/mce/amd.c +Auto-merging arch/x86/include/asm/mce.h +Auto-merging arch/x86/include/asm/fpu/api.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/fpu/api.h +Auto-merging arch/x86/events/perf_event.h +Auto-merging arch/x86/events/intel/core.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kernel/process.c +Auto-merging arch/parisc/kernel/process.c +Auto-merging arch/parisc/include/asm/processor.h +Auto-merging arch/mips/include/asm/processor.h +Auto-merging arch/h8300/include/asm/processor.h +Auto-merging arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/kernel/process.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Recorded preimage for 'arch/x86/include/asm/fpu/api.h' +Resolved 'arch/x86/kernel/fpu/signal.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/x86/include/asm/fpu/api.h'. +[master 5a991312362c] Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-devices-system-cpu | 15 + + Documentation/admin-guide/cgroup-v2.rst | 8 + + Documentation/admin-guide/cputopology.rst | 12 +- + Documentation/admin-guide/kernel-parameters.txt | 9 + + Documentation/kernel-hacking/locking.rst | 14 +- + Documentation/scheduler/sched-bwc.rst | 84 +- + .../translations/it_IT/kernel-hacking/locking.rst | 14 +- + Documentation/userspace-api/futex2.rst | 86 + + Documentation/userspace-api/index.rst | 1 + + Documentation/x86/index.rst | 1 + + Documentation/x86/sgx.rst | 35 + + Documentation/x86/xstate.rst | 65 + + MAINTAINERS | 3 +- + arch/Kconfig | 6 + + arch/alpha/include/asm/processor.h | 2 +- + arch/alpha/kernel/process.c | 5 +- + arch/arc/include/asm/processor.h | 2 +- + arch/arc/kernel/stacktrace.c | 4 +- + arch/arm/include/asm/processor.h | 2 +- + arch/arm/kernel/process.c | 4 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 9 + + arch/arm64/include/asm/processor.h | 2 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/kernel/process.c | 4 +- + arch/arm64/kernel/topology.c | 2 + + arch/csky/include/asm/processor.h | 2 +- + arch/csky/kernel/stacktrace.c | 5 +- + arch/h8300/include/asm/processor.h | 2 +- + arch/h8300/kernel/process.c | 5 +- + arch/hexagon/include/asm/processor.h | 2 +- + arch/hexagon/kernel/process.c | 4 +- + arch/ia64/include/asm/processor.h | 2 +- + arch/ia64/kernel/process.c | 5 +- + arch/m68k/include/asm/processor.h | 2 +- + arch/m68k/kernel/process.c | 4 +- + arch/microblaze/include/asm/processor.h | 2 +- + arch/microblaze/kernel/process.c | 2 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mips/kernel/process.c | 8 +- + arch/nds32/include/asm/processor.h | 2 +- + arch/nds32/kernel/process.c | 7 +- + arch/nios2/include/asm/processor.h | 2 +- + arch/nios2/kernel/process.c | 5 +- + arch/openrisc/include/asm/processor.h | 2 +- + arch/openrisc/kernel/process.c | 2 +- + arch/parisc/include/asm/processor.h | 2 +- + arch/parisc/kernel/process.c | 5 +- + arch/powerpc/include/asm/mem_encrypt.h | 5 - + arch/powerpc/include/asm/processor.h | 2 +- + arch/powerpc/kernel/process.c | 9 +- + arch/powerpc/perf/isa207-common.c | 26 +- + arch/powerpc/perf/isa207-common.h | 2 + + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/powerpc/platforms/pseries/Makefile | 2 + + arch/powerpc/platforms/pseries/cc_platform.c | 26 + + arch/powerpc/platforms/pseries/svm.c | 5 +- + arch/riscv/include/asm/processor.h | 2 +- + arch/riscv/kernel/stacktrace.c | 12 +- + arch/s390/include/asm/mem_encrypt.h | 2 - + arch/s390/include/asm/processor.h | 2 +- + arch/s390/kernel/process.c | 4 +- + arch/sh/include/asm/processor_32.h | 2 +- + arch/sh/kernel/process_32.c | 5 +- + arch/sparc/include/asm/processor_32.h | 2 +- + arch/sparc/include/asm/processor_64.h | 2 +- + arch/sparc/kernel/process_32.c | 5 +- + arch/sparc/kernel/process_64.c | 5 +- + arch/um/include/asm/processor-generic.h | 2 +- + arch/um/kernel/process.c | 5 +- + arch/x86/Kconfig | 34 +- + arch/x86/Kconfig.cpu | 13 + + arch/x86/boot/genimage.sh | 15 +- + arch/x86/boot/mtools.conf.in | 5 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/events/core.c | 6 + + arch/x86/events/intel/bts.c | 6 + + arch/x86/events/intel/core.c | 16 + + arch/x86/events/intel/uncore_discovery.h | 2 +- + arch/x86/events/intel/uncore_snbep.c | 16 +- + arch/x86/events/perf_event.h | 2 + + arch/x86/ia32/ia32_signal.c | 15 +- + arch/x86/include/asm/asm.h | 55 +- + arch/x86/include/asm/cpu_entry_area.h | 8 +- + arch/x86/include/asm/cpufeature.h | 13 +- + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/extable.h | 44 +- + arch/x86/include/asm/extable_fixup_types.h | 22 + + arch/x86/include/asm/fpu/api.h | 58 +- + arch/x86/include/asm/fpu/internal.h | 540 --- + arch/x86/include/asm/fpu/sched.h | 68 + + arch/x86/include/asm/fpu/signal.h | 13 +- + arch/x86/include/asm/fpu/types.h | 214 +- + arch/x86/include/asm/fpu/xcr.h | 11 - + arch/x86/include/asm/fpu/xstate.h | 90 +- + arch/x86/include/asm/ia32.h | 2 +- + arch/x86/include/asm/insn-eval.h | 1 + + arch/x86/include/asm/io.h | 8 + + arch/x86/include/asm/irq_stack.h | 39 +- + arch/x86/include/asm/kexec.h | 2 +- + arch/x86/include/asm/kvm_host.h | 7 +- + arch/x86/include/asm/mce.h | 12 - + arch/x86/include/asm/mem_encrypt.h | 12 +- + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/msr.h | 4 +- + arch/x86/include/asm/page_32.h | 2 +- + arch/x86/include/asm/page_64_types.h | 2 +- + arch/x86/include/asm/paravirt.h | 31 +- + arch/x86/include/asm/pkru.h | 2 +- + arch/x86/include/asm/processor.h | 15 +- + arch/x86/include/asm/proto.h | 2 +- + arch/x86/include/asm/ptrace.h | 2 +- + arch/x86/include/asm/segment.h | 2 +- + arch/x86/include/asm/sev.h | 6 + + arch/x86/include/asm/smp.h | 7 + + arch/x86/include/asm/stacktrace.h | 10 + + arch/x86/include/asm/topology.h | 3 + + arch/x86/include/asm/trace/fpu.h | 4 +- + arch/x86/include/asm/traps.h | 6 +- + arch/x86/include/asm/uaccess.h | 2 +- + arch/x86/include/asm/xen/hypercall.h | 6 +- + arch/x86/include/uapi/asm/prctl.h | 4 + + arch/x86/include/uapi/asm/sgx.h | 2 + + arch/x86/kernel/Makefile | 6 + + arch/x86/kernel/cc_platform.c | 69 + + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/amd.c | 2 + + arch/x86/kernel/cpu/bugs.c | 2 +- + arch/x86/kernel/cpu/cacheinfo.c | 1 + + arch/x86/kernel/cpu/common.c | 51 +- + arch/x86/kernel/cpu/cpu.h | 1 + + arch/x86/kernel/cpu/cpuid-deps.c | 2 + + arch/x86/kernel/cpu/hygon.c | 2 + + arch/x86/kernel/cpu/mce/amd.c | 10 +- + arch/x86/kernel/cpu/mce/core.c | 292 +- + arch/x86/kernel/cpu/mce/internal.h | 71 +- + arch/x86/kernel/cpu/mce/p5.c | 6 +- + arch/x86/kernel/cpu/mce/severity.c | 33 +- + arch/x86/kernel/cpu/mce/winchip.c | 6 +- + arch/x86/kernel/cpu/sgx/virt.c | 65 +- + arch/x86/kernel/cpu/vortex.c | 39 + + arch/x86/kernel/crash_dump_64.c | 4 +- + arch/x86/kernel/devicetree.c | 5 - + arch/x86/kernel/dumpstack_64.c | 6 + + arch/x86/kernel/fpu/bugs.c | 2 +- + arch/x86/kernel/fpu/context.h | 83 + + arch/x86/kernel/fpu/core.c | 391 +- + arch/x86/kernel/fpu/init.c | 76 +- + arch/x86/kernel/fpu/internal.h | 28 + + arch/x86/kernel/fpu/legacy.h | 115 + + arch/x86/kernel/fpu/regset.c | 36 +- + arch/x86/kernel/fpu/signal.c | 282 +- + arch/x86/kernel/fpu/xstate.c | 898 +++- + arch/x86/kernel/fpu/xstate.h | 278 ++ + arch/x86/kernel/head64.c | 9 +- + arch/x86/kernel/irqflags.S | 2 + + arch/x86/kernel/itmt.c | 2 +- + arch/x86/kernel/kvm.c | 3 +- + arch/x86/kernel/kvmclock.c | 4 +- + arch/x86/kernel/machine_kexec_64.c | 19 +- + arch/x86/kernel/paravirt.c | 45 +- + arch/x86/kernel/pci-swiotlb.c | 9 +- + arch/x86/kernel/process.c | 93 +- + arch/x86/kernel/process_32.c | 5 +- + arch/x86/kernel/process_64.c | 5 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/relocate_kernel_64.S | 2 +- + arch/x86/kernel/sev-shared.c | 70 +- + arch/x86/kernel/sev.c | 74 +- + arch/x86/kernel/signal.c | 83 +- + arch/x86/kernel/smpboot.c | 48 +- + arch/x86/kernel/traps.c | 100 +- + arch/x86/kernel/umip.c | 8 +- + arch/x86/kvm/svm/sev.c | 2 +- + arch/x86/kvm/svm/svm.c | 10 +- + arch/x86/kvm/svm/svm.h | 8 +- + arch/x86/kvm/svm/svm_ops.h | 4 +- + arch/x86/kvm/vmx/evmcs.h | 4 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/kvm/x86.c | 258 +- + arch/x86/lib/copy_mc_64.S | 8 +- + arch/x86/lib/copy_user_64.S | 13 - + arch/x86/lib/insn-eval.c | 2 +- + arch/x86/lib/insn.c | 5 +- + arch/x86/math-emu/fpu_aux.c | 2 +- + arch/x86/math-emu/fpu_entry.c | 6 +- + arch/x86/math-emu/fpu_system.h | 2 +- + arch/x86/mm/cpu_entry_area.c | 7 + + arch/x86/mm/extable.c | 135 +- + arch/x86/mm/fault.c | 20 +- + arch/x86/mm/ioremap.c | 18 +- + arch/x86/mm/mem_encrypt.c | 55 +- + arch/x86/mm/mem_encrypt_identity.c | 18 +- + arch/x86/mm/pat/set_memory.c | 3 +- + arch/x86/net/bpf_jit_comp.c | 11 +- + arch/x86/platform/efi/efi_64.c | 9 +- + arch/x86/power/cpu.c | 2 +- + arch/x86/realmode/init.c | 8 +- + arch/x86/xen/enlighten_pv.c | 70 +- + arch/x86/xen/irq.c | 31 +- + arch/x86/xen/mmu_pv.c | 93 +- + arch/x86/xen/xen-asm.S | 79 +- + arch/x86/xen/xen-head.S | 34 +- + arch/xtensa/include/asm/processor.h | 2 +- + arch/xtensa/kernel/process.c | 5 +- + drivers/acpi/pptt.c | 67 + + drivers/base/arch_topology.c | 15 + + drivers/base/topology.c | 10 + + drivers/clocksource/Kconfig | 3 + + drivers/clocksource/arc_timer.c | 6 +- + drivers/firmware/efi/efi.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +- + drivers/gpu/drm/drm_cache.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 6 +- + drivers/iommu/amd/init.c | 7 +- + drivers/iommu/amd/iommu.c | 3 +- + drivers/iommu/amd/iommu_v2.c | 3 +- + drivers/iommu/iommu.c | 3 +- + fs/proc/array.c | 7 +- + fs/proc/base.c | 19 +- + fs/proc/stat.c | 4 +- + fs/proc/uptime.c | 14 +- + fs/proc/vmcore.c | 6 +- + include/linux/acpi.h | 5 + + include/linux/arch_topology.h | 5 + + include/linux/cc_platform.h | 88 + + include/linux/context_tracking.h | 2 +- + include/linux/debug_locks.h | 2 - + include/linux/irq_work.h | 8 + + include/linux/kernel.h | 13 +- + include/linux/kernel_stat.h | 1 + + include/linux/lockdep_types.h | 2 +- + include/linux/mem_encrypt.h | 4 - + include/linux/mm_types.h | 4 + + include/linux/of_fdt.h | 1 - + include/linux/perf_event.h | 1 + + include/linux/preempt.h | 5 +- + include/linux/sched.h | 50 +- + include/linux/sched/idle.h | 4 + + include/linux/sched/mm.h | 29 + + include/linux/sched/task.h | 3 +- + include/linux/sched/topology.h | 7 + + include/linux/signal.h | 6 + + include/linux/syscalls.h | 7 +- + include/linux/topology.h | 13 + + include/linux/wait.h | 3 +- + include/soc/arc/timers.h | 4 +- + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/futex.h | 25 + + include/uapi/linux/perf_event.h | 34 +- + kernel/Kconfig.preempt | 32 +- + kernel/Makefile | 2 +- + kernel/dma/swiotlb.c | 4 +- + kernel/events/Makefile | 5 - + kernel/events/core.c | 30 + + kernel/exit.c | 2 + + kernel/fork.c | 2 +- + kernel/futex.c | 4272 -------------------- + kernel/futex/Makefile | 3 + + kernel/futex/core.c | 1176 ++++++ + kernel/futex/futex.h | 299 ++ + kernel/futex/pi.c | 1233 ++++++ + kernel/futex/requeue.c | 897 ++++ + kernel/futex/syscalls.c | 398 ++ + kernel/futex/waitwake.c | 708 ++++ + kernel/irq/manage.c | 6 +- + kernel/irq/spurious.c | 8 + + kernel/irq_work.c | 130 +- + kernel/kprobes.c | 8 +- + kernel/kthread.c | 16 +- + kernel/livepatch/transition.c | 95 +- + kernel/locking/lockdep.c | 6 +- + kernel/locking/mutex.c | 22 +- + kernel/locking/rtmutex.c | 19 +- + kernel/locking/rwbase_rt.c | 11 +- + kernel/locking/rwsem.c | 70 +- + kernel/locking/spinlock_rt.c | 17 +- + kernel/locking/test-ww_mutex.c | 3 +- + kernel/rcu/tasks.h | 12 +- + kernel/rcu/tree_stall.h | 8 +- + kernel/rcu/update.c | 4 +- + kernel/sched/Makefile | 4 + + kernel/sched/core.c | 459 +-- + kernel/sched/core_sched.c | 9 +- + kernel/sched/deadline.c | 99 +- + kernel/sched/debug.c | 101 +- + kernel/sched/fair.c | 431 +- + kernel/sched/features.h | 5 + + kernel/sched/rt.c | 130 +- + kernel/sched/sched.h | 32 +- + kernel/sched/stats.c | 104 + + kernel/sched/stats.h | 49 + + kernel/sched/stop_task.c | 4 +- + kernel/sched/topology.c | 32 +- + kernel/signal.c | 35 +- + kernel/smp.c | 12 +- + kernel/sys_ni.c | 3 +- + lib/Kconfig.debug | 2 +- + mm/memory.c | 2 +- + scripts/leaking_addresses.pl | 3 +- + scripts/sorttable.c | 4 +- + tools/arch/x86/lib/insn.c | 5 +- + tools/include/asm-generic/unaligned.h | 23 + + tools/include/uapi/linux/perf_event.h | 19 +- + tools/objtool/arch/x86/decode.c | 74 +- + tools/objtool/check.c | 464 ++- + tools/objtool/include/objtool/arch.h | 5 +- + tools/objtool/include/objtool/cfi.h | 2 + + tools/objtool/include/objtool/check.h | 2 +- + tools/objtool/include/objtool/elf.h | 1 + + tools/objtool/include/objtool/objtool.h | 9 + + tools/objtool/objtool.c | 22 + + tools/objtool/orc_gen.c | 15 +- + tools/perf/util/intel-pt-decoder/Build | 2 + + tools/perf/util/mem-events.c | 20 +- + .../testing/selftests/futex/functional/.gitignore | 1 + + tools/testing/selftests/futex/functional/Makefile | 3 +- + .../futex/functional/futex_wait_timeout.c | 21 +- + .../futex/functional/futex_wait_wouldblock.c | 41 +- + .../selftests/futex/functional/futex_waitv.c | 237 ++ + tools/testing/selftests/futex/functional/run.sh | 3 + + tools/testing/selftests/futex/include/futex2test.h | 22 + + tools/testing/selftests/sched/cs_prctl_test.c | 28 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/amx.c | 851 ++++ + 328 files changed, 12286 insertions(+), 7560 deletions(-) + create mode 100644 Documentation/userspace-api/futex2.rst + create mode 100644 Documentation/x86/xstate.rst + create mode 100644 arch/powerpc/platforms/pseries/cc_platform.c + create mode 100644 arch/x86/include/asm/extable_fixup_types.h + create mode 100644 arch/x86/include/asm/fpu/sched.h + create mode 100644 arch/x86/kernel/cc_platform.c + create mode 100644 arch/x86/kernel/cpu/vortex.c + create mode 100644 arch/x86/kernel/fpu/context.h + create mode 100644 arch/x86/kernel/fpu/internal.h + create mode 100644 arch/x86/kernel/fpu/legacy.h + create mode 100644 arch/x86/kernel/fpu/xstate.h + create mode 100644 include/linux/cc_platform.h + delete mode 100644 kernel/futex.c + create mode 100644 kernel/futex/Makefile + create mode 100644 kernel/futex/core.c + create mode 100644 kernel/futex/futex.h + create mode 100644 kernel/futex/pi.c + create mode 100644 kernel/futex/requeue.c + create mode 100644 kernel/futex/syscalls.c + create mode 100644 kernel/futex/waitwake.c + create mode 100644 tools/include/asm-generic/unaligned.h + create mode 100644 tools/testing/selftests/futex/functional/futex_waitv.c + create mode 100644 tools/testing/selftests/futex/include/futex2test.h + create mode 100644 tools/testing/selftests/x86/amx.c +$ git am -3 ../patches/0001-x86-fpu-include-vmalloc.h-for-vzalloc-etc.patch +Applying: x86/fpu: include vmalloc.h for vzalloc etc +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/fpu/core.c +$ git add -A . +$ git commit -v -a --amend +[master 90c231106e2f] Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Thu Oct 28 15:53:05 2021 +1100 +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 +Merge made by the 'recursive' strategy. + drivers/edac/al_mc_edac.c | 12 ++++-------- + drivers/edac/amd64_edac.c | 22 +++++++++++++++++++++- + drivers/edac/edac_mc.c | 42 ++++++++++++++++++------------------------ + drivers/edac/edac_mc_sysfs.c | 8 ++++---- + drivers/edac/sb_edac.c | 2 +- + drivers/edac/ti_edac.c | 7 +------ + 6 files changed, 49 insertions(+), 44 deletions(-) +Merging irqchip/irq/irqchip-next (965acf76b68d Merge branch irq/irq_cpu_offline 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 +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/nds32/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/csky/Kconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mach-s3c/irq-s3c24xx.c +Auto-merging arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3f43a66bb62d] Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/irq/irq-domain.rst | 3 - + .../interrupt-controller/microchip,eic.yaml | 73 ++++++ + MAINTAINERS | 6 + + arch/arc/Kconfig | 1 - + arch/arc/kernel/irq.c | 10 +- + arch/arm/Kconfig | 1 - + arch/arm/kernel/entry-armv.S | 5 +- + arch/arm/kernel/irq.c | 14 +- + arch/arm/mach-bcm/Kconfig | 4 - + arch/arm/mach-imx/avic.c | 2 +- + arch/arm/mach-imx/tzic.c | 2 +- + arch/arm/mach-omap1/irq.c | 2 +- + arch/arm/mach-s3c/irq-s3c24xx.c | 2 +- + arch/arm64/Kconfig | 1 - + arch/arm64/Kconfig.platforms | 4 - + arch/arm64/kernel/entry-common.c | 52 ++-- + arch/csky/Kconfig | 1 - + arch/csky/kernel/entry.S | 2 +- + arch/csky/kernel/irq.c | 5 - + arch/mips/Kconfig | 2 +- + arch/mips/cavium-octeon/octeon-irq.c | 5 +- + arch/mips/kernel/irq.c | 6 +- + arch/mips/kernel/smp-bmips.c | 3 +- + arch/mips/loongson64/smp.c | 1 - + arch/nds32/Kconfig | 1 - + arch/openrisc/Kconfig | 1 - + arch/openrisc/kernel/entry.S | 4 +- + arch/openrisc/kernel/irq.c | 5 - + arch/riscv/Kconfig | 1 - + arch/riscv/kernel/entry.S | 3 +- + arch/riscv/kernel/smp.c | 9 +- + drivers/irqchip/Kconfig | 25 +- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-apple-aic.c | 20 +- + drivers/irqchip/irq-armada-370-xp.c | 13 +- + drivers/irqchip/irq-aspeed-vic.c | 2 +- + drivers/irqchip/irq-ativic32.c | 22 +- + drivers/irqchip/irq-atmel-aic.c | 2 +- + drivers/irqchip/irq-atmel-aic5.c | 2 +- + drivers/irqchip/irq-bcm2835.c | 2 +- + drivers/irqchip/irq-bcm2836.c | 2 +- + drivers/irqchip/irq-bcm6345-l1.c | 6 +- + drivers/irqchip/irq-bcm7038-l1.c | 47 +--- + drivers/irqchip/irq-bcm7120-l2.c | 21 +- + drivers/irqchip/irq-brcmstb-l2.c | 16 +- + drivers/irqchip/irq-clps711x.c | 8 +- + drivers/irqchip/irq-csky-apb-intc.c | 2 +- + drivers/irqchip/irq-csky-mpintc.c | 4 +- + drivers/irqchip/irq-davinci-aintc.c | 2 +- + drivers/irqchip/irq-davinci-cp-intc.c | 2 +- + drivers/irqchip/irq-digicolor.c | 2 +- + drivers/irqchip/irq-dw-apb-ictl.c | 2 +- + drivers/irqchip/irq-ftintc010.c | 2 +- + drivers/irqchip/irq-gic-v3.c | 4 +- + drivers/irqchip/irq-gic.c | 2 +- + drivers/irqchip/irq-hip04.c | 2 +- + drivers/irqchip/irq-ixp4xx.c | 4 +- + drivers/irqchip/irq-lpc32xx.c | 2 +- + drivers/irqchip/irq-mchp-eic.c | 280 +++++++++++++++++++++ + drivers/irqchip/irq-meson-gpio.c | 15 +- + drivers/irqchip/irq-mips-gic.c | 37 ++- + drivers/irqchip/irq-mmp.c | 4 +- + drivers/irqchip/irq-mvebu-icu.c | 4 +- + drivers/irqchip/irq-mvebu-pic.c | 4 +- + drivers/irqchip/irq-mxs.c | 2 +- + drivers/irqchip/irq-nvic.c | 17 +- + drivers/irqchip/irq-omap-intc.c | 2 +- + drivers/irqchip/irq-or1k-pic.c | 2 +- + drivers/irqchip/irq-orion.c | 4 +- + drivers/irqchip/irq-rda-intc.c | 2 +- + drivers/irqchip/irq-riscv-intc.c | 2 +- + drivers/irqchip/irq-sa11x0.c | 4 +- + drivers/irqchip/irq-stm32-exti.c | 4 +- + drivers/irqchip/irq-sun4i.c | 2 +- + drivers/irqchip/irq-ti-sci-inta.c | 4 +- + drivers/irqchip/irq-ts4800.c | 4 +- + drivers/irqchip/irq-versatile-fpga.c | 2 +- + drivers/irqchip/irq-vic.c | 2 +- + drivers/irqchip/irq-vt8500.c | 2 +- + drivers/irqchip/irq-wpcm450-aic.c | 2 +- + drivers/irqchip/irq-zevio.c | 2 +- + include/linux/irq.h | 6 +- + include/linux/irqchip.h | 20 +- + include/linux/irqdesc.h | 9 +- + kernel/irq/Kconfig | 10 +- + kernel/irq/chip.c | 2 + + kernel/irq/generic-chip.c | 3 + + kernel/irq/handle.c | 18 ++ + kernel/irq/irqdesc.c | 81 ++---- + 89 files changed, 681 insertions(+), 321 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/microchip,eic.yaml + create mode 100644 drivers/irqchip/irq-mchp-eic.c +Merging ftrace/for-next (e531e90b5ab0 tracing: Increase PERF_MAX_TRACE_SIZE to handle Sentinel1 and docker together) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging tools/objtool/check.c +Removing tools/bootconfig/include/linux/string.h +Removing tools/bootconfig/include/linux/printk.h +Removing tools/bootconfig/include/linux/memblock.h +Removing tools/bootconfig/include/linux/kernel.h +Removing tools/bootconfig/include/linux/errno.h +Removing tools/bootconfig/include/linux/ctype.h +Removing tools/bootconfig/include/linux/bug.h +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/trace_events_hist.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +CONFLICT (content): Merge conflict in kernel/trace/ftrace.c +Removing kernel/test_kprobes.c +Auto-merging kernel/kprobes.c +CONFLICT (content): Merge conflict in kernel/kprobes.c +Auto-merging kernel/Makefile +Auto-merging init/main.c +Auto-merging include/linux/trace_recursion.h +CONFLICT (content): Merge conflict in include/linux/trace_recursion.h +Auto-merging include/linux/preempt.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kernel/kprobes.c +Auto-merging arch/s390/kernel/ftrace.c +Auto-merging arch/parisc/kernel/ftrace.c +CONFLICT (content): Merge conflict in arch/parisc/kernel/ftrace.c +Auto-merging arch/nds32/kernel/ftrace.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/probes/kprobes/core.c +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Resolved 'arch/parisc/kernel/ftrace.c' using previous resolution. +Recorded preimage for 'include/linux/trace_recursion.h' +Resolved 'kernel/kprobes.c' using previous resolution. +Recorded preimage for 'kernel/trace/ftrace.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/trace_recursion.h'. +Recorded resolution for 'kernel/trace/ftrace.c'. +[master 5ea4b5bbafd5] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + Documentation/trace/histogram.rst | 14 + + Documentation/trace/kprobes.rst | 2 +- + Documentation/trace/timerlat-tracer.rst | 24 +- + MAINTAINERS | 5 +- + arch/Kconfig | 8 + + arch/arc/include/asm/kprobes.h | 2 +- + arch/arc/include/asm/ptrace.h | 5 + + arch/arc/kernel/kprobes.c | 13 +- + arch/arm/Kconfig | 1 + + arch/arm/include/asm/stacktrace.h | 9 + + arch/arm/kernel/ftrace.c | 5 - + arch/arm/kernel/return_address.c | 4 + + arch/arm/kernel/stacktrace.c | 17 +- + arch/arm/probes/kprobes/core.c | 43 +- + arch/arm/probes/kprobes/opt-arm.c | 7 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kprobes.h | 2 +- + arch/arm64/include/asm/stacktrace.h | 4 + + arch/arm64/kernel/ftrace.c | 5 - + arch/arm64/kernel/probes/kprobes.c | 12 +- + arch/arm64/kernel/probes/kprobes_trampoline.S | 8 +- + arch/arm64/kernel/stacktrace.c | 7 + + arch/csky/include/asm/kprobes.h | 2 +- + arch/csky/kernel/ftrace.c | 5 - + arch/csky/kernel/probes/ftrace.c | 9 - + arch/csky/kernel/probes/kprobes.c | 14 +- + arch/csky/kernel/probes/kprobes_trampoline.S | 4 +- + arch/ia64/include/asm/ptrace.h | 5 + + arch/ia64/kernel/ftrace.c | 6 - + arch/ia64/kernel/kprobes.c | 15 +- + arch/microblaze/kernel/ftrace.c | 5 - + arch/mips/kernel/kprobes.c | 26 +- + arch/nds32/kernel/ftrace.c | 5 - + arch/parisc/kernel/ftrace.c | 8 - + arch/parisc/kernel/kprobes.c | 6 +- + arch/powerpc/include/asm/kprobes.h | 2 +- + arch/powerpc/kernel/kprobes-ftrace.c | 2 - + arch/powerpc/kernel/kprobes.c | 29 +- + arch/powerpc/kernel/optprobes.c | 8 +- + arch/powerpc/kernel/stacktrace.c | 2 +- + arch/riscv/include/asm/kprobes.h | 2 +- + arch/riscv/kernel/ftrace.c | 5 - + arch/riscv/kernel/probes/ftrace.c | 2 - + arch/riscv/kernel/probes/kprobes.c | 15 +- + arch/riscv/kernel/probes/kprobes_trampoline.S | 4 +- + arch/s390/include/asm/kprobes.h | 2 +- + arch/s390/kernel/ftrace.c | 5 - + arch/s390/kernel/kprobes.c | 16 +- + arch/s390/kernel/stacktrace.c | 2 +- + arch/sh/boot/compressed/misc.c | 3 + + arch/sh/include/asm/kprobes.h | 2 +- + arch/sh/kernel/ftrace.c | 5 - + arch/sh/kernel/kprobes.c | 12 +- + arch/sparc/include/asm/kprobes.h | 2 +- + arch/sparc/kernel/ftrace.c | 5 - + arch/sparc/kernel/kprobes.c | 12 +- + arch/x86/Kconfig | 3 +- + arch/x86/include/asm/ftrace.h | 9 +- + arch/x86/include/asm/kprobes.h | 1 - + arch/x86/include/asm/unwind.h | 29 ++ + arch/x86/include/asm/unwind_hints.h | 5 + + arch/x86/kernel/ftrace.c | 76 ++-- + arch/x86/kernel/ftrace_64.S | 30 +- + arch/x86/kernel/kprobes/core.c | 71 +++- + arch/x86/kernel/kprobes/ftrace.c | 2 - + arch/x86/kernel/kprobes/opt.c | 6 +- + arch/x86/kernel/trace.c | 2 +- + arch/x86/kernel/unwind_frame.c | 3 +- + arch/x86/kernel/unwind_guess.c | 3 +- + arch/x86/kernel/unwind_orc.c | 21 +- + fs/tracefs/inode.c | 3 +- + include/asm-generic/vmlinux.lds.h | 10 +- + include/linux/bootconfig.h | 31 +- + include/linux/ftrace.h | 38 +- + include/linux/kprobes.h | 113 ++++-- + include/linux/objtool.h | 12 + + include/linux/preempt.h | 21 + + include/linux/trace_events.h | 2 +- + include/linux/trace_recursion.h | 27 +- + init/main.c | 16 +- + kernel/Makefile | 1 - + kernel/events/internal.h | 7 +- + kernel/kprobes.c | 501 +++++++++++++----------- + kernel/livepatch/patch.c | 12 +- + kernel/test_kprobes.c | 313 --------------- + kernel/trace/Makefile | 1 + + kernel/trace/fgraph.c | 6 +- + kernel/trace/ftrace.c | 348 +++++++++++++--- + kernel/trace/pid_list.c | 495 +++++++++++++++++++++++ + kernel/trace/pid_list.h | 88 +++++ + kernel/trace/ring_buffer.c | 9 +- + kernel/trace/trace.c | 151 +++---- + kernel/trace/trace.h | 19 +- + kernel/trace/trace_boot.c | 4 + + kernel/trace/trace_dynevent.c | 2 +- + kernel/trace/trace_event_perf.c | 9 +- + kernel/trace/trace_events.c | 48 +-- + kernel/trace/trace_events_hist.c | 415 ++++++++++++++++---- + kernel/trace/trace_events_synth.c | 4 +- + kernel/trace/trace_functions.c | 5 - + kernel/trace/trace_functions_graph.c | 4 +- + kernel/trace/trace_hwlat.c | 10 +- + kernel/trace/trace_kprobe.c | 10 +- + kernel/trace/trace_osnoise.c | 39 +- + kernel/trace/trace_output.c | 17 +- + kernel/trace/trace_printk.c | 2 +- + kernel/trace/trace_recursion_record.c | 4 +- + kernel/trace/trace_selftest.c | 92 ++++- + kernel/trace/trace_stack.c | 6 +- + kernel/trace/trace_stat.c | 6 +- + kernel/trace/trace_uprobe.c | 4 +- + kernel/trace/tracing_map.c | 40 +- + lib/Kconfig.debug | 3 +- + lib/Makefile | 1 + + lib/bootconfig.c | 231 ++++++----- + lib/error-inject.c | 3 +- + lib/test_kprobes.c | 371 ++++++++++++++++++ + samples/ftrace/Makefile | 1 + + samples/ftrace/ftrace-direct-multi.c | 52 +++ + samples/kprobes/kretprobe_example.c | 2 +- + tools/bootconfig/Makefile | 4 +- + tools/bootconfig/include/linux/bootconfig.h | 45 ++- + tools/bootconfig/include/linux/bug.h | 12 - + tools/bootconfig/include/linux/ctype.h | 7 - + tools/bootconfig/include/linux/errno.h | 7 - + tools/bootconfig/include/linux/kernel.h | 18 - + tools/bootconfig/include/linux/memblock.h | 11 - + tools/bootconfig/include/linux/printk.h | 14 - + tools/bootconfig/include/linux/string.h | 32 -- + tools/bootconfig/main.c | 32 +- + tools/include/linux/objtool.h | 12 + + tools/objtool/check.c | 2 +- + tools/testing/selftests/ftrace/ftracetest | 2 +- + tools/testing/selftests/ftrace/test.d/functions | 12 + + tools/tracing/latency/latency-collector.c | 2 +- + 135 files changed, 3005 insertions(+), 1522 deletions(-) + delete mode 100644 kernel/test_kprobes.c + create mode 100644 kernel/trace/pid_list.c + create mode 100644 kernel/trace/pid_list.h + create mode 100644 lib/test_kprobes.c + create mode 100644 samples/ftrace/ftrace-direct-multi.c + delete mode 100644 tools/bootconfig/include/linux/bug.h + delete mode 100644 tools/bootconfig/include/linux/ctype.h + delete mode 100644 tools/bootconfig/include/linux/errno.h + delete mode 100644 tools/bootconfig/include/linux/kernel.h + delete mode 100644 tools/bootconfig/include/linux/memblock.h + delete mode 100644 tools/bootconfig/include/linux/printk.h + delete mode 100644 tools/bootconfig/include/linux/string.h +$ git am -3 ../patches/Upcoming-merge-conflict-between-ftrace-and-s390-trees.patch +Applying: Upcoming merge conflict between ftrace and s390 trees +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/Kconfig +M samples/Kconfig +M samples/Makefile +M samples/ftrace/Makefile +$ git add -A . +$ git commit -v -a --amend +[master 838f3a946cce] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git + Date: Thu Oct 28 16:28:57 2021 +1100 +Merging rcu/rcu/next (a01016aa420e refscale: Always log the error message) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging tools/testing/selftests/bpf/prog_tests/atomics.c +Auto-merging kernel/rcu/update.c +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/rcu/tasks.h +CONFLICT (content): Merge conflict in kernel/rcu/tasks.h +Auto-merging Documentation/timers/no_hz.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'kernel/rcu/tasks.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master aad4d6fb5bd9] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git +$ git diff -M --stat --summary HEAD^.. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 69 +++-- + Documentation/RCU/stallwarn.rst | 21 +- + Documentation/admin-guide/kernel-parameters.txt | 12 +- + .../admin-guide/kernel-per-CPU-kthreads.rst | 2 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 ++++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++++ + .../litmus-tests/locking/RM-broken.litmus | 42 +++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 +++ + Documentation/timers/no_hz.rst | 10 +- + arch/sh/configs/sdk7786_defconfig | 1 - + arch/xtensa/configs/nommu_kc705_defconfig | 1 - + include/linux/clocksource.h | 2 + + include/linux/kcsan-checks.h | 3 + + include/linux/rcu_segcblist.h | 51 +++- + include/linux/rcupdate.h | 53 ++-- + include/linux/rcupdate_trace.h | 5 +- + include/linux/rcutiny.h | 2 +- + include/linux/srcu.h | 3 +- + include/linux/torture.h | 8 + + kernel/kcsan/core.c | 75 ++--- + kernel/kcsan/kcsan.h | 8 +- + kernel/kcsan/kcsan_test.c | 62 ++-- + kernel/kcsan/report.c | 77 ++++- + kernel/kcsan/selftest.c | 72 ++--- + kernel/locking/locktorture.c | 14 +- + kernel/rcu/Kconfig | 18 -- + kernel/rcu/rcu_segcblist.c | 10 +- + kernel/rcu/rcu_segcblist.h | 12 +- + kernel/rcu/rcuscale.c | 10 +- + kernel/rcu/rcutorture.c | 167 +++++++---- + kernel/rcu/refscale.c | 48 ++-- + kernel/rcu/srcutiny.c | 2 +- + kernel/rcu/tasks.h | 112 ++++---- + kernel/rcu/tree.c | 164 +++++++---- + kernel/rcu/tree.h | 24 +- + kernel/rcu/tree_exp.h | 14 +- + kernel/rcu/tree_nocb.h | 35 ++- + kernel/rcu/tree_plugin.h | 258 +++-------------- + kernel/rcu/tree_stall.h | 27 +- + kernel/rcu/update.c | 8 +- + kernel/scftorture.c | 43 +-- + kernel/softirq.c | 3 +- + kernel/time/clocksource-wdtest.c | 19 +- + kernel/time/clocksource.c | 38 ++- + kernel/time/tick-sched.c | 7 + + tools/include/nolibc/nolibc.h | 86 ++++-- + tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +++- + tools/memory-model/scripts/hwfnseg.sh | 20 ++ + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++++++-- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 +++ + tools/rcu/extract-stall.sh | 34 +++ + tools/testing/selftests/bpf/prog_tests/atomics.c | 4 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 1 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 11 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 13 +- + .../selftests/rcutorture/configs/rcu/TREE01 | 1 - + .../selftests/rcutorture/configs/rcu/TREE02 | 1 - + .../selftests/rcutorture/configs/rcu/TREE04 | 1 - + .../selftests/rcutorture/configs/rcu/TREE05 | 1 - + .../selftests/rcutorture/configs/rcu/TREE06 | 1 - + .../selftests/rcutorture/configs/rcu/TREE07 | 1 - + .../selftests/rcutorture/configs/rcu/TREE08 | 1 - + .../selftests/rcutorture/configs/rcu/TREE10 | 1 - + .../selftests/rcutorture/configs/rcuscale/TINY | 1 - + .../selftests/rcutorture/configs/rcuscale/TRACE01 | 1 - + .../selftests/rcutorture/configs/rcuscale/TREE | 1 - + .../selftests/rcutorture/configs/rcuscale/TREE54 | 1 - + .../rcutorture/configs/refscale/NOPREEMPT | 1 - + .../selftests/rcutorture/configs/refscale/PREEMPT | 1 - + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - + 83 files changed, 1824 insertions(+), 913 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + create mode 100644 tools/rcu/extract-stall.sh +Merging kvm/next (0d7d84498fb4 KVM: x86: SGX must obey the KVM_INTERNAL_ERROR_EMULATION protocol) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging arch/x86/kvm/x86.c +CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/riscv/Kconfig' using previous resolution. +Resolved 'arch/x86/kvm/x86.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 30a19cafd008] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 9 +- + Documentation/virt/kvm/api.rst | 241 ++++- + Documentation/virt/kvm/devices/vcpu.rst | 70 ++ + Documentation/virt/kvm/devices/xics.rst | 2 +- + Documentation/virt/kvm/devices/xive.rst | 2 +- + MAINTAINERS | 12 + + arch/arm64/include/asm/kvm_host.h | 1 - + arch/arm64/kvm/arm.c | 8 - + arch/mips/kvm/mips.c | 2 +- + arch/powerpc/include/asm/kvm_book3s.h | 2 +- + arch/powerpc/include/asm/kvm_host.h | 4 +- + arch/powerpc/kvm/book3s_xive.c | 2 +- + arch/powerpc/kvm/powerpc.c | 2 +- + arch/riscv/Kconfig | 2 + + arch/riscv/Makefile | 1 + + arch/riscv/include/asm/kvm_host.h | 266 ++++++ + arch/riscv/include/asm/kvm_types.h | 7 + + arch/riscv/include/asm/kvm_vcpu_timer.h | 44 + + arch/riscv/include/uapi/asm/kvm.h | 128 +++ + arch/riscv/kernel/asm-offsets.c | 156 ++++ + arch/riscv/kvm/Kconfig | 35 + + arch/riscv/kvm/Makefile | 25 + + arch/riscv/kvm/main.c | 118 +++ + arch/riscv/kvm/mmu.c | 802 +++++++++++++++++ + arch/riscv/kvm/tlb.S | 74 ++ + arch/riscv/kvm/vcpu.c | 997 +++++++++++++++++++++ + arch/riscv/kvm/vcpu_exit.c | 701 +++++++++++++++ + arch/riscv/kvm/vcpu_sbi.c | 185 ++++ + arch/riscv/kvm/vcpu_switch.S | 400 +++++++++ + arch/riscv/kvm/vcpu_timer.c | 225 +++++ + arch/riscv/kvm/vm.c | 97 ++ + arch/riscv/kvm/vmid.c | 120 +++ + arch/x86/include/asm/kvm_host.h | 48 +- + arch/x86/include/asm/kvm_page_track.h | 11 +- + arch/x86/include/uapi/asm/kvm.h | 4 + + arch/x86/kernel/irq.c | 4 +- + arch/x86/kvm/Kconfig | 3 + + arch/x86/kvm/cpuid.c | 10 +- + arch/x86/kvm/emulate.c | 5 + + arch/x86/kvm/hyperv.c | 22 +- + arch/x86/kvm/ioapic.c | 2 +- + arch/x86/kvm/ioapic.h | 4 +- + arch/x86/kvm/mmu.h | 114 ++- + arch/x86/kvm/mmu/mmu.c | 702 ++++++++------- + arch/x86/kvm/mmu/mmu_internal.h | 21 +- + arch/x86/kvm/mmu/mmutrace.h | 18 +- + arch/x86/kvm/mmu/page_track.c | 49 +- + arch/x86/kvm/mmu/paging_tmpl.h | 168 ++-- + arch/x86/kvm/mmu/spte.c | 34 +- + arch/x86/kvm/mmu/spte.h | 21 +- + arch/x86/kvm/mmu/tdp_mmu.c | 119 +-- + arch/x86/kvm/mmu/tdp_mmu.h | 6 +- + arch/x86/kvm/svm/nested.c | 52 +- + arch/x86/kvm/svm/sev.c | 6 +- + arch/x86/kvm/svm/svm.c | 168 ++-- + arch/x86/kvm/svm/svm.h | 9 +- + arch/x86/kvm/trace.h | 9 +- + arch/x86/kvm/vmx/nested.c | 63 +- + arch/x86/kvm/vmx/pmu_intel.c | 6 +- + arch/x86/kvm/vmx/sgx.c | 16 +- + arch/x86/kvm/vmx/vmx.c | 136 +-- + arch/x86/kvm/vmx/vmx.h | 2 +- + arch/x86/kvm/x86.c | 800 +++++++++++------ + arch/x86/kvm/x86.h | 2 - + drivers/clocksource/timer-riscv.c | 9 + + drivers/gpu/drm/i915/Kconfig | 1 + + include/clocksource/timer-riscv.h | 16 + + include/linux/kvm_host.h | 18 +- + include/uapi/linux/kvm.h | 29 +- + tools/arch/x86/include/asm/pvclock-abi.h | 48 + + tools/arch/x86/include/asm/pvclock.h | 103 +++ + tools/testing/selftests/kvm/.gitignore | 2 + + tools/testing/selftests/kvm/Makefile | 2 + + tools/testing/selftests/kvm/include/kvm_util.h | 11 + + tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 46 +- + tools/testing/selftests/kvm/lib/sparsebit.c | 2 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 4 +- + tools/testing/selftests/kvm/lib/x86_64/svm.c | 14 +- + .../selftests/kvm/system_counter_offset_test.c | 132 +++ + .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 3 +- + .../testing/selftests/kvm/x86_64/kvm_clock_test.c | 203 +++++ + .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 2 +- + virt/kvm/eventfd.c | 15 +- + virt/kvm/kvm_main.c | 127 +-- + 85 files changed, 6937 insertions(+), 1226 deletions(-) + create mode 100644 arch/riscv/include/asm/kvm_host.h + create mode 100644 arch/riscv/include/asm/kvm_types.h + create mode 100644 arch/riscv/include/asm/kvm_vcpu_timer.h + create mode 100644 arch/riscv/include/uapi/asm/kvm.h + create mode 100644 arch/riscv/kvm/Kconfig + create mode 100644 arch/riscv/kvm/Makefile + create mode 100644 arch/riscv/kvm/main.c + create mode 100644 arch/riscv/kvm/mmu.c + create mode 100644 arch/riscv/kvm/tlb.S + create mode 100644 arch/riscv/kvm/vcpu.c + create mode 100644 arch/riscv/kvm/vcpu_exit.c + create mode 100644 arch/riscv/kvm/vcpu_sbi.c + create mode 100644 arch/riscv/kvm/vcpu_switch.S + create mode 100644 arch/riscv/kvm/vcpu_timer.c + create mode 100644 arch/riscv/kvm/vm.c + create mode 100644 arch/riscv/kvm/vmid.c + create mode 100644 include/clocksource/timer-riscv.h + create mode 100644 tools/arch/x86/include/asm/pvclock-abi.h + create mode 100644 tools/arch/x86/include/asm/pvclock.h + create mode 100644 tools/testing/selftests/kvm/system_counter_offset_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/kvm_clock_test.c +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 +Auto-merging tools/testing/selftests/kvm/include/kvm_util.h +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/.gitignore +Auto-merging arch/arm64/kvm/reset.c +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/hyp/nvhe/mem_protect.c +Auto-merging arch/arm64/kvm/hyp/include/hyp/switch.h +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kernel/smp.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/kvm_asm.h +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kvm_arm.h | 1 + + arch/arm64/include/asm/kvm_asm.h | 48 +- + arch/arm64/include/asm/kvm_emulate.h | 5 +- + arch/arm64/include/asm/kvm_host.h | 3 + + arch/arm64/include/asm/kvm_hyp.h | 5 + + arch/arm64/include/asm/sysreg.h | 3 + + arch/arm64/kernel/smp.c | 3 +- + arch/arm64/kvm/Kconfig | 10 +- + arch/arm64/kvm/arm.c | 94 +- + arch/arm64/kvm/hyp/include/hyp/fault.h | 75 ++ + arch/arm64/kvm/hyp/include/hyp/switch.h | 235 ++-- + arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 200 +++ + arch/arm64/kvm/hyp/include/nvhe/trap_handler.h | 2 + + arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- + arch/arm64/kvm/hyp/nvhe/host.S | 26 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 48 +- + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 11 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 185 +++ + arch/arm64/kvm/hyp/nvhe/setup.c | 3 + + arch/arm64/kvm/hyp/nvhe/switch.c | 99 ++ + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 487 ++++++++ + arch/arm64/kvm/hyp/vgic-v3-sr.c | 22 +- + arch/arm64/kvm/hyp/vhe/switch.c | 16 + + arch/arm64/kvm/mmu.c | 2 +- + arch/arm64/kvm/pmu-emul.c | 2 +- + arch/arm64/kvm/reset.c | 2 +- + arch/arm64/kvm/sys_regs.c | 41 +- + arch/arm64/kvm/vgic/vgic-init.c | 2 +- + arch/arm64/kvm/vgic/vgic-irqfd.c | 2 +- + arch/arm64/kvm/vgic/vgic-its.c | 18 +- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 25 +- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 8 +- + arch/arm64/kvm/vgic/vgic-v3.c | 27 +- + arch/arm64/kvm/vgic/vgic-v4.c | 2 +- + arch/arm64/kvm/vgic/vgic.h | 5 +- + tools/arch/arm64/include/asm/sysreg.h | 1296 ++++++++++++++++++++ + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 5 +- + tools/testing/selftests/kvm/aarch64/arch_timer.c | 479 ++++++++ + .../selftests/kvm/aarch64/debug-exceptions.c | 30 +- + .../selftests/kvm/aarch64/psci_cpu_on_test.c | 2 +- + tools/testing/selftests/kvm/aarch64/vgic_init.c | 369 ++++-- + .../selftests/kvm/include/aarch64/arch_timer.h | 142 +++ + .../testing/selftests/kvm/include/aarch64/delay.h | 25 + + tools/testing/selftests/kvm/include/aarch64/gic.h | 21 + + .../selftests/kvm/include/aarch64/processor.h | 90 +- + .../selftests/kvm/include/aarch64/spinlock.h | 13 + + tools/testing/selftests/kvm/include/aarch64/vgic.h | 20 + + tools/testing/selftests/kvm/include/kvm_util.h | 2 + + tools/testing/selftests/kvm/lib/aarch64/gic.c | 95 ++ + .../selftests/kvm/lib/aarch64/gic_private.h | 21 + + tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 240 ++++ + tools/testing/selftests/kvm/lib/aarch64/gic_v3.h | 70 ++ + .../testing/selftests/kvm/lib/aarch64/processor.c | 24 +- + tools/testing/selftests/kvm/lib/aarch64/spinlock.c | 27 + + tools/testing/selftests/kvm/lib/aarch64/vgic.c | 70 ++ + tools/testing/selftests/kvm/memslot_perf_test.c | 56 +- + 59 files changed, 4373 insertions(+), 451 deletions(-) + create mode 100644 arch/arm64/kvm/hyp/include/hyp/fault.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/fixed_config.h + create mode 100644 arch/arm64/kvm/hyp/nvhe/pkvm.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/sys_regs.c + create mode 100644 tools/arch/arm64/include/asm/sysreg.h + create mode 100644 tools/testing/selftests/kvm/aarch64/arch_timer.c + create mode 100644 tools/testing/selftests/kvm/include/aarch64/arch_timer.h + create mode 100644 tools/testing/selftests/kvm/include/aarch64/delay.h + create mode 100644 tools/testing/selftests/kvm/include/aarch64/gic.h + create mode 100644 tools/testing/selftests/kvm/include/aarch64/spinlock.h + create mode 100644 tools/testing/selftests/kvm/include/aarch64/vgic.h + create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic.c + create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic_private.h + create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic_v3.c + create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic_v3.h + create mode 100644 tools/testing/selftests/kvm/lib/aarch64/spinlock.c + create mode 100644 tools/testing/selftests/kvm/lib/aarch64/vgic.c +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 +Auto-merging arch/s390/include/asm/pgtable.h +Merge made by the 'recursive' strategy. + arch/s390/include/asm/pgtable.h | 9 ++-- + arch/s390/include/asm/uv.h | 15 +++++- + arch/s390/kernel/uv.c | 65 +++++++++++++++++++++--- + arch/s390/kvm/intercept.c | 5 ++ + arch/s390/kvm/kvm-s390.c | 7 +-- + arch/s390/kvm/kvm-s390.h | 9 ++++ + arch/s390/kvm/priv.c | 2 + + arch/s390/kvm/pv.c | 21 ++++---- + arch/s390/kvm/sigp.c | 14 +----- + arch/s390/mm/gmap.c | 15 ++++-- + arch/s390/mm/pgtable.c | 109 ++++++++++++++++++++++++++++------------ + 11 files changed, 196 insertions(+), 75 deletions(-) +Merging xen-tip/linux-next (97c79d816979 x86/xen: switch initial pvops IRQ functions to dummy ones) +$ 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/mmu_pv.c +Auto-merging arch/x86/xen/irq.c +CONFLICT (content): Merge conflict in arch/x86/xen/irq.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging arch/x86/kernel/paravirt.c +Recorded preimage for 'arch/x86/xen/irq.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/x86/xen/irq.c'. +[master 927510e01820] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/paravirt_types.h | 2 + + arch/x86/include/asm/xen/hypervisor.h | 4 + + arch/x86/kernel/paravirt.c | 13 ++- + arch/x86/xen/enlighten.c | 116 ++++++------------------ + arch/x86/xen/enlighten_hvm.c | 6 +- + arch/x86/xen/enlighten_pv.c | 28 +----- + arch/x86/xen/irq.c | 62 +------------ + arch/x86/xen/mmu_pv.c | 51 ++++++++--- + arch/x86/xen/setup.c | 10 +- + arch/x86/xen/smp.c | 28 ------ + arch/x86/xen/smp_pv.c | 2 - + arch/x86/xen/xen-ops.h | 4 +- + drivers/xen/pvcalls-back.c | 1 - + drivers/xen/xen-acpi-processor.c | 6 +- + drivers/xen/xen-pciback/conf_space_capability.c | 2 +- + 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 +- + 50 files changed, 137 insertions(+), 644 deletions(-) +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 +Merge made by the 'recursive' strategy. + Documentation/core-api/workqueue.rst | 21 +++- + drivers/tty/sysrq.c | 2 +- + include/linux/workqueue.h | 3 +- + kernel/power/process.c | 2 +- + kernel/workqueue.c | 187 ++++++++++++++++++++--------------- + 5 files changed, 128 insertions(+), 87 deletions(-) +Merging drivers-x86/for-next (fc3341b4b55f platform/x86: system76_acpi: fix Kconfig dependencies) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/amd-pmc.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/platform/mellanox/mlxreg-io.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-mlxreg-io | 244 +++ + .../ABI/testing/sysfs-platform-dell-privacy-wmi | 60 +- + Documentation/ABI/testing/sysfs-platform-intel-pmc | 2 + + MAINTAINERS | 28 +- + drivers/hid/surface-hid/surface_hid.c | 4 +- + drivers/input/misc/axp20x-pek.c | 26 +- + drivers/platform/mellanox/Kconfig | 12 + + drivers/platform/mellanox/Makefile | 1 + + drivers/platform/mellanox/mlxreg-hotplug.c | 123 +- + drivers/platform/mellanox/mlxreg-io.c | 2 +- + drivers/platform/mellanox/mlxreg-lc.c | 906 ++++++++ + drivers/platform/surface/surface3-wmi.c | 9 +- + drivers/platform/surface/surface3_power.c | 3 +- + .../platform/surface/surface_aggregator_registry.c | 54 + + drivers/platform/surface/surface_gpe.c | 13 + + drivers/platform/x86/Kconfig | 29 + + drivers/platform/x86/Makefile | 4 + + drivers/platform/x86/acer-wmi.c | 14 +- + drivers/platform/x86/amd-pmc.c | 155 +- + drivers/platform/x86/barco-p50-gpio.c | 436 ++++ + drivers/platform/x86/dell/dell-wmi-base.c | 76 +- + drivers/platform/x86/hp-wmi.c | 329 ++- + drivers/platform/x86/ideapad-laptop.c | 35 +- + drivers/platform/x86/intel/Kconfig | 16 + + drivers/platform/x86/intel/Makefile | 1 + + drivers/platform/x86/intel/int0002_vgpio.c | 14 +- + drivers/platform/x86/intel/ishtp_eclite.c | 701 ++++++ + drivers/platform/x86/lg-laptop.c | 11 +- + drivers/platform/x86/mlx-platform.c | 2279 +++++++++++++++++--- + drivers/platform/x86/nvidia-wmi-ec-backlight.c | 213 ++ + drivers/platform/x86/panasonic-laptop.c | 18 +- + drivers/platform/x86/sony-laptop.c | 46 +- + drivers/platform/x86/system76_acpi.c | 428 +++- + drivers/platform/x86/thinkpad_acpi.c | 195 +- + drivers/platform/x86/wmi.c | 375 ++-- + include/linux/platform_data/mlxreg.h | 82 + + include/linux/platform_data/x86/soc.h | 65 + + include/linux/surface_aggregator/controller.h | 4 +- + sound/soc/intel/common/soc-intel-quirks.h | 51 +- + 39 files changed, 6224 insertions(+), 840 deletions(-) + create mode 100644 drivers/platform/mellanox/mlxreg-lc.c + create mode 100644 drivers/platform/x86/barco-p50-gpio.c + create mode 100644 drivers/platform/x86/intel/ishtp_eclite.c + create mode 100644 drivers/platform/x86/nvidia-wmi-ec-backlight.c + create mode 100644 include/linux/platform_data/x86/soc.h +Merging chrome-platform/for-next (3119c28634dd MAINTAINERS: Chrome: Drop Enric Balletbo i Serra) +$ 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 MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 14 +++- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 3 +- + drivers/platform/chrome/cros_ec_lpc.c | 4 +- + drivers/platform/chrome/cros_ec_proto.c | 60 ++++++++++++++++-- + 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 | 5 +- + 8 files changed, 98 insertions(+), 118 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 +Merge made by the 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/leds/led-class-flash.c | 2 +- + drivers/leds/led-triggers.c | 41 +++++++++++++++++++++-------------------- + drivers/leds/trigger/Kconfig | 1 + + include/linux/leds.h | 2 +- + 4 files changed, 24 insertions(+), 22 deletions(-) +Merging ipmi/for-next (fc4e78481afa char: ipmi: replace snprintf in show functions with sysfs_emit) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'recursive' strategy. + .../bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 1 + + .../devicetree/bindings/ipmi/ipmi-ipmb.yaml | 59 +++ + Documentation/driver-api/ipmi.rst | 64 ++- + drivers/char/ipmi/Kconfig | 11 +- + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/bt-bmc.c | 69 +-- + drivers/char/ipmi/ipmi_devintf.c | 8 +- + drivers/char/ipmi/ipmi_ipmb.c | 539 +++++++++++++++++++++ + drivers/char/ipmi/ipmi_msghandler.c | 330 +++++++++++-- + drivers/char/ipmi/ipmi_si_intf.c | 8 +- + drivers/char/ipmi/ipmi_ssif.c | 4 +- + drivers/char/ipmi/ipmi_watchdog.c | 25 +- + include/linux/ipmi.h | 3 + + include/linux/ipmi_smi.h | 59 +++ + include/uapi/linux/ipmi.h | 16 +- + 15 files changed, 1075 insertions(+), 122 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ipmi/ipmi-ipmb.yaml + create mode 100644 drivers/char/ipmi/ipmi_ipmb.c +Merging driver-core/driver-core-next (27e0bcd02990 device property: Drop redundant NULL checks) +$ 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 +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/base/arch_topology.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/ABI/testing/sysfs-bus-pci +Auto-merging Documentation/ABI/testing/ima_policy +Merge made by the 'recursive' strategy. + Documentation/ABI/obsolete/o2cb | 11 + + Documentation/ABI/obsolete/sysfs-bus-iio | 4 + + Documentation/ABI/stable/o2cb | 2 +- + Documentation/ABI/stable/sysfs-class-infiniband | 64 +- + Documentation/ABI/stable/sysfs-class-tpm | 2 +- + Documentation/ABI/stable/sysfs-devices | 7 + + Documentation/ABI/stable/sysfs-module | 25 +- + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 42 +- + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 43 +- + Documentation/ABI/testing/evm | 5 +- + Documentation/ABI/testing/ima_policy | 2 +- + Documentation/ABI/testing/pstore | 3 +- + Documentation/ABI/testing/sysfs-ata | 2 +- + Documentation/ABI/testing/sysfs-bus-mdio | 9 + + Documentation/ABI/testing/sysfs-bus-pci | 24 +- + Documentation/ABI/testing/sysfs-bus-platform | 12 + + Documentation/ABI/testing/sysfs-bus-rapidio | 32 +- + .../ABI/testing/sysfs-bus-soundwire-master | 20 +- + .../ABI/testing/sysfs-bus-soundwire-slave | 62 +- + Documentation/ABI/testing/sysfs-bus-usb | 292 ++++++- + Documentation/ABI/testing/sysfs-class-bdi | 30 +- + Documentation/ABI/testing/sysfs-class-cxl | 15 +- + .../ABI/testing/sysfs-class-devfreq-event | 12 +- + Documentation/ABI/testing/sysfs-class-extcon | 12 +- + Documentation/ABI/testing/sysfs-class-gnss | 2 +- + Documentation/ABI/testing/sysfs-class-hwmon | 932 +++++++++++++++++++++ + Documentation/ABI/testing/sysfs-class-mei | 18 +- + Documentation/ABI/testing/sysfs-class-mic | 24 +- + Documentation/ABI/testing/sysfs-class-mux | 2 +- + Documentation/ABI/testing/sysfs-class-pwm | 20 +- + Documentation/ABI/testing/sysfs-class-rapidio | 4 +- + Documentation/ABI/testing/sysfs-class-rc | 14 +- + Documentation/ABI/testing/sysfs-class-rc-nuvoton | 2 +- + Documentation/ABI/testing/sysfs-class-typec | 2 +- + Documentation/ABI/testing/sysfs-class-uwb_rc | 26 +- + .../ABI/testing/sysfs-class-uwb_rc-wusbhc | 10 +- + .../ABI/testing/sysfs-devices-platform-dock | 10 +- + Documentation/ABI/testing/sysfs-devices-power | 36 + + Documentation/ABI/testing/sysfs-devices-removable | 8 +- + Documentation/ABI/testing/sysfs-devices-system-cpu | 68 +- + Documentation/ABI/testing/sysfs-driver-ufs | 126 +++ + Documentation/ABI/testing/sysfs-firmware-efi-esrt | 16 +- + Documentation/ABI/testing/sysfs-kernel-slab | 115 +-- + Documentation/ABI/testing/sysfs-mce | 129 +++ + Documentation/ABI/testing/sysfs-module | 7 + + Documentation/ABI/testing/sysfs-platform-dptf | 4 + + Documentation/ABI/testing/sysfs-platform-sst-atom | 2 +- + Documentation/ABI/testing/sysfs-ptp | 30 +- + Documentation/ABI/testing/sysfs-tty | 32 +- + Documentation/admin-guide/dynamic-debug-howto.rst | 15 +- + Documentation/admin-guide/kernel-parameters.txt | 5 - + Documentation/hwmon/sysfs-interface.rst | 596 +------------ + Documentation/x86/x86_64/machinecheck.rst | 56 +- + MAINTAINERS | 3 + + arch/x86/include/asm/microcode.h | 3 - + arch/x86/kernel/cpu/microcode/amd.c | 14 +- + arch/x86/kernel/cpu/microcode/core.c | 17 - + arch/x86/kernel/cpu/microcode/intel.c | 9 +- + arch/x86/tools/relocs.c | 2 + + drivers/base/arch_topology.c | 3 - + drivers/base/component.c | 6 +- + drivers/base/core.c | 17 +- + drivers/base/firmware_loader/builtin/Makefile | 6 +- + drivers/base/firmware_loader/builtin/main.c | 106 +++ + drivers/base/firmware_loader/firmware.h | 17 + + drivers/base/firmware_loader/main.c | 65 +- + drivers/base/platform.c | 3 +- + drivers/base/swnode.c | 6 - + drivers/gpio/gpiolib-acpi.c | 5 +- + drivers/i2c/i2c-core-acpi.c | 22 +- + drivers/pci/pci-sysfs.c | 6 +- + fs/kernfs/symlink.c | 3 +- + fs/sysfs/dir.c | 3 +- + fs/sysfs/file.c | 140 ++-- + fs/sysfs/group.c | 15 +- + fs/sysfs/sysfs.h | 8 +- + include/asm-generic/vmlinux.lds.h | 20 +- + include/linux/device/bus.h | 1 + + include/linux/firmware.h | 30 +- + include/linux/fwnode.h | 1 + + include/linux/kernfs.h | 28 - + include/linux/kobject.h | 1 - + lib/dynamic_debug.c | 60 +- + lib/kobject.c | 2 +- + scripts/get_abi.pl | 493 ++++++++++- + 85 files changed, 2853 insertions(+), 1305 deletions(-) + create mode 100644 Documentation/ABI/obsolete/o2cb + create mode 100644 Documentation/ABI/testing/sysfs-class-hwmon + create mode 100644 Documentation/ABI/testing/sysfs-mce + create mode 100644 drivers/base/firmware_loader/builtin/main.c +Merging usb/usb-next (79a4479a17b8 USB: iowarrior: fix control-message timeouts) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging arch/arm/boot/dts/stm32mp151.dtsi +Removing Documentation/devicetree/bindings/usb/usb3503.txt +Removing Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt +Merge made by the 'recursive' strategy. + .../bindings/phy/nvidia,tegra20-usb-phy.txt | 74 ---- + .../bindings/phy/nvidia,tegra20-usb-phy.yaml | 373 +++++++++++++++++++++ + .../devicetree/bindings/usb/atmel-usb.txt | 4 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 16 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/smsc,usb3503.yaml | 108 ++++++ + .../devicetree/bindings/usb/snps,dwc3.yaml | 18 +- + .../devicetree/bindings/usb/ti,tps6598x.yaml | 4 + + Documentation/devicetree/bindings/usb/usb3503.txt | 39 --- + .../driver-api/usb/writing_usb_driver.rst | 13 +- + arch/arm/boot/dts/stm32mp151.dtsi | 1 + + drivers/platform/x86/i2c-multi-instantiate.c | 31 +- + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/xdomain.c | 2 +- + drivers/usb/atm/usbatm.c | 4 +- + drivers/usb/chipidea/core.c | 23 +- + drivers/usb/chipidea/udc.c | 8 + + drivers/usb/class/cdc-acm.c | 1 - + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/core/config.c | 4 +- + drivers/usb/core/devio.c | 144 ++++++-- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/dwc2/core.h | 19 +- + drivers/usb/dwc2/debugfs.c | 4 +- + drivers/usb/dwc2/drd.c | 24 +- + drivers/usb/dwc2/gadget.c | 1 + + drivers/usb/dwc2/hcd.c | 12 +- + drivers/usb/dwc2/params.c | 75 +++-- + drivers/usb/dwc3/Kconfig | 7 +- + drivers/usb/dwc3/core.c | 29 ++ + drivers/usb/dwc3/core.h | 25 +- + drivers/usb/dwc3/gadget.c | 14 +- + drivers/usb/gadget/configfs.c | 26 +- + drivers/usb/gadget/epautoconf.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 87 ++++- + drivers/usb/gadget/function/f_uac1.c | 1 + + drivers/usb/gadget/function/f_uac2.c | 24 +- + drivers/usb/gadget/function/f_uvc.c | 8 +- + drivers/usb/gadget/function/u_audio.c | 96 ++++-- + drivers/usb/gadget/function/u_audio.h | 10 +- + drivers/usb/gadget/function/u_ether.c | 4 +- + drivers/usb/gadget/function/u_uac2.h | 1 - + drivers/usb/gadget/function/uvc.h | 6 +- + drivers/usb/gadget/function/uvc_queue.c | 2 +- + drivers/usb/gadget/function/uvc_v4l2.c | 52 ++- + drivers/usb/gadget/function/uvc_video.c | 71 +++- + drivers/usb/gadget/function/uvc_video.h | 2 - + drivers/usb/gadget/legacy/hid.c | 4 +- + drivers/usb/gadget/udc/amd5536udc.h | 1 - + drivers/usb/gadget/udc/core.c | 6 +- + drivers/usb/gadget/udc/goku_udc.c | 6 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 2 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 5 - + drivers/usb/gadget/udc/udc-xilinx.c | 25 ++ + drivers/usb/host/Kconfig | 6 +- + drivers/usb/host/ehci-atmel.c | 8 + + drivers/usb/host/ehci-hcd.c | 13 +- + drivers/usb/host/ehci-hub.c | 11 +- + drivers/usb/host/ehci-mem.c | 3 +- + drivers/usb/host/ehci-mv.c | 2 - + drivers/usb/host/ehci-platform.c | 6 + + drivers/usb/host/ehci.h | 1 + + drivers/usb/host/fotg210-hcd.c | 5 +- + drivers/usb/host/max3421-hcd.c | 25 +- + drivers/usb/host/ohci-hcd.c | 3 +- + drivers/usb/host/ohci-hub.c | 3 + + drivers/usb/host/ohci-tmio.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/host/xhci-mtk-sch.c | 2 +- + drivers/usb/host/xhci-pci.c | 16 + + drivers/usb/misc/iowarrior.c | 8 +- + drivers/usb/musb/Kconfig | 2 +- + drivers/usb/musb/mediatek.c | 1 + + drivers/usb/musb/musb_gadget.c | 4 +- + drivers/usb/musb/sunxi.c | 8 + + drivers/usb/musb/tusb6010.c | 5 + + drivers/usb/phy/phy-tahvo.c | 4 - + drivers/usb/phy/phy-tegra-usb.c | 198 ++++++++++- + drivers/usb/storage/unusual_devs.h | 10 + + drivers/usb/typec/Kconfig | 4 +- + drivers/usb/typec/hd3ss3220.c | 8 +- + drivers/usb/typec/tcpm/tcpci.c | 2 +- + drivers/usb/typec/tipd/core.c | 223 +++++++++--- + drivers/usb/typec/tipd/tps6598x.h | 12 + + drivers/usb/typec/tipd/trace.h | 23 ++ + drivers/usb/typec/ucsi/ucsi.c | 337 +++++++++---------- + drivers/usb/typec/ucsi/ucsi.h | 3 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- + drivers/usb/usb-skeleton.c | 2 +- + include/linux/usb/tegra_usb_phy.h | 5 + + 90 files changed, 1846 insertions(+), 652 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/usb/smsc,usb3503.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb3503.txt +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 +Auto-merging drivers/usb/serial/cp210x.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/ch341.c | 85 +++++++++-------------------- + drivers/usb/serial/cp210x.c | 109 +++++++++++-------------------------- + drivers/usb/serial/f81232.c | 96 ++++++++++++-------------------- + drivers/usb/serial/ftdi_sio.c | 53 +++++------------- + drivers/usb/serial/keyspan.c | 15 +++-- + drivers/usb/serial/keyspan_pda.c | 67 ++++++++++------------- + drivers/usb/serial/kl5kusb105.c | 115 +++++++++++++++------------------------ + drivers/usb/serial/usb-serial.c | 59 ++++++++++---------- + 8 files changed, 215 insertions(+), 384 deletions(-) +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 (73a3d4f41886 tty: rpmsg: Define tty name via constant string literal) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging net/nfc/nci/uart.c +Auto-merging drivers/tty/sysrq.c +Removing drivers/tty/moxa.h +Auto-merging drivers/net/hamradio/6pack.c +Auto-merging drivers/bluetooth/hci_ldisc.c +Removing Documentation/devicetree/bindings/serial/xlnx,opb-uartlite.txt +Removing Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/8250_omap.yaml | 2 +- + .../bindings/serial/brcm,bcm6345-uart.txt | 36 -- + .../bindings/serial/brcm,bcm6345-uart.yaml | 47 +++ + .../devicetree/bindings/serial/samsung_uart.yaml | 1 + + .../devicetree/bindings/serial/sprd-uart.yaml | 1 + + .../bindings/serial/xlnx,opb-uartlite.txt | 23 -- + .../bindings/serial/xlnx,opb-uartlite.yaml | 89 +++++ + Documentation/driver-api/serial/n_gsm.rst | 71 +++- + Documentation/driver-api/serial/tty.rst | 2 +- + arch/sh/boot/dts/j2_mimas_v2.dts | 2 + + drivers/bluetooth/hci_ldisc.c | 2 +- + drivers/input/serio/serport.c | 3 +- + drivers/net/can/slcan.c | 5 +- + drivers/net/hamradio/6pack.c | 2 +- + drivers/net/ppp/ppp_async.c | 7 +- + drivers/net/ppp/ppp_synctty.c | 7 +- + drivers/net/slip/slip.c | 5 +- + drivers/rpmsg/rpmsg_core.c | 21 ++ + drivers/rpmsg/rpmsg_internal.h | 2 + + drivers/rpmsg/virtio_rpmsg_bus.c | 10 + + drivers/tty/Kconfig | 12 + + drivers/tty/Makefile | 1 + + drivers/tty/hvc/hvc_console.c | 2 +- + drivers/tty/moxa.c | 302 +++++++++++++++- + drivers/tty/moxa.h | 307 ---------------- + drivers/tty/mxser.c | 119 +++---- + drivers/tty/n_gsm.c | 116 ++++-- + drivers/tty/n_hdlc.c | 2 +- + drivers/tty/n_tty.c | 3 +- + drivers/tty/rpmsg_tty.c | 275 +++++++++++++++ + drivers/tty/serial/8250/8250_dw.c | 28 +- + drivers/tty/serial/8250/8250_dwlib.c | 10 + + drivers/tty/serial/8250/8250_dwlib.h | 1 + + drivers/tty/serial/8250/8250_fsl.c | 8 +- + drivers/tty/serial/8250/8250_lpss.c | 9 +- + drivers/tty/serial/8250/8250_pci.c | 143 +++----- + drivers/tty/serial/8250/8250_pnp.c | 4 - + drivers/tty/serial/8250/8250_port.c | 31 +- + drivers/tty/serial/8250/Kconfig | 2 +- + drivers/tty/serial/Kconfig | 9 +- + drivers/tty/serial/atmel_serial.c | 4 +- + drivers/tty/serial/imx.c | 16 +- + drivers/tty/serial/max310x.c | 7 +- + drivers/tty/serial/samsung_tty.c | 13 +- + drivers/tty/serial/sc16is7xx.c | 12 +- + drivers/tty/serial/serial_core.c | 16 +- + drivers/tty/serial/sifive.c | 2 +- + drivers/tty/serial/stm32-usart.c | 388 ++++++++++++++++----- + drivers/tty/serial/stm32-usart.h | 13 +- + drivers/tty/serial/sunzilog.c | 2 +- + drivers/tty/serial/uartlite.c | 91 ++++- + drivers/tty/serial/xilinx_uartps.c | 3 +- + drivers/tty/sysrq.c | 2 + + drivers/tty/tty_baudrate.c | 2 +- + drivers/tty/tty_buffer.c | 3 + + drivers/tty/tty_ioctl.c | 12 +- + include/linux/console.h | 2 + + include/linux/rpmsg.h | 10 + + include/linux/tty.h | 140 ++++---- + include/linux/tty_driver.h | 8 +- + include/linux/tty_flip.h | 20 +- + include/linux/tty_ldisc.h | 27 +- + net/nfc/nci/uart.c | 2 +- + sound/soc/codecs/cx20442.c | 3 +- + sound/soc/ti/ams-delta.c | 3 +- + 65 files changed, 1664 insertions(+), 859 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/xlnx,opb-uartlite.txt + create mode 100644 Documentation/devicetree/bindings/serial/xlnx,opb-uartlite.yaml + delete mode 100644 drivers/tty/moxa.h + create mode 100644 drivers/tty/rpmsg_tty.c +Merging char-misc/char-misc-next (08e438e6296c fix for "dma-buf: move dma-buf symbols into the DMA_BUF module namespace") +$ 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 +Removing include/linux/counter_enum.h +Auto-merging drivers/media/common/videobuf2/videobuf2-vmalloc.c +Auto-merging drivers/media/common/videobuf2/videobuf2-dma-sg.c +Auto-merging drivers/media/common/videobuf2/videobuf2-dma-contig.c +Auto-merging drivers/media/common/videobuf2/videobuf2-core.c +Auto-merging drivers/gpu/drm/tegra/gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gem.c +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/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/armada/armada_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/dma-buf/dma-buf.c +Removing drivers/counter/counter.c +Auto-merging drivers/android/binder.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/ABI/testing/sysfs-bus-iio-scd30 +Recorded preimage for 'drivers/gpu/drm/i915/gem/i915_gem_dmabuf.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 +Recorded resolution for 'drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c'. +[master 47f623f2a4ed] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/debugfs-driver-habanalabs | 6 + + Documentation/ABI/testing/sysfs-bus-counter | 38 +- + .../ABI/testing/sysfs-bus-fsi-devices-sbefifo | 10 + + Documentation/ABI/testing/sysfs-bus-iio | 42 + + .../ABI/testing/sysfs-bus-iio-chemical-sunrise-co2 | 38 + + Documentation/ABI/testing/sysfs-bus-iio-scd30 | 34 - + .../ABI/testing/sysfs-bus-iio-temperature-max31865 | 20 + + .../testing/sysfs-bus-platform-devices-occ-hwmon | 13 + + .../devicetree/bindings/iio/accel/adi,adxl313.yaml | 86 + + .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 88 + + .../bindings/iio/accel/kionix,kxcjk1013.yaml | 3 + + .../devicetree/bindings/iio/adc/adi,ad7949.yaml | 51 +- + .../devicetree/bindings/iio/adc/adi,ad799x.yaml | 73 + + .../bindings/iio/adc/aspeed,ast2600-adc.yaml | 100 + + .../bindings/iio/adc/atmel,sama5d2-adc.yaml | 1 + + .../bindings/iio/adc/nxp,imx8qxp-adc.yaml | 78 + + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 108 +- + .../bindings/iio/chemical/senseair,sunrise.yaml | 55 + + .../bindings/iio/chemical/sensirion,scd4x.yaml | 46 + + .../bindings/iio/frequency/adi,adrf6780.yaml | 131 ++ + .../bindings/iio/light/liteon,ltr501.yaml | 51 + + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 7 + + .../bindings/iio/multiplexer/io-channel-mux.yaml | 13 +- + .../bindings/iio/temperature/maxim,max31865.yaml | 52 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/driver-api/driver-model/devres.rst | 1 + + Documentation/driver-api/generic-counter.rst | 363 +++- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + Documentation/virt/ne_overview.rst | 21 +- + MAINTAINERS | 42 +- + drivers/android/binder.c | 14 +- + drivers/char/mem.c | 8 +- + drivers/char/xillybus/xillybus.h | 31 +- + drivers/char/xillybus/xillybus_core.c | 131 +- + drivers/char/xillybus/xillybus_of.c | 86 +- + drivers/char/xillybus/xillybus_pcie.c | 99 +- + drivers/char/xillybus/xillyusb.c | 1 + + drivers/comedi/drivers/vmk80xx.c | 28 +- + drivers/counter/104-quad-8.c | 699 ++++--- + drivers/counter/Kconfig | 6 +- + drivers/counter/Makefile | 1 + + drivers/counter/counter-chrdev.c | 573 ++++++ + drivers/counter/counter-chrdev.h | 14 + + drivers/counter/counter-core.c | 191 ++ + drivers/counter/counter-sysfs.c | 959 ++++++++++ + drivers/counter/counter-sysfs.h | 13 + + drivers/counter/counter.c | 1496 --------------- + drivers/counter/ftm-quaddec.c | 60 +- + drivers/counter/intel-qep.c | 146 +- + drivers/counter/interrupt-cnt.c | 62 +- + drivers/counter/microchip-tcb-capture.c | 93 +- + drivers/counter/stm32-lptimer-cnt.c | 212 +-- + drivers/counter/stm32-timer-cnt.c | 195 +- + drivers/counter/ti-eqep.c | 180 +- + drivers/dma-buf/dma-buf.c | 34 +- + drivers/fsi/fsi-occ.c | 218 ++- + drivers/fsi/fsi-sbefifo.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 + + drivers/gpu/drm/armada/armada_gem.c | 2 + + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 3 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 + + drivers/gpu/drm/drm_prime.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 + + drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 + + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 + + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 + + drivers/gpu/drm/tegra/gem.c | 3 + + drivers/gpu/drm/vmwgfx/ttm_object.c | 3 + + drivers/hwmon/occ/common.c | 30 +- + drivers/hwmon/occ/common.h | 3 +- + drivers/hwmon/occ/p8_i2c.c | 15 +- + drivers/hwmon/occ/p9_sbe.c | 90 +- + drivers/iio/accel/Kconfig | 62 + + drivers/iio/accel/Makefile | 6 + + drivers/iio/accel/adxl313.h | 54 + + drivers/iio/accel/adxl313_core.c | 332 ++++ + drivers/iio/accel/adxl313_i2c.c | 66 + + drivers/iio/accel/adxl313_spi.c | 92 + + drivers/iio/accel/adxl355.h | 21 + + drivers/iio/accel/adxl355_core.c | 765 ++++++++ + drivers/iio/accel/adxl355_i2c.c | 62 + + drivers/iio/accel/adxl355_spi.c | 65 + + drivers/iio/accel/adxl372.c | 1 + + drivers/iio/accel/bma400.h | 2 +- + drivers/iio/accel/bma400_core.c | 7 +- + drivers/iio/accel/bma400_i2c.c | 4 +- + drivers/iio/accel/bma400_spi.c | 4 +- + drivers/iio/accel/bmc150-accel-core.c | 5 +- + drivers/iio/accel/bmc150-accel-i2c.c | 4 +- + drivers/iio/accel/bmc150-accel-spi.c | 4 +- + drivers/iio/accel/bmc150-accel.h | 2 +- + drivers/iio/accel/bmi088-accel-core.c | 4 +- + drivers/iio/accel/bmi088-accel-spi.c | 4 +- + drivers/iio/accel/bmi088-accel.h | 2 +- + drivers/iio/accel/fxls8962af-core.c | 347 +++- + drivers/iio/accel/kxsd9-i2c.c | 4 +- + drivers/iio/accel/kxsd9-spi.c | 4 +- + drivers/iio/accel/kxsd9.c | 4 +- + drivers/iio/accel/kxsd9.h | 2 +- + drivers/iio/accel/mma7455.h | 2 +- + drivers/iio/accel/mma7455_core.c | 4 +- + drivers/iio/accel/mma7455_i2c.c | 4 +- + drivers/iio/accel/mma7455_spi.c | 4 +- + drivers/iio/accel/mma7660.c | 2 +- + drivers/iio/accel/sca3000.c | 3 +- + drivers/iio/accel/st_accel_core.c | 31 +- + drivers/iio/accel/st_accel_i2c.c | 23 +- + drivers/iio/accel/st_accel_spi.c | 23 +- + drivers/iio/adc/Kconfig | 18 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ab8500-gpadc.c | 22 +- + drivers/iio/adc/ad7291.c | 70 +- + drivers/iio/adc/ad7949.c | 254 ++- + drivers/iio/adc/ad799x.c | 68 +- + drivers/iio/adc/aspeed_adc.c | 598 +++++- + drivers/iio/adc/at91-sama5d2_adc.c | 598 ++++-- + drivers/iio/adc/axp288_adc.c | 28 +- + drivers/iio/adc/berlin2-adc.c | 34 +- + drivers/iio/adc/da9150-gpadc.c | 27 +- + drivers/iio/adc/ep93xx_adc.c | 4 +- + drivers/iio/adc/fsl-imx25-gcq.c | 55 +- + drivers/iio/adc/imx7d_adc.c | 18 +- + drivers/iio/adc/imx8qxp-adc.c | 494 +++++ + drivers/iio/adc/intel_mrfld_adc.c | 24 +- + drivers/iio/adc/lp8788_adc.c | 31 +- + drivers/iio/adc/lpc18xx_adc.c | 75 +- + drivers/iio/adc/max1027.c | 278 ++- + drivers/iio/adc/max1118.c | 7 +- + drivers/iio/adc/max1241.c | 17 +- + drivers/iio/adc/max1363.c | 82 +- + drivers/iio/adc/meson_saradc.c | 39 +- + drivers/iio/adc/nau7802.c | 50 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 9 +- + drivers/iio/adc/rn5t618-adc.c | 13 +- + drivers/iio/adc/rockchip_saradc.c | 31 +- + drivers/iio/adc/stm32-adc-core.c | 1 + + drivers/iio/adc/stm32-adc-core.h | 10 + + drivers/iio/adc/stm32-adc.c | 422 ++++- + drivers/iio/adc/ti-adc108s102.c | 11 +- + drivers/iio/adc/ti-adc128s052.c | 33 +- + drivers/iio/adc/ti-ads7950.c | 4 +- + drivers/iio/adc/ti-ads8344.c | 27 +- + drivers/iio/adc/twl6030-gpadc.c | 6 +- + drivers/iio/adc/xilinx-xadc-core.c | 5 +- + drivers/iio/adc/xilinx-xadc.h | 1 - + drivers/iio/buffer/industrialio-triggered-buffer.c | 8 +- + drivers/iio/buffer/kfifo_buf.c | 50 + + drivers/iio/chemical/Kconfig | 24 + + drivers/iio/chemical/Makefile | 2 + + drivers/iio/chemical/scd4x.c | 696 +++++++ + drivers/iio/chemical/sunrise_co2.c | 537 ++++++ + .../iio/common/hid-sensors/hid-sensor-trigger.c | 5 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 48 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 - + drivers/iio/common/st_sensors/st_sensors_spi.c | 1 - + drivers/iio/common/st_sensors/st_sensors_trigger.c | 53 +- + drivers/iio/dac/ad5064.c | 49 +- + drivers/iio/dac/ad5380.c | 15 +- + drivers/iio/dac/ad5446.c | 12 +- + drivers/iio/dac/ad5592r-base.c | 4 +- + drivers/iio/dac/ad5592r-base.h | 2 +- + drivers/iio/dac/ad5592r.c | 4 +- + drivers/iio/dac/ad5593r.c | 4 +- + drivers/iio/dac/ad5686-spi.c | 4 +- + drivers/iio/dac/ad5686.c | 4 +- + drivers/iio/dac/ad5686.h | 2 +- + drivers/iio/dac/ad5696-i2c.c | 4 +- + drivers/iio/dac/ad5766.c | 42 + + drivers/iio/dac/ad5770r.c | 2 +- + drivers/iio/dac/ad7303.c | 47 +- + drivers/iio/dac/ad8801.c | 11 +- + drivers/iio/dac/ds4424.c | 9 +- + drivers/iio/dac/lpc18xx_dac.c | 14 +- + drivers/iio/dac/ltc1660.c | 7 +- + drivers/iio/dac/max5821.c | 9 +- + drivers/iio/dac/mcp4922.c | 7 +- + drivers/iio/dac/stm32-dac-core.c | 18 +- + drivers/iio/dac/ti-dac7311.c | 7 +- + drivers/iio/frequency/Kconfig | 12 + + drivers/iio/frequency/Makefile | 1 + + drivers/iio/frequency/adrf6780.c | 527 ++++++ + drivers/iio/gyro/Kconfig | 1 - + drivers/iio/gyro/adis16080.c | 11 +- + drivers/iio/gyro/mpu3050-core.c | 24 +- + drivers/iio/gyro/st_gyro_core.c | 27 +- + drivers/iio/gyro/st_gyro_i2c.c | 23 +- + drivers/iio/gyro/st_gyro_spi.c | 23 +- + drivers/iio/health/afe4403.c | 14 +- + drivers/iio/health/afe4404.c | 8 +- + drivers/iio/iio_core.h | 4 + + drivers/iio/imu/adis.c | 17 +- + drivers/iio/imu/adis16400.c | 20 +- + drivers/iio/imu/adis16460.c | 18 +- + drivers/iio/imu/adis16475.c | 19 +- + drivers/iio/imu/adis_trigger.c | 4 + + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c | 36 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 22 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 1 - + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 29 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 6 - + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 6 - + drivers/iio/industrialio-buffer.c | 173 +- + drivers/iio/industrialio-core.c | 1 + + drivers/iio/inkern.c | 17 + + drivers/iio/light/cm3605.c | 29 +- + drivers/iio/light/cm36651.c | 7 +- + drivers/iio/light/gp2ap002.c | 24 +- + drivers/iio/light/ltr501.c | 37 + + drivers/iio/light/max44000.c | 17 +- + drivers/iio/light/noa1305.c | 7 +- + drivers/iio/magnetometer/Kconfig | 2 +- + drivers/iio/magnetometer/ak8975.c | 35 + + drivers/iio/magnetometer/hmc5843.h | 2 +- + drivers/iio/magnetometer/hmc5843_core.c | 4 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 4 +- + drivers/iio/magnetometer/hmc5843_spi.c | 4 +- + drivers/iio/magnetometer/st_magn_core.c | 29 +- + drivers/iio/magnetometer/st_magn_i2c.c | 23 +- + drivers/iio/magnetometer/st_magn_spi.c | 23 +- + drivers/iio/multiplexer/iio-mux.c | 7 +- + drivers/iio/potentiometer/max5487.c | 7 +- + drivers/iio/pressure/ms5611.h | 2 +- + drivers/iio/pressure/ms5611_core.c | 4 +- + drivers/iio/pressure/ms5611_i2c.c | 4 +- + drivers/iio/pressure/ms5611_spi.c | 4 +- + drivers/iio/pressure/st_pressure_core.c | 27 +- + drivers/iio/pressure/st_pressure_i2c.c | 23 +- + drivers/iio/pressure/st_pressure_spi.c | 23 +- + drivers/iio/temperature/Kconfig | 10 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/ltc2983.c | 16 + + drivers/iio/temperature/max31865.c | 349 ++++ + drivers/infiniband/core/umem_dmabuf.c | 3 + + drivers/interconnect/qcom/icc-rpm.c | 263 ++- + drivers/interconnect/qcom/icc-rpm.h | 56 +- + drivers/interconnect/qcom/msm8916.c | 1214 +++++++++++- + drivers/interconnect/qcom/msm8939.c | 1283 ++++++++++++- + drivers/interconnect/qcom/qcs404.c | 967 +++++++++- + drivers/interconnect/qcom/sdm660.c | 1940 ++++++++++++++------ + drivers/interconnect/samsung/Kconfig | 6 +- + drivers/ipack/devices/ipoctal.c | 48 +- + drivers/media/common/videobuf2/videobuf2-core.c | 1 + + .../media/common/videobuf2/videobuf2-dma-contig.c | 1 + + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 1 + + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 1 + + drivers/misc/ad525x_dpot-i2c.c | 3 +- + drivers/misc/ad525x_dpot-spi.c | 3 +- + drivers/misc/ad525x_dpot.c | 4 +- + drivers/misc/ad525x_dpot.h | 2 +- + drivers/misc/cardreader/rtsx_pcr.c | 2 +- + drivers/misc/enclosure.c | 16 +- + drivers/misc/fastrpc.c | 21 +- + drivers/misc/genwqe/card_utils.c | 10 +- + drivers/misc/habanalabs/Kconfig | 2 + + drivers/misc/habanalabs/common/Makefile | 2 +- + .../misc/habanalabs/common/command_submission.c | 105 +- + drivers/misc/habanalabs/common/context.c | 8 +- + drivers/misc/habanalabs/common/debugfs.c | 51 + + drivers/misc/habanalabs/common/device.c | 159 +- + drivers/misc/habanalabs/common/firmware_if.c | 28 +- + drivers/misc/habanalabs/common/habanalabs.h | 64 +- + drivers/misc/habanalabs/common/habanalabs_drv.c | 24 +- + .../{gaudi/gaudi_hwmgr.c => common/hwmgr.c} | 38 +- + drivers/misc/habanalabs/common/hwmon.c | 194 +- + drivers/misc/habanalabs/common/irq.c | 5 +- + drivers/misc/habanalabs/common/memory.c | 515 +++++- + drivers/misc/habanalabs/common/mmu/mmu.c | 30 +- + drivers/misc/habanalabs/common/sysfs.c | 6 +- + drivers/misc/habanalabs/gaudi/Makefile | 2 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 22 +- + drivers/misc/habanalabs/gaudi/gaudiP.h | 4 - + drivers/misc/habanalabs/goya/goya.c | 13 +- + drivers/misc/habanalabs/goya/goyaP.h | 1 - + drivers/misc/habanalabs/goya/goya_hwmgr.c | 31 - + drivers/misc/habanalabs/include/common/cpucp_if.h | 22 +- + .../misc/habanalabs/include/common/hl_boot_if.h | 189 +- + .../misc/habanalabs/include/gaudi/gaudi_fw_if.h | 10 +- + .../misc/habanalabs/include/gaudi/gaudi_reg_map.h | 1 + + drivers/misc/hisi_hikey_usb.c | 119 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 3 +- + drivers/misc/lis3lv02d/lis3lv02d.h | 2 +- + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +- + drivers/misc/lkdtm/bugs.c | 77 + + drivers/misc/lkdtm/core.c | 1 + + drivers/misc/lkdtm/lkdtm.h | 1 + + drivers/misc/mei/pci-txe.c | 4 +- + drivers/misc/pvpanic/pvpanic-mmio.c | 9 +- + drivers/misc/pvpanic/pvpanic-pci.c | 26 +- + drivers/misc/pvpanic/pvpanic.c | 16 +- + drivers/misc/tifm_7xx1.c | 2 +- + drivers/misc/tifm_core.c | 8 +- + drivers/most/most_usb.c | 5 +- + drivers/mux/core.c | 38 +- + drivers/nvmem/core.c | 174 +- + drivers/nvmem/imx-ocotp.c | 25 + + drivers/platform/x86/hp_accel.c | 3 +- + drivers/soundwire/bus.c | 2 +- + drivers/soundwire/debugfs.c | 2 +- + drivers/soundwire/qcom.c | 27 + + drivers/staging/iio/cdc/ad7746.c | 4 +- + drivers/staging/iio/frequency/ad9832.c | 82 +- + drivers/staging/media/tegra-vde/dmabuf-cache.c | 3 + + drivers/tee/tee_shm.c | 3 + + drivers/virt/acrn/hsm.c | 49 + + drivers/virt/acrn/hypercall.h | 52 + + drivers/virt/nitro_enclaves/Kconfig | 8 +- + drivers/virt/nitro_enclaves/ne_misc_dev.c | 17 +- + drivers/virt/nitro_enclaves/ne_pci_dev.c | 2 +- + drivers/virt/nitro_enclaves/ne_pci_dev.h | 8 +- + drivers/virtio/virtio_dma_buf.c | 1 + + drivers/xen/gntdev-dmabuf.c | 3 + + include/linux/counter.h | 715 ++++---- + include/linux/counter_enum.h | 45 - + include/linux/fsi-occ.h | 2 + + include/linux/iio/buffer.h | 11 + + include/linux/iio/buffer_impl.h | 11 + + include/linux/iio/common/st_sensors.h | 13 - + include/linux/iio/driver.h | 14 + + include/linux/iio/iio-opaque.h | 4 + + include/linux/iio/imu/adis.h | 2 + + include/linux/iio/triggered_buffer.h | 11 +- + include/linux/mfd/stm32-lptimer.h | 5 + + include/linux/mfd/stm32-timers.h | 4 + + include/linux/mux/consumer.h | 23 +- + include/linux/mux/driver.h | 4 + + include/linux/nvmem-provider.h | 5 + + include/uapi/linux/acrn.h | 70 + + include/uapi/linux/counter.h | 154 ++ + include/uapi/linux/nitro_enclaves.h | 10 +- + include/uapi/misc/habanalabs.h | 84 +- + samples/kfifo/bytestream-example.c | 12 +- + samples/kfifo/inttype-example.c | 12 +- + samples/kfifo/record-example.c | 12 +- + samples/nitro_enclaves/ne_ioctl_sample.c | 7 +- + samples/vfio-mdev/mbochs.c | 1 + + scripts/tags.sh | 6 +- + tools/Makefile | 13 +- + tools/counter/Build | 1 + + tools/counter/Makefile | 53 + + tools/counter/counter_example.c | 92 + + tools/testing/selftests/lkdtm/config | 1 + + tools/testing/selftests/lkdtm/run.sh | 10 +- + tools/testing/selftests/lkdtm/tests.txt | 1 + + 345 files changed, 19305 insertions(+), 6542 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-fsi-devices-sbefifo + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-sunrise-co2 + delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-scd30 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-temperature-max31865 + create mode 100644 Documentation/ABI/testing/sysfs-bus-platform-devices-occ-hwmon + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl313.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl355.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad799x.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/aspeed,ast2600-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/chemical/senseair,sunrise.yaml + create mode 100644 Documentation/devicetree/bindings/iio/chemical/sensirion,scd4x.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,adrf6780.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/liteon,ltr501.yaml + create mode 100644 Documentation/devicetree/bindings/iio/temperature/maxim,max31865.yaml + create mode 100644 drivers/counter/counter-chrdev.c + create mode 100644 drivers/counter/counter-chrdev.h + create mode 100644 drivers/counter/counter-core.c + create mode 100644 drivers/counter/counter-sysfs.c + create mode 100644 drivers/counter/counter-sysfs.h + delete mode 100644 drivers/counter/counter.c + create mode 100644 drivers/iio/accel/adxl313.h + create mode 100644 drivers/iio/accel/adxl313_core.c + create mode 100644 drivers/iio/accel/adxl313_i2c.c + create mode 100644 drivers/iio/accel/adxl313_spi.c + create mode 100644 drivers/iio/accel/adxl355.h + create mode 100644 drivers/iio/accel/adxl355_core.c + create mode 100644 drivers/iio/accel/adxl355_i2c.c + create mode 100644 drivers/iio/accel/adxl355_spi.c + create mode 100644 drivers/iio/adc/imx8qxp-adc.c + create mode 100644 drivers/iio/chemical/scd4x.c + create mode 100644 drivers/iio/chemical/sunrise_co2.c + create mode 100644 drivers/iio/frequency/adrf6780.c + create mode 100644 drivers/iio/temperature/max31865.c + rename drivers/misc/habanalabs/{gaudi/gaudi_hwmgr.c => common/hwmgr.c} (61%) + delete mode 100644 include/linux/counter_enum.h + create mode 100644 include/uapi/linux/counter.h + create mode 100644 tools/counter/Build + create mode 100644 tools/counter/Makefile + create mode 100644 tools/counter/counter_example.c +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 +Merge made by the 'recursive' strategy. + .../bindings/extcon/extcon-usbc-tusb320.yaml | 4 +- + drivers/extcon/Kconfig | 2 +- + drivers/extcon/extcon-axp288.c | 31 +++- + drivers/extcon/extcon-max3355.c | 1 - + drivers/extcon/extcon-usb-gpio.c | 3 +- + drivers/extcon/extcon-usbc-tusb320.c | 163 ++++++++++++++++++++- + 6 files changed, 192 insertions(+), 12 deletions(-) +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 +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/bcm-ns-usb2-phy.yaml | 25 +- + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 129 ++++ + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 84 +- + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 7 + + .../devicetree/bindings/phy/rockchip-usb-phy.yaml | 11 +- + drivers/phy/broadcom/Kconfig | 4 + + drivers/phy/cadence/phy-cadence-torrent.c | 316 +++++++- + drivers/phy/hisilicon/Kconfig | 10 + + drivers/phy/hisilicon/Makefile | 1 + + drivers/phy/hisilicon/phy-hi3670-pcie.c | 845 +++++++++++++++++++++ + drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 10 +- + drivers/phy/microchip/sparx5_serdes.c | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 157 +++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 2 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 21 +- + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 11 +- + drivers/phy/samsung/Kconfig | 16 +- + drivers/phy/st/phy-stm32-usbphyc.c | 203 +++++ + drivers/phy/ti/phy-gmii-sel.c | 2 + + include/dt-bindings/phy/phy-cadence.h | 2 + + 21 files changed, 1752 insertions(+), 110 deletions(-) + create mode 100644 drivers/phy/hisilicon/phy-hi3670-pcie.c +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 (9cef73918e15 vfio: Use cdev_device_add() instead of device_create()) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging samples/vfio-mdev/mbochs.c +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Merge made by the 'recursive' strategy. + drivers/bus/fsl-mc/Makefile | 3 +- + drivers/bus/fsl-mc/fsl-mc-private.h | 39 +- + drivers/bus/fsl-mc/obj-api.c | 103 +++++ + drivers/s390/crypto/vfio_ap_ops.c | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 62 +-- + drivers/vfio/mdev/mdev_driver.c | 45 +- + drivers/vfio/mdev/vfio_mdev.c | 2 +- + drivers/vfio/pci/vfio_pci_core.c | 13 +- + drivers/vfio/pci/vfio_pci_igd.c | 234 +++++++--- + drivers/vfio/platform/vfio_platform_common.c | 13 +- + drivers/vfio/vfio.c | 622 +++++++++++---------------- + drivers/vfio/vfio.h | 72 ++++ + drivers/vfio/vfio_iommu_spapr_tce.c | 6 +- + drivers/vfio/vfio_iommu_type1.c | 256 ++++------- + include/linux/fsl/mc.h | 14 + + include/linux/mdev.h | 20 - + include/linux/vfio.h | 53 +-- + samples/vfio-mdev/mbochs.c | 2 +- + samples/vfio-mdev/mdpy.c | 2 +- + samples/vfio-mdev/mtty.c | 2 +- + 20 files changed, 779 insertions(+), 786 deletions(-) + create mode 100644 drivers/bus/fsl-mc/obj-api.c + create mode 100644 drivers/vfio/vfio.h +Merging staging/staging-next (3d34b180323b staging: r8188eu: core: remove the goto from rtw_IOL_accquire_xmit_frame) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Removing drivers/staging/r8188eu/include/rtw_sreset.h +Removing drivers/staging/r8188eu/include/rtw_mp_phy_regdef.h +Removing drivers/staging/r8188eu/include/rtw_mp_ioctl.h +Removing drivers/staging/r8188eu/include/rtw_mp.h +Removing drivers/staging/r8188eu/include/rtw_ioctl_rtl.h +Removing drivers/staging/r8188eu/include/odm_reg.h +Removing drivers/staging/r8188eu/include/odm_RegDefine11AC.h +Removing drivers/staging/r8188eu/include/mp_custom_oid.h +Removing drivers/staging/r8188eu/include/HalHWImg8188E_FW.h +Removing drivers/staging/r8188eu/hal/rtl8188e_mp.c +Removing drivers/staging/r8188eu/core/rtw_sreset.c +Removing drivers/staging/r8188eu/core/rtw_mp_ioctl.c +Removing drivers/staging/r8188eu/core/rtw_mp.c +Removing drivers/staging/r8188eu/core/rtw_io.c +Removing drivers/staging/r8188eu/core/rtw_debug.c +Auto-merging drivers/staging/qlge/qlge_main.c +Removing drivers/staging/most/dim2/sysfs.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/controller/pcie-mt7621.c +Merge made by the 'recursive' strategy. + arch/mips/include/asm/mach-ralink/spaces.h | 4 +- + arch/mips/include/asm/pci.h | 4 + + arch/mips/pci/pci-generic.c | 14 + + drivers/pci/controller/pcie-mt7621.c | 2 +- + drivers/pci/pci.c | 2 + + drivers/staging/axis-fifo/axis-fifo.c | 88 +- + drivers/staging/fbtft/fbtft-core.c | 11 +- + drivers/staging/fbtft/fbtft.h | 8 +- + drivers/staging/gdm724x/gdm_lte.c | 4 +- + drivers/staging/ks7010/Kconfig | 3 + + drivers/staging/ks7010/ks_hostif.c | 2 +- + drivers/staging/ks7010/ks_wlan_net.c | 4 +- + drivers/staging/most/dim2/Makefile | 2 +- + drivers/staging/most/dim2/dim2.c | 115 +- + drivers/staging/most/dim2/sysfs.c | 49 - + drivers/staging/most/dim2/sysfs.h | 11 - + drivers/staging/most/net/net.c | 2 +- + drivers/staging/mt7621-dma/hsdma-mt7621.c | 6 +- + drivers/staging/mt7621-dts/gbpc1.dts | 3 +- + drivers/staging/mt7621-dts/gbpc2.dts | 1 + + drivers/staging/mt7621-dts/mt7621.dtsi | 74 +- + drivers/staging/octeon/ethernet.c | 2 +- + drivers/staging/pi433/pi433_if.c | 18 +- + drivers/staging/pi433/pi433_if.h | 23 +- + drivers/staging/qlge/qlge_main.c | 18 +- + drivers/staging/qlge/qlge_mpi.c | 2 +- + drivers/staging/r8188eu/Kconfig | 10 - + drivers/staging/r8188eu/Makefile | 155 +- + drivers/staging/r8188eu/core/rtw_ap.c | 607 +---- + drivers/staging/r8188eu/core/rtw_br_ext.c | 3 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 618 +----- + drivers/staging/r8188eu/core/rtw_debug.c | 904 -------- + drivers/staging/r8188eu/core/rtw_efuse.c | 582 +---- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 339 +-- + drivers/staging/r8188eu/core/rtw_io.c | 299 --- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 397 +--- + drivers/staging/r8188eu/core/rtw_iol.c | 34 +- + drivers/staging/r8188eu/core/rtw_led.c | 1365 +----------- + drivers/staging/r8188eu/core/rtw_mlme.c | 126 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 386 +--- + drivers/staging/r8188eu/core/rtw_mp.c | 935 -------- + drivers/staging/r8188eu/core/rtw_mp_ioctl.c | 1170 ---------- + drivers/staging/r8188eu/core/rtw_p2p.c | 43 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 140 +- + drivers/staging/r8188eu/core/rtw_recv.c | 116 +- + drivers/staging/r8188eu/core/rtw_rf.c | 17 - + drivers/staging/r8188eu/core/rtw_security.c | 197 +- + drivers/staging/r8188eu/core/rtw_sreset.c | 62 - + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 34 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 157 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 121 +- + drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c | 22 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 32 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 10 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 15 +- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 171 +- + drivers/staging/r8188eu/hal/hal_com.c | 26 +- + drivers/staging/r8188eu/hal/hal_intf.c | 391 +--- + drivers/staging/r8188eu/hal/odm.c | 1188 +--------- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 393 +--- + drivers/staging/r8188eu/hal/odm_RTL8188E.c | 31 +- + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 8 - + drivers/staging/r8188eu/hal/odm_interface.c | 85 - + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 29 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 93 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 310 +-- + drivers/staging/r8188eu/hal/rtl8188e_mp.c | 798 ------- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 215 +- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 226 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188e_sreset.c | 27 - + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 4 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 60 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 328 +-- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 256 +-- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 91 - + .../staging/r8188eu/include/Hal8188ERateAdaptive.h | 2 - + drivers/staging/r8188eu/include/HalHWImg8188E_FW.h | 16 - + drivers/staging/r8188eu/include/HalVerDef.h | 70 - + drivers/staging/r8188eu/include/drv_types.h | 37 +- + drivers/staging/r8188eu/include/hal_intf.h | 312 +-- + drivers/staging/r8188eu/include/ieee80211.h | 71 - + drivers/staging/r8188eu/include/ioctl_cfg80211.h | 2 - + drivers/staging/r8188eu/include/mp_custom_oid.h | 333 --- + drivers/staging/r8188eu/include/odm.h | 457 +--- + drivers/staging/r8188eu/include/odm_HWConfig.h | 11 +- + drivers/staging/r8188eu/include/odm_RTL8188E.h | 2 - + .../staging/r8188eu/include/odm_RegConfig8188E.h | 3 - + .../staging/r8188eu/include/odm_RegDefine11AC.h | 29 - + drivers/staging/r8188eu/include/odm_RegDefine11N.h | 112 +- + drivers/staging/r8188eu/include/odm_interface.h | 88 - + drivers/staging/r8188eu/include/odm_precomp.h | 22 - + drivers/staging/r8188eu/include/odm_reg.h | 89 - + drivers/staging/r8188eu/include/odm_types.h | 24 - + drivers/staging/r8188eu/include/osdep_intf.h | 5 - + drivers/staging/r8188eu/include/osdep_service.h | 42 +- + drivers/staging/r8188eu/include/recv_osdep.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_cmd.h | 16 - + drivers/staging/r8188eu/include/rtl8188e_dm.h | 13 - + drivers/staging/r8188eu/include/rtl8188e_hal.h | 102 +- + drivers/staging/r8188eu/include/rtl8188e_led.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_recv.h | 2 +- + drivers/staging/r8188eu/include/rtl8188e_rf.h | 1 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 4 - + drivers/staging/r8188eu/include/rtl8188e_sreset.h | 2 - + drivers/staging/r8188eu/include/rtw_ap.h | 11 - + drivers/staging/r8188eu/include/rtw_br_ext.h | 3 +- + drivers/staging/r8188eu/include/rtw_cmd.h | 27 +- + drivers/staging/r8188eu/include/rtw_debug.h | 156 -- + drivers/staging/r8188eu/include/rtw_eeprom.h | 57 +- + drivers/staging/r8188eu/include/rtw_efuse.h | 21 - + drivers/staging/r8188eu/include/rtw_io.h | 87 +- + drivers/staging/r8188eu/include/rtw_ioctl_rtl.h | 63 - + drivers/staging/r8188eu/include/rtw_ioctl_set.h | 8 - + drivers/staging/r8188eu/include/rtw_iol.h | 5 - + drivers/staging/r8188eu/include/rtw_led.h | 20 - + drivers/staging/r8188eu/include/rtw_mlme.h | 11 - + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 14 - + drivers/staging/r8188eu/include/rtw_mp.h | 474 ---- + drivers/staging/r8188eu/include/rtw_mp_ioctl.h | 242 -- + .../staging/r8188eu/include/rtw_mp_phy_regdef.h | 1063 --------- + drivers/staging/r8188eu/include/rtw_p2p.h | 1 - + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 130 +- + drivers/staging/r8188eu/include/rtw_recv.h | 6 - + drivers/staging/r8188eu/include/rtw_rf.h | 12 - + drivers/staging/r8188eu/include/rtw_security.h | 20 +- + drivers/staging/r8188eu/include/rtw_sreset.h | 34 - + drivers/staging/r8188eu/include/rtw_xmit.h | 6 - + drivers/staging/r8188eu/include/sta_info.h | 7 - + drivers/staging/r8188eu/include/usb_ops.h | 5 - + drivers/staging/r8188eu/include/usb_ops_linux.h | 8 - + drivers/staging/r8188eu/include/usb_osintf.h | 5 +- + drivers/staging/r8188eu/include/wifi.h | 52 - + drivers/staging/r8188eu/include/xmit_osdep.h | 2 - + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 2331 +------------------- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 6 - + drivers/staging/r8188eu/os_dep/os_intfs.c | 399 +--- + drivers/staging/r8188eu/os_dep/osdep_service.c | 82 +- + drivers/staging/r8188eu/os_dep/recv_linux.c | 14 - + drivers/staging/r8188eu/os_dep/usb_intf.c | 281 +-- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 40 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 7 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 9 +- + drivers/staging/rtl8192u/r8192U.h | 3 +- + drivers/staging/rtl8192u/r8192U_core.c | 36 +- + drivers/staging/rtl8712/os_intfs.c | 9 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 2 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 2 +- + drivers/staging/rtl8712/rtl871x_xmit.h | 10 +- + drivers/staging/rtl8712/usb_intf.c | 6 +- + drivers/staging/rtl8712/usb_ops_linux.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 23 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 210 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 24 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 79 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 22 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 48 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 49 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 - + drivers/staging/rtl8723bs/include/osdep_service.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 26 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 34 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 8 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 11 +- + drivers/staging/rts5208/ms.c | 42 +- + drivers/staging/rts5208/rtsx.c | 2 +- + drivers/staging/rts5208/rtsx_card.c | 8 +- + drivers/staging/rts5208/rtsx_chip.c | 16 +- + drivers/staging/rts5208/rtsx_scsi.c | 106 +- + drivers/staging/rts5208/rtsx_transport.c | 6 +- + drivers/staging/rts5208/sd.c | 68 +- + drivers/staging/rts5208/xd.c | 48 +- + drivers/staging/unisys/visornic/visornic_main.c | 5 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 298 ++- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 52 - + .../interface/vchiq_arm/vchiq_connected.c | 20 +- + .../interface/vchiq_arm/vchiq_connected.h | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 765 +++---- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 105 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 182 +- + drivers/staging/vt6655/baseband.c | 74 +- + drivers/staging/vt6655/baseband.h | 2 +- + drivers/staging/vt6655/card.c | 98 +- + drivers/staging/vt6655/channel.c | 12 +- + drivers/staging/vt6655/device.h | 10 +- + drivers/staging/vt6655/device_main.c | 162 +- + drivers/staging/vt6655/dpc.c | 2 +- + drivers/staging/vt6655/key.c | 2 +- + drivers/staging/vt6655/mac.c | 50 +- + drivers/staging/vt6655/mac.h | 6 +- + drivers/staging/vt6655/power.c | 24 +- + drivers/staging/vt6655/rf.c | 140 +- + drivers/staging/vt6655/rf.h | 2 +- + drivers/staging/vt6655/rxtx.c | 64 +- + drivers/staging/wfx/bh.c | 37 +- + drivers/staging/wfx/bh.h | 4 +- + drivers/staging/wfx/bus_sdio.c | 25 +- + drivers/staging/wfx/bus_spi.c | 22 +- + drivers/staging/wfx/data_rx.c | 7 +- + drivers/staging/wfx/data_rx.h | 4 +- + drivers/staging/wfx/data_tx.c | 87 +- + drivers/staging/wfx/data_tx.h | 6 +- + drivers/staging/wfx/debug.c | 56 +- + drivers/staging/wfx/debug.h | 2 +- + drivers/staging/wfx/fwio.c | 26 +- + drivers/staging/wfx/fwio.h | 2 +- + drivers/staging/wfx/hif_api_cmd.h | 14 +- + drivers/staging/wfx/hif_api_general.h | 25 +- + drivers/staging/wfx/hif_api_mib.h | 85 +- + drivers/staging/wfx/hif_rx.c | 23 +- + drivers/staging/wfx/hif_rx.h | 3 +- + drivers/staging/wfx/hif_tx.c | 60 +- + drivers/staging/wfx/hif_tx.h | 6 +- + drivers/staging/wfx/hif_tx_mib.c | 14 +- + drivers/staging/wfx/hif_tx_mib.h | 2 +- + drivers/staging/wfx/hwio.c | 6 +- + drivers/staging/wfx/hwio.h | 20 +- + drivers/staging/wfx/key.c | 30 +- + drivers/staging/wfx/key.h | 4 +- + drivers/staging/wfx/main.c | 37 +- + drivers/staging/wfx/main.h | 3 +- + drivers/staging/wfx/queue.c | 43 +- + drivers/staging/wfx/queue.h | 6 +- + drivers/staging/wfx/scan.c | 51 +- + drivers/staging/wfx/scan.h | 4 +- + drivers/staging/wfx/sta.c | 118 +- + drivers/staging/wfx/sta.h | 8 +- + drivers/staging/wfx/traces.h | 2 +- + drivers/staging/wfx/wfx.h | 14 +- + drivers/staging/wlan-ng/hfa384x.h | 2 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 24 +- + drivers/staging/wlan-ng/p80211conv.c | 2 +- + drivers/staging/wlan-ng/p80211conv.h | 2 +- + drivers/staging/wlan-ng/p80211hdr.h | 2 +- + drivers/staging/wlan-ng/p80211ioctl.h | 2 +- + drivers/staging/wlan-ng/p80211mgmt.h | 2 +- + drivers/staging/wlan-ng/p80211msg.h | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/staging/wlan-ng/p80211netdev.h | 2 +- + drivers/staging/wlan-ng/p80211req.c | 2 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 2 +- + drivers/staging/wlan-ng/p80211wep.c | 2 +- + drivers/staging/wlan-ng/prism2mgmt.c | 2 +- + drivers/staging/wlan-ng/prism2mgmt.h | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 2 +- + drivers/staging/wlan-ng/prism2sta.c | 6 +- + drivers/staging/wlan-ng/prism2usb.c | 3 +- + 255 files changed, 3307 insertions(+), 22317 deletions(-) + delete mode 100644 drivers/staging/most/dim2/sysfs.c + delete mode 100644 drivers/staging/r8188eu/core/rtw_debug.c + delete mode 100644 drivers/staging/r8188eu/core/rtw_io.c + delete mode 100644 drivers/staging/r8188eu/core/rtw_mp.c + delete mode 100644 drivers/staging/r8188eu/core/rtw_mp_ioctl.c + delete mode 100644 drivers/staging/r8188eu/core/rtw_sreset.c + delete mode 100644 drivers/staging/r8188eu/hal/rtl8188e_mp.c + delete mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_FW.h + delete mode 100644 drivers/staging/r8188eu/include/mp_custom_oid.h + delete mode 100644 drivers/staging/r8188eu/include/odm_RegDefine11AC.h + delete mode 100644 drivers/staging/r8188eu/include/odm_reg.h + delete mode 100644 drivers/staging/r8188eu/include/rtw_ioctl_rtl.h + delete mode 100644 drivers/staging/r8188eu/include/rtw_mp.h + delete mode 100644 drivers/staging/r8188eu/include/rtw_mp_ioctl.h + delete mode 100644 drivers/staging/r8188eu/include/rtw_mp_phy_regdef.h + delete mode 100644 drivers/staging/r8188eu/include/rtw_sreset.h +Merging iio/togreg (7b473ae754fe iio: frequency: adrf6780: Fix adrf6780_spi_{read,write}()) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging 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 (07c609cc9877 dmaengine: sa11x0: Mark PM functions as __maybe_unused) +$ 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. + drivers/dma/Kconfig | 2 +- + drivers/dma/at_xdmac.c | 67 +++++++-------- + 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 | 113 ++++++++++++++++++------- + 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 | 4 +- + drivers/dma/hisi_dma.c | 6 +- + drivers/dma/hsu/pci.c | 6 +- + drivers/dma/idxd/device.c | 7 +- + drivers/dma/idxd/dma.c | 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/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 | 4 +- + drivers/dma/xilinx/xilinx_dpdma.c | 15 +--- + drivers/dma/xilinx/zynqmp_dma.c | 67 +++++++-------- + include/linux/dmaengine.h | 2 - + 37 files changed, 344 insertions(+), 250 deletions(-) +Merging cgroup/for-next (822bc9bac9e9 cgroup: no need for cgroup_mutex for /proc/cgroups) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 10 ++++ + include/linux/misc_cgroup.h | 6 ++- + kernel/cgroup/cgroup-v1.c | 17 ++----- + kernel/cgroup/cgroup.c | 82 ++++++++++++++++++++++----------- + kernel/cgroup/misc.c | 31 ++++++++++--- + 5 files changed, 99 insertions(+), 47 deletions(-) +Merging scsi/for-next (cfb34c044d8e 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 include/scsi/scsi_cmnd.h +Auto-merging include/linux/libata.h +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/staging/rts5208/rtsx.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/scsi/ufs/ufshcd.h +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/sr.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_scan.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/qla2xxx/qla_nvme.c +Auto-merging drivers/scsi/qedf/qedf_main.c +Auto-merging drivers/scsi/qedf/qedf_io.c +Auto-merging drivers/scsi/qedf/qedf.h +Auto-merging drivers/scsi/lpfc/lpfc.h +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Auto-merging drivers/ata/sata_mv.c +Auto-merging drivers/ata/libata-scsi.c +Auto-merging Documentation/ABI/testing/sysfs-driver-ufs +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-fc | 27 ++ + Documentation/ABI/testing/sysfs-driver-ufs | 2 +- + 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/firewire/sbp2.c | 10 +- + drivers/infiniband/ulp/srp/ib_srp.c | 59 ++- + drivers/infiniband/ulp/srpt/ib_srpt.c | 38 +- + drivers/message/fusion/mptfc.c | 8 +- + 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/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/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/gadget/function/f_tcm.c | 31 +- + drivers/usb/image/microtek.c | 5 +- + drivers/usb/storage/scsiglue.c | 13 +- + drivers/usb/storage/uas.c | 13 +- + drivers/usb/storage/usb.c | 4 +- + include/linux/libata.h | 8 +- + 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 + + 240 files changed, 4172 insertions(+), 2788 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fc + create mode 100644 drivers/scsi/ufs/ufs-hwmon.c +Merging scsi-mkp/for-next (a1efc896cb8a scsi: sr: Remove duplicate assignment) +$ 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_device.h +Auto-merging drivers/scsi/ufs/ufshcd.h +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/ufs/ufs-exynos.c +Auto-merging drivers/scsi/sr.c +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/qla2xxx/qla_os.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 | 108 ++++++---- + 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, 866 insertions(+), 363 deletions(-) +Merging vhost/linux-next (06aff93f1842 iommu/virtio: Support identity-mapped domains) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/vdpa/mlx5/net/mlx5_vnet.c +Auto-merging drivers/vdpa/mlx5/core/mlx5_vdpa.h +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/block/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + drivers/block/Kconfig | 1 + + drivers/block/virtio_blk.c | 178 +++++++---- + drivers/char/hw_random/virtio-rng.c | 84 +++-- + drivers/char/virtio_console.c | 9 + + drivers/i2c/busses/i2c-virtio.c | 56 ++-- + drivers/iommu/virtio-iommu.c | 113 +++++-- + drivers/net/virtio_net.c | 4 +- + drivers/scsi/virtio_scsi.c | 1 + + drivers/vdpa/Kconfig | 8 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/alibaba/Makefile | 3 + + drivers/vdpa/alibaba/eni_vdpa.c | 553 +++++++++++++++++++++++++++++++++ + drivers/vdpa/ifcvf/ifcvf_main.c | 3 +- + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 2 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 202 ++++++++++-- + drivers/vdpa/vdpa.c | 261 +++++++++++++++- + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 3 +- + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 38 ++- + drivers/vdpa/vdpa_user/vduse_dev.c | 32 +- + drivers/vdpa/virtio_pci/vp_vdpa.c | 12 + + drivers/vhost/vdpa.c | 3 +- + drivers/virtio/Kconfig | 10 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio_pci_common.c | 58 +++- + drivers/virtio/virtio_pci_common.h | 16 +- + drivers/virtio/virtio_pci_legacy.c | 106 ++----- + drivers/virtio/virtio_pci_legacy_dev.c | 222 +++++++++++++ + drivers/virtio/virtio_pci_modern.c | 6 +- + drivers/virtio/virtio_ring.c | 92 +++++- + drivers/virtio/virtio_vdpa.c | 24 +- + include/linux/vdpa.h | 53 ++-- + include/linux/virtio.h | 2 + + include/linux/virtio_config.h | 6 + + include/linux/virtio_pci_legacy.h | 42 +++ + include/uapi/linux/vdpa.h | 7 + + include/uapi/linux/virtio_i2c.h | 6 + + include/uapi/linux/virtio_iommu.h | 8 +- + 38 files changed, 1912 insertions(+), 321 deletions(-) + create mode 100644 drivers/vdpa/alibaba/Makefile + create mode 100644 drivers/vdpa/alibaba/eni_vdpa.c + create mode 100644 drivers/virtio/virtio_pci_legacy_dev.c + create mode 100644 include/linux/virtio_pci_legacy.h +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 (f4a20dfac88c gpio: mc33880: Drop if with an always false condition) +$ 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/linux/firmware/xlnx-zynqmp.h +Auto-merging drivers/gpio/gpio-uniphier.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 | 12 ++ + 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-tegra186.c | 114 +++++++++++++-- + drivers/gpio/gpio-tps65218.c | 1 - + drivers/gpio/gpio-uniphier.c | 18 ++- + drivers/gpio/gpio-xilinx.c | 6 +- + drivers/gpio/gpio-zynqmp-modepin.c | 162 +++++++++++++++++++++ + include/linux/firmware/xlnx-zynqmp.h | 14 ++ + include/linux/spi/max7301.h | 2 +- + 18 files changed, 413 insertions(+), 50 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml + create mode 100644 drivers/gpio/gpio-zynqmp-modepin.c +Merging gpio-intel/for-next (1649b8376694 gpio: pca953x: Improve bias setting) +$ 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 (bb369f4373f5 selftests: gpio: add test cases for gpio-sim) +$ 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 | 882 ++++++++++++++++++++++++++ + 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, 1748 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 +Auto-merging drivers/pinctrl/stm32/pinctrl-stm32.c +Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +Auto-merging drivers/pinctrl/qcom/Kconfig +Auto-merging drivers/pinctrl/core.c +Removing Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt +Removing Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.txt +Merge made by the 'recursive' strategy. + .../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 + + drivers/gpio/gpiolib.c | 9 +- + 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 + + include/dt-bindings/pinctrl/mt65xx.h | 9 + + include/linux/gpio/driver.h | 19 +- + 64 files changed, 8720 insertions(+), 709 deletions(-) + 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 + 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 +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 (3f2b16734914 pwm: mtk-disp: Implement atomic API .get_state()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (e9012e756d30 Merge of per_signal_struct_coredumps-for-v5.16, and ucount-fixes-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 mm/debug.c +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm_types.h +Auto-merging fs/proc/array.c +Auto-merging fs/binfmt_elf.c +Auto-merging arch/ia64/include/asm/ptrace.h +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/ptrace.h | 4 +- + arch/sparc/include/asm/ptrace.h | 8 ++-- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/coredump.c | 88 ++++++----------------------------------- + fs/exec.c | 14 +++---- + fs/proc/array.c | 6 +-- + include/linux/mm_types.h | 13 ------ + include/linux/ptrace.h | 22 +++++------ + include/linux/sched.h | 1 + + include/linux/sched/signal.h | 13 ++++++ + kernel/cred.c | 5 +-- + kernel/exit.c | 76 +++++++++++++++++++---------------- + kernel/fork.c | 4 +- + kernel/signal.c | 49 ++++------------------- + kernel/ucount.c | 20 ++++++---- + mm/debug.c | 4 +- + mm/oom_kill.c | 6 +-- + 18 files changed, 121 insertions(+), 218 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 (dd40f44eabe1 selftests: x86: fix [-Wstringop-overread] warn in test_process_vm_readv()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'recursive' strategy. + tools/testing/selftests/kvm/x86_64/mmio_warning_test.c | 2 +- + tools/testing/selftests/x86/test_vsyscall.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge -m Merge branch 'next' of git://git.linaro.org/kernel/coresight.git coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'recursive' strategy. +Merging seccomp/for-next/seccomp (d9bbdbf324cd x86: deduplicate the spectre_v2_user documentation) +$ 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 arch/x86/kernel/cpu/bugs.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/hw-vuln/spectre.rst | 61 +++---------------------- + Documentation/admin-guide/kernel-parameters.txt | 5 +- + arch/x86/kernel/cpu/bugs.c | 4 +- + 3 files changed, 10 insertions(+), 60 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 +Auto-merging scripts/kernel-doc +Removing scripts/gcc-plugins/cyc_complexity_plugin.c +Auto-merging scripts/Makefile.gcc-plugins +Auto-merging net/xfrm/xfrm_user.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/sched.h +Auto-merging include/uapi/rdma/rdma_user_rxe.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/ieee80211.h +Auto-merging include/linux/filter.h +Auto-merging include/linux/compiler_types.h +Auto-merging drivers/staging/r8188eu/include/ieee80211.h +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/tx.h +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/fw/api/tx.h +Auto-merging drivers/iommu/amd/init.c +Auto-merging arch/s390/lib/string.c +Auto-merging arch/riscv/kernel/head.S +Auto-merging arch/riscv/kernel/entry.S +Auto-merging arch/riscv/kernel/asm-offsets.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/Makefile +Auto-merging arch/arm64/kernel/asm-offsets.c +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging Makefile +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/net/wireless/intel/iwlwifi/fw/api/tx.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/wireless/intel/iwlwifi/fw/api/tx.h'. +[master 51f34dcd100d] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/kbuild/gcc-plugins.rst | 28 +- + MAINTAINERS | 9 + + Makefile | 6 +- + arch/arm/boot/compressed/string.c | 1 + + arch/arm64/include/asm/thread_info.h | 1 + + arch/arm64/kernel/asm-offsets.c | 2 +- + arch/arm64/kernel/head.S | 2 +- + arch/powerpc/Makefile | 11 - + arch/powerpc/include/asm/smp.h | 17 +- + arch/powerpc/include/asm/thread_info.h | 3 + + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/riscv/kernel/asm-offsets.c | 1 - + arch/riscv/kernel/entry.S | 5 - + arch/riscv/kernel/head.S | 1 - + arch/s390/include/asm/thread_info.h | 1 + + arch/s390/lib/string.c | 3 + + arch/x86/boot/compressed/misc.h | 2 + + arch/x86/boot/compressed/pgtable_64.c | 2 + + arch/x86/include/asm/thread_info.h | 3 + + arch/x86/lib/string_32.c | 1 + + drivers/char/pcmcia/cm4000_cs.c | 9 +- + drivers/crypto/chelsio/chcr_crypto.h | 14 +- + drivers/cxl/cxl.h | 61 ++--- + drivers/gpu/drm/mga/mga_ioc32.c | 27 +- + drivers/hid/hid-cp2112.c | 14 +- + drivers/hid/hid-roccat-kone.c | 2 +- + drivers/hid/hid-roccat-kone.h | 12 +- + drivers/iommu/amd/init.c | 9 +- + drivers/macintosh/smu.c | 3 +- + drivers/net/can/flexcan.c | 68 ++--- + drivers/net/can/usb/etas_es58x/es581_4.h | 2 +- + drivers/net/can/usb/etas_es58x/es58x_fd.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 14 +- + drivers/net/wireless/ath/ath10k/bmi.h | 10 +- + drivers/net/wireless/ath/ath10k/htt.h | 7 +- + drivers/net/wireless/intel/iwlegacy/commands.h | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 12 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 6 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 3 +- + drivers/scsi/qla4xxx/ql4_def.h | 4 +- + drivers/staging/r8188eu/include/ieee80211.h | 6 +- + drivers/staging/rtl8712/ieee80211.h | 4 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 6 +- + fs/btrfs/root-tree.c | 6 +- + fs/hpfs/hpfs.h | 8 +- + include/linux/compiler-gcc.h | 10 +- + include/linux/compiler_types.h | 5 - + include/linux/filter.h | 6 +- + include/linux/fortify-string.h | 77 ++++-- + include/linux/ieee80211.h | 30 +-- + include/linux/sched.h | 13 +- + include/linux/stddef.h | 65 ++++- + include/linux/string.h | 44 +++- + include/linux/thread_info.h | 2 +- + include/scsi/sas.h | 12 +- + include/uapi/drm/mga_drm.h | 22 +- + include/uapi/linux/dlm_device.h | 4 +- + include/uapi/linux/stddef.h | 37 +++ + include/uapi/rdma/rdma_user_rxe.h | 4 +- + include/uapi/sound/asoc.h | 4 +- + kernel/kallsyms.c | 46 +++- + kernel/sched/sched.h | 4 - + lib/.gitignore | 2 + + lib/Kconfig.debug | 11 + + lib/Makefile | 34 +++ + lib/memcpy_kunit.c | 289 +++++++++++++++++++++ + lib/string.c | 210 +-------------- + lib/string_helpers.c | 195 ++++++++++++++ + lib/test_fortify/read_overflow-memchr.c | 5 + + lib/test_fortify/read_overflow-memchr_inv.c | 5 + + lib/test_fortify/read_overflow-memcmp.c | 5 + + lib/test_fortify/read_overflow-memscan.c | 5 + + lib/test_fortify/read_overflow2-memcmp.c | 5 + + lib/test_fortify/read_overflow2-memcpy.c | 5 + + lib/test_fortify/read_overflow2-memmove.c | 5 + + lib/test_fortify/test_fortify.h | 35 +++ + lib/test_fortify/write_overflow-memcpy.c | 5 + + lib/test_fortify/write_overflow-memmove.c | 5 + + lib/test_fortify/write_overflow-memset.c | 5 + + lib/test_fortify/write_overflow-strcpy-lit.c | 5 + + lib/test_fortify/write_overflow-strcpy.c | 5 + + lib/test_fortify/write_overflow-strlcpy-src.c | 5 + + lib/test_fortify/write_overflow-strlcpy.c | 5 + + lib/test_fortify/write_overflow-strncpy-src.c | 5 + + lib/test_fortify/write_overflow-strncpy.c | 5 + + lib/test_fortify/write_overflow-strscpy.c | 5 + + net/xfrm/xfrm_policy.c | 4 +- + net/xfrm/xfrm_user.c | 2 +- + scripts/Makefile.gcc-plugins | 2 - + scripts/gcc-plugins/Kconfig | 20 +- + scripts/gcc-plugins/cyc_complexity_plugin.c | 69 ----- + scripts/gcc-plugins/gcc-common.h | 132 +--------- + scripts/gcc-plugins/gcc-generate-gimple-pass.h | 19 -- + scripts/gcc-plugins/gcc-generate-ipa-pass.h | 19 -- + scripts/gcc-plugins/gcc-generate-rtl-pass.h | 19 -- + scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h | 19 -- + scripts/gcc-plugins/structleak_plugin.c | 2 - + scripts/kernel-doc | 9 + + scripts/test_fortify.sh | 62 +++++ + security/Kconfig | 3 + + security/Kconfig.hardening | 14 +- + 104 files changed, 1249 insertions(+), 822 deletions(-) + create mode 100644 lib/memcpy_kunit.c + create mode 100644 lib/test_fortify/read_overflow-memchr.c + create mode 100644 lib/test_fortify/read_overflow-memchr_inv.c + create mode 100644 lib/test_fortify/read_overflow-memcmp.c + create mode 100644 lib/test_fortify/read_overflow-memscan.c + create mode 100644 lib/test_fortify/read_overflow2-memcmp.c + create mode 100644 lib/test_fortify/read_overflow2-memcpy.c + create mode 100644 lib/test_fortify/read_overflow2-memmove.c + create mode 100644 lib/test_fortify/test_fortify.h + create mode 100644 lib/test_fortify/write_overflow-memcpy.c + create mode 100644 lib/test_fortify/write_overflow-memmove.c + create mode 100644 lib/test_fortify/write_overflow-memset.c + create mode 100644 lib/test_fortify/write_overflow-strcpy-lit.c + create mode 100644 lib/test_fortify/write_overflow-strcpy.c + create mode 100644 lib/test_fortify/write_overflow-strlcpy-src.c + create mode 100644 lib/test_fortify/write_overflow-strlcpy.c + create mode 100644 lib/test_fortify/write_overflow-strncpy-src.c + create mode 100644 lib/test_fortify/write_overflow-strncpy.c + create mode 100644 lib/test_fortify/write_overflow-strscpy.c + delete mode 100644 scripts/gcc-plugins/cyc_complexity_plugin.c + create mode 100644 scripts/test_fortify.sh +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 fs/fs-writeback.c +Auto-merging fs/aio.c +Auto-merging drivers/scsi/st.c +Auto-merging arch/powerpc/include/asm/kvm_host.h +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 8 ++++++++ + arch/mips/alchemy/devboards/db1550.c | 1 + + arch/mips/kernel/uprobes.c | 1 + + arch/powerpc/include/asm/kvm_host.h | 2 +- + arch/powerpc/kvm/book3s_64_vio.c | 3 +-- + drivers/dma/pxa_dma.c | 3 +-- + drivers/firewire/core-cdev.c | 32 ++++++++++++++++++++++++++------ + drivers/firmware/psci/psci_checker.c | 2 +- + drivers/pcmcia/db1xxx_ss.c | 1 + + fs/aio.c | 3 +-- + fs/fs-writeback.c | 6 +++--- + include/linux/firewire.h | 11 +++++++---- + lib/assoc_array.c | 22 ++++++++++------------ + 13 files changed, 62 insertions(+), 33 deletions(-) +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 (62b834d8972b Drivers: hv: vmbus: Remove unused code to check for subchannels) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging drivers/hv/hyperv_vmbus.h +Auto-merging arch/x86/mm/pat/set_memory.c +CONFLICT (content): Merge conflict in arch/x86/mm/pat/set_memory.c +Resolved 'arch/x86/mm/pat/set_memory.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e3f694907652] Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/hyperv/Makefile | 2 +- + arch/x86/hyperv/hv_init.c | 78 +++++++--- + arch/x86/hyperv/ivm.c | 291 +++++++++++++++++++++++++++++++++++++ + arch/x86/include/asm/hyperv-tlfs.h | 17 +++ + arch/x86/include/asm/mshyperv.h | 70 +++++++-- + arch/x86/kernel/cpu/mshyperv.c | 5 + + arch/x86/mm/pat/set_memory.c | 23 ++- + drivers/hv/Kconfig | 1 + + drivers/hv/channel.c | 72 ++++++--- + drivers/hv/channel_mgmt.c | 34 ----- + drivers/hv/connection.c | 101 ++++++++++++- + drivers/hv/hv.c | 82 ++++++++--- + drivers/hv/hv_common.c | 12 ++ + drivers/hv/hyperv_vmbus.h | 2 + + drivers/hv/ring_buffer.c | 55 +++++-- + drivers/net/hyperv/hyperv_net.h | 5 +- + drivers/net/hyperv/netvsc.c | 15 +- + drivers/uio/uio_hv_generic.c | 18 +-- + include/asm-generic/hyperv-tlfs.h | 1 + + include/asm-generic/mshyperv.h | 20 ++- + include/linux/hyperv.h | 25 ++-- + 21 files changed, 758 insertions(+), 171 deletions(-) + create mode 100644 arch/x86/hyperv/ivm.c +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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/auxdisplay/holtek,ht16k33.yaml | 32 +- + MAINTAINERS | 1 + + 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 ++ + include/uapi/linux/map_to_14segment.h | 241 ++++++++++ + 11 files changed, 1023 insertions(+), 286 deletions(-) + create mode 100644 drivers/auxdisplay/line-display.c + create mode 100644 drivers/auxdisplay/line-display.h + create mode 100644 include/uapi/linux/map_to_14segment.h +Merging kgdb/kgdb/for-next (f8416aa29185 kernel: debug: Convert to SPDX identifier) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging fpga/for-next (57b44817a8d6 MAINTAINERS: Drop outdated FPGA Manager website) +$ 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 (2ab5d5e67f7a kunit: tool: continue past invalid utf-8 output) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/running_tips.rst | 11 +- + lib/kunit/executor.c | 152 ++- + lib/kunit/executor_test.c | 110 ++- + lib/kunit/kunit-test.c | 14 +- + lib/kunit/test.c | 6 +- + tools/testing/kunit/kunit.py | 154 ++- + tools/testing/kunit/kunit_json.py | 56 +- + tools/testing/kunit/kunit_kernel.py | 92 +- + tools/testing/kunit/kunit_parser.py | 1015 ++++++++++++++------ + tools/testing/kunit/kunit_tool_test.py | 211 +++- + .../test_is_test_passed-all_passed_nested.log | 34 + + .../test_data/test_is_test_passed-kselftest.log | 14 + + .../test_data/test_is_test_passed-missing_plan.log | 31 + + .../testing/kunit/test_data/test_strip_hyphen.log | 16 + + 14 files changed, 1404 insertions(+), 512 deletions(-) + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-all_passed_nested.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-kselftest.log + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-missing_plan.log + create mode 100644 tools/testing/kunit/test_data/test_strip_hyphen.log +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 arch/riscv/Makefile +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Recorded preimage for 'Makefile' +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 +Recorded resolution for 'Makefile'. +[master b7ff5290e5dc] 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 | 8 +- + 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, 25441 insertions(+), 33 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 51fce7e9e989] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Thu Oct 28 20:00:35 2021 +1100 +Merging cxl/next (ed97afb53365 cxl/pci: Disambiguate cxl_pci further from cxl_mem) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +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 + + drivers/cxl/acpi.c | 129 ++- + 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 | 48 +- + drivers/cxl/cxlmem.h | 202 +++- + drivers/cxl/pci.c | 1121 ++--------------------- + drivers/cxl/pmem.c | 163 +++- + 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 +- + include/linux/nd.h | 4 +- + 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 + + 31 files changed, 3168 insertions(+), 1389 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 (121703c1c817 mm/writeback: Add folio_write_one) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging mm/vmscan.c +Auto-merging mm/swapfile.c +Auto-merging mm/shmem.c +Auto-merging mm/page_owner.c +Auto-merging mm/page_io.c +Auto-merging mm/migrate.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/linux/writeback.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/netfs.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/io_uring.c +CONFLICT (modify/delete): fs/cachefiles/rdwr.c deleted in HEAD and modified in folio/for-next. Version folio/for-next of fs/cachefiles/rdwr.c left in tree. +Auto-merging fs/afs/write.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/cachefiles/rdwr.c +rm 'fs/cachefiles/rdwr.c' +$ git commit --no-edit -v -a +[master 8e2a23854b17] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/cachetlb.rst | 6 + + Documentation/core-api/mm-api.rst | 5 + + Documentation/filesystems/netfs_library.rst | 2 + + arch/arc/include/asm/cacheflush.h | 1 + + arch/arm/include/asm/cacheflush.h | 1 + + arch/m68k/include/asm/cacheflush_mm.h | 1 + + arch/mips/include/asm/cacheflush.h | 2 + + arch/nds32/include/asm/cacheflush.h | 1 + + arch/nios2/include/asm/cacheflush.h | 3 +- + arch/parisc/include/asm/cacheflush.h | 3 +- + arch/sh/include/asm/cacheflush.h | 3 +- + arch/xtensa/include/asm/cacheflush.h | 5 +- + fs/afs/write.c | 9 +- + fs/io_uring.c | 2 +- + fs/jfs/jfs_metapage.c | 1 + + include/asm-generic/cacheflush.h | 6 + + include/linux/backing-dev.h | 6 +- + include/linux/flex_proportions.h | 9 +- + include/linux/gfp.h | 22 +- + include/linux/highmem-internal.h | 11 + + include/linux/highmem.h | 37 ++ + include/linux/huge_mm.h | 15 - + include/linux/ksm.h | 4 +- + include/linux/memcontrol.h | 264 ++++++++----- + include/linux/migrate.h | 4 + + include/linux/mm.h | 239 +++++++++--- + include/linux/mm_inline.h | 103 +++-- + include/linux/mm_types.h | 77 ++++ + include/linux/mmdebug.h | 20 + + include/linux/netfs.h | 77 ++-- + include/linux/page-flags.h | 267 +++++++++---- + include/linux/page_idle.h | 99 +++-- + include/linux/page_owner.h | 8 +- + include/linux/page_ref.h | 158 +++++++- + include/linux/pagemap.h | 585 ++++++++++++++++++---------- + include/linux/rmap.h | 10 +- + include/linux/swap.h | 17 +- + include/linux/vmstat.h | 113 +++++- + include/linux/writeback.h | 9 +- + include/trace/events/pagemap.h | 46 ++- + include/trace/events/writeback.h | 28 +- + kernel/bpf/verifier.c | 2 +- + kernel/events/uprobes.c | 3 +- + lib/flex_proportions.c | 28 +- + mm/Makefile | 2 +- + mm/compaction.c | 4 +- + mm/filemap.c | 567 +++++++++++++-------------- + mm/folio-compat.c | 142 +++++++ + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 2 +- + mm/internal.h | 36 +- + mm/khugepaged.c | 8 +- + mm/ksm.c | 34 +- + mm/memcontrol.c | 356 +++++++++-------- + mm/memory-failure.c | 2 +- + mm/memory.c | 20 +- + mm/mempolicy.c | 10 + + mm/memremap.c | 2 +- + mm/migrate.c | 189 +++++---- + mm/mlock.c | 3 +- + mm/page-writeback.c | 476 ++++++++++++---------- + mm/page_alloc.c | 14 +- + mm/page_io.c | 4 +- + mm/page_owner.c | 10 +- + mm/rmap.c | 14 +- + mm/shmem.c | 7 +- + mm/swap.c | 197 +++++----- + mm/swap_state.c | 2 +- + mm/swapfile.c | 8 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 111 +++--- + mm/vmscan.c | 8 +- + mm/workingset.c | 52 +-- + 73 files changed, 2906 insertions(+), 1695 deletions(-) + create mode 100644 mm/folio-compat.c +$ git am -3 ../patches/0001-fix-up-for-9p-untested-Convert-to-using-the-netfs-he.patch +Applying: fix up for "9p: Convert to using the netfs helper lib to do reads and caching" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/9p/vfs_file.c +$ git add -A . +$ git commit -v -a --amend +[master 160b87053b46] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git + Date: Thu Oct 28 20:23:45 2021 +1100 +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 lib/vsprintf.c +Auto-merging kernel/time/clocksource.c +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/bitmap.h +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 2c25d325866e] 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 (464413496acb MAINTAINERS: Add maintainer entry for zstd) +$ 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 +Recorded preimage for 'fs/f2fs/sysfs.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/f2fs/sysfs.c'. +[master bd19f4b1af89] 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-disable-ntfs-for-now-due-to.patch +Applying: disable ntfs for now due to +Merging akpm-current/current (9748d08a885e shm: extend forced shm destroy to support objects from several IPC nses) +$ git merge --no-ff akpm-current/current +Auto-merging security/Kconfig +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/tcp.c +Auto-merging mm/workingset.c +Auto-merging mm/vmscan.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap.c +Auto-merging mm/slub.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/readahead.c +Auto-merging mm/percpu.c +Auto-merging mm/page_owner.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page-writeback.c +Auto-merging mm/oom_kill.c +Auto-merging mm/nommu.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +CONFLICT (content): Merge conflict in mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/khugepaged.c +Auto-merging mm/kasan/report.c +Auto-merging mm/kasan/kasan.h +Auto-merging mm/internal.h +CONFLICT (content): Merge conflict in mm/internal.h +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/gup.c +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging mm/debug.c +Auto-merging mm/compaction.c +Auto-merging mm/backing-dev.c +Auto-merging lib/vsprintf.c +Auto-merging lib/test_kasan.c +Auto-merging lib/bootconfig.c +CONFLICT (content): Merge conflict in lib/bootconfig.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/workqueue.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/sched/topology.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/printk/printk.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 kernel/dma/swiotlb.c +Auto-merging init/main.c +Auto-merging include/trace/events/writeback.h +Auto-merging include/linux/swap.h +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/page-flags.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/migrate.h +CONFLICT (content): Merge conflict in include/linux/migrate.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/kasan.h +Auto-merging include/linux/kallsyms.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/gfp.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/compiler_attributes.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/vmcore.c +Auto-merging fs/proc/base.c +Auto-merging fs/open.c +Auto-merging fs/ocfs2/dlm/dlmrecovery.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/xen/swiotlb-xen.c +Auto-merging drivers/virtio/Kconfig +Auto-merging drivers/s390/char/sclp_early.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/macintosh/smu.c +Auto-merging drivers/hwmon/occ/p9_sbe.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging arch/x86/xen/setup.c +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging arch/x86/kernel/unwind_orc.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sh/boards/mach-se/7724/setup.c +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Auto-merging arch/s390/kernel/uv.c +Auto-merging arch/s390/kernel/setup.c +CONFLICT (content): Merge conflict in arch/s390/kernel/setup.c +Auto-merging arch/powerpc/platforms/pseries/svm.c +Auto-merging arch/powerpc/platforms/pseries/setup.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/kernel/setup-common.c +Auto-merging arch/powerpc/include/asm/machdep.h +Auto-merging arch/powerpc/configs/skiroot_defconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/loongson64/init.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/translations/zh_CN/core-api/memory-hotplug.rst +Auto-merging Documentation/admin-guide/mm/pagemap.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/s390/kernel/setup.c' using previous resolution. +Resolved 'include/linux/migrate.h' using previous resolution. +Resolved 'include/linux/sched/mm.h' using previous resolution. +Resolved 'kernel/exit.c' using previous resolution. +Resolved 'kernel/sched/core.c' using previous resolution. +Resolved 'lib/bootconfig.c' using previous resolution. +Resolved 'mm/filemap.c' using previous resolution. +Resolved 'mm/internal.h' using previous resolution. +Resolved 'mm/mempolicy.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 330a72f0489f] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/blockdev/zram.rst | 8 + + Documentation/admin-guide/cgroup-v1/memory.rst | 11 +- + Documentation/admin-guide/kernel-parameters.txt | 14 +- + 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/kcov.rst | 5 + + Documentation/dev-tools/kfence.rst | 23 +- + .../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 | 23 +- + Makefile | 15 + + arch/Kconfig | 28 + + arch/alpha/kernel/core_irongate.c | 2 +- + arch/alpha/kernel/traps.c | 4 +- + arch/arc/mm/init.c | 6 +- + arch/arm/mach-hisi/platmcpm.c | 2 +- + arch/arm/mach-rpc/ecard.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/mm/pgtable.c | 3 +- + arch/mips/loongson64/init.c | 4 +- + arch/mips/mm/init.c | 2 +- + arch/mips/sgi-ip27/ip27-memory.c | 3 +- + arch/mips/sgi-ip30/ip30-setup.c | 6 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/powerpc/include/asm/machdep.h | 2 +- + arch/powerpc/include/asm/sections.h | 13 - + arch/powerpc/kernel/dt_cpu_ftrs.c | 4 +- + arch/powerpc/kernel/paca.c | 8 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + arch/powerpc/mm/hugetlbpage.c | 9 +- + arch/powerpc/mm/pgtable_32.c | 7 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 4 +- + arch/powerpc/platforms/pseries/setup.c | 2 +- + arch/powerpc/platforms/pseries/svm.c | 3 +- + arch/riscv/kernel/setup.c | 4 +- + arch/s390/include/asm/sections.h | 12 - + arch/s390/kernel/setup.c | 11 +- + arch/s390/kernel/smp.c | 4 +- + arch/s390/kernel/uv.c | 2 +- + arch/s390/mm/init.c | 3 - + arch/s390/mm/kasan_init.c | 2 +- + 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/smp_64.c | 2 +- + arch/um/kernel/mem.c | 2 +- + arch/x86/Kconfig | 6 +- + arch/x86/kernel/aperture_64.c | 13 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/unwind_orc.c | 2 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/init_32.c | 45 +- + arch/x86/mm/kasan_init_64.c | 4 +- + arch/x86/mm/numa.c | 2 +- + arch/x86/mm/numa_emulation.c | 2 +- + arch/x86/xen/mmu_hvm.c | 37 +- + arch/x86/xen/mmu_pv.c | 6 +- + arch/x86/xen/p2m.c | 2 +- + arch/x86/xen/setup.c | 6 +- + drivers/base/Makefile | 2 +- + drivers/base/arch_numa.c | 92 ++- + drivers/base/node.c | 9 +- + drivers/block/zram/zram_drv.c | 66 +- + drivers/firmware/efi/memmap.c | 2 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 5 +- + drivers/gpu/drm/drm_mm.c | 5 +- + drivers/gpu/drm/i915/i915_vma.c | 5 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 20 +- + drivers/hwmon/occ/p9_sbe.c | 1 + + drivers/macintosh/smu.c | 2 +- + .../media/dvb-frontends/cxd2880/cxd2880_common.h | 1 + + drivers/mmc/core/mmc_test.c | 1 - + drivers/mtd/mtdcore.c | 1 + + drivers/of/kexec.c | 4 +- + drivers/of/of_reserved_mem.c | 5 +- + drivers/rapidio/devices/rio_mport_cdev.c | 9 +- + drivers/s390/char/sclp_early.c | 2 +- + drivers/usb/early/xhci-dbc.c | 10 +- + drivers/virtio/Kconfig | 3 +- + drivers/virtio/virtio_mem.c | 301 ++++++--- + drivers/xen/swiotlb-xen.c | 2 +- + 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/d_path.c | 8 +- + 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/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/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/suballoc.c | 22 +- + fs/ocfs2/super.c | 40 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/open.c | 16 +- + fs/posix_acl.c | 3 +- + fs/proc/base.c | 21 +- + fs/proc/fd.c | 23 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 28 +- + fs/proc/vmcore.c | 105 +++- + fs/ramfs/inode.c | 11 +- + fs/seq_file.c | 16 - + fs/super.c | 3 + + fs/sysv/super.c | 6 +- + include/asm-generic/sections.h | 89 ++- + include/kunit/test.h | 13 +- + include/linux/backing-dev-defs.h | 3 + + include/linux/backing-dev.h | 1 - + include/linux/bottom_half.h | 1 + + include/linux/cma.h | 1 + + include/linux/compiler-gcc.h | 8 + + include/linux/compiler_attributes.h | 10 + + include/linux/compiler_types.h | 12 + + include/linux/container_of.h | 40 ++ + include/linux/cpuset.h | 17 + + include/linux/crash_dump.h | 26 +- + include/linux/damon.h | 234 ++++++- + include/linux/delay.h | 2 +- + include/linux/fs.h | 2 + + include/linux/generic-radix-tree.h | 3 +- + include/linux/gfp.h | 8 +- + include/linux/highmem.h | 28 +- + include/linux/hugetlb.h | 36 +- + include/linux/io-mapping.h | 6 - + include/linux/ipc_namespace.h | 15 + + include/linux/kallsyms.h | 13 +- + include/linux/kasan.h | 8 + + include/linux/kernel.h | 36 +- + include/linux/kfence.h | 21 +- + include/linux/list.h | 4 +- + include/linux/llist.h | 4 +- + 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 | 10 +- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 24 +- + 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 | 25 +- + include/linux/page_owner.h | 12 +- + include/linux/pagemap.h | 50 ++ + include/linux/percpu.h | 6 +- + 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/slab.h | 135 ++-- + include/linux/slub_def.h | 13 +- + include/linux/smp.h | 1 - + include/linux/spinlock.h | 1 - + include/linux/stackdepot.h | 11 +- + include/linux/stacktrace.h | 1 + + include/linux/string_helpers.h | 1 + + include/linux/swap.h | 1 - + include/linux/vmalloc.h | 24 +- + include/media/media-entity.h | 3 +- + include/trace/events/mmap_lock.h | 48 +- + include/trace/events/vmscan.h | 38 ++ + include/trace/events/writeback.h | 7 - + init/initramfs.c | 2 +- + init/main.c | 35 +- + ipc/ipc_sysctl.c | 32 +- + ipc/shm.c | 170 +++-- + ipc/util.c | 6 +- + kernel/cgroup/cpuset.c | 23 + + kernel/cpu.c | 2 +- + kernel/dma/swiotlb.c | 2 +- + kernel/exit.c | 2 +- + kernel/extable.c | 35 +- + kernel/fork.c | 60 +- + kernel/hung_task.c | 44 ++ + kernel/kcov.c | 36 +- + kernel/kexec_file.c | 5 + + kernel/kthread.c | 21 +- + kernel/locking/lockdep.c | 18 +- + kernel/printk/printk.c | 4 +- + kernel/resource.c | 54 +- + kernel/sched/core.c | 35 +- + kernel/sched/sched.h | 4 +- + kernel/sched/topology.c | 1 - + kernel/stacktrace.c | 30 + + kernel/sysctl.c | 8 +- + kernel/trace/ftrace.c | 2 +- + kernel/tsacct.c | 2 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 8 +- + lib/Kconfig.kfence | 26 +- + lib/bootconfig.c | 2 +- + lib/cpumask.c | 2 +- + lib/scatterlist.c | 11 +- + lib/stackdepot.c | 118 +++- + lib/test_kasan.c | 29 +- + lib/test_kasan_module.c | 2 + + lib/vsprintf.c | 3 +- + mm/Kconfig | 18 +- + mm/backing-dev.c | 72 +-- + 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 | 425 +++++++++++-- + 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.c | 167 +++-- + mm/debug.c | 20 +- + mm/debug_vm_pgtable.c | 7 +- + mm/filemap.c | 86 +-- + mm/gup.c | 5 +- + mm/huge_memory.c | 2 + + 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/report.c | 17 +- + mm/kasan/shadow.c | 5 + + mm/kfence/core.c | 200 ++++-- + mm/kfence/kfence.h | 2 + + mm/kfence/kfence_test.c | 14 +- + mm/khugepaged.c | 36 +- + mm/list_lru.c | 58 +- + mm/memblock.c | 35 +- + mm/memcontrol.c | 213 +++---- + mm/memory-failure.c | 139 ++-- + mm/memory.c | 175 +++--- + mm/memory_hotplug.c | 59 +- + mm/mempolicy.c | 155 +++-- + mm/memremap.c | 20 + + mm/migrate.c | 61 ++ + mm/mmap.c | 2 +- + mm/mprotect.c | 5 +- + mm/mremap.c | 86 ++- + mm/nommu.c | 6 - + mm/oom_kill.c | 55 +- + mm/page-writeback.c | 11 +- + mm/page_alloc.c | 127 ++-- + mm/page_ext.c | 2 +- + mm/page_isolation.c | 29 +- + mm/page_owner.c | 24 +- + mm/percpu.c | 8 +- + mm/readahead.c | 2 +- + mm/rmap.c | 22 +- + mm/secretmem.c | 2 +- + 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/truncate.c | 19 +- + mm/userfaultfd.c | 8 +- + mm/vmalloc.c | 112 +++- + mm/vmpressure.c | 2 +- + mm/vmscan.c | 161 ++++- + mm/vmstat.c | 76 ++- + mm/workingset.c | 10 + + mm/zsmalloc.c | 10 +- + net/ipv4/tcp.c | 1 - + net/ipv4/udp.c | 1 - + net/netfilter/ipvs/ip_vs_ctl.c | 1 - + net/openvswitch/meter.c | 1 - + net/sctp/protocol.c | 1 - + net/sysctl_net.c | 2 +- + scripts/checkpatch.pl | 36 +- + scripts/const_structs.checkpatch | 4 + + scripts/decodecode | 2 +- + scripts/spelling.txt | 16 + + security/Kconfig | 14 - + tools/testing/selftests/damon/debugfs_attrs.sh | 13 + + tools/testing/selftests/kselftest/runner.sh | 28 +- + tools/testing/selftests/memory-hotplug/config | 1 - + tools/testing/selftests/proc/.gitignore | 1 + + tools/testing/selftests/proc/Makefile | 2 + + tools/testing/selftests/proc/proc-tid0.c | 81 +++ + 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/split_huge_page_test.c | 2 +- + 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 ++- + 392 files changed, 7927 insertions(+), 2955 deletions(-) + 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 include/linux/container_of.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 tools/testing/selftests/proc/proc-tid0.c + create mode 100644 tools/testing/selftests/vm/hugepage-mremap.c +$ git am -3 ../mmotm/broken-out/mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios.patch +Applying: mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/page-flags.h +$ git add -A . +$ git commit -v -a --amend +[master 04e794e4215c] Merge branch 'akpm-current/current' + Date: Thu Oct 28 21:43:47 2021 +1100 +$ git am -3 ../patches/0001-kvmalloc-etc-moved-to-slab.h.patch +Applying: kvmalloc etc moved to slab.h +Using index info to reconstruct a base tree... +M drivers/hwmon/occ/p9_sbe.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/hwmon/occ/p9_sbe.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hwmon/occ/p9_sbe.c +$ git add -A . +$ git commit -v -a --amend +[master c8f97173a179] Merge branch 'akpm-current/current' + Date: Thu Oct 28 21:43:47 2021 +1100 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5a1fa94dfdbd --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20211028 |