diff options
| -rw-r--r-- | Next/SHA1s | 339 | ||||
| -rw-r--r-- | Next/Trees | 341 | ||||
| -rw-r--r-- | Next/merge.log | 9080 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 9761 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1ce9b0f85f1c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,339 @@ +Name SHA1 +---- ---- +origin f6274b06e326d8471cdfb52595f989a90f5e888f +fixes 3ca706c189db861b2ca2019a0901b94050ca49d8 +kbuild-current 0664684e1ebd7875e120d0cecd525bac4805f8ed +arc-current 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm-current 463dbba4d189750c2f576449d0bbb11c5413712e +arm64-fixes 22b70e6f2da0a4c8b1421b00cfc3016bc9d4d9d4 +arm-soc-fixes 3f1c260ffddb7ea51d54c37343c6d500a10317eb +drivers-memory-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +m68k-current 9fde0348640252c79d462c4d29a09a14e8741f5c +powerpc-fixes 23c216b335d1fbd716076e8263b54a714ea3cf0e +s390-fixes a46044a92add6a400f4dada7b943b30221f7cc80 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net b44d52a50bc6f191f0ae03f65de8401f3ef039b3 +bpf b0e875bac0fab3e7a7431c2eee36a8ccc0c712ac +ipsec 93ec1320b0170d7a207eda2d119c669b673401ed +netfilter 7cd8b1542a7ba0720c5a0a85ed414a122015228b +ipvs 3d3b30175a51cf027201670af3e2e5b05447b985 +wireless-drivers 603a1621caa097be23c7784e36cb8edf23cd31db +mac80211 a2083eeb119fb9307258baea9b7c243ca9a2e0b6 +rdma-fixes 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +sound-current cc03069a397005da24f6783835c274d5aedf6043 +sound-asoc-fixes c417c32a473e2dbff5184e5aa43f8d91a1f4cfe3 +regmap-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +regulator-fixes 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +spi-fixes fa382a0f96cf6ea01abc2d935883ee67aa15fb0f +pci-current e4e737bb5c170df6135a127739a9e6148ee3da82 +driver-core.current 410d591a19543f1347bc2b4b4ec3399cb548ba47 +tty.current 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 +usb.current 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +staging.current 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 +iio-fixes 26d90b5590579def54382a2fc34cfbe8518a9851 +char-misc.current ad2b502bc5e65632104ef89372abd6691de8851c +soundwire-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +thunderbolt-fixes 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +input-current 0c5483a5778fa9910538453b5a9f1a6ed49e95ad +crypto-current 0e14ef38669ce4faa80589247fe8ed8a3780f414 +vfio-fixes 42de956ca7e5f6c47048dde640f797e783b23198 +kselftest-fixes 2f9602870886af74d97bac23ee6db5f5466d0a49 +modules-fixes 0d67e332e6df72f43eaa21228daa3a79e23093f3 +dmaengine-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes f60f5741002b9fde748cff65fd09bd6222c5db0c +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 206704a1fe0bcaaa036d3e90358bb168fac8bea1 +reset-fixes ed104ca4bd9c405b41e968ad4ece51f6462e90b6 +mips-fixes 740da9d7ca4e25f5d87db9f80d75432681b61305 +at91-fixes dbe68bc9e82b6951ff88285ccffc191d872d9a01 +omap-fixes e879f855e590b40fe3c79f2fbd8f65ca3c724120 +kvm-fixes 2353e593a13ba76c82921940471ce442fe498927 +kvms390-fixes 25b5476a294cd5f7c7730f334f6b400d30bb783d +hwmon-fixes dd4d747ef05addab887dc8ff0d6ab9860bbcd783 +nvdimm-fixes d55174cccac2e4c2a58ff68b6b573fc0836f73bd +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 45940091a3c1c76952d91e1269f52c1cb021c822 +vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 6f6aab1caf6c7fef46852aaab03f4e8250779e52 +samsung-krzk-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pinctrl-samsung-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +devicetree-fixes b2d70c0dbf2731a37d1c7bcc86ab2387954d5f56 +scsi-fixes 79a7482249a7353bc86aff8127954d5febf02472 +drm-fixes 78ea81417944fe03f48648eddeb8e8a8e513c4ad +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +mmc-fixes e2845b1d92d758f229d0ead9c580322732d5f087 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hyperv-fixes 41608b64b10b80fe00dd253cd8326ec8ad85930f +soc-fsl-fixes c1e64c0aec8cb0499e61af7ea086b59abba97945 +risc-v-fixes 5155cf7b6aaefe64d7d7e1f8ca1871fce55444c4 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 2a2a79577ddae7d5314b2f57ca86b44d794403d5 +spdx 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +gpio-brgl-fixes 1649b83766944e320a6f087abf1e8a221f1cd8b0 +gpio-intel-fixes 1649b83766944e320a6f087abf1e8a221f1cd8b0 +pinctrl-intel-fixes 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +erofs-fixes c40dd3ca2a45d5bd6e8b3f4ace5cb81493096263 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes f62314b1ced25c58b86e044fc951cd6a1ea234cf +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 024591f9a6e0164ec23301784d1e6d8f6cacbe59 +cel-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f +irqchip-fixes b78f26926b17cc289e4f16b63363abe0aa2e8efc +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 0513e464f9007b70b96740271a948ca5ab6e7dd7 +drm-misc-fixes f86e9e383a71be055f4e1fa602a1ee8618316ba4 +kspp-gustavo 6409e7102a9bbd1a27a74fd6bd12693f6bd92c16 +kbuild 6988f70cf105e70b4ea424d320521a9ed452fe46 +perf be8ecc57f180415e8a7c1cc5620c5236be2a7e56 +compiler-attributes b83a908498d68fafca931e1276e145b339cac5fb +dma-mapping 59583f747664046aaae5588d56d5954fab66cce8 +asm-generic 7962c2eddbfe7cce879acb06f9b4f205789e57b7 +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 4603664c0fe9d33bfe353fe5b51f1a76b8c64175 +arm64 e45ac92bcc92e0cc01e34b4a9a7186cac3308bf9 +arm-perf e656972b69864348a747954ea187576808000c5a +arm-soc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 83e38509109e44b884be13fb6c6943aca1742a57 +aspeed e986277a56dae997258841d7a0e8083e315ac8b7 +at91 b4af371d908f61b5367353e991fc69191cf7d239 +drivers-memory bf7cf1ccbccca37af47714abdc4eb070b8b337c2 +imx-mxs 0dd3273df8c2a6f8ff397989087c16e4979d7fd1 +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 69862ae4e37890fa4313d55ad51dcd5927457e7e +mvebu 930af8dda7509ce6c79cb44401b79f876599faac +omap 7fd4d99072ce6b546bdcf99d32c8f7449abd7fa4 +qcom 37f6317b18820328e968099fd0a7244d66f0ec58 +raspberrypi 9f5289ec6f1cb1580b17d666abee2b65886129b5 +renesas a462ac13da67252c742a2c044b302f37eae9d089 +reset 09f3824342f665d222fb7ac17c91f8334779630b +rockchip 9a6218fd50c15bbf027ab7b2b1e07d06dc81fa94 +samsung-krzk 64052e7fbb0939475fe21cc017bdc3573fe175bc +scmi cb5da0da36027d52c1a9d11fe17d9f4d73fa05af +stm32 3500810079160e7b3932320ad6db9eb3e8e68c3f +sunxi bb289f4c0b2bb10c7ecd51b6799cd9d1b9c409aa +tegra 6f8b0fca12e4a589b44cef5dc651dba8b3fefa63 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new 6037c75b193ac7aec33f131cd48744549b552604 +xilinx 7a4c31ee877a40053e39b80fe1d61c42b49f1078 +clk 1a10ca10a6752dc6065e7469e1bd361dda7a50c1 +clk-imx d1012253a2d377f389ea09a82e04b2241fb30b10 +clk-renesas cc3e8f97bbd370b51b3bb7fec391d65d461d7d02 +clk-samsung 1d26eaeec37a91ff4575f6fead889818c5895304 +csky 40e080ed8218ef15a356410d8d80fd58360af93d +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 6621cb4a2d0a40c54adf378bf2a17a50f91cc831 +m68knommu 16352355b8f47b0286a2bc25ecfbbf1716e226c3 +microblaze 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +mips 67512a8cf5a730938fdb1e48de33edfef6015e03 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 72698a8789268cb11da21c018041b45233b82cbb +parisc-hd 144857444edbc57a80533bf5c67a2f539b0d820c +powerpc e4e737bb5c170df6135a127739a9e6148ee3da82 +soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b +risc-v 21ccdccd21e4b0efc92fd95c9a99673c455838f0 +s390 7e8601b12f46ab6678de72d31f13ff9da545b1cb +sh 12285ff8667bf06c168113c10d3619834e423ae6 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 2346402756756e55b2e6574fba50b00d1db5b292 +xtensa ddc33155115a1544dc117dfcd2cde8093cba6bc4 +pidfd 61bc346ce64a3864ac55f5d18bdc1572cda4fb18 +fscrypt 7f595d6a6cdc336834552069a2e0a4f6d4756ddf +fscache 97b85f2079a9823bb8457af061aa8fce052d1ac6 +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs 9a10940c7b285b2f8df52108fc045d4c45840839 +ceph b96728705f91ca529f296ebe4e9d99db0733173f +cifs 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 1266b4a7ecb679587dc4d098abe56ea53313d569 +exfat 50be9417e23af5a8ac860d998e1e3f06b8fd79d7 +ext3 372d1f3e1bfede719864d0d1fbf3146b1e638c88 +ext4 f2c77973507fd116c3657df1dc048864a2b16a1c +f2fs 6663b138ded1a59e630c9e605e42aa7fde490cdc +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 7a41554fdfb0d787b51d5e879255390f2ac5e13d +gfs2 11603f0011d0ee6f8d15e5ef7800ec69a92b1ca3 +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +nfs 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +nfs-anna 8cfb9015280d49f9d92d5b0f88cedf5f0856c0fd +nfsd 35940a58f9f1db96e5688e426d713f330ead70b8 +cel 2ba5acfb34957e8a7fe47cd78c77ca88e9cc2b03 +ntfs3 35afb70dcfe4eb445060dd955e5b67d962869ce5 +orangefs 0fdec1b3c9fbb5e856a40db5993c9eaf91c74a83 +overlayfs 1dc1eed46f9fa4cb8a07baa24fb44c96d6dd35c9 +ubifs a801fcfeef96702fa3f9b22ad56c5eb1989d9221 +v9fs 9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe +xfs f38a032b165d812b0ba8378a5cd237c0888ff65f +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 03b8df8d43ecc3c5724e6bfb80bc0b9ea2aa2612 +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks 90f7d7a0d0d68623b5f7df5621a8d54d9518fcc4 +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk c15b5fc054c3d6c97e953617605235c5cb8ce979 +pci ef4bce990eab7a8425d97c69277f230b50f6f082 +pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e +hid dd0f17ef2ea8c0be7ecdade3107b28b9395760bc +i2c 90d8f9584220c801c39b5aa971df7a43b8cfe70b +i3c a3587e2c0578101900d4abbbd72ab3dad6d5568a +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging 0889b7c73a4d8eaaa321eafcf66835979ead862a +jc_docs 250a0a5ba9d2cfbdb7c77b421ff1e03d630bea46 +v4l-dvb c52e7b855b33ff2a3af57b1b1d114720cd39ec7e +v4l-dvb-next c52e7b855b33ff2a3af57b1b1d114720cd39ec7e +pm d91db9b878c32d8a746d69b30925174081c951d4 +cpufreq-arm c2ace21f937a0c7a296d233b4441b99b66579bda +cpupower 79a0dc5530a91694b1e85ef7219893397d85e5bb +devfreq 6b28c7d0781e9554cd50e5e7d4b48aea0c2bdf93 +opp e69709f6861aaba80b4eaab6825e8c522a2afb5c +thermal fc26023f88167bc90e05f5fa56768eeadab4f5f0 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm ecd95673142ef80169a6c003b569b8a86d1e6329 +swiotlb f3c4b1341e8320e63f197a554fc5a25686a11d22 +rdma d30ef6d5c013c19e907f2a3a3d6eee04fcd3de0d +net-next 129291980f4901ae68ee3ba4344bdc38cf5f800d +bpf-next 6bbc7103738f0e0871a9331351ee3cd4d462b431 +ipsec-next 83688aec17bf3203d8477a9dd7cce88132950798 +mlx5-next d2c8a1554c10d5e0443b1f97f480d7dacd55cf55 +netfilter-next acde891c243c1ed85b19d4d5042bdf00914f5739 +ipvs-next acde891c243c1ed85b19d4d5042bdf00914f5739 +wireless-drivers-next a8e5387f8362e9da66fdc76a2e761ad618ae16db +bluetooth 4d51fb04c3c4a9b3b80f537385bdceb20e773767 +mac80211-next 171964252189d8ad5672c730f2197aa73092db6e +mtd b72841e4dcd54de486fca2e4ffa00b8defc1eecc +nand c2606ddcf5ad1969ceffe3c98d427b272243e150 +spi-nor 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 +crypto e42dff467ee688fe6b5a083f1837d06e3b27d8c0 +drm 1e3944578b749449bd7fa6bf0bae4c3d3f5f1733 +drm-misc 61bae132030af4e9aaebe801e547da4a41803d3c +amdgpu 4e45069010e5b2834508e3988653d73f5a946bc5 +drm-intel 7d396cacaea63bafe68d3a84971845c043b7c579 +drm-tegra c3dbfb9c49eef7d07904e5fd5e158dd6688bbab3 +drm-msm bc80747eb68198075fc55b9d29b98236b8e0794e +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +sound 23939115be181bc5dbc33aa8471adcdbffa28910 +sound-asoc 6de669e88076173d07648e7a04bcc8d90599a105 +modules ced75a2f5da71de5775fda44250e27d7b8024355 +input 5c4c2c8e6fac26fa0b80c234d6e9f75d637193af +block 1b2d1439fc25c65c26b59ca32cb2383e968b5a2c +device-mapper d3703ef331297b6daa97f5228cbe2a657d0cfd21 +libata 0e96dc47b95a4f33c4abcb7724887b73ff319832 +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc fb99597d255a370633b4a7582ba754f608b6c8dd +mfd cdff1eda69326fb46de10c5454212b3efcf4bb41 +backlight 79fad92f2e596f5a8dd085788a24f540263ef887 +battery 0668281d329db2c21ba6494a7bfcb8331dd0f5fa +regulator d17e70999e4a3e5eacd5f85850c5e5d3f6b48175 +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity 836f7b6ca082b7031d2687b3493eefd104ddc060 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux f5d0e5e9d72d3a06018efbfa3adccc0e09a129f9 +smack 387ef964460f14fe1c1ea29aba70e22731ea7cf7 +tomoyo 7d2a07b769330c34b4deabeed939325c77a7ec2f +tpmdd f985911b7bc75d5c98ed24d8aaa8b94c590f7c6a +watchdog 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 +iommu 0b29edc2156722bbc6f5f2d6fd52a285938a55e8 +audit 571e5c0efcb29c5dac8cf2949d3eed84ec43056c +devicetree 37ef2c34e437b04fb9b7e3126ea3bdd203a35e85 +mailbox 85dfdbfc13ea9614a2168ce4a7d2cd089d84cb64 +spi 8886d5c77f83a118081dd8a76f9cc31622eb45bd +tip d4bfebd9ef497ee0afb498f6028a5074a6ccf307 +clockevents f196ae282070d798c9144771db65577910d58566 +edac 1c60e6f24b674579a7dea2827b221ece19d61ce0 +irqchip 6e3b473ee06445d4eae2f8b1e143db70ed66f519 +ftrace 5dfe50b05588010f347cb2f436434bf22b7a84ed +rcu 718ecc280a842d5fcf9a855a665f7a6945519ce2 +kvm deae4a10f16649d9c8bfb89f38b61930fb938284 +kvm-arm 419025b3b4190ee867ef4fc48fb3bd7da2e67a0c +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 d5d7bdc80baf22bbd0b4501fb7e804683f916aad +xen-tip 0594c58161b6e0f3da8efa9c6e3d4ba52b652717 +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +drivers-x86 c99ca78d67a67e2828be417ed4006f1a3c0addb5 +chrome-platform eb057514ccca92d44f37be057152c7d2791cdae0 +hsi 4ef69e17eb567a3b276fcc3cb3452dcf89d8b063 +leds 2a5a8fa8b23144d14567d6f8293dd6fbeecee393 +ipmi bc7b6871360e17bda939d9be06f0a3d7b788eff6 +driver-core bb76c823585b108b8e3ee9dfc5ef99dd4715ea9a +usb ae9a6149884e04b3460bd9d7ffe29c5ec8d223d8 +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial c8345c0500de4411762db5941058e34979879128 +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty 5ecb11dd892f443d4900292edaba88a26efee8fe +char-misc 8bf7a12c628d1cad59cd8057171dd3ef95f0857a +extcon f83d7033d4ec1edd02c0289e71dc77bf3f41fee6 +phy-next 717e04fba4fa0e2f8e5a1fa810c5eff4d4d5e7db +soundwire ccfdcb325f2a9fd188b89bcd43bb82680823201d +thunderbolt 0a0624a26f9ceb8aae16882d87dc3b12f17f4a49 +vfio d9a0cd510c3383b61db6f70a84e0c3487f836a63 +staging 42ce32b1ae54593e28bc27ec149c04569d3a2e5b +iio 4c2d124b3c9dade959740e0a842868ca4520cf46 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc dfe14674bf7b267c44eb91d66bad076af3827a47 +dmaengine 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +cgroup 7ee285395b211cad474b2b989db52666e0430daf +scsi b198c36ab6054018d578aedd5a126cc47de24570 +scsi-mkp c749301ebee82eb5e97dec14b6ab31a4aabe37a6 +vhost dd7dc7e82b147c2424c446681a8ed46d78bd9b98 +rpmsg eb2685635cb765f27ed4a794d652955d826963b6 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 7687a5b0ee9358c96d85db58bad2a3aebee562b7 +gpio-intel 1649b83766944e320a6f087abf1e8a221f1cd8b0 +pinctrl 5077a3240bb3a971005afa2f30482283c0984c41 +pinctrl-intel 176412f8674be8ba9a45bb61086e224e2118324a +pinctrl-renesas fcfb63148c241adad54ed99fc318167176d7254b +pinctrl-samsung 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pwm 3f2b16734914fa7c53ef7f8a10a63828890dbd37 +userns a3be01837fc9f2c0f9f7356adec7222c0e199af8 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 27ff63eb076c31086e0a72d41b5c635193a58516 +nvdimm e765f13ed126fe7e41d1a6e3c60d754cd6c2af93 +at24 7629254054820bead6e18f8c3ae65c2bb01a5ae2 +ntb f96cb827ce49627543b4aabe8d54d8ea9740ae4e +seccomp d9bbdbf324cda23aa44873f505be77ed4b61d79c +kspp e6f21e8a3c4f7b7eb3ccd6da76fe7faefed4c4ea +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 0f79ce970e79ffb771733f9634d5918d0eb3e30a +fsi 9ab1428dfe2c66b51e0b41337cd0164da0ab6080 +slimbus 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nvmem d162d84b27c85a63cb5df260681157a58f88645e +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 9d68cd9120e4e3af38f843e165631c323b86b4e4 +auxdisplay 24ebc044c72ee6e88dc902a0041bac672f012537 +kgdb f8416aa29185468e0d914ba4b2a330fd53ee263f +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 57b44817a8d63e75394bc21849f585ded53de8bb +kunit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +cfi ff1176468d368232b684f75e82563369208bc371 +kunit-next 3b29021ddd10cfb6b2565c623595bd3b02036f33 +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 813272ed5238b37c81e448b302048e8008570121 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 5d3986cf8ed63ff8d86270e578649e71143112d6 +cxl ed97afb53365cd03dde266c9644334a558fe5a16 +folio 27b231798da13550ca64d931cbb4990b069d3189 +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +akpm-current dd22e075277079a124adaaeb47d3b3675254e4a4 +akpm 506ac22b3b7e63700e8e82a6f121b201cc03fa9a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..8ad9078a7c89 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,341 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-fixes +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +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 +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +bitmap git https://guthub.com/norov/linux.git#bitmap-master-5.15 +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..f9f9228906a5 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9080 @@ +$ date -R +Tue, 05 Oct 2021 09:33:06 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4de593fb965f Merge tag 'net-5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net +Merging origin/master (f6274b06e326 Merge tag 'linux-kselftest-fixes-5.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 4de593fb965f..f6274b06e326 +Fast-forward (no commit created; -m option ignored) + .../bindings/interconnect/qcom,sdm660.yaml | 46 +++- + Documentation/hwmon/k10temp.rst | 17 -- + MAINTAINERS | 12 +- + Makefile | 2 +- + arch/mips/include/asm/mips-cps.h | 23 +- + arch/x86/events/core.c | 1 + + arch/x86/events/intel/core.c | 1 + + arch/x86/include/asm/kvmclock.h | 14 ++ + arch/x86/kernel/kvmclock.c | 13 +- + arch/x86/kvm/cpuid.c | 4 +- + arch/x86/kvm/emulate.c | 1 - + arch/x86/kvm/vmx/vmx.c | 2 +- + block/bfq-iosched.c | 16 +- + drivers/acpi/nfit/core.c | 12 + + drivers/base/core.c | 90 +++++--- + drivers/block/nbd.c | 29 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 31 +++ + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 15 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 4 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- + drivers/gpu/drm/i915/gt/intel_context.c | 5 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 2 - + .../drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 10 +- + .../i915/gt/uc/abi/guc_communication_mmio_abi.h | 10 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 4 +- + drivers/gpu/drm/i915/i915_request.c | 11 +- + drivers/gpu/drm/tegra/dc.c | 3 - + drivers/gpu/drm/tegra/dc.h | 6 - + drivers/gpu/drm/tegra/uapi.c | 2 +- + drivers/gpu/host1x/fence.c | 6 +- + drivers/hwmon/k10temp.c | 6 - + drivers/hwmon/ltc2947-core.c | 8 +- + drivers/hwmon/mlxreg-fan.c | 12 +- + drivers/hwmon/occ/common.c | 17 +- + drivers/hwmon/pmbus/ibm-cffps.c | 10 +- + drivers/hwmon/pmbus/mp2975.c | 2 +- + drivers/hwmon/tmp421.c | 71 +++--- + drivers/hwmon/w83791d.c | 29 +-- + drivers/hwmon/w83792d.c | 28 +-- + drivers/hwmon/w83793.c | 26 +-- + drivers/interconnect/qcom/sdm660.c | 25 +- + drivers/iommu/apple-dart.c | 56 +++-- + drivers/iommu/intel/dmar.c | 6 +- + drivers/ipack/devices/ipoctal.c | 63 +++-- + drivers/net/phy/mdio_bus.c | 4 + + drivers/nvdimm/pmem.c | 5 +- + drivers/nvme/host/core.c | 4 +- + drivers/nvme/host/nvme.h | 6 + + drivers/nvme/host/pci.c | 3 +- + drivers/ptp/ptp_kvm_x86.c | 9 +- + drivers/s390/cio/blacklist.c | 8 +- + drivers/s390/cio/css.c | 40 +++- + drivers/s390/cio/css.h | 10 +- + drivers/scsi/csiostor/csio_init.c | 1 + + drivers/scsi/qla2xxx/qla_isr.c | 4 +- + drivers/scsi/ses.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 3 +- + drivers/scsi/virtio_scsi.c | 4 +- + .../pci/hive_isp_css_common/host/input_system.c | 2 + + fs/binfmt_elf.c | 2 +- + fs/debugfs/inode.c | 2 +- + fs/ext4/dir.c | 6 +- + fs/ext4/ext4.h | 3 - + fs/ext4/extents.c | 19 +- + fs/ext4/fast_commit.c | 6 + + fs/ext4/inline.c | 150 ++++++------ + fs/ext4/inode.c | 176 +++++--------- + fs/ext4/super.c | 21 +- + fs/io-wq.c | 5 +- + fs/io_uring.c | 17 +- + fs/kernfs/dir.c | 9 +- + fs/ksmbd/auth.c | 205 ----------------- + fs/ksmbd/crypto_ctx.c | 16 -- + fs/ksmbd/crypto_ctx.h | 8 - + fs/ksmbd/misc.c | 17 +- + fs/ksmbd/oplock.c | 41 +++- + fs/ksmbd/smb2pdu.c | 256 ++++++++++++++++----- + fs/ksmbd/smb2pdu.h | 9 + + fs/ksmbd/smb_common.c | 47 ++-- + fs/ksmbd/smb_common.h | 8 - + fs/ksmbd/smbacl.c | 21 +- + fs/ksmbd/transport_tcp.c | 4 +- + fs/overlayfs/dir.c | 10 +- + fs/overlayfs/file.c | 15 +- + include/linux/cpumask.h | 7 +- + include/linux/fwnode.h | 11 +- + include/linux/perf_event.h | 4 +- + include/linux/sched.h | 2 +- + include/trace/events/cachefiles.h | 2 +- + kernel/events/core.c | 34 ++- + kernel/sched/debug.c | 8 +- + kernel/sched/fair.c | 6 +- + tools/objtool/special.c | 38 ++- + tools/testing/selftests/drivers/dma-buf/udmabuf.c | 5 +- + .../selftests/kvm/include/x86_64/processor.h | 2 +- + tools/testing/selftests/kvm/rseq_test.c | 69 +++++- + 108 files changed, 1188 insertions(+), 983 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 (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (463dbba4d189 ARM: 9104/2: Fix Keystone 2 kernel mapping regression) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (22b70e6f2da0 arm64: Restore forced disabling of KPTI on ThunderX) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (3f1c260ffddb MAINTAINERS: Add myself as MStar/Sigmastar Armv7 SoC maintainers) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/configs/multi_v7_defconfig | 3 +++ + 2 files changed, 4 insertions(+) +Merging drivers-memory-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (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 (23c216b335d1 powerpc/iommu: Report the correct most efficient DMA mask for PCI devices) +$ 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/kernel/dma-iommu.c | 9 +++++++++ + 1 file changed, 9 insertions(+) +Merging s390-fixes/fixes (a46044a92add s390/pci: fix zpci_zdev_put() on reserve) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/include/asm/pci.h | 2 ++ + arch/s390/net/bpf_jit_comp.c | 2 +- + arch/s390/pci/pci.c | 45 +++++++++++++++++++++++++++++++++----- + arch/s390/pci/pci_event.c | 4 ++-- + drivers/pci/hotplug/s390_pci_hpc.c | 9 +------- + 5 files changed, 46 insertions(+), 16 deletions(-) +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 (b44d52a50bc6 dsa: tag_dsa: Fix mask for trunked packets) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging drivers/net/phy/mdio_bus.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 1 + + MAINTAINERS | 5 +- + arch/powerpc/boot/dts/fsl/t1023rdb.dts | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 12 +- + .../ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 2 + + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 ++ + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 178 +++++++++++++++------ + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 11 +- + .../mellanox/mlx5/core/esw/acl/egress_lgcy.c | 12 +- + .../mellanox/mlx5/core/esw/acl/ingress_lgcy.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 37 ++--- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 9 +- + drivers/net/ethernet/mscc/ocelot_vcap.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 5 + + drivers/net/phy/mdio_bus.c | 8 +- + drivers/net/wireless/ath/ath5k/Kconfig | 4 +- + drivers/net/wireless/ath/ath5k/led.c | 10 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 5 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 3 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 + + drivers/net/wireless/marvell/mwifiex/sta_tx.c | 4 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 4 +- + drivers/ptp/ptp_pch.c | 1 + + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 1 - + include/net/netfilter/nf_tables.h | 2 +- + include/net/netns/netfilter.h | 6 + + include/net/sock.h | 1 + + include/soc/mscc/ocelot_vcap.h | 4 +- + net/dsa/tag_dsa.c | 2 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 30 ++-- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 25 ++- + net/netfilter/nf_tables_api.c | 91 +++++++---- + net/netfilter/nft_quota.c | 2 +- + net/sched/sch_fifo.c | 3 + + 41 files changed, 334 insertions(+), 209 deletions(-) +Merging bpf/master (b0e875bac0fa libbpf: Fix memory leak in strset) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'recursive' strategy. + arch/arm/net/bpf_jit_32.c | 19 +++++++++++++++++++ + kernel/bpf/stackmap.c | 3 ++- + samples/bpf/Makefile | 17 ++++++++--------- + samples/bpf/bpf_insn.h | 2 +- + samples/bpf/xdp_redirect_map_multi.bpf.c | 5 ----- + tools/lib/bpf/libbpf.c | 3 ++- + tools/lib/bpf/strset.c | 1 + + 7 files changed, 33 insertions(+), 17 deletions(-) +Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'recursive' strategy. + include/uapi/linux/xfrm.h | 15 ++++++---- + net/xfrm/xfrm_user.c | 67 +++++++++++++++++++++++++++++++++++++-------- + security/selinux/nlmsgtab.c | 4 ++- + 3 files changed, 67 insertions(+), 19 deletions(-) +Merging netfilter/master (7cd8b1542a7b ptp_pch: Load module automatically if ID matches) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (3d3b30175a51 netfilter: nf_tables: honor NLM_F_CREATE and NLM_F_EXCL in event notification) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Merge made by the 'recursive' strategy. + net/netfilter/nft_dynset.c | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) +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 (a2083eeb119f cfg80211: scan: fix RCU in cfg80211_add_nontrans_list()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git mac80211/master +Merge made by the 'recursive' strategy. + net/mac80211/mesh.c | 9 +++++---- + net/wireless/scan.c | 7 +++++-- + 2 files changed, 10 insertions(+), 6 deletions(-) +Merging rdma-fixes/for-rc (9e1ff307c779 Linux 5.15-rc4) +$ 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 (cc03069a3970 ALSA: hda/realtek: Add quirk for Clevo X170KM-G) +$ 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/seq_device.c | 8 +++----- + sound/pci/hda/patch_realtek.c | 6 +++++- + sound/usb/mixer_scarlett_gen2.c | 2 ++ + 3 files changed, 10 insertions(+), 6 deletions(-) +Merging sound-asoc-fixes/for-linus (c417c32a473e 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 +Merge made by the 'recursive' strategy. + sound/soc/codecs/cs4341.c | 7 +++++++ + sound/soc/codecs/nau8824.c | 4 ++-- + sound/soc/codecs/pcm179x-spi.c | 1 + + sound/soc/codecs/pcm512x.c | 2 ++ + sound/soc/fsl/fsl_xcvr.c | 17 ++++++++++++----- + 5 files changed, 24 insertions(+), 7 deletions(-) +Merging regmap-fixes/for-linus (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (9e1ff307c779 Linux 5.15-rc4) +$ 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 (fa382a0f96cf Merge remote-tracking branch 'spi/for-5.15' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 2 +- + drivers/spi/spi-atmel.c | 4 +- + drivers/spi/spi-mt65xx.c | 64 ++++++++++++---------- + drivers/spi/spi-nxp-fspi.c | 26 +++------ + drivers/spi/spi-tegra20-slink.c | 4 +- + drivers/spi/spidev.c | 14 +++++ + 6 files changed, 61 insertions(+), 53 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 (410d591a1954 kernfs: don't create a negative dentry if inactive node exists) +$ 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 +Merge made by the 'recursive' strategy. + fs/kernfs/dir.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) +Merging tty.current/tty-linus (5816b3e6577e Linux 5.15-rc3) +$ 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 (5816b3e6577e Linux 5.15-rc3) +$ 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 (5816b3e6577e Linux 5.15-rc3) +$ 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. + drivers/usb/chipidea/ci_hdrc_imx.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) +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 (5816b3e6577e Linux 5.15-rc3) +$ 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 (26d90b559057 iio: light: opt3001: Fixed timeout error when 0 lux) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'recursive' strategy. + drivers/iio/accel/fxls8962af-core.c | 2 +- + drivers/iio/adc/ad7192.c | 1 + + drivers/iio/adc/ad7780.c | 2 +- + drivers/iio/adc/ad7793.c | 2 +- + drivers/iio/adc/aspeed_adc.c | 1 + + drivers/iio/adc/max1027.c | 3 +-- + drivers/iio/adc/mt6577_auxadc.c | 8 ++++++++ + drivers/iio/adc/rzg2l_adc.c | 6 ++++-- + drivers/iio/adc/ti-adc128s052.c | 6 ++++++ + drivers/iio/common/ssp_sensors/ssp_spi.c | 11 +++++++++-- + drivers/iio/dac/ti-dac5571.c | 1 + + drivers/iio/imu/adis16475.c | 3 ++- + drivers/iio/imu/adis16480.c | 14 +++++++++++--- + drivers/iio/light/opt3001.c | 6 +++--- + 14 files changed, 50 insertions(+), 16 deletions(-) +Merging char-misc.current/char-misc-linus (ad2b502bc5e6 Merge tag 'misc-habanalabs-fixes-2021-09-29' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-linus) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + .../misc/habanalabs/common/command_submission.c | 33 +++++++++++++--------- + include/uapi/misc/habanalabs.h | 6 ++-- + 2 files changed, 21 insertions(+), 18 deletions(-) +Merging soundwire-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (9e1ff307c779 Linux 5.15-rc4) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (0c5483a5778f Input: analog - always use ktime functions) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (0e14ef38669c crypto: x86/sm4 - Fix frame pointer stack corruption) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (42de956ca7e5 vfio/ap_ops: Add missed vfio_uninit_group_dev()) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (2f9602870886 selftests: drivers/dma-buf: Fix implicit declaration warns) +$ 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 +Merge made by the 'recursive' strategy. + kernel/module.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging dmaengine-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (f60f5741002b mtd: rawnand: qcom: Update code word value for raw read) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/qcom_nandc.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (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 (ed104ca4bd9c reset: reset-zynqmp: Fixed the argument data type) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - + arch/arm/boot/dts/at91-sama7g5ek.dts | 45 ++++++++-- + arch/arm/boot/dts/sama7g5.dtsi | 39 +++++++++ + arch/arm/mach-at91/pm.c | 130 ++++++++++++++++++++++++---- + arch/arm/mach-at91/pm_suspend.S | 42 +++++++-- + 5 files changed, 225 insertions(+), 32 deletions(-) +Merging omap-fixes/fixes (e879f855e590 bus: ti-sysc: Add break in switch statement in sysc_init_soc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Auto-merging drivers/bus/ti-sysc.c +Merge made by the 'recursive' strategy. + drivers/bus/ti-sysc.c | 1 + + 1 file changed, 1 insertion(+) +Merging kvm-fixes/master (2353e593a13b Merge tag 'kvm-s390-master-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'recursive' strategy. + arch/s390/kvm/gaccess.c | 12 ++++++++++++ + arch/s390/kvm/intercept.c | 4 +++- + 2 files changed, 15 insertions(+), 1 deletion(-) +Merging kvms390-fixes/master (25b5476a294c KVM: s390: Function documentation fixes) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (dd4d747ef05a hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (d55174cccac2 nvdimm/pmem: fix creating the dax group) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (45940091a3c1 Merge branch 'misc-5.15' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Already up to date. +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/stat.c +Merge made by the 'recursive' strategy. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (6f6aab1caf6c platform/x86: gigabyte-wmi: add support for B550I Aorus Pro AX) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml | 2 -- + Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml | 2 +- + Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml | 2 +- + Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml | 2 +- + Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml | 2 +- + Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml | 2 +- + Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml | 4 +--- + Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml | 1 - + Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 1 - + 9 files changed, 6 insertions(+), 12 deletions(-) +Merging scsi-fixes/fixes (79a7482249a7 scsi: csiostor: Add module softdep on cxgb4) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (78ea81417944 Merge tag 'exynos-drm-fixes-for-v5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (9e1ff307c779 Linux 5.15-rc4) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (e2845b1d92d7 mmc: meson-gx: do not use memcpy_to/fromio for dram-access-quirk) +$ 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/meson-gx-mmc.c | 73 ++++++++++++++++++++++++++++++++-------- + drivers/mmc/host/sdhci-of-at91.c | 22 ++++++------ + 2 files changed, 70 insertions(+), 25 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 (41608b64b10b PCI: hv: Fix sleep while in non-sleep context when removing child devices from the bus) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging drivers/pci/controller/pci-hyperv.c +Merge made by the 'recursive' strategy. + drivers/pci/controller/pci-hyperv.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging soc-fsl-fixes/fix (c1e64c0aec8c soc: fsl: qe: fix static checker warning) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (5155cf7b6aae Merge remote-tracking branch 'palmer/riscv-vdso-cleanup' into fixes) +$ 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/include/asm/syscall.h | 1 + + arch/riscv/include/asm/vdso.h | 18 ++++++++----- + arch/riscv/kernel/syscall_table.c | 1 - + arch/riscv/kernel/vdso.c | 53 ++++++++++++++++++++++++--------------- + arch/riscv/kernel/vdso/vdso.lds.S | 3 ++- + 5 files changed, 48 insertions(+), 28 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/fpga/ice40-spi.c | 7 +++++++ + 1 file changed, 7 insertions(+) +Merging spdx/spdx-linus (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (1649b8376694 gpio: pca953x: Improve bias setting) +$ 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-74x164.c | 8 ++++++++ + drivers/gpio/gpio-pca953x.c | 16 +++++++++------- + 2 files changed, 17 insertions(+), 7 deletions(-) +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 +Already up to date. +Merging pinctrl-intel-fixes/fixes (9e1ff307c779 Linux 5.15-rc4) +$ 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 (f62314b1ced2 kunit: fix reference count leak in kfree_at_end) +$ 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 +Merge made by the 'recursive' strategy. + lib/kunit/executor_test.c | 4 ++-- + tools/testing/kunit/kunit.py | 24 ++++++++++++++++++++++-- + tools/testing/kunit/kunit_tool_test.py | 8 ++++++++ + 3 files changed, 32 insertions(+), 4 deletions(-) +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (7d2a07b76933 Linux 5.14) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (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 (0513e464f900 Merge tag 'perf-tools-fixes-for-v5.15-2021-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (f86e9e383a71 video: fbdev: gbefb: Only instantiate device when built for IP32) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c +Resolved 'drivers/gpu/drm/vc4/vc4_hdmi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2923234d916d] Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/panel/ilitek,ili9341.yaml | 2 +- + drivers/gpu/drm/kmb/kmb_drv.c | 8 +- + drivers/gpu/drm/kmb/kmb_drv.h | 5 + + drivers/gpu/drm/kmb/kmb_plane.c | 81 +++++- + drivers/gpu/drm/kmb/kmb_plane.h | 5 +- + drivers/gpu/drm/kmb/kmb_regs.h | 3 + + drivers/gpu/drm/nouveau/dispnv50/head.c | 2 +- + drivers/gpu/drm/nouveau/include/nvif/class.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 1 + + drivers/gpu/drm/nouveau/nouveau_chan.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 4 + + drivers/gpu/drm/nouveau/nv84_fence.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c | 311 +++++++++++++++++++++ + drivers/gpu/drm/nouveau/nvkm/subdev/top/ga100.c | 7 +- + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 26 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 7 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 4 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 97 ++++--- + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 173 ++++++++---- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 6 + + drivers/of/base.c | 1 + + drivers/video/fbdev/Kconfig | 5 +- + drivers/video/fbdev/gbefb.c | 2 +- + 28 files changed, 623 insertions(+), 147 deletions(-) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c +Merging kspp-gustavo/for-next/kspp (6409e7102a9b Merge branch 'for-next/kspp-fixes' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 8 ++++++++ + arch/mips/alchemy/devboards/db1550.c | 1 + + arch/mips/kernel/uprobes.c | 1 + + drivers/firewire/core-cdev.c | 32 ++++++++++++++++++++++++++------ + drivers/pcmcia/db1xxx_ss.c | 1 + + include/linux/firewire.h | 11 +++++++---- + lib/assoc_array.c | 22 ++++++++++------------ + 7 files changed, 54 insertions(+), 22 deletions(-) +Merging kbuild/for-next (6988f70cf105 kconfig: rename a variable in the lexer to a clearer name) +$ 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. + Makefile | 2 +- + arch/arm64/lib/Makefile | 2 ++ + arch/nds32/Makefile | 2 ++ + arch/nios2/Makefile | 3 ++- + arch/nios2/boot/Makefile | 3 --- + arch/powerpc/lib/Makefile | 2 ++ + crypto/Makefile | 2 ++ + lib/raid6/Makefile | 4 +++ + scripts/Makefile.build | 63 +++++++++++++++++++++++++++-------------------- + scripts/Makefile.lib | 11 --------- + scripts/kconfig/lexer.l | 9 ++++--- + scripts/kconfig/menu.c | 33 ++++++++++++++----------- + 12 files changed, 74 insertions(+), 62 deletions(-) +Merging perf/perf/core (be8ecc57f180 perf srcline: Use long-running addr2line per DSO) +$ 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/tests/code-reading.c +Merge made by the 'recursive' strategy. + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 4 + + tools/build/feature/test-libtracefs.c | 10 + + tools/perf/Documentation/perf-record.txt | 16 + + tools/perf/Makefile.config | 21 ++ + tools/perf/Makefile.perf | 2 + + tools/perf/arch/riscv64/annotate/instructions.c | 34 +++ + tools/perf/arch/x86/annotate/instructions.c | 28 +- + tools/perf/bench/synthesize.c | 4 +- + tools/perf/builtin-daemon.c | 13 +- + tools/perf/builtin-kvm.c | 2 +- + tools/perf/builtin-record.c | 46 ++- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-trace.c | 4 +- + .../arch/arm64/hisilicon/hip08/uncore-ddrc.json | 32 +- + .../arch/arm64/hisilicon/hip08/uncore-hha.json | 120 ++++++-- + .../arch/arm64/hisilicon/hip08/uncore-l3c.json | 52 ++-- + .../pmu-events/arch/test/test_soc/sys/uncore.json | 7 + + tools/perf/pmu-events/jevents.c | 16 +- + tools/perf/tests/code-reading.c | 3 +- + tools/perf/tests/expr.c | 160 +++++++--- + tools/perf/tests/mmap-thread-lookup.c | 4 +- + tools/perf/tests/parse-events.c | 8 +- + tools/perf/tests/pmu-events.c | 135 +++++--- + 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/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/expr.c | 121 ++++++-- + tools/perf/util/expr.h | 20 +- + tools/perf/util/expr.l | 9 - + tools/perf/util/expr.y | 325 +++++++++++++++----- + tools/perf/util/metricgroup.c | 142 +++++---- + tools/perf/util/parse-events.c | 82 ++++- + tools/perf/util/parse-events.h | 3 +- + tools/perf/util/parse-events.l | 1 - + tools/perf/util/record.h | 1 + + tools/perf/util/srcline.c | 338 +++++++++++++++------ + tools/perf/util/stat-shadow.c | 54 ++-- + tools/perf/util/synthetic-events.c | 73 +++-- + tools/perf/util/synthetic-events.h | 20 +- + 45 files changed, 1608 insertions(+), 504 deletions(-) + create mode 100644 tools/build/feature/test-libtracefs.c + create mode 100644 tools/perf/arch/riscv64/annotate/instructions.c + 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 (b83a908498d6 compiler_attributes.h: move __compiletime_{error|warning}) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (59583f747664 sparc32: page align size in arch_dma_alloc) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (7962c2eddbfe arch: remove unused function syscall_set_arguments()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging arch/riscv/include/asm/syscall.h +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 (4603664c0fe9 Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging drivers/amba/bus.c +Auto-merging arch/arm/kernel/traps.c +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/fdt_check_mem_start.c | 48 ++++++++++-- + arch/arm/common/scoop.c | 3 - + arch/arm/include/asm/io.h | 1 + + arch/arm/kernel/traps.c | 2 +- + arch/arm/mach-imx/pm-imx6.c | 2 + + arch/arm/mm/ioremap.c | 6 ++ + drivers/amba/bus.c | 100 +++++++------------------ + drivers/of/platform.c | 6 +- + include/linux/amba/bus.h | 18 ----- + 9 files changed, 79 insertions(+), 107 deletions(-) +Merging arm64/for-next/core (e45ac92bcc92 Merge branches 'for-next/kexec', 'for-next/kselftest', 'for-next/misc', 'for-next/mm', 'for-next/mte', 'for-next/pfn-valid' and 'for-next/scs' 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 +Removing arch/arm64/kernel/cpu-reset.h +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 3 +- + arch/arm64/include/asm/assembler.h | 49 ++- + arch/arm64/include/asm/kexec.h | 12 + + arch/arm64/include/asm/mmu_context.h | 24 ++ + arch/arm64/include/asm/page.h | 1 - + arch/arm64/include/asm/pgtable.h | 5 + + arch/arm64/include/asm/sections.h | 1 + + arch/arm64/include/asm/trans_pgd.h | 14 +- + arch/arm64/include/asm/virt.h | 7 + + arch/arm64/include/asm/vmalloc.h | 4 +- + arch/arm64/kernel/asm-offsets.c | 11 + + arch/arm64/kernel/cpu-reset.S | 7 +- + arch/arm64/kernel/cpu-reset.h | 32 -- + arch/arm64/kernel/entry.S | 10 +- + 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 | 26 ++ + arch/arm64/kernel/relocate_kernel.S | 69 ++-- + arch/arm64/kernel/sdei.c | 2 +- + arch/arm64/kernel/traps.c | 4 +- + arch/arm64/kernel/vmlinux.lds.S | 19 + + arch/arm64/mm/Makefile | 1 + + arch/arm64/mm/hugetlbpage.c | 26 +- + 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 ++-- + include/linux/kasan.h | 9 +- + kernel/dma/mapping.c | 4 - + kernel/scs.c | 1 + + tools/testing/selftests/arm64/fp/Makefile | 2 +- + tools/testing/selftests/arm64/fp/TODO | 9 +- + tools/testing/selftests/arm64/fp/sve-ptrace-asm.S | 33 -- + tools/testing/selftests/arm64/fp/sve-ptrace.c | 460 +++++++++++++++------- + tools/testing/selftests/arm64/fp/vec-syscfg.c | 95 ++++- + 36 files changed, 828 insertions(+), 603 deletions(-) + delete mode 100644 arch/arm64/kernel/cpu-reset.h + create mode 100644 arch/arm64/mm/trans_pgd-asm.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 +Merge made by the 'recursive' strategy. + drivers/perf/Kconfig | 12 +++++++----- + drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 2 +- + drivers/perf/thunderx2_pmu.c | 2 +- + 3 files changed, 9 insertions(+), 7 deletions(-) +Merging arm-soc/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/amlogic/Makefile | 3 + + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 362 ++++++++++++++++++ + .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 405 +++++++++++++++++++++ + 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 +- + drivers/soc/amlogic/meson-canvas.c | 4 +- + drivers/soc/amlogic/meson-clk-measure.c | 4 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 1 + + 20 files changed, 1099 insertions(+), 19 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts +Merging aspeed/for-next (e986277a56da 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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 5 + + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 180 ++- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 1556 +++++++++++++++++++--- + arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 7 + + arch/arm/boot/dts/aspeed-g6.dtsi | 20 + + arch/arm/configs/aspeed_g5_defconfig | 1 + + 6 files changed, 1550 insertions(+), 219 deletions(-) +Merging at91/at91-next (b4af371d908f Merge branch 'at91-soc' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/arm/microchip.rst | 20 +++ + .../devicetree/bindings/arm/atmel-at91.yaml | 24 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/at91-lmu5000.dts | 147 +++++++++++++++ + arch/arm/boot/dts/at91-q5xr5.dts | 199 +++++++++++++++++++++ + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 12 +- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 23 ++- + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 70 ++++++++ + arch/arm/boot/dts/at91-sama5d2_icp.dts | 22 ++- + arch/arm/boot/dts/at91-sama7g5ek.dts | 8 + + arch/arm/boot/dts/at91-tse850-3.dts | 2 +- + arch/arm/boot/dts/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/sama5d29.dtsi | 16 ++ + arch/arm/boot/dts/sama7g5.dtsi | 16 ++ + arch/arm/mach-at91/Kconfig | 9 + + 16 files changed, 569 insertions(+), 7 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-lmu5000.dts + create mode 100644 arch/arm/boot/dts/at91-q5xr5.dts + create mode 100644 arch/arm/boot/dts/sama5d29.dtsi +Merging drivers-memory/for-next (bf7cf1ccbccc 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../memory-controllers/mediatek,smi-common.yaml | 34 +- + .../memory-controllers/mediatek,smi-larb.yaml | 3 + + .../memory-controllers/renesas,rpc-if.yaml | 1 + + MAINTAINERS | 8 + + drivers/memory/Kconfig | 4 +- + drivers/memory/mtk-smi.c | 596 ++++++++++++--------- + drivers/memory/renesas-rpc-if.c | 159 ++++-- + drivers/memory/samsung/Kconfig | 13 +- + drivers/memory/tegra/mc.c | 25 +- + drivers/memory/tegra/tegra186-emc.c | 4 + + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 2 +- + drivers/memory/tegra/tegra210-emc-core.c | 4 +- + drivers/memory/tegra/tegra30-emc.c | 4 +- + include/memory/renesas-rpc-if.h | 1 + + 14 files changed, 548 insertions(+), 310 deletions(-) +Merging imx-mxs/for-next (0dd3273df8c2 Merge branch 'imx/dt64' 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 +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx53-m53menlo.dts | 4 ++-- + arch/arm/boot/dts/imx6dl-alti6p.dts | 2 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 11 ++++------- + arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-pico.dtsi | 11 +++++++++++ + 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/imx6sx.dtsi | 6 +++--- + arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 1 + + arch/arm/boot/dts/imx7d-sdb.dts | 2 +- + arch/arm/boot/dts/imx7d.dtsi | 7 +++---- + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/mach-imx/mach-imx6q.c | 3 +++ + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 16 ++++++++-------- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 16 ++++++++-------- + .../boot/dts/freescale/imx8mm-kontron-n801x-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 ++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 10 ++++------ + 27 files changed, 68 insertions(+), 54 deletions(-) +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (69862ae4e378 Merge branch 'v5.14-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (930af8dda750 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging omap/for-next (7fd4d99072ce Merge branch 'omap-for-v5.16/ti-sysc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging drivers/bus/ti-sysc.c +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/pdata-quirks.c | 36 ----- + drivers/bus/ti-sysc.c | 277 +++++++++++++++++++++++++++++----- + include/linux/platform_data/ti-sysc.h | 3 + + 3 files changed, 245 insertions(+), 71 deletions(-) +Merging qcom/for-next (37f6317b1882 Merge branches 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Removing include/dt-bindings/power/qcom-aoss-qmp.h +Auto-merging arch/arm64/boot/dts/qcom/ipq8074.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Removing Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 4 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 16 + + .../bindings/display/msm/dp-controller.yaml | 1 - + .../devicetree/bindings/firmware/qcom,scm.txt | 4 +- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 + + .../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,spm.yaml | 80 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-apq8026-lge-lenok.dts | 237 ++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 33 +- + 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-msm8226.dtsi | 263 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 4 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 27 + + arch/arm/mach-qcom/platsmp.c | 71 + + arch/arm64/boot/dts/qcom/Makefile | 9 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 12 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 29 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 85 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 23 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 62 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 16 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 673 ++++ + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 431 +++ + .../arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 431 +++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 53 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 319 ++ + .../dts/qcom/msm8998-sony-xperia-yoshino-lilac.dts | 30 + + .../dts/qcom/msm8998-sony-xperia-yoshino-maple.dts | 54 + + .../qcom/msm8998-sony-xperia-yoshino-poplar.dts | 35 + + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 670 ++++ + arch/arm64/boot/dts/qcom/msm8998.dtsi | 200 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 1 + + arch/arm64/boot/dts/qcom/pm660.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pm8150.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 9 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 12 + + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 10 + + .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 14 + + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 2 +- + .../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 | 335 ++ + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 12 + + .../boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 11 + + .../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 | 8 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 24 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 76 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 225 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 3436 +++++++++++++++----- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 203 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 39 + + arch/arm64/boot/dts/qcom/sm6125.dtsi | 52 +- + .../dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 57 + + arch/arm64/boot/dts/qcom/sm6350.dtsi | 934 ++++++ + arch/arm64/boot/dts/qcom/sm8150.dtsi | 28 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 30 +- + drivers/cpuidle/Kconfig.arm | 1 + + drivers/cpuidle/cpuidle-qcom-spm.c | 318 +- + drivers/firmware/Kconfig | 2 +- + drivers/firmware/qcom_scm.c | 4 + + drivers/soc/qcom/Kconfig | 11 +- + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/apr.c | 287 +- + drivers/soc/qcom/cpr.c | 4 +- + drivers/soc/qcom/llcc-qcom.c | 18 +- + drivers/soc/qcom/mdt_loader.c | 2 +- + 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/rpmh-rsc.c | 4 +- + drivers/soc/qcom/rpmhpd.c | 16 + + drivers/soc/qcom/rpmpd.c | 24 + + drivers/soc/qcom/smd-rpm.c | 2 + + drivers/soc/qcom/smp2p.c | 20 + + drivers/soc/qcom/socinfo.c | 14 +- + drivers/soc/qcom/spm.c | 258 ++ + include/dt-bindings/power/qcom-aoss-qmp.h | 14 - + include/dt-bindings/power/qcom-rpmpd.h | 17 + + include/dt-bindings/soc/qcom,gpr.h | 19 + + include/linux/soc/qcom/apr.h | 70 +- + include/linux/soc/qcom/qcom_aoss.h | 38 + + include/soc/qcom/spm.h | 43 + + 97 files changed, 9424 insertions(+), 1786 deletions(-) + 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 arch/arm/boot/dts/qcom-apq8026-lge-lenok.dts + create mode 100644 arch/arm/boot/dts/qcom-pm8226.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/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/sm6350-sony-xperia-lena-pdx213.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm6350.dtsi + create mode 100644 drivers/soc/qcom/spm.c + delete mode 100644 include/dt-bindings/power/qcom-aoss-qmp.h + 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 raspberrypi/for-next (9f5289ec6f1c ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/bcm2835.yaml | 1 + + .../bindings/display/brcm,bcm2835-dsi0.yaml | 3 + + .../bindings/display/brcm,bcm2835-hdmi.yaml | 3 + + .../bindings/display/brcm,bcm2835-v3d.yaml | 3 + + .../bindings/display/brcm,bcm2835-vec.yaml | 3 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 49 +++----- + arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts | 138 +++++++++++++++++++++ + arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi | 113 +++++++++++++++++ + arch/arm/boot/dts/bcm2711.dtsi | 12 +- + arch/arm/boot/dts/bcm2835-common.dtsi | 8 ++ + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 31 ++--- + arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 36 ++---- + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 36 ++---- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 36 ++---- + arch/arm/boot/dts/bcm283x-rpi-wifi-bt.dtsi | 34 +++++ + arch/arm/boot/dts/bcm283x.dtsi | 8 -- + arch/arm64/boot/dts/broadcom/Makefile | 1 + + .../arm64/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts | 2 + + 19 files changed, 366 insertions(+), 152 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts + create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-wifi-bt.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts +Merging renesas/next (a462ac13da67 Merge branches 'renesas-arm-defconfig-for-v5.16' and '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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/renesas.yaml | 61 ++ + arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 + + 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/sh73a0-kzm9g.dts | 2 +- + 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 | 801 +++++++++++++++++++++ + 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 | 37 + + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 2 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 109 +++ + arch/arm64/boot/dts/renesas/r8a779m0.dtsi | 12 + + arch/arm64/boot/dts/renesas/r8a779m2.dtsi | 12 + + arch/arm64/boot/dts/renesas/r8a779m4.dtsi | 12 + + .../boot/dts/renesas/r8a779m5-salvator-xs.dts | 36 + + arch/arm64/boot/dts/renesas/r8a779m5.dtsi | 12 + + 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 | 248 +++++++ + arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts | 7 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 35 + + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 229 +++++- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 + + arch/arm64/configs/defconfig | 7 + + drivers/soc/renesas/Kconfig | 7 +- + drivers/soc/renesas/renesas-soc.c | 7 + + 58 files changed, 2455 insertions(+), 1471 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/draak.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ebisu.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m0.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 +Merging reset/reset/next (09f3824342f6 reset: simple: remove ZTE details in Kconfig help) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (9a6218fd50c1 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. + .../devicetree/bindings/arm/rockchip.yaml | 48 +- + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + arch/arm/boot/dts/rk3036.dtsi | 4 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 27 + + arch/arm/boot/dts/rk3066a.dtsi | 17 +- + arch/arm/boot/dts/rk3188.dtsi | 2 +- + arch/arm/boot/dts/rk3229.dtsi | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 6 +- + arch/arm/boot/dts/rk3288.dtsi | 4 +- + arch/arm/boot/dts/rv1108.dtsi | 8 +- + arch/arm64/boot/dts/rockchip/Makefile | 6 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 52 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 118 ++- + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 39 +- + 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 | 9 +- + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 47 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 5 - + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 176 ++++ + .../boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts | 41 + + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 180 ++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 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 | 6 +- + .../arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 218 ++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 54 + + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 + + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 47 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 29 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 94 +- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 497 +++++++++ + arch/arm64/boot/dts/rockchip/rk3566.dtsi | 20 + + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 313 ++++++ + arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi | 9 + + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 644 ++---------- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 1107 ++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3399.c | 17 +- + drivers/clk/rockchip/clk-rk3568.c | 2 +- + 43 files changed, 3404 insertions(+), 655 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk356x.dtsi +Merging samsung-krzk/for-next (64052e7fbb09 Merge branch 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4210-origen.dts | 24 ++++++++++++------------ + arch/arm/boot/dts/exynos4412-origen.dts | 14 +++++++------- + arch/arm/boot/dts/exynos5250-arndale.dts | 3 --- + arch/arm/boot/dts/exynos5250.dtsi | 1 - + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-s3c/irq-s3c24xx.c | 22 ++++++++++++++++++---- + arch/arm/mach-s3c/mach-mini6410.c | 2 +- + arch/arm64/Kconfig.platforms | 1 - + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 10 +++++----- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +++--- + drivers/soc/samsung/Kconfig | 5 ++++- + drivers/soc/samsung/Makefile | 3 ++- + drivers/soc/samsung/exynos-chipid.c | 14 +++++++++++--- + drivers/soc/samsung/exynos5422-asv.c | 1 + + 14 files changed, 64 insertions(+), 43 deletions(-) +Merging scmi/for-linux-next (cb5da0da3602 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 67 +++++++++++++++++++--- + arch/arm/boot/dts/vexpress-v2m.dtsi | 65 +++++++++++++++++++-- + arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 57 +----------------- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 57 +----------------- + arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 57 +----------------- + arch/arm/boot/dts/vexpress-v2p-ca9.dts | 58 ------------------- + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 1 - + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 23 -------- + arch/arm64/boot/dts/arm/juno-base.dtsi | 12 ---- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 21 ++++--- + arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 11 ---- + .../boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 2 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 20 +++++-- + .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 57 +----------------- + drivers/firmware/arm_ffa/bus.c | 10 +++- + drivers/firmware/arm_scmi/Kconfig | 2 +- + drivers/firmware/arm_scmi/virtio.c | 2 +- + 17 files changed, 164 insertions(+), 358 deletions(-) +Merging stm32/stm32-next (350081007916 ARM: dts: stm32: set the DCMI pins on stm32mp157c-odyssey) +$ 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. + Documentation/arm/index.rst | 1 + + Documentation/arm/stm32/stm32mp13-overview.rst | 37 +++ + .../devicetree/bindings/arm/stm32/stm32.yaml | 4 + + arch/arm/boot/dts/Makefile | 1 + + 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/stm32mp157c-odyssey.dts | 6 + + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 +- + arch/arm/mach-stm32/Kconfig | 8 + + arch/arm/mach-stm32/board-dt.c | 3 + + 15 files changed, 547 insertions(+), 1 deletion(-) + create mode 100644 Documentation/arm/stm32/stm32mp13-overview.rst + 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 +Merging sunxi/sunxi/for-next (bb289f4c0b2b Merge branches 'sunxi/clk-for-5.16', 'sunxi/core-for-5.16', 'sunxi/drivers-for-5.16', 'sunxi/dt-for-5.16' and 'sunxi/fixes-for-5.15' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + .../arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml | 38 +++++++++ + .../arm/sunxi/allwinner,sun9i-a80-prcm.yaml | 33 ++++++++ + .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 2 +- + arch/arm/boot/dts/axp209.dtsi | 6 +- + arch/arm/boot/dts/axp22x.dtsi | 6 +- + arch/arm/boot/dts/axp81x.dtsi | 10 +-- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 11 ++- + arch/arm/boot/dts/sun4i-a10.dtsi | 11 ++- + arch/arm/boot/dts/sun5i-a13.dtsi | 15 ++-- + arch/arm/boot/dts/sun6i-a31.dtsi | 44 +++++----- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 17 ++-- + arch/arm/boot/dts/sun7i-a20.dtsi | 34 ++++---- + arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 2 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 4 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 4 +- + arch/arm/boot/dts/sun8i-v3-sl631.dtsi | 2 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 2 +- + arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi | 2 +- + arch/arm/mach-sunxi/platsmp.c | 4 +- + arch/arm/mach-sunxi/sunxi.c | 4 +- + arch/arm64/boot/dts/allwinner/axp803.dtsi | 10 +-- + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 6 +- + .../boot/dts/allwinner/sun50i-a64-cpu-opp.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 3 +- + .../boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-h6-cpu-opp.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 +- + drivers/clk/sunxi-ng/Kconfig | 1 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun5i.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 6 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 8 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 7 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 7 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 2 +- + drivers/clk/sunxi-ng/ccu_common.c | 96 ++++++++++++++++++---- + drivers/clk/sunxi-ng/ccu_common.h | 6 +- + drivers/clk/sunxi-ng/ccu_mux.h | 1 - + drivers/clk/sunxi/clk-mod0.c | 4 +- + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 4 +- + drivers/clk/sunxi/clk-sun6i-apb0.c | 4 +- + drivers/clk/sunxi/clk-sun6i-ar100.c | 4 +- + drivers/clk/sunxi/clk-sun8i-apb0.c | 4 +- + drivers/soc/sunxi/sunxi_sram.c | 4 +- + 63 files changed, 304 insertions(+), 206 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/allwinner,sun9i-a80-prcm.yaml +Merging tegra/for-next (e7ed16ca46b5 Merge branch for-5.16/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging drivers/cpuidle/Kconfig.arm +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra114.dtsi | 4 + + arch/arm/boot/dts/tegra124.dtsi | 6 + + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 7 +- + arch/arm/boot/dts/tegra20.dtsi | 6 + + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 30 +- + arch/arm/boot/dts/tegra30-ouya.dts | 5 +- + arch/arm/boot/dts/tegra30.dtsi | 6 + + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 6 + + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 506 ++++++++++++++++++++- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 49 +- + drivers/cpuidle/Kconfig.arm | 2 +- + drivers/cpuidle/cpuidle-tegra.c | 3 + + drivers/soc/tegra/pmc.c | 23 +- + include/linux/clk/tegra.h | 22 + + include/soc/tegra/fuse.h | 31 +- + include/soc/tegra/irq.h | 9 +- + include/soc/tegra/pm.h | 2 +- + 17 files changed, 697 insertions(+), 20 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 68dd2810a365 Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git +Merging next-20211001 version of tegra +$ git merge -m next-20211001/tegra 6f8b0fca12e4a589b44cef5dc651dba8b3fefa63 +Merge made by the 'recursive' strategy. + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 506 ++++++++++++++++++++- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 49 +- + 2 files changed, 552 insertions(+), 3 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 (6037c75b193a arm64: dts: ti: k3-am65: Relocate thermal-zones to SoC specific location) +$ git merge -m Merge branch 'ti-k3-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git ti-k3-new/ti-k3-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 8 ++++++++ + arch/arm64/boot/dts/ti/k3-am64.dtsi | 2 ++ + 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 ++ + arch/arm64/boot/dts/ti/k3-am654.dtsi | 4 ++++ + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 7 ++++--- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 2 ++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 16 ++++++++-------- + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 3 +++ + 10 files changed, 37 insertions(+), 19 deletions(-) +Merging xilinx/for-next (7a4c31ee877a arm64: zynqmp: Add support for Xilinx Kria SOM board) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/xilinx.yaml | 17 + + 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 ++++-- + 24 files changed, 3813 insertions(+), 98 deletions(-) + 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 +Merging clk/clk-next (1a10ca10a675 Merge branch 'clk-rockchip' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Removing Documentation/devicetree/bindings/clock/fixed-mmio-clock.txt +Merge made by the 'recursive' strategy. + .../arm/mediatek/mediatek,mt8195-clock.yaml | 254 ++++ + .../arm/mediatek/mediatek,mt8195-sys-clock.yaml | 73 ++ + .../devicetree/bindings/clock/arm,syscon-icst.yaml | 5 + + .../devicetree/bindings/clock/fixed-mmio-clock.txt | 24 - + .../bindings/clock/fixed-mmio-clock.yaml | 47 + + .../bindings/clock/qcom,gcc-msm8998.yaml | 26 +- + drivers/clk/clk-composite.c | 1 + + drivers/clk/mediatek/Kconfig | 28 +- + drivers/clk/mediatek/Makefile | 8 + + drivers/clk/mediatek/clk-apmixed.c | 3 + + drivers/clk/mediatek/clk-cpumux.c | 3 + + drivers/clk/mediatek/clk-gate.c | 8 + + drivers/clk/mediatek/clk-mt6779-aud.c | 4 +- + drivers/clk/mediatek/clk-mt6779-cam.c | 4 +- + drivers/clk/mediatek/clk-mt6779-img.c | 4 +- + drivers/clk/mediatek/clk-mt6779-ipe.c | 4 +- + drivers/clk/mediatek/clk-mt6779-mfg.c | 4 +- + drivers/clk/mediatek/clk-mt6779-mm.c | 4 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt6779-venc.c | 4 +- + drivers/clk/mediatek/clk-mt6779.c | 2 + + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 145 +++ + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 92 ++ + drivers/clk/mediatek/clk-mt8195-cam.c | 142 +++ + drivers/clk/mediatek/clk-mt8195-ccu.c | 50 + + drivers/clk/mediatek/clk-mt8195-img.c | 96 ++ + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 68 ++ + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 206 ++++ + drivers/clk/mediatek/clk-mt8195-ipe.c | 51 + + drivers/clk/mediatek/clk-mt8195-mfg.c | 47 + + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 62 + + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 47 + + drivers/clk/mediatek/clk-mt8195-topckgen.c | 1273 ++++++++++++++++++++ + drivers/clk/mediatek/clk-mt8195-vdec.c | 104 ++ + drivers/clk/mediatek/clk-mt8195-vdo0.c | 123 ++ + drivers/clk/mediatek/clk-mt8195-vdo1.c | 140 +++ + drivers/clk/mediatek/clk-mt8195-venc.c | 69 ++ + drivers/clk/mediatek/clk-mt8195-vpp0.c | 110 ++ + drivers/clk/mediatek/clk-mt8195-vpp1.c | 108 ++ + drivers/clk/mediatek/clk-mt8195-wpe.c | 143 +++ + drivers/clk/mediatek/clk-mtk.c | 29 +- + drivers/clk/mediatek/clk-mtk.h | 1 + + drivers/clk/mediatek/clk-mux.c | 6 + + drivers/clk/mediatek/clk-pll.c | 6 +- + drivers/clk/mediatek/reset.c | 2 + + drivers/clk/mvebu/ap-cpu-clk.c | 14 +- + drivers/clk/qcom/a53-pll.c | 4 +- + drivers/clk/qcom/common.c | 8 +- + drivers/clk/qcom/gcc-msm8998.c | 705 ++++++----- + drivers/clk/qcom/gcc-sdm660.c | 80 +- + drivers/clk/qcom/gpucc-msm8998.c | 13 +- + drivers/clk/qcom/gpucc-sdm660.c | 15 +- + drivers/clk/qcom/kpss-xcc.c | 4 +- + drivers/clk/qcom/mmcc-msm8998.c | 183 ++- + drivers/clk/qcom/mmcc-sdm660.c | 72 +- + drivers/clk/renesas/r9a07g044-cpg.c | 2 + + drivers/clk/renesas/rzg2l-cpg.c | 2 +- + drivers/clk/socfpga/clk-agilex.c | 9 - + drivers/clk/versatile/clk-icst.c | 3 +- + include/dt-bindings/clock/mt8195-clk.h | 864 +++++++++++++ + 60 files changed, 5005 insertions(+), 607 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8195-clock.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8195-sys-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/fixed-mmio-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/fixed-mmio-clock.yaml + create mode 100644 drivers/clk/mediatek/clk-mt8195-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-apusys_pll.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-ccu.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-infra_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-ipe.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-peri_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-scp_adsp.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vdo0.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vdo1.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vpp0.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-vpp1.c + create mode 100644 drivers/clk/mediatek/clk-mt8195-wpe.c + create mode 100644 include/dt-bindings/clock/mt8195-clk.h +Merging clk-imx/for-next (d1012253a2d3 clk: imx: imx6ul: Fix csi clk gate register) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/imx8ulp-cgc-clock.yaml | 43 ++ + .../bindings/clock/imx8ulp-pcc-clock.yaml | 50 ++ + drivers/clk/imx/Kconfig | 6 + + drivers/clk/imx/Makefile | 2 + + drivers/clk/imx/clk-composite-7ulp.c | 88 +++- + drivers/clk/imx/clk-composite-8m.c | 4 +- + drivers/clk/imx/clk-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 +++++------------ + include/dt-bindings/clock/imx8ulp-clock.h | 258 ++++++++++ + include/dt-bindings/reset/imx8ulp-pcc-reset.h | 59 +++ + 14 files changed, 1275 insertions(+), 348 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx8ulp-cgc-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imx8ulp-pcc-clock.yaml + create mode 100644 drivers/clk/imx/clk-imx8ulp.c + create mode 100644 include/dt-bindings/clock/imx8ulp-clock.h + create mode 100644 include/dt-bindings/reset/imx8ulp-pcc-reset.h +Merging clk-renesas/renesas-clk (cc3e8f97bbd3 clk: renesas: r8a779a0: Add Z0 and Z1 clock support) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 159 ++++++++++++++++++++++++++++++++ + drivers/clk/renesas/r9a07g044-cpg.c | 29 +++++- + drivers/clk/renesas/rzg2l-cpg.c | 94 +++++++++++++++++++ + drivers/clk/renesas/rzg2l-cpg.h | 26 +++++- + 4 files changed, 306 insertions(+), 2 deletions(-) +Merging clk-samsung/for-next (1d26eaeec37a clk: samsung: s5pv210-audss: Make use of devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-exynos-audss.c | 4 +--- + drivers/clk/samsung/clk-exynos4412-isp.c | 4 +--- + drivers/clk/samsung/clk-exynos5433.c | 4 +--- + drivers/clk/samsung/clk-s5pv210-audss.c | 4 +--- + 4 files changed, 4 insertions(+), 12 deletions(-) +Merging csky/linux-next (40e080ed8218 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 +Auto-merging arch/csky/kernel/signal.c +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 3 ++- + arch/csky/include/asm/bitops.h | 1 - + arch/csky/kernel/ptrace.c | 3 ++- + arch/csky/kernel/signal.c | 4 ++++ + 4 files changed, 8 insertions(+), 3 deletions(-) +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 (6621cb4a2d0a m68k: muldi3: Use semicolon instead of comma) +$ 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/lib/muldi3.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging m68knommu/for-next (16352355b8f4 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 (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (67512a8cf5a7 MIPS: Avoid macro redefinitions) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 1 + + arch/mips/configs/loongson3_defconfig | 1 + + arch/mips/include/asm/ginvt.h | 11 +- + .../include/asm/mach-loongson64/loongson_regs.h | 12 ++ + arch/mips/include/asm/mipsregs.h | 190 ++++++++++++--------- + arch/mips/include/asm/msa.h | 34 ++-- + 6 files changed, 157 insertions(+), 92 deletions(-) +Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git nds32/next +Auto-merging arch/nds32/Makefile +Auto-merging arch/nds32/Kconfig +CONFLICT (content): Merge conflict in arch/nds32/Kconfig +Resolved 'arch/nds32/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 09e7b837a9ca] 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 (72698a878926 openrisc: time: don't mark comment as kernel-doc) +$ 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/time.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging parisc-hd/for-next (144857444edb parisc/unwind: use copy_from_kernel_nofault()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/kernel/unwind.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging powerpc/next (e4e737bb5c17 Linux 5.15-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (21ccdccd21e4 riscv: mm: don't advertise 1 num_asid for 0 asid bits) +$ 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/Kconfig +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/page.h | 2 + + arch/riscv/include/asm/vdso.h | 2 +- + arch/riscv/include/asm/vdso/gettimeofday.h | 7 + + arch/riscv/kernel/reset.c | 12 +- + arch/riscv/kernel/vdso.c | 250 +++++++++++++++++++++++------ + arch/riscv/kernel/vdso/vdso.lds.S | 3 + + arch/riscv/mm/context.c | 8 +- + 8 files changed, 225 insertions(+), 60 deletions(-) +Merging s390/for-next (7e8601b12f46 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 +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 12 +++++ + arch/s390/boot/compressed/decompressor.h | 1 + + arch/s390/boot/head.S | 17 +++++++ + arch/s390/boot/startup.c | 8 +++ + arch/s390/configs/debug_defconfig | 1 + + arch/s390/include/asm/ftrace.h | 28 +++++++++++ + arch/s390/kernel/entry.h | 1 + + arch/s390/kernel/ftrace.c | 86 +++----------------------------- + arch/s390/kernel/head64.S | 18 ------- + arch/s390/kernel/kprobes.c | 48 +++++++++++++++++- + arch/s390/kernel/setup.c | 22 ++++---- + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/s390/lib/Makefile | 2 + + arch/s390/lib/test_kprobes.c | 75 ++++++++++++++++++++++++++++ + arch/s390/lib/test_kprobes.h | 10 ++++ + arch/s390/lib/test_kprobes_asm.S | 45 +++++++++++++++++ + arch/s390/pci/pci_event.c | 4 ++ + arch/s390/pci/pci_sysfs.c | 8 +++ + drivers/s390/block/dasd_genhd.c | 10 +++- + drivers/s390/block/dcssblk.c | 8 ++- + drivers/s390/block/scm_blk.c | 7 ++- + drivers/s390/char/sclp_sd.c | 9 +++- + drivers/s390/char/sclp_vt220.c | 4 +- + drivers/s390/cio/css.c | 9 ++-- + drivers/s390/cio/device.c | 2 + + 25 files changed, 314 insertions(+), 122 deletions(-) + 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 (12285ff8667b sh: kdump: add some attribute to function) +$ 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/boards/mach-landisk/irq.c | 4 ++-- + arch/sh/boot/Makefile | 4 ++-- + arch/sh/boot/compressed/.gitignore | 5 ----- + arch/sh/boot/compressed/Makefile | 32 +++++++++++++------------------- + arch/sh/boot/compressed/ashiftrt.S | 2 ++ + arch/sh/boot/compressed/ashldi3.c | 2 ++ + arch/sh/boot/compressed/ashlsi3.S | 2 ++ + arch/sh/boot/compressed/ashrsi3.S | 2 ++ + arch/sh/boot/compressed/lshrsi3.S | 2 ++ + arch/sh/include/asm/checksum_32.h | 5 +++-- + arch/sh/include/asm/uaccess.h | 4 ++-- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- + arch/sh/kernel/crash_dump.c | 4 ++-- + arch/sh/kernel/traps_32.c | 8 ++++---- + arch/sh/math-emu/math.c | 4 ++-- + arch/sh/mm/nommu.c | 4 ++-- + drivers/sh/maple/maple.c | 5 ++++- + 17 files changed, 49 insertions(+), 45 deletions(-) + create mode 100644 arch/sh/boot/compressed/ashiftrt.S + create mode 100644 arch/sh/boot/compressed/ashldi3.c + create mode 100644 arch/sh/boot/compressed/ashlsi3.S + create mode 100644 arch/sh/boot/compressed/ashrsi3.S + create mode 100644 arch/sh/boot/compressed/lshrsi3.S +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/linux-next (234640275675 um: rename set_signals() to um_set_signals()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/include/asm/delay.h | 4 ++-- + arch/um/include/asm/irqflags.h | 4 ++-- + arch/um/include/shared/longjmp.h | 2 +- + arch/um/include/shared/os.h | 4 ++-- + arch/um/kernel/ksyms.c | 2 +- + arch/um/os-Linux/sigio.c | 6 +++--- + arch/um/os-Linux/signal.c | 8 ++++---- + 7 files changed, 15 insertions(+), 15 deletions(-) +Merging xtensa/xtensa-for-next (ddc33155115a xtensa: xtfpga: Try software restart before simulating CPU reset) +$ 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/include/asm/kmem_layout.h | 2 +- + arch/xtensa/kernel/irq.c | 2 +- + arch/xtensa/kernel/setup.c | 12 ++++++------ + arch/xtensa/mm/mmu.c | 2 +- + arch/xtensa/platforms/xtfpga/setup.c | 8 ++++++-- + 5 files changed, 15 insertions(+), 11 deletions(-) +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 (7f595d6a6cdc fscrypt: allow 256-bit master keys with AES-256-XTS) +$ 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 | 5 +- + fs/crypto/hkdf.c | 11 ++-- + fs/crypto/keysetup.c | 57 ++++++++++++++++----- + fs/ext4/super.c | 1 - + fs/f2fs/super.c | 1 - + fs/ubifs/crypto.c | 1 - + include/linux/fscrypt.h | 3 -- + 11 files changed, 137 insertions(+), 62 deletions(-) +Merging fscache/fscache-next (97b85f2079a9 Merge branch 'fscache-iter-3' 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 +Auto-merging fs/cifs/fscache.h +Auto-merging fs/cifs/fscache.c +Auto-merging fs/cifs/file.c +Removing fs/cachefiles/rdwr.c +Auto-merging fs/afs/file.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 | 194 ++-- + 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 | 56 +- + 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 | 161 +--- + 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, 602 insertions(+), 4041 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 (9a10940c7b28 Merge branch 'for-next-next-v5.15-20211004' into for-next-20211004) +$ 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 | 51 +- + fs/btrfs/block-group.h | 4 + + fs/btrfs/btrfs_inode.h | 39 +- + fs/btrfs/check-integrity.c | 4 +- + fs/btrfs/compression.c | 685 +++++++++++++++----------- + fs/btrfs/compression.h | 4 +- + fs/btrfs/ctree.c | 156 +++--- + fs/btrfs/ctree.h | 73 ++- + fs/btrfs/delayed-inode.c | 41 +- + fs/btrfs/disk-io.c | 37 +- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent-tree.c | 289 +++++++---- + fs/btrfs/extent_io.c | 334 ++++++++----- + fs/btrfs/extent_io.h | 10 +- + fs/btrfs/extent_map.c | 4 +- + fs/btrfs/file-item.c | 13 +- + fs/btrfs/file.c | 23 +- + fs/btrfs/free-space-cache.c | 106 +++- + fs/btrfs/free-space-cache.h | 2 + + fs/btrfs/inode.c | 550 +++++++++++---------- + fs/btrfs/ioctl.c | 911 ++++++++++++++++------------------- + 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/reflink.c | 4 +- + fs/btrfs/relocation.c | 49 +- + fs/btrfs/scrub.c | 131 +++-- + fs/btrfs/send.c | 15 +- + fs/btrfs/subpage.c | 292 ++++++++--- + fs/btrfs/subpage.h | 56 ++- + fs/btrfs/super.c | 26 +- + 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/tree-log.c | 647 +++++++++++++++++-------- + fs/btrfs/tree-log.h | 2 + + fs/btrfs/volumes.c | 340 +++++++------ + fs/btrfs/volumes.h | 73 +-- + fs/btrfs/xattr.c | 2 +- + fs/btrfs/zoned.c | 533 ++++++++++++++++++-- + fs/btrfs/zoned.h | 39 +- + 43 files changed, 3703 insertions(+), 2362 deletions(-) +Merging ceph/master (b96728705f91 ceph: convert to noop_direct_IO) +$ 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 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) +Merging cifs/for-next (9e1ff307c779 Linux 5.15-rc4) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Already up to date. +Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging erofs/dev (1266b4a7ecb6 erofs: fix double free of 'copied') +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (372d1f3e1bfe ext2: fix sleeping in atomic bugs on error) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Already up to date. +Merging ext4/dev (f2c77973507f ext4: recheck buffer uptodate bit under buffer lock) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (6663b138ded1 f2fs: set SBI_NEED_FSCK flag when inconsistent node block found) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 6 ++---- + fs/f2fs/f2fs.h | 3 +++ + 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 | 23 +++++++++++++++++++++-- + 8 files changed, 31 insertions(+), 19 deletions(-) +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (7a41554fdfb0 fuse: move fuse_invalidate_attr() into fuse_update_ctime()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 8 ++++---- + fs/fuse/dir.c | 11 +++-------- + fs/fuse/file.c | 1 - + fs/fuse/ioctl.c | 4 ++-- + fs/fuse/readdir.c | 4 ++-- + fs/fuse/xattr.c | 10 ++++------ + 6 files changed, 15 insertions(+), 23 deletions(-) +Merging gfs2/for-next (11603f0011d0 gfs2: Allow append and immutable bits to coexist) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 10 ++-------- + fs/gfs2/glock.c | 23 ++++++++++++++++------- + fs/gfs2/glock.h | 7 +++++++ + fs/gfs2/glops.c | 16 +++++++++++++--- + fs/gfs2/incore.h | 1 + + fs/gfs2/rgrp.c | 41 +++++++++++++++++++++++++++++------------ + fs/gfs2/rgrp.h | 1 + + 7 files changed, 69 insertions(+), 30 deletions(-) +Merging jfs/jfs-next (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 (9e1ff307c779 Linux 5.15-rc4) +$ 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 (9e1ff307c779 Linux 5.15-rc4) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (35940a58f9f1 SUNRPC: Capture value of xdr_buf::page_base) +$ git merge -m Merge branch 'nfsd-next' of git://git.linux-nfs.org/~bfields/linux.git nfsd/nfsd-next +Removing include/uapi/linux/nfsd/nfsfh.h +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/index.rst | 1 + + Documentation/filesystems/nfs/reexport.rst | 113 ++++++++++++++++++ + fs/nfsd/flexfilelayout.c | 2 +- + fs/nfsd/lockd.c | 2 +- + fs/nfsd/nfs3proc.c | 3 +- + fs/nfsd/nfs3xdr.c | 16 +-- + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4proc.c | 9 +- + fs/nfsd/nfs4state.c | 6 +- + fs/nfsd/nfs4xdr.c | 4 +- + fs/nfsd/nfscache.c | 17 ++- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfsfh.c | 173 +++++++++------------------ + fs/nfsd/nfsfh.h | 55 ++++++++- + fs/nfsd/nfsproc.c | 3 +- + fs/nfsd/nfsxdr.c | 13 +- + fs/nfsd/vfs.c | 1 + + fs/nfsd/xdr.h | 2 +- + fs/nfsd/xdr3.h | 2 +- + include/linux/sunrpc/svc.h | 3 +- + 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 | 11 +- + 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 ++- + 31 files changed, 559 insertions(+), 351 deletions(-) + create mode 100644 Documentation/filesystems/nfs/reexport.rst + delete mode 100644 include/uapi/linux/nfsd/nfsfh.h +Merging cel/for-next (2ba5acfb3495 SUNRPC: fix sign error causing rpcsec_gss drops) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel/for-next +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfs4xdr.c +Merge made by the 'recursive' strategy. + fs/nfsd/filecache.c | 2 +- + fs/nfsd/nfs4xdr.c | 19 +++++++++++-------- + fs/nfsd/nfsctl.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + 4 files changed, 14 insertions(+), 11 deletions(-) +Merging ntfs3/master (35afb70dcfe4 fs/ntfs3: Check for NULL if ATTR_EA_INFO is incorrect) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/xattr.c +Auto-merging fs/ntfs3/ntfs_fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/ntfs3.rst | 141 ++++---- + fs/ntfs3/attrib.c | 12 +- + fs/ntfs3/attrlist.c | 9 +- + fs/ntfs3/bitfunc.c | 10 +- + fs/ntfs3/bitmap.c | 14 +- + fs/ntfs3/debug.h | 3 + + fs/ntfs3/dir.c | 11 +- + fs/ntfs3/file.c | 5 +- + fs/ntfs3/frecord.c | 23 +- + fs/ntfs3/fslog.c | 12 +- + fs/ntfs3/fsntfs.c | 77 +++-- + fs/ntfs3/index.c | 160 +++------ + fs/ntfs3/inode.c | 35 +- + fs/ntfs3/lib/decompress_common.h | 5 + + fs/ntfs3/lib/lib.h | 6 + + fs/ntfs3/lznt.c | 12 +- + fs/ntfs3/namei.c | 24 -- + fs/ntfs3/ntfs.h | 20 +- + fs/ntfs3/ntfs_fs.h | 63 +++- + fs/ntfs3/record.c | 3 - + fs/ntfs3/run.c | 2 - + fs/ntfs3/super.c | 641 +++++++++++++++++------------------- + fs/ntfs3/upcase.c | 8 +- + fs/ntfs3/xattr.c | 95 ++---- + 24 files changed, 641 insertions(+), 750 deletions(-) +Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (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 (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (9c4d94dc9a64 net/9p: increase default msize to 128k) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (f38a032b165d xfs: fix I_DONTCACHE) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. +Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (90f7d7a0d0d6 locks: remove LOCK_MAND flock lock support) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging fs/nfs/file.c +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/ceph/locks.c | 3 --- + fs/gfs2/file.c | 2 -- + fs/locks.c | 47 +++++++++++++++++++--------------------- + fs/nfs/file.c | 9 -------- + include/uapi/asm-generic/fcntl.h | 4 ++++ + 5 files changed, 26 insertions(+), 39 deletions(-) +Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging printk/for-next (c15b5fc054c3 ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + arch/ia64/Kconfig.debug | 2 +- + kernel/printk/index.c | 5 ++--- + kernel/printk/printk.c | 5 +++-- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging pci/next (ef4bce990eab Merge branch 'pci/virtualization') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging arch/s390/pci/pci.c +Merge made by the 'recursive' strategy. + arch/microblaze/pci/pci-common.c | 3 +- + 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/pci/common.c | 2 +- + drivers/pci/p2pdma.c | 2 +- + drivers/pci/pci.c | 12 +++++-- + drivers/pci/pcie/portdrv_core.c | 47 +++++++++++++++--------- + drivers/pci/probe.c | 4 +-- + drivers/pci/quirks.c | 57 ++++++++++++++++++++++++++++++ + include/linux/pci.h | 2 +- + 12 files changed, 107 insertions(+), 30 deletions(-) +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 (dd0f17ef2ea8 Merge branches 'for-5.15/upstream-fixes' and 'for-5.16/amd-sfh' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 7 ++ + drivers/hid/Makefile | 1 + + 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 | 12 +-- + drivers/hid/hid-debug.c | 10 +-- + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-input.c | 1 + + drivers/hid/hid-xiaomi.c | 94 ++++++++++++++++++++++ + 15 files changed, 140 insertions(+), 28 deletions(-) + create mode 100644 drivers/hid/hid-xiaomi.c +Merging i2c/i2c/for-next (90d8f9584220 Merge branch 'i2c/for-current-fixed' 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. + drivers/i2c/busses/Kconfig | 5 +- + 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 | 6 +- + drivers/i2c/busses/i2c-mt65xx.c | 13 ++- + drivers/i2c/busses/i2c-pxa.c | 1 - + drivers/i2c/busses/i2c-rcar.c | 6 +- + drivers/i2c/busses/i2c-xiic.c | 161 +++++++++++++++-------------------- + drivers/i2c/i2c-core-acpi.c | 1 + + 12 files changed, 128 insertions(+), 164 deletions(-) +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 (0889b7c73a4d hwmon: (tmp421) introduce MAX_CHANNELS define) +$ 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/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/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/iio-hwmon.yaml | 37 ++ + Documentation/devicetree/bindings/hwmon/jc42.txt | 46 -- + .../devicetree/bindings/hwmon/jedec,jc42.yaml | 69 ++ + .../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/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 ++ + Documentation/devicetree/bindings/hwmon/tmp108.txt | 18 - + .../devicetree/bindings/trivial-devices.yaml | 20 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/max6620.rst | 46 ++ + MAINTAINERS | 3 +- + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/i5500_temp.c | 114 ++-- + drivers/hwmon/max6620.c | 514 +++++++++++++++ + drivers/hwmon/mlxreg-fan.c | 126 ++-- + drivers/hwmon/nct6683.c | 3 + + drivers/hwmon/nct6775.c | 706 ++++++++++++++------- + drivers/hwmon/raspberrypi-hwmon.c | 2 +- + drivers/hwmon/tmp421.c | 9 +- + 30 files changed, 1618 insertions(+), 564 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/dps650ab.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/hih6130.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/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 + 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 (250a0a5ba9d2 docs: checkpatch: add multiline, do/while, and multiple-assignment messages) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/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/block/queue-sysfs.rst | 9 +- + Documentation/dev-tools/checkpatch.rst | 128 ++++ + Documentation/process/index.rst | 1 + + Documentation/process/maintainer-handbooks.rst | 18 + + Documentation/process/maintainer-tip.rst | 785 +++++++++++++++++++++ + Documentation/process/submitting-patches.rst | 7 + + Documentation/timers/no_hz.rst | 8 +- + .../translations/ko_KR/memory-barriers.txt | 8 +- + .../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 +- + Documentation/translations/zh_CN/core-api/kref.rst | 311 ++++++++ + .../zh_CN/core-api/memory-allocation.rst | 138 ++++ + .../translations/zh_CN/core-api/mm-api.rst | 110 +++ + .../zh_CN/core-api/unaligned-memory-access.rst | 229 ++++++ + .../translations/zh_CN/process/5.Posting.rst | 8 +- + Documentation/translations/zh_CN/process/howto.rst | 10 +- + .../zh_CN/process/submitting-patches.rst | 4 +- + Documentation/translations/zh_TW/index.rst | 10 +- + Documentation/vm/page_migration.rst | 2 +- + 27 files changed, 2317 insertions(+), 39 deletions(-) + create mode 100644 Documentation/process/maintainer-handbooks.rst + create mode 100644 Documentation/process/maintainer-tip.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/sysrq.rst + 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 (c52e7b855b33 Merge tag 'v5.15-rc4' into media_tree) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/renesas,imr.txt +Removing Documentation/devicetree/bindings/media/i2c/mt9p031.txt +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/admin-guide/media/imx7.rst | 60 + + Documentation/admin-guide/media/ipu3.rst | 14 +- + Documentation/admin-guide/media/ivtv.rst | 2 +- + Documentation/admin-guide/media/vimc.rst | 20 +- + .../bindings/media/i2c/aptina,mt9p031.yaml | 108 ++ + .../devicetree/bindings/media/i2c/mt9p031.txt | 40 - + .../devicetree/bindings/media/mediatek-vcodec.txt | 2 + + .../devicetree/bindings/media/renesas,csi2.yaml | 1 + + .../devicetree/bindings/media/renesas,imr.txt | 31 - + .../devicetree/bindings/media/renesas,imr.yaml | 67 + + .../devicetree/bindings/media/rockchip-isp1.yaml | 114 +- + Documentation/driver-api/media/drivers/rkisp1.rst | 43 + + Documentation/driver-api/media/v4l2-subdev.rst | 14 +- + .../userspace-api/media/drivers/cx2341x-uapi.rst | 8 +- + Documentation/userspace-api/media/v4l/buffer.rst | 40 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 57 + + .../media/v4l/ext-ctrls-image-source.rst | 20 + + .../userspace-api/media/v4l/pixfmt-reserved.rst | 29 +- + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 50 +- + .../userspace-api/media/v4l/vidioc-create-bufs.rst | 7 +- + .../userspace-api/media/v4l/vidioc-g-ctrl.rst | 3 + + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 3 + + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 6 + + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 16 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 2 + + MAINTAINERS | 15 +- + drivers/media/cec/core/cec-pin.c | 4 +- + drivers/media/cec/platform/meson/ao-cec-g12a.c | 4 +- + drivers/media/cec/platform/meson/ao-cec.c | 4 +- + drivers/media/cec/platform/s5p/s5p_cec.c | 4 +- + drivers/media/cec/platform/sti/stih-cec.c | 4 +- + drivers/media/cec/platform/stm32/stm32-cec.c | 4 +- + drivers/media/common/siano/smscoreapi.c | 7 +- + drivers/media/common/videobuf2/videobuf2-core.c | 149 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 195 ++- + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 39 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 59 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 30 +- + drivers/media/dvb-core/dvb_vb2.c | 2 +- + drivers/media/dvb-frontends/cxd2099.c | 9 - + drivers/media/dvb-frontends/cxd2099.h | 9 - + drivers/media/dvb-frontends/cxd2820r_priv.h | 2 +- + drivers/media/dvb-frontends/mxl5xx.c | 9 - + drivers/media/dvb-frontends/mxl5xx.h | 9 - + drivers/media/dvb-frontends/mxl5xx_defs.h | 4 - + drivers/media/dvb-frontends/mxl5xx_regs.h | 10 - + drivers/media/dvb-frontends/mxl692.c | 9 - + drivers/media/dvb-frontends/mxl692.h | 9 - + drivers/media/dvb-frontends/mxl692_defs.h | 9 - + drivers/media/dvb-frontends/stv0910.c | 9 - + drivers/media/dvb-frontends/stv0910.h | 9 - + drivers/media/dvb-frontends/stv6111.c | 9 - + drivers/media/dvb-frontends/stv6111.h | 9 - + drivers/media/firewire/firedtv-avc.c | 14 +- + drivers/media/firewire/firedtv-ci.c | 2 + + drivers/media/i2c/Kconfig | 12 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/imx258.c | 12 +- + drivers/media/i2c/ir-kbd-i2c.c | 1 + + drivers/media/i2c/max9286.c | 17 +- + drivers/media/i2c/mt9p031.c | 80 +- + drivers/media/i2c/ov13b10.c | 1491 ++++++++++++++++++++ + drivers/media/i2c/ov8856.c | 83 +- + drivers/media/i2c/st-mipid02.c | 22 +- + drivers/media/i2c/tda1997x.c | 12 +- + drivers/media/i2c/video-i2c.c | 21 +- + drivers/media/mc/Kconfig | 8 - + drivers/media/pci/cobalt/cobalt-driver.c | 4 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx18/cx18-ioctl.c | 4 +- + drivers/media/pci/cx18/cx18-queue.c | 13 +- + drivers/media/pci/cx18/cx18-streams.c | 24 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 3 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 4 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 266 ++-- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 4 + + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 8 +- + drivers/media/pci/ivtv/ivtv-queue.c | 18 +- + drivers/media/pci/ivtv/ivtv-streams.c | 22 +- + drivers/media/pci/ivtv/ivtv-udma.c | 19 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 10 +- + drivers/media/pci/ivtv/ivtvfb.c | 8 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 29 +- + drivers/media/pci/pluto2/pluto2.c | 20 +- + drivers/media/pci/pt1/pt1.c | 2 +- + drivers/media/pci/saa7164/saa7164-api.c | 2 - + drivers/media/pci/tw5864/tw5864-core.c | 2 +- + drivers/media/platform/Kconfig | 4 + + drivers/media/platform/am437x/am437x-vpfe.c | 23 +- + drivers/media/platform/aspeed-video.c | 16 +- + drivers/media/platform/atmel/atmel-isc-base.c | 29 +- + drivers/media/platform/atmel/atmel-isc.h | 2 + + drivers/media/platform/atmel/atmel-isi.c | 17 +- + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 54 +- + drivers/media/platform/atmel/atmel-sama7g5-isc.c | 37 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 18 +- + drivers/media/platform/cadence/cdns-csi2tx.c | 4 +- + drivers/media/platform/coda/imx-vdoa.c | 3 +- + drivers/media/platform/davinci/vpbe_venc.c | 9 +- + drivers/media/platform/davinci/vpif.c | 5 +- + drivers/media/platform/davinci/vpif_capture.c | 21 +- + drivers/media/platform/davinci/vpss.c | 10 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 3 +- + drivers/media/platform/exynos4-is/media-dev.c | 20 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 4 +- + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 6 +- + drivers/media/platform/imx-pxp.c | 4 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 9 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 10 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 6 +- + drivers/media/platform/meson/ge2d/ge2d.c | 10 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/mtk-vcodec/Makefile | 3 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 820 ++--------- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 27 +- + .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 65 +- + .../platform/mtk-vcodec/mtk_vcodec_dec_stateful.c | 628 +++++++++ + .../platform/mtk-vcodec/mtk_vcodec_dec_stateless.c | 360 +++++ + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 59 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 148 +- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 69 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 774 ++++++++++ + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 3 + + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 1 + + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 23 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 43 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 5 + + drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 +- + drivers/media/platform/mx2_emmaprp.c | 4 +- + drivers/media/platform/omap3isp/isp.c | 21 +- + drivers/media/platform/pxa_camera.c | 26 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 9 +- + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 28 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 18 +- + drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 17 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 4 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 2 +- + drivers/media/platform/qcom/camss/camss.c | 18 +- + drivers/media/platform/qcom/venus/core.c | 4 +- + drivers/media/platform/rcar-vin/rcar-core.c | 1077 +++++++------- + drivers/media/platform/rcar-vin/rcar-csi2.c | 214 ++- + drivers/media/platform/rcar-vin/rcar-dma.c | 25 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 25 +- + drivers/media/platform/rcar_drif.c | 17 +- + drivers/media/platform/rcar_fdp1.c | 4 +- + drivers/media/platform/rcar_jpu.c | 4 +- + drivers/media/platform/renesas-ceu.c | 33 +- + drivers/media/platform/rockchip/rga/rga.c | 5 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 9 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 44 +- + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 98 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 29 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 557 ++++++-- + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 406 ++++-- + .../media/platform/rockchip/rkisp1/rkisp1-stats.c | 107 +- + drivers/media/platform/s3c-camif/camif-core.c | 6 +- + drivers/media/platform/s5p-g2d/g2d.c | 4 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 9 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 1 - + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 1 - + drivers/media/platform/sti/hva/hva-hw.c | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 37 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 16 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 33 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 2 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 8 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 4 +- + drivers/media/platform/ti-vpe/cal.c | 16 +- + drivers/media/platform/via-camera.c | 6 +- + drivers/media/platform/video-mux.c | 17 +- + drivers/media/platform/vsp1/vsp1_drv.c | 4 +- + drivers/media/platform/xilinx/xilinx-vip.c | 4 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 17 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- + drivers/media/rc/img-ir/img-ir-core.c | 4 +- + drivers/media/rc/imon.c | 2 + + drivers/media/rc/ir-hix5hd2.c | 4 +- + drivers/media/rc/ir_toy.c | 61 +- + drivers/media/rc/mceusb.c | 2 + + drivers/media/rc/meson-ir-tx.c | 1 - + drivers/media/rc/meson-ir.c | 4 +- + drivers/media/rc/mtk-cir.c | 4 +- + drivers/media/rc/st_rc.c | 5 +- + drivers/media/rc/streamzap.c | 1 + + drivers/media/rc/sunxi-cir.c | 4 +- + drivers/media/spi/cxd2880-spi.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 1 + + drivers/media/test-drivers/vim2m.c | 5 - + drivers/media/test-drivers/vimc/vimc-scaler.c | 366 ++--- + drivers/media/test-drivers/vivid/vivid-cec.c | 341 +++-- + drivers/media/test-drivers/vivid/vivid-cec.h | 9 +- + drivers/media/test-drivers/vivid/vivid-core.c | 52 +- + drivers/media/test-drivers/vivid/vivid-core.h | 23 +- + drivers/media/tuners/mxl5007t.c | 9 - + drivers/media/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/em28xx/em28xx-cards.c | 12 +- + 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 | 10 +- + drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 52 + + drivers/staging/media/hantro/hantro_hevc.c | 21 + + drivers/staging/media/hantro/hantro_hw.h | 4 + + drivers/staging/media/imx/TODO | 5 - + drivers/staging/media/imx/imx-media-csi.c | 17 +- + drivers/staging/media/imx/imx-media-dev-common.c | 9 +- + drivers/staging/media/imx/imx-media-dev.c | 6 +- + drivers/staging/media/imx/imx-media-of.c | 6 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 17 +- + drivers/staging/media/imx/imx7-media-csi.c | 24 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 16 +- + drivers/staging/media/imx/imx8mq-mipi-csi2.c | 16 +- + .../staging/media/ipu3/include/uapi/intel-ipu3.h | 7 +- + drivers/staging/media/ipu3/ipu3-css-fw.c | 7 +- + drivers/staging/media/ipu3/ipu3-css-fw.h | 2 +- + drivers/staging/media/meson/vdec/esparser.h | 6 +- + drivers/staging/media/meson/vdec/vdec.c | 7 +- + drivers/staging/media/meson/vdec/vdec.h | 16 +- + drivers/staging/media/meson/vdec/vdec_helpers.h | 3 +- + drivers/staging/media/rkvdec/rkvdec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 8 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 1 + + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 70 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 6 +- + drivers/staging/media/tegra-video/vi.c | 17 +- + include/media/hevc-ctrls.h | 11 + + include/media/i2c/mt9p031.h | 1 + + include/media/tuner.h | 1 + + include/media/v4l2-async.h | 105 +- + include/media/v4l2-fwnode.h | 12 +- + include/media/videobuf2-core.h | 59 +- + include/uapi/linux/v4l2-controls.h | 1 + + include/uapi/linux/videodev2.h | 31 +- + 266 files changed, 8666 insertions(+), 3801 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt + delete mode 100644 Documentation/devicetree/bindings/media/renesas,imr.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,imr.yaml + create mode 100644 Documentation/driver-api/media/drivers/rkisp1.rst + create mode 100644 drivers/media/i2c/ov13b10.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c + create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c + create mode 100644 drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c +Merging v4l-dvb-next/master (c52e7b855b33 Merge tag 'v5.15-rc4' into media_tree) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (d91db9b878c3 Merge branch 'pm-pci' 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.c +Merge made by the 'recursive' strategy. + Documentation/firmware-guide/acpi/osi.rst | 2 +- + arch/x86/kernel/acpi/boot.c | 9 +++ + drivers/acpi/Kconfig | 2 +- + drivers/acpi/acpi_pnp.c | 2 - + drivers/acpi/glue.c | 34 +++++++---- + drivers/acpi/processor_idle.c | 3 +- + drivers/acpi/resource.c | 49 +++++++++++++++- + drivers/idle/intel_idle.c | 13 ++++- + drivers/pci/pci-acpi.c | 77 ++++++++----------------- + drivers/pci/pci-mid.c | 37 +++--------- + drivers/pci/pci.c | 54 +++++++++-------- + drivers/pci/pci.h | 96 ++++++++++++++++++------------- + include/acpi/acpi_bus.h | 1 - + include/acpi/actbl2.h | 1 + + include/linux/pci-acpi.h | 8 +++ + kernel/power/suspend.c | 4 +- + kernel/power/swap.c | 2 +- + 17 files changed, 223 insertions(+), 171 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (c2ace21f937a cpufreq: tegra186/tegra194: Handle errors in BPMP response) +$ 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 +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 +++++++- + 4 files changed, 13 insertions(+), 3 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 (6b28c7d0781e 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 (e69709f6861a opp: Add more resource-managed variants of dev_pm_opp_of_add_table()) +$ 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 +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 6 +++--- + drivers/opp/of.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- + include/linux/pm_opp.h | 20 ++++++++++++++++---- + 3 files changed, 59 insertions(+), 15 deletions(-) +Merging thermal/thermal/linux-next (fc26023f8816 thermal/drivers/int340x: Fix tcc offset on resume) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +CONFLICT (content): Merge conflict in drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +Resolved 'drivers/thermal/intel/int340x_thermal/processor_thermal_device.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d3185d9ef509] Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git +$ git diff -M --stat --summary HEAD^.. + .../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 ++++- + 5 files changed, 60 insertions(+), 11 deletions(-) +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging swiotlb/linux-next (f3c4b1341e83 swiotlb: use depends on for DMA_RESTRICTED_POOL) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git swiotlb/linux-next +Already up to date. +Merging rdma/for-next (d30ef6d5c013 Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux) +$ 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 drivers/infiniband/hw/hfi1/ipoib_tx.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/ipoib_tx.c +Resolved 'drivers/infiniband/hw/hfi1/ipoib_tx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a1f2ee8e1d0f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 19 +- + drivers/infiniband/hw/bnxt_re/hw_counters.c | 277 +++++++++++++++-------- + 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 | 5 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 9 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 51 +++++ + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 28 +++ + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 85 +++++++ + drivers/infiniband/hw/hfi1/ipoib.h | 76 ++++--- + 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/mlx5/cmd.c | 26 +++ + drivers/infiniband/hw/mlx5/cmd.h | 2 + + drivers/infiniband/hw/mlx5/main.c | 55 +++-- + drivers/infiniband/sw/rxe/rxe_comp.c | 12 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 25 +- + 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 | 2 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 14 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 30 ++- + drivers/infiniband/sw/rxe/rxe_queue.h | 292 ++++++++++-------------- + drivers/infiniband/sw/rxe/rxe_req.c | 57 ++--- + drivers/infiniband/sw/rxe/rxe_resp.c | 46 ++-- + drivers/infiniband/sw/rxe/rxe_srq.c | 2 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 97 ++------ + drivers/infiniband/sw/rxe/rxe_verbs.h | 49 ++-- + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 14 +- + include/linux/mlx5/driver.h | 2 - + include/linux/mlx5/mlx5_ifc.h | 4 +- + 38 files changed, 1204 insertions(+), 877 deletions(-) +Merging net-next/master (166003436190 Merge branch 'phy-10g-mode-helper') +$ 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 tools/lib/bpf/libbpf.c +Auto-merging kernel/events/core.c +Auto-merging include/soc/mscc/ocelot_vcap.h +Auto-merging include/net/sock.h +Auto-merging include/linux/perf_event.h +Removing drivers/ptp/idt8a340_reg.h +Auto-merging arch/x86/events/intel/core.c +Removing Documentation/devicetree/bindings/net/lantiq,xrx200-net.txt +Merge made by the 'recursive' strategy. + 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/lantiq,etop-xway.yaml | 69 + + .../devicetree/bindings/net/lantiq,xrx200-net.txt | 21 - + .../devicetree/bindings/net/lantiq,xrx200-net.yaml | 75 + + .../devicetree/bindings/net/renesas,ether.yaml | 17 +- + .../devicetree/bindings/net/renesas,etheravb.yaml | 3 + + .../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/ip-sysctl.rst | 8 - + Documentation/networking/mctp.rst | 59 + + 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/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/infiniband/hw/qedr/main.c | 2 +- + drivers/net/dsa/b53/b53_common.c | 59 +- + drivers/net/dsa/b53/b53_priv.h | 1 - + drivers/net/dsa/bcm_sf2.c | 4 +- + drivers/net/dsa/ocelot/felix.c | 4 +- + drivers/net/dsa/realtek-smi-core.h | 3 - + drivers/net/dsa/rtl8366.c | 96 +- + drivers/net/dsa/rtl8366rb.c | 189 +- + drivers/net/dsa/sja1105/sja1105.h | 2 - + drivers/net/dsa/sja1105/sja1105_main.c | 43 +- + drivers/net/dsa/sja1105/sja1105_ptp.c | 45 +- + drivers/net/dsa/sja1105/sja1105_ptp.h | 19 - + drivers/net/dsa/sja1105/sja1105_vl.c | 12 +- + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/8390/ax88796.c | 6 +- + drivers/net/ethernet/agere/et131x.c | 4 +- + drivers/net/ethernet/alacritech/slicoss.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- + drivers/net/ethernet/arc/emac_mdio.c | 9 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 8 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 6 +- + drivers/net/ethernet/broadcom/b44.c | 4 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 7 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 50 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 13 - + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 60 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 8 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 195 +- + drivers/net/ethernet/brocade/bna/bnad.c | 4 +- + drivers/net/ethernet/cadence/macb.h | 7 +- + drivers/net/ethernet/cadence/macb_main.c | 16 +- + drivers/net/ethernet/cadence/macb_ptp.c | 13 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 27 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + drivers/net/ethernet/cavium/thunder/nic_main.c | 3 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 9 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 +- + drivers/net/ethernet/chelsio/cxgb/subr.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/vsc7326.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 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 | 6 +- + 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 | 2 +- + drivers/net/ethernet/cortina/gemini.c | 4 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 4 +- + drivers/net/ethernet/ethoc.c | 16 +- + drivers/net/ethernet/ezchip/nps_enet.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 4 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-devlink.c | 21 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 9 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 5 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 12 +- + drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 6 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/google/gve/gve.h | 13 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 2 +- + drivers/net/ethernet/google/gve/gve_main.c | 15 +- + drivers/net/ethernet/google/gve/gve_tx.c | 23 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 84 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 5 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 3 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 14 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 46 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 + + .../hisilicon/hns3/hns3vf/hclgevf_devlink.c | 14 +- + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_devlink.h | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 13 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 8 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 12 +- + drivers/net/ethernet/ibm/ibmveth.c | 29 +- + drivers/net/ethernet/ibm/ibmvnic.c | 645 +- + drivers/net/ethernet/ibm/ibmvnic.h | 10 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 + + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 52 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 4 +- + drivers/net/ethernet/intel/ice/ice.h | 6 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 15 + + drivers/net/ethernet/intel/ice/ice_arfs.c | 2 +- + 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 | 7 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 12 + + drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 192 +- + drivers/net/ethernet/intel/ice/ice_devlink.c | 145 +- + drivers/net/ethernet/intel/ice/ice_devlink.h | 2 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 + + drivers/net/ethernet/intel/ice/ice_fdir.c | 2 +- + drivers/net/ethernet/intel/ice/ice_fdir.h | 2 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 47 + + drivers/net/ethernet/intel/ice/ice_lib.h | 2 + + drivers/net/ethernet/intel/ice/ice_main.c | 28 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 34 + + drivers/net/ethernet/intel/ice/ice_txrx.h | 19 +- + drivers/net/ethernet/intel/ice/ice_type.h | 10 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 92 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 23 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 50 +- + .../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 | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 21 +- + drivers/net/ethernet/lantiq_xrx200.c | 85 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 11 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 10 +- + 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 | 126 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 9 +- + .../ethernet/marvell/octeontx2/af/npc_profile.h | 572 +- + 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 | 58 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 12 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 12 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 135 + + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 16 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 211 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 96 + + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 2 + + .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 40 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 16 + + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 21 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 38 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 219 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 125 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 243 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 12 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 7 + + .../ethernet/marvell/prestera/prestera_devlink.c | 35 +- + .../ethernet/marvell/prestera/prestera_devlink.h | 4 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 10 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 86 +- + drivers/net/ethernet/mellanox/mlx4/cq.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 8 + + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- + 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/main.c | 11 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 + + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 23 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 27 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.h | 27 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 14 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 92 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 113 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +- + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 2 + + .../mellanox/mlx5/core/steering/dr_action.c | 19 +- + .../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 | 2 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 2 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 88 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 2 - + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 183 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 13 + + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 30 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 263 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 6 - + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 326 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 10 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 432 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 27 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 315 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 6 +- + drivers/net/ethernet/micrel/ks8851_common.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 7 +- + drivers/net/ethernet/microchip/enc28j60.c | 4 +- + drivers/net/ethernet/microchip/encx24j600.c | 1 - + drivers/net/ethernet/microchip/lan743x_main.c | 4 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 3 +- + .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 2 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 2 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 125 +- + drivers/net/ethernet/mscc/ocelot_net.c | 4 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 9 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 2 +- + drivers/net/ethernet/netronome/nfp/devlink_param.c | 9 +- + 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 | 2 +- + drivers/net/ethernet/nxp/lpc_eth.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 1 + + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 2 - + 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 | 9 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 38 - + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 74 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 45 - + drivers/net/ethernet/pensando/ionic/ionic_main.c | 53 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 121 - + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 14 - + 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 | 1394 +- + drivers/net/ethernet/qlogic/qed/qed_debug.h | 7 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 122 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 345 +- + 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 | 41 +- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 135 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 64 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 131 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 21 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 64 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 763 +- + drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h | 2474 +++ + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 7 +- + 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 | 200 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 126 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 11 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 307 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 51 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 21 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- + drivers/net/ethernet/realtek/r8169.h | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 41 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 59 - + drivers/net/ethernet/renesas/ravb.h | 39 +- + drivers/net/ethernet/renesas/ravb_main.c | 452 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/seeq/sgiseeq.c | 2 +- + drivers/net/ethernet/sfc/ef100_nic.c | 2 +- + drivers/net/ethernet/sfc/ef10_sriov.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/efx_common.c | 4 +- + drivers/net/ethernet/sfc/falcon/efx.c | 6 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 2 +- + drivers/net/ethernet/sgi/meth.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 4 +- + drivers/net/ethernet/smsc/smsc9420.c | 6 +- + drivers/net/ethernet/socionext/netsec.c | 23 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- + drivers/net/ethernet/sun/niu.c | 4 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 8 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 2 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 24 +- + drivers/net/ethernet/ti/cpsw.c | 6 +- + drivers/net/ethernet/ti/cpsw_new.c | 17 +- + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/wiznet/w5100.c | 4 +- + drivers/net/ethernet/wiznet/w5300.c | 4 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/fddi/defxx.c | 6 +- + drivers/net/fddi/skfp/skfddi.c | 7 +- + drivers/net/hyperv/netvsc_drv.c | 2 +- + drivers/net/ipvlan/ipvlan_main.c | 4 +- + drivers/net/macsec.c | 2 +- + drivers/net/macvlan.c | 4 +- + drivers/net/netdevsim/dev.c | 12 +- + drivers/net/netdevsim/ethtool.c | 28 + + drivers/net/netdevsim/health.c | 32 - + drivers/net/netdevsim/netdevsim.h | 1 + + drivers/net/phy/at803x.c | 58 +- + drivers/net/phy/bcm7xxx.c | 201 + + drivers/net/phy/broadcom.c | 106 +- + drivers/net/phy/marvell10g.c | 107 +- + drivers/net/phy/micrel.c | 74 + + drivers/net/phy/phylink.c | 16 +- + drivers/net/usb/aqc111.c | 2 +- + 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 | 4 +- + drivers/net/usb/dm9601.c | 2 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kalmia.c | 2 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/sr9800.c | 2 +- + drivers/net/virtio_net.c | 26 +- + 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/nfc/fdp/i2c.c | 1 - + drivers/nfc/microread/mei.c | 4 +- + drivers/nfc/nfcmrvl/fw_dnld.c | 4 +- + drivers/nfc/pn533/i2c.c | 4 - + drivers/nfc/pn533/pn533.c | 4 +- + drivers/nfc/pn544/mei.c | 8 +- + drivers/ptp/idt8a340_reg.h | 720 - + drivers/ptp/ptp_clockmatrix.c | 1588 +- + drivers/ptp/ptp_clockmatrix.h | 109 +- + drivers/ptp/ptp_ocp.c | 1354 +- + drivers/s390/net/ctcm_fsms.c | 60 +- + drivers/s390/net/ctcm_main.c | 38 +- + drivers/s390/net/ctcm_mpc.c | 8 +- + drivers/s390/net/fsm.c | 2 +- + drivers/s390/net/ism_drv.c | 2 +- + drivers/s390/net/lcs.c | 121 +- + drivers/s390/net/netiucv.c | 104 +- + 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/staging/qlge/qlge_main.c | 12 +- + include/linux/bpf.h | 7 +- + include/linux/brcmphy.h | 10 + + include/linux/dsa/ocelot.h | 4 +- + include/linux/dsa/sja1105.h | 41 +- + include/linux/etherdevice.h | 2 +- + include/linux/filter.h | 7 +- + include/linux/mfd/idt8a340_reg.h | 31 +- + include/linux/micrel_phy.h | 1 + + include/linux/perf_event.h | 23 + + include/linux/phylink.h | 1 + + 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 | 21 +- + include/linux/qed/qed_if.h | 263 +- + 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/rdma_common.h | 1 + + include/linux/soc/marvell/octeontx2/asm.h | 14 + + include/linux/socket.h | 1 + + include/net/devlink.h | 26 +- + include/net/ioam6.h | 3 +- + include/net/ip.h | 6 +- + include/net/mctp.h | 56 +- + include/net/mctpdevice.h | 5 + + include/net/mptcp.h | 4 + + include/net/sch_generic.h | 6 + + include/net/sock.h | 64 +- + include/net/tcp.h | 24 +- + include/net/tls.h | 3 +- + include/net/xdp.h | 8 +- + include/net/xdp_sock_drv.h | 22 + + include/net/xsk_buff_pool.h | 48 +- + include/soc/mscc/ocelot_vcap.h | 10 + + 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/devlink.h | 2 + + include/uapi/linux/ioam6_iptunnel.h | 29 + + include/uapi/linux/mptcp.h | 35 + + include/uapi/linux/smc.h | 27 + + include/uapi/linux/tls.h | 30 + + 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/test_bpf.c | 17182 ++++++++++++------- + net/8021q/vlan_dev.c | 6 +- + net/Kconfig | 2 +- + net/bpf/test_run.c | 22 +- + net/bridge/br_ioctl.c | 8 +- + net/bridge/br_stp_if.c | 2 +- + net/core/dev.c | 25 +- + net/core/devlink.c | 399 +- + net/core/filter.c | 21 + + net/core/flow_dissector.c | 3 +- + net/core/net_namespace.c | 4 + + net/core/rtnetlink.c | 4 +- + net/core/skbuff.c | 27 +- + net/core/sock.c | 69 + + net/core/stream.c | 2 +- + net/dsa/Kconfig | 1 - + net/dsa/dsa2.c | 15 +- + net/dsa/slave.c | 4 +- + net/dsa/tag_8021q.c | 1 - + net/dsa/tag_ksz.c | 1 - + net/dsa/tag_ocelot.c | 39 + + net/dsa/tag_rtl4_a.c | 2 +- + net/dsa/tag_sja1105.c | 43 + + net/ethernet/eth.c | 2 +- + net/ethtool/ioctl.c | 16 +- + net/hsr/hsr_device.c | 2 +- + net/hsr/hsr_main.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/route.c | 8 - + net/ipv4/syncookies.c | 2 - + net/ipv4/sysctl_net_ipv4.c | 21 - + net/ipv4/tcp.c | 38 +- + net/ipv4/tcp_fastopen.c | 6 - + net/ipv4/tcp_input.c | 37 +- + net/ipv4/tcp_ipv4.c | 6 - + net/ipv4/tcp_minisocks.c | 7 - + net/ipv4/tcp_nv.c | 1 - + net/ipv4/tcp_output.c | 5 +- + net/ipv4/tcp_rate.c | 6 + + net/ipv4/udp_tunnel_core.c | 3 - + net/ipv6/Kconfig | 6 +- + net/ipv6/Makefile | 11 +- + 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/seg6.c | 8 +- + net/ipv6/seg6_hmac.c | 4 +- + net/ipv6/tcp_ipv6.c | 6 - + net/mctp/Kconfig | 5 + + net/mctp/Makefile | 3 + + net/mctp/af_mctp.c | 66 +- + net/mctp/device.c | 53 +- + net/mctp/neigh.c | 4 +- + net/mctp/route.c | 195 +- + 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/protocol.c | 212 +- + net/mptcp/protocol.h | 1 - + net/mptcp/sockopt.c | 276 + + net/nfc/hci/llc_shdlc.c | 23 +- + net/qrtr/Makefile | 3 +- + net/qrtr/{qrtr.c => af_qrtr.c} | 0 + net/rxrpc/rtt.c | 2 +- + net/sched/sch_api.c | 7 +- + net/sched/sch_generic.c | 33 + + net/sched/sch_mq.c | 1 + + net/sched/sch_mqprio.c | 1 + + net/sched/sch_netem.c | 2 +- + net/smc/af_smc.c | 34 +- + net/smc/smc.h | 3 - + net/smc/smc_clc.c | 330 +- + net/smc/smc_clc.h | 19 +- + net/smc/smc_core.c | 10 +- + net/smc/smc_core.h | 1 + + net/smc/smc_ism.c | 16 +- + net/smc/smc_ism.h | 2 +- + net/smc/smc_netlink.c | 47 +- + net/smc/smc_netlink.h | 2 + + net/tls/tls_main.c | 46 + + net/tls/tls_sw.c | 54 +- + 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/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 + + tools/testing/selftests/net/ioam6.sh | 209 +- + tools/testing/selftests/net/mptcp/.gitignore | 1 + + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 683 + + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 31 +- + 755 files changed, 45185 insertions(+), 24239 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-timecard + create mode 100644 Documentation/bpf/bpf_licensing.rst + create mode 100644 Documentation/devicetree/bindings/net/lantiq,etop-xway.yaml + delete mode 100644 Documentation/devicetree/bindings/net/lantiq,xrx200-net.txt + create mode 100644 Documentation/devicetree/bindings/net/lantiq,xrx200-net.yaml + create mode 100644 Documentation/networking/devlink/iosm.rst + 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 + 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 + create mode 100644 include/trace/events/mctp.h + 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/netdevsim/tc-mq-visibility.sh + create mode 100644 tools/testing/selftests/net/mptcp/mptcp_sockopt.c +$ git reset --hard HEAD^ +HEAD is now at a1f2ee8e1d0f Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git +Merging next-20211001 version of net-next +$ git merge -m next-20211001/net-next 129291980f4901ae68ee3ba4344bdc38cf5f800d +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging kernel/events/core.c +Auto-merging include/net/sock.h +Auto-merging include/linux/perf_event.h +Removing drivers/ptp/idt8a340_reg.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h +Auto-merging arch/x86/events/intel/core.c +Removing Documentation/devicetree/bindings/net/lantiq,xrx200-net.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-timecard | 174 +++ + Documentation/bpf/btf.rst | 29 +- + .../devicetree/bindings/net/lantiq,etop-xway.yaml | 69 + + .../devicetree/bindings/net/lantiq,xrx200-net.txt | 21 - + .../devicetree/bindings/net/lantiq,xrx200-net.yaml | 75 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/devlink/iosm.rst | 182 +++ + Documentation/networking/ip-sysctl.rst | 8 - + Documentation/networking/mctp.rst | 59 + + arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 2 +- + arch/mips/lantiq/xway/dma.c | 57 +- + arch/x86/events/intel/core.c | 67 +- + arch/x86/events/intel/ds.c | 2 +- + arch/x86/events/intel/lbr.c | 20 +- + arch/x86/events/perf_event.h | 19 + + arch/x86/net/bpf_jit_comp.c | 53 +- + drivers/net/dsa/b53/b53_common.c | 59 +- + drivers/net/dsa/b53/b53_priv.h | 1 - + drivers/net/dsa/bcm_sf2.c | 4 +- + drivers/net/dsa/ocelot/felix.c | 4 +- + drivers/net/dsa/realtek-smi-core.h | 3 - + drivers/net/dsa/rtl8366.c | 96 +- + drivers/net/dsa/rtl8366rb.c | 189 ++- + drivers/net/dsa/sja1105/sja1105.h | 2 - + drivers/net/dsa/sja1105/sja1105_main.c | 43 +- + drivers/net/dsa/sja1105/sja1105_ptp.c | 45 +- + drivers/net/dsa/sja1105/sja1105_ptp.h | 19 - + drivers/net/dsa/sja1105/sja1105_vl.c | 12 +- + drivers/net/ethernet/arc/emac_mdio.c | 9 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 8 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 6 +- + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 50 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 13 - + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 56 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 8 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 195 ++- + drivers/net/ethernet/cadence/macb.h | 7 +- + drivers/net/ethernet/cadence/macb_main.c | 9 +- + drivers/net/ethernet/cadence/macb_ptp.c | 13 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 25 +- + drivers/net/ethernet/cavium/thunder/nic_main.c | 3 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 6 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 +- + drivers/net/ethernet/chelsio/cxgb/vsc7326.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 6 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 4 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- + drivers/net/ethernet/ethoc.c | 12 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-devlink.c | 21 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 9 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 5 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 5 + + drivers/net/ethernet/freescale/enetc/enetc.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 12 +- + drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 6 +- + drivers/net/ethernet/google/gve/gve.h | 13 +- + drivers/net/ethernet/google/gve/gve_main.c | 15 +- + drivers/net/ethernet/google/gve/gve_tx.c | 23 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 84 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 5 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 3 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 14 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 46 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 + + .../hisilicon/hns3/hns3vf/hclgevf_devlink.c | 14 +- + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_devlink.h | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 13 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 6 +- + drivers/net/ethernet/ibm/emac/core.c | 12 +- + drivers/net/ethernet/ibm/ibmveth.c | 25 +- + drivers/net/ethernet/ibm/ibmvnic.c | 640 +++++--- + drivers/net/ethernet/ibm/ibmvnic.h | 10 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 + + drivers/net/ethernet/intel/ice/ice.h | 6 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 15 + + drivers/net/ethernet/intel/ice/ice_arfs.c | 2 +- + 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 | 7 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 12 + + drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 192 ++- + drivers/net/ethernet/intel/ice/ice_devlink.c | 145 +- + drivers/net/ethernet/intel/ice/ice_devlink.h | 2 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 + + drivers/net/ethernet/intel/ice/ice_fdir.c | 2 +- + drivers/net/ethernet/intel/ice/ice_fdir.h | 2 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 47 + + drivers/net/ethernet/intel/ice/ice_lib.h | 2 + + drivers/net/ethernet/intel/ice/ice_main.c | 24 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 34 + + drivers/net/ethernet/intel/ice/ice_txrx.h | 3 + + drivers/net/ethernet/intel/ice/ice_type.h | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 23 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 50 +- + .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 16 +- + drivers/net/ethernet/lantiq_etop.c | 21 +- + drivers/net/ethernet/lantiq_xrx200.c | 85 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 10 +- + 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 | 126 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 9 +- + .../ethernet/marvell/octeontx2/af/npc_profile.h | 572 ++----- + 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 | 58 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 12 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 12 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 135 ++ + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 16 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 211 ++- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 96 ++ + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 2 + + .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 38 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 16 + + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 21 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 38 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 219 ++- + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 125 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 243 ++- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 12 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 7 + + .../ethernet/marvell/prestera/prestera_devlink.c | 35 +- + .../ethernet/marvell/prestera/prestera_devlink.h | 4 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 8 +- + drivers/net/ethernet/marvell/sky2.c | 84 +- + drivers/net/ethernet/mellanox/mlx4/cq.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 8 + + drivers/net/ethernet/mellanox/mlx4/en_port.c | 4 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 15 + + drivers/net/ethernet/mellanox/mlx4/main.c | 11 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 + + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 27 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.h | 27 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 14 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 92 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 113 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 + + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 2 + + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 88 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 2 - + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 183 ++- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 13 + + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 30 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 263 +++- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 6 - + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 326 ++-- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 10 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 432 +++++- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 27 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 315 ++-- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 6 +- + drivers/net/ethernet/microchip/encx24j600.c | 1 - + .../net/ethernet/microchip/sparx5/sparx5_main.c | 3 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 9 +- + drivers/net/ethernet/netronome/nfp/devlink_param.c | 9 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 9 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 3 +- + .../net/ethernet/pensando/ionic/ionic_devlink.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 12 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 23 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 47 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 12 +- + drivers/net/ethernet/realtek/r8169.h | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 41 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 59 - + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/smsc/smsc9420.c | 6 +- + drivers/net/ethernet/socionext/netsec.c | 21 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 + + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 2 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 22 +- + drivers/net/ethernet/ti/cpsw_new.c | 13 +- + drivers/net/fddi/defxx.c | 6 +- + drivers/net/fddi/skfp/skfddi.c | 2 +- + drivers/net/netdevsim/dev.c | 12 +- + drivers/net/netdevsim/ethtool.c | 28 + + drivers/net/netdevsim/health.c | 32 - + drivers/net/netdevsim/netdevsim.h | 1 + + drivers/net/phy/at803x.c | 58 +- + drivers/net/phy/bcm7xxx.c | 201 +++ + drivers/net/phy/broadcom.c | 106 +- + drivers/net/phy/marvell10g.c | 107 +- + drivers/net/phy/micrel.c | 74 + + drivers/net/phy/phylink.c | 5 +- + drivers/net/virtio_net.c | 26 +- + 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 | 372 +++++ + drivers/net/wwan/iosm/iosm_ipc_devlink.h | 189 +++ + drivers/net/wwan/iosm/iosm_ipc_flash.c | 588 ++++++++ + 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/nfc/fdp/i2c.c | 1 - + drivers/nfc/microread/mei.c | 4 +- + drivers/nfc/nfcmrvl/fw_dnld.c | 4 +- + drivers/nfc/pn533/i2c.c | 4 - + drivers/nfc/pn533/pn533.c | 4 +- + drivers/nfc/pn544/mei.c | 8 +- + drivers/ptp/idt8a340_reg.h | 720 --------- + drivers/ptp/ptp_clockmatrix.c | 1588 +++++++++++--------- + drivers/ptp/ptp_clockmatrix.h | 109 +- + drivers/ptp/ptp_ocp.c | 1354 +++++++++++++++-- + drivers/s390/net/ctcm_fsms.c | 60 +- + drivers/s390/net/ctcm_main.c | 38 +- + drivers/s390/net/ctcm_mpc.c | 8 +- + drivers/s390/net/fsm.c | 2 +- + drivers/s390/net/ism_drv.c | 2 +- + drivers/s390/net/lcs.c | 121 +- + drivers/s390/net/netiucv.c | 104 +- + drivers/scsi/qedf/qedf_main.c | 2 + + drivers/staging/qlge/qlge_main.c | 12 +- + include/linux/brcmphy.h | 10 + + include/linux/dsa/sja1105.h | 41 +- + include/linux/mfd/idt8a340_reg.h | 31 +- + include/linux/micrel_phy.h | 1 + + include/linux/perf_event.h | 23 + + include/linux/qed/qed_eth_if.h | 21 +- + include/linux/soc/marvell/octeontx2/asm.h | 14 + + include/linux/socket.h | 1 + + include/net/devlink.h | 26 +- + include/net/ip.h | 6 +- + include/net/mctp.h | 56 +- + include/net/mctpdevice.h | 5 + + include/net/mptcp.h | 4 + + include/net/sch_generic.h | 6 + + include/net/sock.h | 64 +- + include/net/tcp.h | 24 +- + include/net/tls.h | 3 +- + include/trace/events/mctp.h | 75 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 26 +- + include/uapi/linux/btf.h | 55 +- + include/uapi/linux/mptcp.h | 35 + + include/uapi/linux/smc.h | 27 + + include/uapi/linux/tls.h | 30 + + kernel/bpf/btf.c | 128 ++ + kernel/bpf/trampoline.c | 3 +- + kernel/events/core.c | 2 + + kernel/trace/bpf_trace.c | 30 + + lib/test_bpf.c | 1 + + net/bpf/test_run.c | 16 +- + net/bridge/br_ioctl.c | 8 +- + net/core/dev.c | 20 +- + net/core/devlink.c | 394 ++--- + net/core/filter.c | 21 + + net/core/flow_dissector.c | 3 +- + net/core/net_namespace.c | 4 + + net/core/rtnetlink.c | 4 +- + net/core/skbuff.c | 27 +- + net/core/sock.c | 69 + + net/core/stream.c | 2 +- + net/dsa/Kconfig | 1 - + net/dsa/dsa2.c | 15 +- + net/dsa/tag_8021q.c | 1 - + net/dsa/tag_ksz.c | 1 - + net/dsa/tag_rtl4_a.c | 2 +- + net/dsa/tag_sja1105.c | 43 + + net/ethtool/ioctl.c | 16 +- + 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/route.c | 8 - + net/ipv4/syncookies.c | 2 - + net/ipv4/sysctl_net_ipv4.c | 21 - + net/ipv4/tcp.c | 38 +- + net/ipv4/tcp_fastopen.c | 6 - + net/ipv4/tcp_input.c | 37 +- + net/ipv4/tcp_ipv4.c | 6 - + net/ipv4/tcp_minisocks.c | 7 - + net/ipv4/tcp_nv.c | 1 - + net/ipv4/tcp_output.c | 5 +- + net/ipv4/tcp_rate.c | 6 + + net/ipv4/udp_tunnel_core.c | 3 - + net/ipv6/Makefile | 11 +- + net/ipv6/ila/ila_xlat.c | 6 +- + net/ipv6/seg6.c | 8 +- + net/ipv6/seg6_hmac.c | 4 +- + net/ipv6/tcp_ipv6.c | 6 - + net/mctp/af_mctp.c | 66 +- + net/mctp/device.c | 53 +- + net/mctp/neigh.c | 4 +- + net/mctp/route.c | 190 ++- + net/mptcp/mib.c | 17 +- + net/mptcp/mptcp_diag.c | 26 +- + net/mptcp/options.c | 15 +- + net/mptcp/protocol.c | 212 +-- + net/mptcp/protocol.h | 1 - + net/mptcp/sockopt.c | 276 ++++ + net/nfc/hci/llc_shdlc.c | 23 +- + net/qrtr/Makefile | 3 +- + net/qrtr/{qrtr.c => af_qrtr.c} | 0 + net/rxrpc/rtt.c | 2 +- + net/sched/sch_api.c | 7 +- + net/sched/sch_generic.c | 33 + + net/sched/sch_mq.c | 1 + + net/sched/sch_mqprio.c | 1 + + net/sched/sch_netem.c | 2 +- + net/smc/af_smc.c | 34 +- + net/smc/smc.h | 3 - + net/smc/smc_clc.c | 330 +++- + net/smc/smc_clc.h | 19 +- + net/smc/smc_core.c | 10 +- + net/smc/smc_core.h | 1 + + net/smc/smc_ism.c | 16 +- + net/smc/smc_ism.h | 2 +- + net/smc/smc_netlink.c | 47 +- + net/smc/smc_netlink.h | 2 + + net/tls/tls_main.c | 46 + + net/tls/tls_sw.c | 54 +- + tools/bpf/bpftool/Makefile | 3 + + tools/bpf/bpftool/btf.c | 12 + + tools/bpf/bpftool/gen.c | 31 +- + tools/bpf/resolve_btfids/Makefile | 5 +- + tools/include/uapi/linux/bpf.h | 26 +- + tools/include/uapi/linux/btf.h | 55 +- + tools/lib/bpf/.gitignore | 1 - + tools/lib/bpf/Makefile | 39 +- + tools/lib/bpf/btf.c | 84 +- + tools/lib/bpf/btf.h | 87 ++ + tools/lib/bpf/btf_dump.c | 3 + + tools/lib/bpf/libbpf.c | 431 ++++-- + tools/lib/bpf/libbpf.h | 41 +- + tools/lib/bpf/libbpf.map | 5 + + tools/lib/bpf/libbpf_common.h | 24 + + tools/lib/bpf/libbpf_internal.h | 27 +- + tools/lib/bpf/libbpf_version.h | 9 + + tools/lib/bpf/xsk.c | 4 +- + tools/testing/selftests/bpf/.gitignore | 5 +- + tools/testing/selftests/bpf/Makefile | 4 +- + tools/testing/selftests/bpf/README.rst | 14 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 19 +- + tools/testing/selftests/bpf/btf_helpers.c | 7 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 6 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 441 +++++- + tools/testing/selftests/bpf/prog_tests/btf_tag.c | 20 + + tools/testing/selftests/bpf/prog_tests/btf_write.c | 21 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 17 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 43 +- + .../selftests/bpf/prog_tests/get_branch_snapshot.c | 100 ++ + .../selftests/bpf/prog_tests/module_attach.c | 39 - + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 6 + + tools/testing/selftests/bpf/prog_tests/skeleton.c | 6 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 25 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_cubic.c | 12 +- + .../selftests/bpf/progs/get_branch_snapshot.c | 40 + + tools/testing/selftests/bpf/progs/tag.c | 49 + + tools/testing/selftests/bpf/progs/tailcall6.c | 34 + + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 6 + + tools/testing/selftests/bpf/test_btf.h | 3 + + tools/testing/selftests/bpf/test_progs.c | 39 + + tools/testing/selftests/bpf/test_progs.h | 2 + + tools/testing/selftests/bpf/trace_helpers.c | 37 + + tools/testing/selftests/bpf/trace_helpers.h | 5 + + tools/testing/selftests/bpf/verifier/ctx_skb.c | 60 + + tools/testing/selftests/bpf/verifier/jit.c | 22 +- + tools/testing/selftests/bpf/xdpxceiver.c | 872 +++++++---- + tools/testing/selftests/bpf/xdpxceiver.h | 66 +- + .../drivers/net/netdevsim/ethtool-common.sh | 2 +- + .../drivers/net/netdevsim/tc-mq-visibility.sh | 77 + + tools/testing/selftests/net/fib_nexthops.sh | 1 + + tools/testing/selftests/net/mptcp/.gitignore | 1 + + tools/testing/selftests/net/mptcp/Makefile | 2 +- + tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 683 +++++++++ + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 31 +- + 395 files changed, 15806 insertions(+), 6256 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-timecard + create mode 100644 Documentation/devicetree/bindings/net/lantiq,etop-xway.yaml + delete mode 100644 Documentation/devicetree/bindings/net/lantiq,xrx200-net.txt + create mode 100644 Documentation/devicetree/bindings/net/lantiq,xrx200-net.yaml + create mode 100644 Documentation/networking/devlink/iosm.rst + 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 + create mode 100644 include/trace/events/mctp.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/progs/get_branch_snapshot.c + create mode 100644 tools/testing/selftests/bpf/progs/tag.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall6.c + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh + create mode 100644 tools/testing/selftests/net/mptcp/mptcp_sockopt.c +$ git am -3 ../patches/0001-fix-up-for-net-add-new-socket-option-SO_RESERVE_MEM.patch +Applying: fix up for "net: add new socket option SO_RESERVE_MEM" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/alpha/include/uapi/asm/socket.h +M arch/mips/include/uapi/asm/socket.h +M arch/parisc/include/uapi/asm/socket.h +M arch/sparc/include/uapi/asm/socket.h +$ git add -A . +$ git commit -v -a --amend +[master 96958d6c3597] next-20211001/net-next + Date: Tue Oct 5 11:51:14 2021 +1100 +Merging bpf-next/for-next (0693b27644f0 Merge branch 'mctp-kunit-tests') +$ 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/lib/bpf/libbpf.c +Auto-merging include/soc/mscc/ocelot_vcap.h +Auto-merging arch/sparc/include/uapi/asm/socket.h +CONFLICT (content): Merge conflict in arch/sparc/include/uapi/asm/socket.h +Recorded preimage for 'arch/sparc/include/uapi/asm/socket.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/sparc/include/uapi/asm/socket.h'. +[master 16a8ed79df98] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/bpf_licensing.rst | 92 + + Documentation/bpf/index.rst | 9 + + .../devicetree/bindings/net/renesas,ether.yaml | 17 +- + .../devicetree/bindings/net/renesas,etheravb.yaml | 3 + + .../networking/devlink/devlink-region.rst | 4 +- + Documentation/networking/devlink/ice.rst | 4 + + Documentation/networking/devlink/iosm.rst | 32 +- + arch/m68k/emu/nfeth.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/8390/ax88796.c | 6 +- + drivers/net/ethernet/agere/et131x.c | 4 +- + drivers/net/ethernet/alacritech/slicoss.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 7 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/brocade/bna/bnad.c | 4 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 3 +- + drivers/net/ethernet/chelsio/cxgb/subr.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 3 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- + drivers/net/ethernet/cirrus/mac89x0.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 4 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 4 +- + drivers/net/ethernet/ethoc.c | 4 +- + drivers/net/ethernet/ezchip/nps_enet.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 4 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/ibm/ibmveth.c | 4 +- + drivers/net/ethernet/ibm/ibmvnic.c | 5 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 52 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 4 +- + drivers/net/ethernet/intel/ice/ice_main.c | 4 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 16 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 92 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 2 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 +- + .../mellanox/mlx5/core/steering/dr_action.c | 19 +- + .../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 | 18 +- + .../mellanox/mlx5/core/steering/dr_types.h | 47 +- + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 2 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 2 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- + drivers/net/ethernet/micrel/ks8851_common.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 7 +- + drivers/net/ethernet/microchip/enc28j60.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.c | 4 +- + .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 2 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 2 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 125 +- + drivers/net/ethernet/mscc/ocelot_net.c | 4 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 2 +- + drivers/net/ethernet/ni/nixge.c | 2 +- + drivers/net/ethernet/nvidia/forcedeth.c | 2 +- + drivers/net/ethernet/nxp/lpc_eth.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 1 + + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 2 - + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 1 - + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 4 - + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 38 - + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 74 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 45 - + drivers/net/ethernet/pensando/ionic/ionic_main.c | 53 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 121 - + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 14 - + drivers/net/ethernet/qlogic/qede/qede_filter.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- + drivers/net/ethernet/renesas/ravb.h | 39 +- + drivers/net/ethernet/renesas/ravb_main.c | 452 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/seeq/sgiseeq.c | 2 +- + drivers/net/ethernet/sfc/ef100_nic.c | 2 +- + drivers/net/ethernet/sfc/ef10_sriov.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/efx_common.c | 4 +- + drivers/net/ethernet/sfc/falcon/efx.c | 6 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 2 +- + drivers/net/ethernet/sgi/meth.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 4 +- + drivers/net/ethernet/socionext/netsec.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/sun/niu.c | 4 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 8 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 6 +- + drivers/net/ethernet/ti/cpsw_new.c | 4 +- + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/wiznet/w5100.c | 4 +- + drivers/net/ethernet/wiznet/w5300.c | 4 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/fddi/skfp/skfddi.c | 5 +- + drivers/net/hyperv/netvsc_drv.c | 2 +- + drivers/net/ipvlan/ipvlan_main.c | 4 +- + drivers/net/macsec.c | 2 +- + drivers/net/macvlan.c | 4 +- + drivers/net/usb/aqc111.c | 2 +- + 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 | 4 +- + drivers/net/usb/dm9601.c | 2 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kalmia.c | 2 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/sr9800.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_devlink.c | 81 +- + drivers/net/wwan/iosm/iosm_ipc_devlink.h | 44 +- + drivers/net/wwan/iosm/iosm_ipc_flash.c | 42 +- + include/linux/bpf.h | 7 +- + include/linux/dsa/ocelot.h | 4 +- + include/linux/etherdevice.h | 2 +- + include/linux/filter.h | 7 +- + include/net/xdp.h | 8 +- + include/net/xdp_sock_drv.h | 22 + + include/net/xsk_buff_pool.h | 48 +- + include/soc/mscc/ocelot_vcap.h | 10 + + include/uapi/linux/bpf.h | 16 +- + include/uapi/linux/devlink.h | 2 + + kernel/bpf/arraymap.c | 7 +- + kernel/bpf/core.c | 5 + + kernel/bpf/hashtab.c | 13 +- + kernel/bpf/helpers.c | 11 +- + kernel/bpf/verifier.c | 123 +- + kernel/trace/bpf_trace.c | 54 +- + lib/test_bpf.c | 17181 ++++++++++++------- + net/8021q/vlan_dev.c | 6 +- + net/Kconfig | 2 +- + net/bpf/test_run.c | 6 +- + net/bridge/br_stp_if.c | 2 +- + net/core/dev.c | 5 +- + net/core/devlink.c | 5 + + net/dsa/slave.c | 4 +- + net/dsa/tag_ocelot.c | 39 + + net/ethernet/eth.c | 2 +- + net/hsr/hsr_device.c | 2 +- + net/hsr/hsr_main.c | 2 +- + net/mctp/Kconfig | 5 + + net/mctp/Makefile | 3 + + net/mctp/route.c | 5 + + net/mctp/test/route-test.c | 544 + + net/mctp/test/utils.c | 67 + + net/mctp/test/utils.h | 20 + + 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/feature.c | 1 + + tools/bpf/bpftool/gen.c | 5 +- + tools/include/uapi/linux/bpf.h | 16 +- + tools/lib/bpf/bpf_helpers.h | 51 +- + tools/lib/bpf/gen_loader.c | 7 +- + tools/lib/bpf/libbpf.c | 846 +- + tools/lib/bpf/libbpf.h | 67 +- + tools/lib/bpf/libbpf_internal.h | 7 + + tools/lib/bpf/libbpf_legacy.h | 9 + + tools/lib/bpf/skel_internal.h | 6 +- + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/README.rst | 13 + + .../selftests/bpf/prog_tests/attach_probe.c | 24 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 27 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 4 +- + .../selftests/bpf/prog_tests/get_branch_snapshot.c | 5 +- + .../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 +- + .../selftests/bpf/prog_tests/sockopt_multi.c | 30 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 58 +- + .../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_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 +- + 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/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 | 6 +- + .../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 +- + .../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 +- + .../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/verifier/spill_fill.c | 161 + + tools/testing/selftests/bpf/xdping.c | 5 +- + tools/testing/selftests/bpf/xdpxceiver.c | 133 +- + tools/testing/selftests/bpf/xdpxceiver.h | 11 +- + .../drivers/net/ocelot/tc_flower_chains.sh | 50 +- + 332 files changed, 15604 insertions(+), 7631 deletions(-) + create mode 100644 Documentation/bpf/bpf_licensing.rst + 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 + 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/trace_vprintk.c + create mode 100644 tools/testing/selftests/bpf/progs/xdpwall.c +$ git reset --hard HEAD^ +HEAD is now at 96958d6c3597 next-20211001/net-next +Merging next-20211001 version of bpf-next +$ git merge -m next-20211001/bpf-next 6bbc7103738f0e0871a9331351ee3cd4d462b431 +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging net/bpf/test_run.c +Auto-merging kernel/bpf/core.c +Auto-merging include/linux/bpf.h +Auto-merging drivers/net/ethernet/intel/ice/ice_txrx.h +Merge made by the 'recursive' strategy. + Documentation/bpf/bpf_licensing.rst | 92 + + Documentation/bpf/index.rst | 9 + + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 52 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 16 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 92 +- + include/linux/bpf.h | 7 +- + include/linux/filter.h | 7 +- + include/net/xdp.h | 8 +- + include/net/xdp_sock_drv.h | 22 + + include/net/xsk_buff_pool.h | 48 +- + include/uapi/linux/bpf.h | 16 +- + kernel/bpf/arraymap.c | 7 +- + kernel/bpf/core.c | 5 + + kernel/bpf/hashtab.c | 13 +- + kernel/bpf/helpers.c | 11 +- + kernel/bpf/verifier.c | 123 +- + kernel/trace/bpf_trace.c | 54 +- + lib/test_bpf.c | 14182 ++++++++++++------- + net/bpf/test_run.c | 6 +- + 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/feature.c | 1 + + tools/bpf/bpftool/gen.c | 5 +- + tools/include/uapi/linux/bpf.h | 16 +- + tools/lib/bpf/bpf_helpers.h | 51 +- + tools/lib/bpf/gen_loader.c | 7 +- + tools/lib/bpf/libbpf.c | 822 +- + tools/lib/bpf/libbpf.h | 67 +- + tools/lib/bpf/libbpf_internal.h | 7 + + tools/lib/bpf/libbpf_legacy.h | 9 + + tools/lib/bpf/skel_internal.h | 6 +- + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/README.rst | 13 + + .../selftests/bpf/prog_tests/attach_probe.c | 24 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 27 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 4 +- + .../selftests/bpf/prog_tests/get_branch_snapshot.c | 5 +- + .../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 +- + .../selftests/bpf/prog_tests/sockopt_multi.c | 30 +- + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 58 +- + .../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_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 +- + .../testing/selftests/bpf/progs/kfunc_call_test.c | 4 +- + .../selftests/bpf/progs/kfunc_call_test_subprog.c | 2 +- + tools/testing/selftests/bpf/progs/skb_pkt_end.c | 2 +- + tools/testing/selftests/bpf/progs/sockopt_multi.c | 5 +- + 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 | 6 +- + .../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_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 | 2 +- + .../bpf/progs/test_misc_tcp_hdr_options.c | 2 +- + .../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 +- + 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 +- + .../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 +- + 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 +- + 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 +- + .../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 +- + .../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/verifier/spill_fill.c | 161 + + tools/testing/selftests/bpf/xdping.c | 5 +- + tools/testing/selftests/bpf/xdpxceiver.c | 133 +- + tools/testing/selftests/bpf/xdpxceiver.h | 11 +- + 120 files changed, 11048 insertions(+), 6354 deletions(-) + create mode 100644 Documentation/bpf/bpf_licensing.rst + 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/trace_vprintk.c + create mode 100644 tools/testing/selftests/bpf/progs/xdpwall.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 (d2c8a1554c10 IB/mlx5: Enable UAR to have DevX UID) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (acde891c243c rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (acde891c243c rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies()) +$ 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 (a8e5387f8362 ipw2200: Fix a function name in print messages) +$ 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 +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 12 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 370 +++++----- + 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.h | 2 - + 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/ralink/rt2x00/rt2800usb.c | 1 - + drivers/net/wireless/realtek/rtw88/debug.c | 41 +- + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 47 ++ + drivers/net/wireless/realtek/rtw88/fw.h | 24 + + drivers/net/wireless/realtek/rtw88/main.c | 21 +- + drivers/net/wireless/realtek/rtw88/main.h | 48 +- + drivers/net/wireless/realtek/rtw88/phy.c | 119 +++- + drivers/net/wireless/realtek/rtw88/phy.h | 2 + + drivers/net/wireless/realtek/rtw88/reg.h | 5 + + 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/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 | 16 +- + 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/zydas/zd1211rw/zd_usb.c | 1 - + include/linux/platform_data/brcmfmac.h | 2 +- + 43 files changed, 1368 insertions(+), 663 deletions(-) +Merging bluetooth/master (43f51bd946da Bluetooth: Rename driver .prevent_wake to .wakeup) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging tools/lib/bpf/libbpf.c +Auto-merging include/soc/mscc/ocelot_vcap.h +Auto-merging arch/sparc/include/uapi/asm/socket.h +CONFLICT (content): Merge conflict in arch/sparc/include/uapi/asm/socket.h +Resolved 'arch/sparc/include/uapi/asm/socket.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c80a30b04741] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/renesas,ether.yaml | 17 +- + .../devicetree/bindings/net/renesas,etheravb.yaml | 3 + + .../networking/devlink/devlink-region.rst | 4 +- + Documentation/networking/devlink/ice.rst | 4 + + Documentation/networking/devlink/iosm.rst | 32 +- + arch/m68k/emu/nfeth.c | 2 +- + arch/xtensa/platforms/iss/network.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 | 124 + + drivers/infiniband/hw/qedr/main.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/8390/ax88796.c | 6 +- + drivers/net/ethernet/agere/et131x.c | 4 +- + drivers/net/ethernet/alacritech/slicoss.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 7 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/brocade/bna/bnad.c | 4 +- + drivers/net/ethernet/cadence/macb_main.c | 7 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 3 +- + drivers/net/ethernet/chelsio/cxgb/subr.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 3 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- + drivers/net/ethernet/cirrus/mac89x0.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 4 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 4 +- + drivers/net/ethernet/ethoc.c | 4 +- + drivers/net/ethernet/ezchip/nps_enet.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 4 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 7 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/ibm/ibmveth.c | 4 +- + drivers/net/ethernet/ibm/ibmvnic.c | 5 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 4 +- + drivers/net/ethernet/intel/ice/ice_main.c | 4 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 11 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 2 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 12 +- + .../mellanox/mlx5/core/steering/dr_action.c | 19 +- + .../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 | 18 +- + .../mellanox/mlx5/core/steering/dr_types.h | 47 +- + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 2 +- + .../ethernet/mellanox/mlx5/core/steering/mlx5dr.h | 2 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- + drivers/net/ethernet/micrel/ks8851_common.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 7 +- + drivers/net/ethernet/microchip/enc28j60.c | 4 +- + drivers/net/ethernet/microchip/lan743x_main.c | 4 +- + .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 2 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 2 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 125 +- + drivers/net/ethernet/mscc/ocelot_net.c | 4 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 2 +- + drivers/net/ethernet/ni/nixge.c | 2 +- + drivers/net/ethernet/nvidia/forcedeth.c | 2 +- + drivers/net/ethernet/nxp/lpc_eth.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 1 + + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 2 - + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 1 - + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 4 - + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 38 - + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 74 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 45 - + drivers/net/ethernet/pensando/ionic/ionic_main.c | 53 +- + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 121 - + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 14 - + 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 | 1394 +- + drivers/net/ethernet/qlogic/qed/qed_debug.h | 7 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 122 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 345 +- + 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 | 18 +- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 135 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 64 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 131 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 21 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 64 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 763 +- + drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h | 2474 ++++ + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 7 +- + 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 | 200 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 126 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 11 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 307 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 9 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- + drivers/net/ethernet/renesas/ravb.h | 39 +- + drivers/net/ethernet/renesas/ravb_main.c | 452 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/seeq/sgiseeq.c | 2 +- + drivers/net/ethernet/sfc/ef100_nic.c | 2 +- + drivers/net/ethernet/sfc/ef10_sriov.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/efx_common.c | 4 +- + drivers/net/ethernet/sfc/falcon/efx.c | 6 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 2 +- + drivers/net/ethernet/sgi/meth.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 4 +- + drivers/net/ethernet/socionext/netsec.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/sun/niu.c | 4 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 8 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 6 +- + drivers/net/ethernet/ti/cpsw_new.c | 4 +- + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/wiznet/w5100.c | 4 +- + drivers/net/ethernet/wiznet/w5300.c | 4 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/fddi/skfp/skfddi.c | 5 +- + drivers/net/hyperv/netvsc_drv.c | 2 +- + drivers/net/ipvlan/ipvlan_main.c | 4 +- + drivers/net/macsec.c | 2 +- + drivers/net/macvlan.c | 4 +- + drivers/net/phy/phylink.c | 11 + + drivers/net/usb/aqc111.c | 2 +- + 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 | 4 +- + drivers/net/usb/dm9601.c | 2 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kalmia.c | 2 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/sr9800.c | 2 +- + drivers/net/wwan/iosm/iosm_ipc_devlink.c | 81 +- + drivers/net/wwan/iosm/iosm_ipc_devlink.h | 44 +- + drivers/net/wwan/iosm/iosm_ipc_flash.c | 42 +- + 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 | 8 +- + 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 +- + include/linux/dsa/ocelot.h | 4 +- + include/linux/etherdevice.h | 2 +- + include/linux/phylink.h | 1 + + 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_if.h | 263 +- + 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/rdma_common.h | 1 + + include/net/bluetooth/bluetooth.h | 90 + + include/net/bluetooth/hci.h | 117 + + include/net/bluetooth/hci_core.h | 75 +- + include/net/ioam6.h | 3 +- + include/soc/mscc/ocelot_vcap.h | 10 + + include/uapi/linux/devlink.h | 2 + + include/uapi/linux/ioam6_iptunnel.h | 29 + + lib/test_bpf.c | 14295 +++++++++++-------- + net/8021q/vlan_dev.c | 6 +- + net/Kconfig | 2 +- + net/bluetooth/Makefile | 3 +- + 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/bridge/br_stp_if.c | 2 +- + net/core/dev.c | 5 +- + net/core/devlink.c | 5 + + net/dsa/slave.c | 4 +- + net/dsa/tag_ocelot.c | 39 + + net/ethernet/eth.c | 2 +- + net/hsr/hsr_device.c | 2 +- + net/hsr/hsr_main.c | 2 +- + net/ipv6/Kconfig | 6 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/ioam6.c | 11 +- + net/ipv6/ioam6_iptunnel.c | 300 +- + net/ipv6/seg6.c | 2 +- + net/mctp/Kconfig | 5 + + net/mctp/Makefile | 3 + + net/mctp/route.c | 5 + + net/mctp/test/route-test.c | 544 + + net/mctp/test/utils.c | 67 + + net/mctp/test/utils.h | 20 + + tools/lib/bpf/libbpf.c | 24 + + tools/testing/selftests/bpf/progs/kfree_skb.c | 4 +- + .../selftests/bpf/progs/perf_event_stackmap.c | 4 +- + .../selftests/bpf/progs/sockmap_verdict_prog.c | 12 +- + .../selftests/bpf/progs/test_btf_map_in_map.c | 14 +- + .../testing/selftests/bpf/progs/test_map_in_map.c | 10 +- + .../selftests/bpf/progs/test_map_in_map_invalid.c | 2 +- + .../selftests/bpf/progs/test_pe_preserve_elems.c | 8 +- + .../testing/selftests/bpf/progs/test_perf_buffer.c | 4 +- + .../bpf/progs/test_select_reuseport_kern.c | 4 +- + .../selftests/bpf/progs/test_stacktrace_build_id.c | 4 +- + .../selftests/bpf/progs/test_stacktrace_map.c | 4 +- + .../selftests/bpf/progs/test_tcpnotify_kern.c | 4 +- + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 4 +- + .../drivers/net/ocelot/tc_flower_chains.sh | 50 +- + tools/testing/selftests/net/ioam6.sh | 209 +- + 329 files changed, 27013 insertions(+), 18613 deletions(-) + 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 + 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 + 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 +$ git reset --hard HEAD^ +HEAD is now at 0b32b0d6d527 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git +Merging next-20211001 version of bluetooth +$ git merge -m next-20211001/bluetooth 4d51fb04c3c4a9b3b80f537385bdceb20e773767 +Merge made by the 'recursive' strategy. + drivers/bluetooth/btintel.c | 239 ++++++++++++++++--- + drivers/bluetooth/btintel.h | 11 + + drivers/bluetooth/btmtkuart.c | 13 +- + drivers/bluetooth/btrsi.c | 1 - + drivers/bluetooth/btrtl.c | 14 +- + drivers/bluetooth/btusb.c | 54 ++++- + drivers/bluetooth/hci_h5.c | 35 ++- + drivers/bluetooth/hci_ldisc.c | 3 + + drivers/bluetooth/hci_qca.c | 1 + + drivers/bluetooth/hci_vhci.c | 122 ++++++++++ + include/net/bluetooth/bluetooth.h | 90 +++++++ + include/net/bluetooth/hci.h | 117 ++++++++++ + include/net/bluetooth/hci_core.h | 73 +++--- + net/bluetooth/Makefile | 3 +- + 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 | 319 +++++++++++-------------- + 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 | 152 ++++++++---- + 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 +++++++++++++++-- + 34 files changed, 2750 insertions(+), 1026 deletions(-) + 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 +Merging mac80211-next/master (171964252189 mac80211: MBSSID support in interface handling) +$ 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/mac80211/rx.c +Auto-merging net/mac80211/mesh.c +Auto-merging include/net/mac80211.h +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 156 +++++++++++-- + include/linux/ieee80211.h | 38 ++++ + include/net/cfg80211.h | 66 ++++++ + include/net/mac80211.h | 11 + + include/uapi/linux/nl80211.h | 113 +++++++++- + net/mac80211/agg-rx.c | 11 +- + net/mac80211/cfg.c | 38 ++++ + net/mac80211/debugfs_sta.c | 38 +++- + net/mac80211/ibss.c | 25 ++- + net/mac80211/ieee80211_i.h | 32 ++- + net/mac80211/iface.c | 31 ++- + 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 | 272 +++++++++++++---------- + net/mac80211/rx.c | 12 +- + net/mac80211/s1g.c | 8 +- + net/mac80211/scan.c | 16 +- + net/mac80211/tdls.c | 63 +++--- + net/mac80211/util.c | 40 +++- + net/wireless/Makefile | 4 +- + net/wireless/core.c | 10 + + net/wireless/nl80211.c | 407 ++++++++++++++++++++++++++-------- + net/wireless/rdev-ops.h | 14 ++ + net/wireless/trace.h | 31 +++ + 26 files changed, 1209 insertions(+), 395 deletions(-) +Merging mtd/mtd/next (b72841e4dcd5 mtd: mtdswap: Remove redundant assignment of pointer eb) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'recursive' strategy. + drivers/mtd/mtdswap.c | 1 - + 1 file changed, 1 deletion(-) +Merging nand/nand/next (c2606ddcf5ad mtd: onenand: samsung: drop Exynos4 and describe driver in KConfig) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'recursive' strategy. + drivers/mtd/nand/onenand/Kconfig | 9 +++++---- + drivers/mtd/nand/raw/atmel/pmecc.c | 7 ++----- + drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c | 5 +---- + drivers/mtd/nand/raw/denali_dt.c | 7 ++----- + drivers/mtd/nand/raw/gpio.c | 3 +-- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 4 +--- + drivers/mtd/nand/raw/hisi504_nand.c | 7 ++----- + drivers/mtd/nand/raw/intel-nand-controller.c | 5 +++++ + drivers/mtd/nand/raw/mtk_ecc.c | 4 +--- + drivers/mtd/nand/raw/mtk_nand.c | 4 +--- + drivers/mtd/nand/raw/omap_elm.c | 5 ++--- + drivers/mtd/nand/raw/oxnas_nand.c | 4 +--- + drivers/mtd/nand/raw/plat_nand.c | 4 +--- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 8 ++------ + drivers/mtd/nand/raw/tegra_nand.c | 4 +--- + drivers/mtd/nand/raw/txx9ndfmc.c | 4 +--- + drivers/mtd/nand/raw/vf610_nfc.c | 4 +--- + drivers/mtd/nand/raw/xway_nand.c | 4 +--- + include/linux/mtd/mtd.h | 2 -- + 19 files changed, 31 insertions(+), 63 deletions(-) +Merging spi-nor/spi-nor/next (5816b3e6577e Linux 5.15-rc3) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (e42dff467ee6 crypto: api - Export crypto_boot_test_finished) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'recursive' strategy. + arch/arm64/crypto/Kconfig | 6 - + arch/arm64/crypto/aes-ce-ccm-core.S | 24 +-- + arch/arm64/crypto/aes-ce-ccm-glue.c | 203 +++++++-------------- + arch/arm64/crypto/aes-glue.c | 102 ++--------- + arch/arm64/crypto/aes-neonbs-glue.c | 122 +------------ + arch/arm64/crypto/ghash-ce-glue.c | 209 ++++++---------------- + arch/x86/crypto/aesni-intel_glue.c | 2 +- + crypto/Kconfig | 2 +- + crypto/algapi.c | 73 +++++--- + crypto/api.c | 53 +++++- + crypto/drbg.c | 2 +- + crypto/internal.h | 10 ++ + crypto/jitterentropy.c | 24 +-- + drivers/char/hw_random/Kconfig | 12 +- + drivers/char/hw_random/ixp4xx-rng.c | 4 +- + drivers/char/hw_random/meson-rng.c | 5 +- + drivers/crypto/caam/caampkc.c | 19 +- + drivers/crypto/caam/regs.h | 3 + + drivers/crypto/hisilicon/qm.c | 52 +++++- + drivers/crypto/hisilicon/zip/zip_main.c | 2 +- + drivers/crypto/img-hash.c | 7 +- + drivers/crypto/marvell/cesa/cesa.c | 1 - + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 31 ++++ + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 10 ++ + drivers/crypto/qat/qat_common/adf_accel_devices.h | 24 ++- + drivers/crypto/qat/qat_common/adf_init.c | 5 + + drivers/crypto/qat/qat_common/adf_isr.c | 170 +++++++++--------- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 24 ++- + lib/crypto/sm4.c | 4 +- + 29 files changed, 507 insertions(+), 698 deletions(-) +Merging drm/drm-next (1e3944578b74 Merge tag 'amd-drm-next-5.16-2021-09-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +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/sun4i/sun8i_dw_hdmi.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.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/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +Removing drivers/dma-buf/seqno-fence.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/display/panel/panel-edp.yaml | 188 ++ + .../bindings/display/panel/samsung,s6d27a1.yaml | 98 + + Documentation/driver-api/dma-buf.rst | 6 - + Documentation/gpu/drm-mm.rst | 84 +- + MAINTAINERS | 14 + + 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 + + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf.c | 1 + + drivers/dma-buf/dma-fence.c | 13 +- + drivers/dma-buf/dma-resv.c | 24 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/dma-buf/seqno-fence.c | 71 - + drivers/gpu/drm/Kconfig | 9 +- + drivers/gpu/drm/Makefile | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 143 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 160 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 10 +- + 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 | 4 +- + 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 | 34 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 615 ++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 175 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 20 +- + 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 | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 166 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h | 51 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 113 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 111 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 4 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 34 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 - + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 46 +- + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 21 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 5 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 459 ++++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 91 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 3 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 16 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 49 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 10 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 10 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 55 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 12 +- + .../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 | 6 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 49 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 549 +++++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1323 +++++++++++++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 11 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 476 +++-- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 358 +++- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 138 +- + drivers/gpu/drm/amd/display/dc/dc.h | 36 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 222 +++ + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 16 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 21 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 16 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 12 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 2 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 164 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 114 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 9 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 1 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 30 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 45 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 29 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 8 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 24 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 4 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 20 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 6 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 1 + + 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 | 162 ++ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 18 + + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 43 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.h | 11 +- + .../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 | 30 +- + 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 | 318 +++- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c | 87 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h | 162 ++ + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 + + .../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.h | 4 +- + .../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/inc/core_types.h | 33 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 24 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 23 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 4 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 97 + + .../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 | 3 + + 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 | 18 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 25 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.h | 2 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 25 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.h | 2 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 4 + + .../display/dc/virtual/virtual_stream_encoder.c | 5 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 4 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 34 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 8 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 10 +- + .../drm/amd/display/include/bios_parser_types.h | 8 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 2 +- + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 17 + + .../gpu/drm/amd/display/include/grph_object_defs.h | 12 + + .../gpu/drm/amd/display/include/grph_object_id.h | 8 + + .../drm/amd/display/include/link_service_types.h | 57 +- + drivers/gpu/drm/amd/display/include/logger_types.h | 6 + + .../drm/amd/display/modules/color/color_gamma.c | 32 +- + .../amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h | 27 + + drivers/gpu/drm/amd/include/atomfirmware.h | 4 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 14 +- + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 15 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 27 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 4 +- + drivers/gpu/drm/bridge/ite-it66121.c | 21 +- + drivers/gpu/drm/bridge/panel.c | 37 + + drivers/gpu/drm/bridge/parade-ps8640.c | 18 +- + drivers/gpu/drm/drm_bridge.c | 7 +- + drivers/gpu/drm/drm_connector.c | 83 +- + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_edid.c | 280 +-- + drivers/gpu/drm/drm_gem_shmem_helper.c | 23 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 1 - + drivers/gpu/drm/drm_ioctl.c | 21 +- + drivers/gpu/drm/drm_kms_helper_common.c | 11 - + drivers/gpu/drm/drm_of.c | 3 + + drivers/gpu/drm/drm_panel_orientation_quirks.c | 49 +- + drivers/gpu/drm/drm_sysfs.c | 87 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +- + drivers/gpu/drm/gud/Kconfig | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 1 - + drivers/gpu/drm/lima/lima_gem.c | 9 +- + drivers/gpu/drm/lima/lima_sched.c | 28 +- + drivers/gpu/drm/lima/lima_sched.h | 6 +- + drivers/gpu/drm/mcde/mcde_drv.c | 4 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 4 +- + drivers/gpu/drm/meson/meson_drv.c | 3 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 4 +- + drivers/gpu/drm/msm/msm_gem.h | 5 - + drivers/gpu/drm/msm/msm_gem_submit.c | 35 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 12 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 - + drivers/gpu/drm/omapdrm/Kconfig | 1 - + drivers/gpu/drm/panel/Kconfig | 27 +- + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-edp.c | 1895 ++++++++++++++++++++ + 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/ci_dpm.c | 3 +- + drivers/gpu/drm/radeon/r600_dpm.c | 10 +- + drivers/gpu/drm/radeon/radeon_fence.c | 24 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- + drivers/gpu/drm/rockchip/Kconfig | 1 - + drivers/gpu/drm/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/stm/ltdc.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 18 +- + drivers/gpu/drm/sun4i/sun8i_csc.h | 4 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 21 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 4 +- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/plane.c | 2 +- + drivers/gpu/drm/tiny/Kconfig | 4 +- + drivers/gpu/drm/tiny/bochs.c | 8 + + drivers/gpu/drm/ttm/ttm_bo.c | 67 +- + drivers/gpu/drm/ttm/ttm_device.c | 48 + + drivers/gpu/drm/ttm/ttm_module.c | 12 + + drivers/gpu/drm/ttm/ttm_pool.c | 40 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 8 +- + drivers/gpu/drm/ttm/ttm_resource.c | 49 + + drivers/gpu/drm/ttm/ttm_tt.c | 17 +- + drivers/gpu/drm/udl/Kconfig | 1 + + drivers/gpu/drm/v3d/Kconfig | 2 +- + drivers/gpu/drm/v3d/v3d_drv.c | 5 +- + drivers/gpu/drm/v3d/v3d_drv.h | 6 +- + drivers/gpu/drm/v3d/v3d_gem.c | 129 +- + drivers/gpu/drm/v3d/v3d_sched.c | 44 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 15 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 28 +- + drivers/gpu/drm/vgem/vgem_drv.c | 342 +--- + drivers/gpu/drm/virtio/virtgpu_drv.h | 8 + + drivers/gpu/drm/virtio/virtgpu_prime.c | 32 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 61 + + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +- + drivers/gpu/drm/zte/Kconfig | 10 - + drivers/gpu/drm/zte/Makefile | 10 - + drivers/gpu/drm/zte/zx_common_regs.h | 28 - + drivers/gpu/drm/zte/zx_drm_drv.c | 184 -- + drivers/gpu/drm/zte/zx_drm_drv.h | 34 - + drivers/gpu/drm/zte/zx_hdmi.c | 760 -------- + drivers/gpu/drm/zte/zx_hdmi_regs.h | 66 - + drivers/gpu/drm/zte/zx_plane.c | 537 ------ + drivers/gpu/drm/zte/zx_plane.h | 26 - + drivers/gpu/drm/zte/zx_plane_regs.h | 120 -- + drivers/gpu/drm/zte/zx_tvenc.c | 400 ----- + drivers/gpu/drm/zte/zx_tvenc_regs.h | 27 - + drivers/gpu/drm/zte/zx_vga.c | 527 ------ + drivers/gpu/drm/zte/zx_vga_regs.h | 33 - + drivers/gpu/drm/zte/zx_vou.c | 921 ---------- + drivers/gpu/drm/zte/zx_vou.h | 64 - + drivers/gpu/drm/zte/zx_vou_regs.h | 212 --- + drivers/usb/typec/altmodes/Kconfig | 1 + + drivers/usb/typec/altmodes/displayport.c | 58 +- + include/drm/drm_bridge.h | 2 + + include/drm/drm_connector.h | 25 + + include/drm/drm_edid.h | 45 + + include/drm/drm_ioctl.h | 1 - + include/drm/drm_mode_config.h | 13 +- + include/drm/drm_plane.h | 2 +- + include/drm/gpu_scheduler.h | 188 +- + include/drm/ttm/ttm_bo_api.h | 12 - + include/drm/ttm/ttm_caching.h | 17 + + include/drm/ttm/ttm_device.h | 77 +- + include/drm/ttm/ttm_placement.h | 1 + + include/drm/ttm/ttm_pool.h | 5 +- + include/drm/ttm/ttm_range_manager.h | 18 +- + include/drm/ttm/ttm_resource.h | 9 +- + include/drm/ttm/ttm_tt.h | 18 +- + include/linux/dma-buf.h | 7 + + include/linux/dma-fence.h | 32 +- + include/linux/dma-resv.h | 104 +- + include/linux/seqno-fence.h | 109 -- + include/linux/shrinker.h | 1 + + include/uapi/drm/drm_fourcc.h | 6 + + include/uapi/drm/drm_mode.h | 3 + + mm/vmscan.c | 15 + + 363 files changed, 14780 insertions(+), 9258 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 drivers/dma-buf/seqno-fence.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h + 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 + delete mode 100644 include/linux/seqno-fence.h +Merging drm-misc/for-linux-next (61bae132030a Revert "drm: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN()") +$ 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/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Merge made by the 'recursive' strategy. + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 7 + + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/todo.rst | 17 - + Documentation/locking/ww-mutex-design.rst | 2 +- + drivers/dma-buf/dma-buf.c | 152 ++--- + drivers/gpu/drm/Kconfig | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 25 +- + drivers/gpu/drm/ast/ast_drv.h | 2 - + drivers/gpu/drm/ast/ast_mm.c | 27 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 274 +++++++- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 25 +- + drivers/gpu/drm/drm_bridge.c | 71 +- + drivers/gpu/drm/drm_edid.c | 121 ++-- + drivers/gpu/drm/drm_format_helper.c | 88 +++ + drivers/gpu/drm/drm_fourcc.c | 1 + + drivers/gpu/drm/drm_lease.c | 39 +- + drivers/gpu/drm/drm_mipi_dsi.c | 81 +++ + drivers/gpu/drm/drm_probe_helper.c | 119 +++- + 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/gud_drv.c | 6 + + drivers/gpu/drm/gud/gud_internal.h | 12 + + drivers/gpu/drm/gud/gud_pipe.c | 6 + + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 6 +- + 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/nouveau/nouveau_bo.c | 4 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 743 ++++++++++++++++++++- + drivers/gpu/drm/panel/panel-edp.c | 23 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 8 +- + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 15 +- + drivers/gpu/drm/ttm/ttm_pool.c | 2 +- + drivers/gpu/drm/ttm/ttm_tt.c | 54 +- + drivers/gpu/drm/v3d/v3d_drv.c | 10 +- + drivers/gpu/drm/v3d/v3d_drv.h | 24 +- + drivers/gpu/drm/v3d/v3d_gem.c | 390 ++++++++--- + 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_hdmi.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 1 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 44 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 28 +- + 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_vq.c | 19 +- + include/drm/drm_bridge.h | 23 +- + include/drm/drm_dp_helper.h | 20 + + include/drm/drm_edid.h | 14 +- + include/drm/drm_format_helper.h | 4 + + include/drm/drm_mipi_dsi.h | 4 + + include/drm/drm_print.h | 30 + + include/drm/drm_probe_helper.h | 1 + + include/drm/gud.h | 6 +- + include/drm/ttm/ttm_device.h | 2 +- + include/drm/ttm/ttm_tt.h | 82 ++- + include/linux/dma-buf.h | 2 +- + include/linux/io.h | 5 + + include/uapi/drm/drm_mode.h | 3 +- + include/uapi/drm/v3d_drm.h | 78 +++ + include/uapi/drm/virtgpu_drm.h | 27 + + include/uapi/linux/virtio_gpu.h | 18 +- + lib/devres.c | 82 +++ + 96 files changed, 2858 insertions(+), 875 deletions(-) +Merging amdgpu/drm-next (4e45069010e5 drm/amdgpu/pm: properly handle sclk for profiling modes on vangogh) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v5_2.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/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/gpu/amdgpu.rst | 4 +- + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 + + 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 | 1 + + 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_debugfs.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 841 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 671 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 388 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 20 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 121 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 69 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 47 +- + 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/df_v3_6.c | 31 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 380 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 229 +- + 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/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/nv.c | 95 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 51 +- + 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 | 51 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 166 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 + + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 34 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 17 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 259 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 81 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 + + drivers/gpu/drm/amd/display/Kconfig | 2 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 222 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 8 +- + drivers/gpu/drm/amd/display/dc/Makefile | 1 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 4 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + 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 | 2 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 260 + + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.h | 34 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 75 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 73 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 169 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 23 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 + + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 54 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 2 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 39 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 21 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 33 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 11 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 5 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 7 + + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 9 +- + 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 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 59 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + 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/dc_link_dp.h | 5 +- + 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/dpp.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 + + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 4 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 2 +- + .../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 | 2 +- + .../amd/display/dc/irq/dcn21/irq_service_dcn21.h | 2 +- + drivers/gpu/drm/amd/display/dc/os_types.h | 1 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 58 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 10 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 1 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../amd/include/asic_reg/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 +++++++++++++++++++ + .../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/soc15_hw_ip.h | 2 + + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 126 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 50 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 24 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 96 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 93 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 22 +- + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 + + include/drm/amd_asic_type.h | 1 + + 167 files changed, 38652 insertions(+), 1978 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.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/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/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 +Merging drm-intel/for-linux-next (7d396cacaea6 drm/i195: Make the async flip VT-d workaround dynamic) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.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/Makefile +Auto-merging drivers/gpu/drm/drm_edid.c +Merge made by the 'recursive' strategy. + Documentation/gpu/i915.rst | 25 +- + drivers/gpu/drm/drm_dp_helper.c | 42 +- + drivers/gpu/drm/drm_edid.c | 89 +- + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/display/g4x_dp.c | 86 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 161 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 46 + + drivers/gpu/drm/i915/display/intel_acpi.h | 3 + + drivers/gpu/drm/i915/display/intel_audio.c | 48 +- + 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 | 397 +++-- + drivers/gpu/drm/i915/display/intel_cdclk.c | 345 ++-- + drivers/gpu/drm/i915/display/intel_cdclk.h | 4 +- + drivers/gpu/drm/i915/display/intel_color.c | 140 +- + 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 | 9 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 479 +++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 7 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 670 +++---- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 11 +- + drivers/gpu/drm/i915/display/intel_display.c | 1748 +++++-------------- + drivers/gpu/drm/i915/display/intel_display.h | 32 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 121 +- + .../gpu/drm/i915/display/intel_display_debugfs.h | 10 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 9 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 4 + + drivers/gpu/drm/i915/display/intel_display_types.h | 41 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 20 +- + drivers/gpu/drm/i915/display/intel_dp.c | 748 +++----- + 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 | 157 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 30 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 28 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 5 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 672 +++---- + 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_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_fbc.c | 292 ++-- + drivers/gpu/drm/i915/display/intel_fbc.h | 2 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 3 +- + 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 | 64 +- + 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_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_vbt_defs.h | 5 + + 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 | 9 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 51 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 23 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 29 +- + drivers/gpu/drm/i915/i915_drv.c | 7 +- + drivers/gpu/drm/i915/i915_drv.h | 161 +- + drivers/gpu/drm/i915/i915_irq.c | 94 +- + drivers/gpu/drm/i915/i915_irq.h | 51 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 82 +- + drivers/gpu/drm/i915/i915_vma_types.h | 7 +- + drivers/gpu/drm/i915/intel_dram.c | 4 +- + drivers/gpu/drm/i915/intel_pm.c | 304 ++-- + drivers/gpu/drm/i915/intel_pm.h | 3 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 - + drivers/gpu/drm/i915/intel_uncore.c | 72 +- + drivers/gpu/drm/i915/intel_uncore.h | 7 +- + drivers/video/fbdev/efifb.c | 21 +- + include/drm/drm_connector.h | 12 + + include/drm/drm_displayid.h | 101 +- + include/drm/drm_dp_helper.h | 6 + + include/drm/i915_pciids.h | 8 +- + 103 files changed, 8011 insertions(+), 6549 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight.c + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.h + create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.c + create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.h +Merging drm-tegra/drm/tegra/for-next (c3dbfb9c49ee gpu: host1x: Plug potential memory leak) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-msm/msm-next (bc80747eb681 drm/msm: Do not run snapshot on non-DPU devices) +$ 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_gem_submit.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_submit.c +Recorded preimage for 'drivers/gpu/drm/msm/msm_gem_submit.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/msm/msm_gem_submit.c'. +[master d86531dedbe3] Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 9 ++-- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 9 ++-- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +++ + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 3 ++ + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 46 ++++++++++++++++---- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 11 ++++- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 16 +++++++ + drivers/gpu/drm/msm/dp/dp_display.c | 10 ++--- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 3 +- + drivers/gpu/drm/msm/msm_drv.c | 15 +++++-- + drivers/gpu/drm/msm/msm_drv.h | 47 +------------------- + drivers/gpu/drm/msm/msm_gem_submit.c | 5 ++- + drivers/gpu/drm/msm/msm_gpu.h | 66 +++++++++++++++++++++++++++- + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 6 +++ + drivers/gpu/drm/msm/msm_submitqueue.c | 72 +++++++++++++++++++++++++------ + 15 files changed, 233 insertions(+), 91 deletions(-) +Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-tve.c | 4 +--- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (23939115be18 ALSA: usb-audio: Fix packet size calculation regression) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'recursive' strategy. + include/sound/hdaudio_ext.h | 2 + + sound/hda/ext/hdac_ext_stream.c | 46 ++++---- + sound/hda/hdac_stream.c | 4 +- + sound/pci/hda/hda_intel.c | 49 ++++----- + sound/soc/sof/intel/hda-dai.c | 7 +- + sound/usb/card.h | 11 +- + sound/usb/clock.c | 4 +- + sound/usb/endpoint.c | 230 +++++++++++++++++++++++++++++----------- + sound/usb/endpoint.h | 13 ++- + sound/usb/implicit.c | 2 - + sound/usb/pcm.c | 157 +++++++++++++++++++++------ + sound/usb/usx2y/usbusx2yaudio.c | 11 +- + sound/virtio/virtio_pcm_msg.c | 5 +- + 13 files changed, 374 insertions(+), 167 deletions(-) +Merging sound-asoc/for-next (6de669e88076 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 +Removing sound/soc/sof/compress.c +Auto-merging drivers/firmware/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/spdif-transmitter.txt +Removing Documentation/devicetree/bindings/sound/simple-amplifier.txt +Removing Documentation/devicetree/bindings/sound/rockchip,pdm.txt +Removing Documentation/devicetree/bindings/sound/name-prefix.txt +Removing Documentation/devicetree/bindings/sound/bt-sco.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/bt-sco.txt | 13 - + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 157 + + .../devicetree/bindings/sound/linux,bt-sco.yaml | 38 + + .../devicetree/bindings/sound/linux,spdif-dit.yaml | 32 + + .../devicetree/bindings/sound/name-prefix.txt | 24 - + .../devicetree/bindings/sound/name-prefix.yaml | 21 + + .../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 +- + .../devicetree/bindings/sound/qcom,q6afe.txt | 2 +- + .../devicetree/bindings/sound/qcom,q6asm.txt | 2 +- + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 117 + + .../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/wlf,wm8978.yaml | 58 + + Documentation/sound/alsa-configuration.rst | 9 + + MAINTAINERS | 11 + + 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 | 5 + + include/linux/firmware/cirrus/cs_dsp.h | 242 ++ + .../linux/firmware/cirrus}/wmfw.h | 8 +- + include/sound/cs35l41.h | 34 + + include/sound/rt5682s.h | 48 + + include/sound/simple_card_utils.h | 2 +- + include/sound/soc-component.h | 16 +- + include/sound/soc-dpcm.h | 1 + + include/sound/soc-topology.h | 2 +- + include/sound/sof.h | 5 - + include/uapi/sound/sof/tokens.h | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 6 +- + sound/soc/amd/acp-pcm-dma.c | 6 +- + sound/soc/amd/acp.h | 2 + + sound/soc/atmel/atmel-i2s.c | 6 +- + sound/soc/atmel/atmel_ssc_dai.c | 26 +- + sound/soc/atmel/atmel_wm8904.c | 2 +- + sound/soc/atmel/mchp-i2s-mcc.c | 10 +- + sound/soc/atmel/mikroe-proto.c | 4 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/atmel/sam9x5_wm8731.c | 2 +- + sound/soc/atmel/tse850-pcm5142.c | 2 +- + sound/soc/au1x/db1200.c | 6 +- + sound/soc/au1x/i2sc.c | 6 +- + sound/soc/au1x/psc-i2s.c | 10 +- + sound/soc/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 | 23 + + sound/soc/codecs/Makefile | 8 + + 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 | 113 + + sound/soc/codecs/cs35l41-spi.c | 138 + + sound/soc/codecs/cs35l41-tables.c | 594 ++++ + sound/soc/codecs/cs35l41.c | 1447 ++++++++ + sound/soc/codecs/cs35l41.h | 775 +++++ + sound/soc/codecs/cs42l42.c | 138 +- + sound/soc/codecs/cs42l42.h | 59 + + 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/madera.c | 18 +- + sound/soc/codecs/max98390.c | 2 +- + sound/soc/codecs/mt6359.c | 2 +- + sound/soc/codecs/nau8821.c | 1712 ++++++++++ + sound/soc/codecs/nau8821.h | 533 +++ + sound/soc/codecs/nau8824.c | 70 + + sound/soc/codecs/nau8824.h | 3 +- + sound/soc/codecs/pcm5102a.c | 2 +- + sound/soc/codecs/rt1011.c | 54 + + sound/soc/codecs/rt1011.h | 7 + + 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 | 22 + + sound/soc/codecs/rt5682.c | 76 +- + sound/soc/codecs/rt5682.h | 3 + + sound/soc/codecs/rt5682s.c | 3184 ++++++++++++++++++ + sound/soc/codecs/rt5682s.h | 1468 ++++++++ + 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/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/audio-graph-card.c | 4 +- + sound/soc/intel/boards/Kconfig | 1 + + 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 | 4 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + 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_rt5682.c | 122 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 15 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 26 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 2 +- + sound/soc/intel/skylake/skl-topology.c | 6 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 1 - + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 8 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 2 +- + .../mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c | 54 +- + sound/soc/meson/aiu-encoder-spdif.c | 2 +- + sound/soc/qcom/apq8096.c | 2 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 2 +- + 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 | 61 +- + sound/soc/soc-compress.c | 43 +- + sound/soc/soc-dapm.c | 2 + + sound/soc/soc-generic-dmaengine-pcm.c | 6 +- + sound/soc/soc-pcm.c | 8 +- + sound/soc/soc-topology.c | 16 +- + sound/soc/sof/Kconfig | 2 +- + sound/soc/sof/Makefile | 3 +- + sound/soc/sof/compress.c | 147 - + sound/soc/sof/compress.h | 32 - + sound/soc/sof/control.c | 192 +- + sound/soc/sof/core.c | 11 +- + sound/soc/sof/debug.c | 26 +- + sound/soc/sof/imx/imx-ops.h | 10 + + sound/soc/sof/imx/imx8.c | 20 +- + sound/soc/sof/imx/imx8m.c | 25 +- + sound/soc/sof/intel/Makefile | 2 +- + sound/soc/sof/intel/apl.c | 3 +- + sound/soc/sof/intel/bdw.c | 7 +- + sound/soc/sof/intel/byt.c | 6 +- + sound/soc/sof/intel/cnl.c | 3 +- + sound/soc/sof/intel/hda-dai.c | 190 +- + sound/soc/sof/intel/hda-dsp.c | 61 +- + sound/soc/sof/intel/hda-ipc.c | 15 +- + .../soc/sof/intel/{hda-compress.c => hda-probes.c} | 0 + sound/soc/sof/intel/hda-stream.c | 92 +- + sound/soc/sof/intel/hda.c | 210 +- + sound/soc/sof/intel/hda.h | 52 +- + sound/soc/sof/intel/icl.c | 3 +- + sound/soc/sof/intel/intel-ipc.c | 14 +- + sound/soc/sof/intel/pci-apl.c | 2 - + sound/soc/sof/intel/pci-cnl.c | 3 - + sound/soc/sof/intel/pci-icl.c | 2 - + sound/soc/sof/intel/pci-tgl.c | 5 - + sound/soc/sof/intel/pci-tng.c | 4 +- + sound/soc/sof/intel/tgl.c | 3 +- + sound/soc/sof/ipc.c | 174 +- + sound/soc/sof/loader.c | 147 +- + sound/soc/sof/ops.h | 56 +- + sound/soc/sof/pcm.c | 64 +- + sound/soc/sof/pm.c | 6 +- + sound/soc/sof/probe.h | 85 - + sound/soc/sof/sof-audio.c | 709 +++- + sound/soc/sof/sof-audio.h | 37 +- + sound/soc/sof/sof-of-dev.c | 5 +- + sound/soc/sof/sof-priv.h | 94 +- + sound/soc/sof/{probe.c => sof-probes.c} | 280 +- + sound/soc/sof/sof-probes.h | 38 + + sound/soc/sof/topology.c | 362 +- + 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 | 2 +- + 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 +- + 278 files changed, 25303 insertions(+), 5237 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/bt-sco.txt + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs35l41.yaml + create mode 100644 Documentation/devicetree/bindings/sound/linux,bt-sco.yaml + create mode 100644 Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/name-prefix.txt + create mode 100644 Documentation/devicetree/bindings/sound/name-prefix.yaml + create mode 100644 Documentation/devicetree/bindings/sound/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/realtek,rt5682s.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/simple-amplifier.txt + create mode 100644 Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8978.yaml + create mode 100644 drivers/firmware/cirrus/Kconfig + create mode 100644 drivers/firmware/cirrus/Makefile + create mode 100644 drivers/firmware/cirrus/cs_dsp.c + 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 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/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 + delete mode 100644 sound/soc/sof/compress.c + 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 + 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 +$ git am -3 ../patches/0001-Revert-firmware-cs_dsp-add-driver-to-support-firmwar.patch +Applying: Revert "firmware: cs_dsp: add driver to support firmware loading on Cirrus Logic DSPs" +$ git reset HEAD^ +Unstaged changes after reset: +M MAINTAINERS +M drivers/firmware/Kconfig +M drivers/firmware/Makefile +D drivers/firmware/cirrus/Kconfig +D drivers/firmware/cirrus/Makefile +D drivers/firmware/cirrus/cs_dsp.c +D include/linux/firmware/cirrus/cs_dsp.h +D include/linux/firmware/cirrus/wmfw.h +M sound/soc/codecs/Kconfig +M sound/soc/codecs/wm_adsp.c +M sound/soc/codecs/wm_adsp.h +$ git add -A . +$ git commit -v -a --amend +[master e1bfde727529] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git + Date: Tue Oct 5 13:23:15 2021 +1100 +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 (5c4c2c8e6fac Input: ariel-pwrbutton - add SPI device ID table) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/input/touchscreen/elants_i2c.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/cypress-sf.yaml | 61 +++ + MAINTAINERS | 10 +- + 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/mpr121_touchkey.c | 4 +- + drivers/input/keyboard/omap-keypad.c | 3 +- + drivers/input/misc/ariel-pwrbutton.c | 7 + + drivers/input/misc/cpcap-pwrbutton.c | 6 +- + drivers/input/misc/palmas-pwrbutton.c | 5 + + drivers/input/touchscreen/Makefile | 3 +- + drivers/input/touchscreen/ads7846.c | 192 ++++----- + 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/raydium_i2c_ts.c | 54 ++- + include/linux/spi/ads7846.h | 15 - + 19 files changed, 1096 insertions(+), 280 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 (1b2d1439fc25 Merge branch 'for-5.16/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging fs/ntfs3/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ctree.c +Auto-merging fs/btrfs/compression.c +Auto-merging drivers/s390/block/dasd_genhd.c +Merge made by the 'recursive' strategy. + Documentation/cdrom/cdrom-standard.rst | 11 + + Documentation/userspace-api/ioctl/cdrom.rst | 3 + + 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 | 1 + + arch/xtensa/platforms/iss/simdisk.c | 13 +- + block/bdev.c | 1 + + block/bfq-cgroup.c | 2 +- + block/bfq-iosched.c | 2 +- + block/bio-integrity.c | 2 +- + block/blk-core.c | 4 +- + block/blk-crypto-fallback.c | 1 + + block/blk-crypto-internal.h | 2 +- + block/blk-integrity.c | 2 +- + block/blk-iolatency.c | 1 + + block/blk-merge.c | 25 + + block/blk-mq-sched.h | 1 + + block/blk-mq-tag.h | 2 + + block/blk-mq.c | 2 + + block/blk.h | 40 + + block/bounce.c | 1 + + block/elevator.c | 2 +- + {include/linux => block}/elevator.h | 21 +- + block/genhd.c | 1 + + block/holder.c | 1 + + block/keyslot-manager.c | 1 + + block/kyber-iosched.c | 2 +- + block/mq-deadline.c | 222 ++++-- + block/partitions/core.c | 1 + + block/t10-pi.c | 2 +- + drivers/block/amiflop.c | 9 +- + drivers/block/aoe/aoeblk.c | 6 +- + drivers/block/ataflop.c | 48 +- + drivers/block/brd.c | 44 +- + drivers/block/drbd/drbd_main.c | 6 +- + drivers/block/floppy.c | 35 +- + drivers/block/loop.c | 8 +- + drivers/block/mtip32xx/mtip32xx.c | 4 +- + drivers/block/n64cart.c | 12 +- + drivers/block/nbd.c | 6 +- + drivers/block/null_blk/main.c | 108 ++- + 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 | 4 +- + drivers/block/rbd.c | 6 +- + drivers/block/rnbd/rnbd-proto.h | 2 +- + drivers/block/rsxx/core.c | 4 +- + drivers/block/rsxx/dev.c | 12 +- + drivers/block/swim.c | 36 +- + drivers/block/swim3.c | 5 +- + drivers/block/sx8.c | 15 +- + drivers/block/xen-blkfront.c | 1 + + drivers/cdrom/cdrom.c | 59 +- + drivers/cdrom/gdrom.c | 7 +- + drivers/gpu/drm/i915/i915_utils.h | 1 + + drivers/md/dm-bio-record.h | 1 + + drivers/md/dm-crypt.c | 1 + + drivers/md/dm-ima.c | 1 + + drivers/md/dm-ps-historical-service-time.c | 1 + + drivers/md/dm-rq.c | 1 - + drivers/md/dm-table.c | 1 + + drivers/md/dm-verity-target.c | 1 + + drivers/md/md.c | 2 + + drivers/mmc/core/sd.c | 1 + + drivers/mtd/mtdsuper.c | 1 + + drivers/nvdimm/core.c | 1 + + drivers/nvme/host/core.c | 1 + + drivers/nvme/host/pci.c | 1 + + drivers/nvme/host/rdma.c | 1 + + drivers/nvme/target/io-cmd-bdev.c | 1 + + drivers/nvme/target/rdma.c | 1 + + drivers/s390/block/dasd_genhd.c | 1 + + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 + + drivers/scsi/lpfc/lpfc.h | 1 + + drivers/scsi/scsi_lib.c | 1 + + drivers/scsi/sd.c | 1 + + drivers/scsi/sd_dif.c | 2 +- + drivers/scsi/sg.c | 1 + + drivers/scsi/sr.c | 1 + + drivers/scsi/st.c | 1 + + drivers/scsi/virtio_scsi.c | 1 + + drivers/target/target_core_file.c | 1 + + drivers/target/target_core_iblock.c | 2 + + fs/btrfs/compression.c | 1 + + fs/btrfs/ctree.c | 1 + + fs/btrfs/inode.c | 1 + + fs/f2fs/compress.c | 1 + + fs/io-wq.c | 9 +- + fs/io-wq.h | 59 +- + fs/io_uring.c | 1100 +++++++++++++-------------- + fs/ntfs/file.c | 1 + + fs/ntfs3/file.c | 1 + + fs/orangefs/inode.c | 2 +- + fs/orangefs/super.c | 1 + + fs/quota/quota.c | 1 + + fs/ramfs/inode.c | 1 + + include/linux/backing-dev.h | 19 +- + include/linux/blk-integrity.h | 183 +++++ + include/linux/blk-mq.h | 465 +++++++++++ + include/linux/blk_types.h | 2 - + include/linux/blkdev.h | 743 +----------------- + include/linux/blktrace_api.h | 2 +- + include/linux/cdrom.h | 1 + + include/linux/genhd.h | 14 +- + include/linux/part_stat.h | 1 + + include/linux/t10-pi.h | 2 +- + include/linux/writeback.h | 14 +- + include/scsi/scsi_device.h | 2 +- + include/trace/events/io_uring.h | 61 ++ + 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 | 2 +- + kernel/sched/sched.h | 1 - + lib/random32.c | 1 + + mm/backing-dev.c | 19 +- + mm/filemap.c | 1 - + mm/highmem.c | 1 - + mm/mempool.c | 1 - + mm/nommu.c | 1 - + mm/readahead.c | 1 - + mm/shmem.c | 1 - + mm/swapfile.c | 2 +- + 131 files changed, 2343 insertions(+), 1939 deletions(-) + rename {include/linux => block}/elevator.h (92%) + create mode 100644 include/linux/blk-integrity.h +Merging device-mapper/for-next (d3703ef33129 dm crypt: use in_hardirq() instead of deprecated in_irq()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (0e96dc47b95a ahci: remove duplicated PCI device IDs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ahci.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 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 (fb99597d255a mmc: slot-gpio: Update default label when no con_id provided) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Removing Documentation/devicetree/bindings/mmc/mmc-card.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 29 ++++++- + .../devicetree/bindings/mmc/cdns,sdhci.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 | 3 + + drivers/memstick/core/ms_block.c | 8 +- + drivers/memstick/core/mspro_block.c | 6 +- + drivers/memstick/host/jmb38x_ms.c | 3 +- + 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/cqhci-core.c | 4 +- + drivers/mmc/host/dw_mmc.c | 3 +- + drivers/mmc/host/mmci.c | 4 + + drivers/mmc/host/mtk-sd.c | 99 +++++++++++++++++++--- + drivers/mmc/host/omap_hsmmc.c | 12 +-- + drivers/mmc/host/sdhci-of-arasan.c | 29 ++++++- + drivers/mmc/host/sdhci-omap.c | 61 +++++++++++-- + drivers/mmc/host/sdhci-pci-o2micro.c | 2 +- + drivers/mmc/host/sdhci-s3c.c | 1 - + drivers/mmc/host/sdhci-sprd.c | 13 +++ + drivers/mmc/host/sdhci.c | 23 +++-- + include/linux/mmc/host.h | 4 + + 28 files changed, 359 insertions(+), 109 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/mmc-card.txt + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-card.yaml +Merging mfd/for-mfd-next (cdff1eda6932 mfd: lpc_sch: Rename GPIOBASE to prevent build error) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (79fad92f2e59 backlight: pwm_bl: Improve bootloader/kernel device handover) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (0668281d329d power: supply: cpcap-battery: use device_get_match_data() to simplify code) +$ 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 +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 13 +++++ + .../bindings/power/supply/maxim,max17040.yaml | 2 +- + drivers/power/reset/at91-reset.c | 4 +- + drivers/power/reset/ltc2952-poweroff.c | 4 +- + drivers/power/supply/Kconfig | 21 ++++--- + drivers/power/supply/cpcap-battery.c | 15 ++--- + drivers/power/supply/max17042_battery.c | 7 ++- + drivers/power/supply/power_supply_core.c | 65 ++++++++++++---------- + drivers/power/supply/wm831x_power.c | 12 ++-- + include/linux/power/max17042_battery.h | 4 +- + 10 files changed, 84 insertions(+), 63 deletions(-) +Merging regulator/for-next (d17e70999e4a Merge remote-tracking branch 'regulator/for-5.16' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Removing Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt +Removing Documentation/devicetree/bindings/regulator/max8952.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/max8952.txt | 52 ---------- + .../bindings/regulator/maxim,max8952.yaml | 109 +++++++++++++++++++++ + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 4 + + .../bindings/regulator/silergy,sy8106a.yaml | 52 ++++++++++ + .../bindings/regulator/sy8106a-regulator.txt | 23 ----- + drivers/regulator/Kconfig | 6 +- + drivers/regulator/bd71815-regulator.c | 4 +- + drivers/regulator/core.c | 9 +- + drivers/regulator/dummy.c | 3 +- + drivers/regulator/max8973-regulator.c | 4 +- + drivers/regulator/pwm-regulator.c | 12 +-- + drivers/regulator/qcom_smd-regulator.c | 49 +++++++++ + drivers/regulator/rtq6752-regulator.c | 18 ++-- + drivers/regulator/ti-abb-regulator.c | 31 ++---- + drivers/regulator/vqmmc-ipq4019-regulator.c | 4 +- + drivers/spi/spi.c | 41 ++++++++ + 16 files changed, 288 insertions(+), 133 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/max8952.txt + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max8952.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge -m Merge branch 'next-testing' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git security/next-testing +Already up to date. +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/policy.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/label.c +Auto-merging security/apparmor/include/label.h +Auto-merging security/apparmor/include/file.h +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/apparmorfs.c | 4 +-- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 1 + + security/apparmor/include/policy.h | 6 ++-- + security/apparmor/label.c | 4 +-- + security/apparmor/lsm.c | 22 +++++++------- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 59 ++++++++++++++++++++++++++++++++------ + security/apparmor/policy_unpack.c | 2 +- + 9 files changed, 73 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (836f7b6ca082 ima: fix deadlock when traversing "ima_default_rules".) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'recursive' strategy. + security/integrity/ima/ima_policy.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Auto-merging scripts/Makefile +Auto-merging include/keys/system_keyring.h +Auto-merging certs/system_keyring.c +CONFLICT (content): Merge conflict in certs/system_keyring.c +Auto-merging certs/Makefile +Auto-merging certs/Kconfig +Resolved 'certs/system_keyring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 57d256d1789a] 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 (f5d0e5e9d72d selinux: remove the SELinux lockdown implementation) +$ 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 fs/io_uring.c +Auto-merging fs/io-wq.c +CONFLICT (content): Merge conflict in fs/io-wq.c +Resolved 'fs/io-wq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c6ac102b4366] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git +$ git diff -M --stat --summary HEAD^.. + fs/anon_inodes.c | 29 +++ + fs/io-wq.c | 4 + + fs/io_uring.c | 69 +++++- + include/linux/anon_inodes.h | 4 + + include/linux/audit.h | 26 ++ + include/linux/lsm_hook_defs.h | 5 + + include/linux/lsm_hooks.h | 13 + + include/linux/security.h | 16 ++ + 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 | 12 + + security/selinux/hooks.c | 65 ++--- + security/selinux/include/classmap.h | 4 +- + security/smack/smack_lsm.c | 46 ++++ + 18 files changed, 646 insertions(+), 147 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 5f05ffb35306] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git + Date: Tue Oct 5 13:51:09 2021 +1100 +Merging smack/next (387ef964460f Smack:- Use overlay inode label in smack_inode_copy_up()) +$ 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 | 11 +++++++---- + security/smack/smackfs.c | 5 ++++- + 2 files changed, 11 insertions(+), 5 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 (f985911b7bc7 crypto: public_key: fix overflow during implicit conversion) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (5816b3e6577e Linux 5.15-rc3) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (0b29edc21567 Merge branches 'arm/mediatek', 'arm/renesas', 'iommu/fixes', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + + drivers/iommu/amd/amd_iommu_types.h | 2 + + drivers/iommu/amd/iommu.c | 21 +++ + drivers/iommu/apple-dart.c | 2 - + drivers/iommu/dma-iommu.c | 195 +++++++++------------ + drivers/iommu/iommu.c | 3 +- + drivers/iommu/ipmmu-vmsa.c | 32 +++- + drivers/iommu/mtk_iommu.c | 4 +- + drivers/xen/swiotlb-xen.c | 2 +- + include/linux/swiotlb.h | 3 +- + kernel/dma/swiotlb.c | 13 +- + 11 files changed, 150 insertions(+), 128 deletions(-) +Merging audit/next (571e5c0efcb2 audit: add OPENAT2 record to list "how" info) +$ 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 774ab5af0ed7] 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 | 46 +++++++++++++++++++++----------------- + lib/audit.c | 14 +++++++----- + lib/compat_audit.c | 15 ++++++++----- + security/lsm_audit.c | 2 +- + 23 files changed, 181 insertions(+), 96 deletions(-) + create mode 100644 include/linux/audit_arch.h +Merging devicetree/for-next (37ef2c34e437 docs: dt: Fix a few grammar nits in the binding/schema docs) +$ 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 Makefile +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/w1/w1-gpio.txt +Removing Documentation/devicetree/bindings/usb/udc-xilinx.txt +Removing Documentation/devicetree/bindings/rng/omap_rng.txt +Removing Documentation/devicetree/bindings/mfd/aspeed-lpc.txt +Removing Documentation/devicetree/bindings/memory-controllers/fsl/ddr.txt +Removing Documentation/devicetree/bindings/gnss/u-blox.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Removing Documentation/devicetree/bindings/arm/cci.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/arm,cci-400.yaml | 216 ++++++++++++++++++++ + .../devicetree/bindings/arm/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 + + .../devicetree/bindings/example-schema.yaml | 14 +- + .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 62 ++++++ + Documentation/devicetree/bindings/gnss/u-blox.txt | 45 ----- + .../interrupt-controller/msi-controller.yaml | 46 +++++ + .../devicetree/bindings/mailbox/mtk-gce.txt | 4 +- + .../devicetree/bindings/media/ti,cal.yaml | 4 +- + .../bindings/memory-controllers/fsl/ddr.txt | 29 --- + .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 83 ++++++++ + .../devicetree/bindings/mfd/aspeed-lpc.txt | 157 --------------- + .../devicetree/bindings/mfd/aspeed-lpc.yaml | 199 ++++++++++++++++++ + 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/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 ++++++ + .../devicetree/bindings/submitting-patches.rst | 3 + + .../devicetree/bindings/usb/udc-xilinx.txt | 18 -- + .../devicetree/bindings/usb/xlnx,usb2.yaml | 41 ++++ + Documentation/devicetree/bindings/w1/w1-gpio.txt | 27 --- + Documentation/devicetree/bindings/w1/w1-gpio.yaml | 43 ++++ + .../devicetree/bindings/writing-bindings.rst | 2 +- + .../devicetree/bindings/writing-schema.rst | 29 +-- + Documentation/w1/masters/w1-gpio.rst | 2 +- + MAINTAINERS | 1 + + Makefile | 10 +- + drivers/of/of_numa.c | 2 + + scripts/Makefile.lib | 1 - + 39 files changed, 1386 insertions(+), 763 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/arm,cci-400.yaml + create mode 100644 Documentation/devicetree/bindings/arm/cci-control-port.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/cci.txt + create mode 100644 Documentation/devicetree/bindings/gnss/u-blox,neo-6m.yaml + delete mode 100644 Documentation/devicetree/bindings/gnss/u-blox.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/msi-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ddr.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/aspeed-lpc.txt + create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-lpc.yaml + create mode 100644 Documentation/devicetree/bindings/pci/apple,pcie.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/memory-region.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/reserved-memory.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/shared-dma-pool.yaml + delete mode 100644 Documentation/devicetree/bindings/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 (85dfdbfc13ea mailbox: cmdq: add multi-gce clocks support for mt8195) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (8886d5c77f83 Merge remote-tracking branch 'spi/for-5.16' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/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 +- + 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-bcm-qspi.c | 3 +- + drivers/spi/spi-cadence-quadspi.c | 214 +++++++ + drivers/spi/spi-cadence-xspi.c | 640 +++++++++++++++++++++ + drivers/spi/spi-ingenic.c | 482 ++++++++++++++++ + drivers/spi/spi-mtk-nor.c | 2 +- + drivers/spi/spi-rspi.c | 1 - + drivers/spi/spi-sh-msiof.c | 1 - + drivers/spi/spi-stm32-qspi.c | 2 +- + include/linux/firmware/xlnx-zynqmp.h | 12 + + 20 files changed, 1643 insertions(+), 94 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 (d4bfebd9ef49 Merge remote-tracking branch 'tip/x86/cpu' 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 kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/debug.c +Auto-merging kernel/sched/core.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/dma-resv.h +Auto-merging drivers/regulator/core.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/x86/kvm/svm/svm.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 8 + + Documentation/scheduler/sched-bwc.rst | 84 ++++- + arch/x86/Kconfig | 3 +- + arch/x86/events/intel/bts.c | 6 + + arch/x86/events/intel/uncore_discovery.h | 2 +- + arch/x86/events/intel/uncore_snbep.c | 16 +- + arch/x86/ia32/ia32_signal.c | 14 +- + arch/x86/include/asm/asm.h | 55 ++- + arch/x86/include/asm/cpufeature.h | 13 +- + arch/x86/include/asm/extable.h | 44 ++- + arch/x86/include/asm/extable_fixup_types.h | 22 ++ + arch/x86/include/asm/fpu/internal.h | 46 +-- + arch/x86/include/asm/insn-eval.h | 1 + + arch/x86/include/asm/irq_stack.h | 37 +- + arch/x86/include/asm/mce.h | 12 - + arch/x86/include/asm/msr.h | 4 +- + arch/x86/include/asm/page_64_types.h | 2 +- + arch/x86/include/asm/paravirt.h | 31 +- + arch/x86/include/asm/processor.h | 1 + + arch/x86/include/asm/ptrace.h | 2 +- + arch/x86/include/asm/segment.h | 2 +- + arch/x86/include/asm/stacktrace.h | 10 + + arch/x86/include/asm/traps.h | 6 +- + arch/x86/include/asm/xen/hypercall.h | 6 +- + 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/dumpstack_64.c | 6 + + arch/x86/kernel/fpu/signal.c | 146 ++++---- + arch/x86/kernel/irqflags.S | 2 + + arch/x86/kernel/itmt.c | 2 +- + arch/x86/kernel/paravirt.c | 45 ++- + arch/x86/kernel/process.c | 1 + + arch/x86/kernel/sev-shared.c | 2 +- + arch/x86/kernel/signal.c | 18 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/traps.c | 58 +++- + arch/x86/kernel/umip.c | 8 +- + arch/x86/kvm/svm/svm.h | 8 +- + arch/x86/kvm/svm/svm_ops.h | 4 +- + arch/x86/kvm/vmx/evmcs.h | 4 +- + arch/x86/lib/copy_mc_64.S | 8 +- + arch/x86/lib/copy_user_64.S | 13 - + arch/x86/lib/insn-eval.c | 2 +- + arch/x86/mm/extable.c | 131 +++----- + arch/x86/mm/fault.c | 20 +- + arch/x86/net/bpf_jit_comp.c | 11 +- + arch/x86/xen/enlighten_pv.c | 70 ++-- + arch/x86/xen/irq.c | 31 +- + arch/x86/xen/mmu_pv.c | 93 +++--- + arch/x86/xen/xen-asm.S | 79 ++--- + arch/x86/xen/xen-head.S | 34 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + drivers/regulator/core.c | 2 +- + fs/proc/stat.c | 4 +- + fs/proc/uptime.c | 14 +- + include/linux/context_tracking.h | 2 +- + include/linux/debug_locks.h | 2 - + include/linux/dma-resv.h | 2 +- + include/linux/kernel_stat.h | 1 + + include/linux/lockdep_types.h | 2 +- + include/linux/sched.h | 8 +- + include/linux/ww_mutex.h | 15 +- + kernel/Kconfig.preempt | 32 +- + kernel/irq/manage.c | 6 +- + kernel/irq/spurious.c | 8 + + kernel/kthread.c | 16 +- + kernel/locking/lockdep.c | 6 +- + kernel/locking/mutex.c | 41 +++ + kernel/locking/test-ww_mutex.c | 86 +++-- + kernel/locking/ww_rt_mutex.c | 25 ++ + kernel/rcu/update.c | 4 +- + kernel/sched/core.c | 225 ++++++------- + kernel/sched/deadline.c | 99 +++++- + kernel/sched/debug.c | 100 +++--- + kernel/sched/fair.c | 407 +++++++++++++--------- + kernel/sched/rt.c | 130 +++++++- + kernel/sched/sched.h | 19 +- + kernel/sched/stats.c | 104 ++++++ + kernel/sched/stats.h | 49 +++ + kernel/sched/stop_task.c | 4 +- + kernel/sched/topology.c | 21 +- + lib/Kconfig.debug | 2 +- + lib/locking-selftest.c | 2 +- + scripts/sorttable.c | 4 +- + tools/objtool/arch/x86/decode.c | 74 +++- + tools/objtool/check.c | 464 ++++++++++++++++++++------ + tools/objtool/include/objtool/arch.h | 5 +- + tools/objtool/include/objtool/cfi.h | 2 + + tools/objtool/include/objtool/check.h | 2 +- + tools/objtool/include/objtool/elf.h | 1 + + tools/objtool/include/objtool/objtool.h | 9 + + tools/objtool/objtool.c | 22 ++ + tools/objtool/orc_gen.c | 15 +- + tools/testing/selftests/sched/cs_prctl_test.c | 28 +- + 98 files changed, 2390 insertions(+), 1319 deletions(-) + create mode 100644 arch/x86/include/asm/extable_fixup_types.h +Merging clockevents/timers/drivers/next (f196ae282070 dt-bindings: timer: Add ABIs for new Ingenic SoCs) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (1c60e6f24b67 Merge branch 'edac-misc' 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/edac_mc.c | 42 ++++++++++++++++++------------------------ + 2 files changed, 22 insertions(+), 32 deletions(-) +Merging irqchip/irq/irqchip-next (6e3b473ee064 Merge branch irq/qcom-pdc-nowake-cleanup into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (5dfe50b05588 bootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Already up to date. +Merging rcu/rcu/next (718ecc280a84 rcu: Make idle entry report expedited quiescent states) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging kernel/rcu/update.c +Auto-merging Documentation/timers/no_hz.rst +Merge made by the 'recursive' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 69 +++-- + Documentation/RCU/stallwarn.rst | 21 +- + Documentation/admin-guide/kernel-parameters.txt | 4 - + .../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/kcsan-checks.h | 3 + + 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/rcuscale.c | 10 +- + kernel/rcu/rcutorture.c | 167 +++++++---- + kernel/rcu/refscale.c | 6 +- + kernel/rcu/srcutiny.c | 2 +- + kernel/rcu/tasks.h | 112 ++++---- + kernel/rcu/tree.c | 77 ++--- + kernel/rcu/tree.h | 8 - + kernel/rcu/tree_exp.h | 14 +- + kernel/rcu/tree_nocb.h | 2 +- + kernel/rcu/tree_plugin.h | 247 ++-------------- + kernel/rcu/tree_stall.h | 27 +- + kernel/rcu/update.c | 8 +- + kernel/scftorture.c | 43 +-- + kernel/softirq.c | 3 +- + kernel/time/clocksource-wdtest.c | 5 +- + kernel/time/clocksource.c | 31 +- + kernel/time/tick-sched.c | 7 + + tools/memory-model/Documentation/locking.txt | 320 +++++++++++++++++++++ + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 11 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 +++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +++- + tools/memory-model/scripts/hwfnseg.sh | 20 ++ + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 ++++++-- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 +++ + tools/rcu/extract-stall.sh | 34 +++ + 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 | 11 +- + .../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 - + 78 files changed, 1569 insertions(+), 787 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 (deae4a10f166 KVM: x86: only allocate gfn_track when necessary) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/kvm/svm/svm.h +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/devices/xics.rst | 2 +- + Documentation/virt/kvm/devices/xive.rst | 2 +- + 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/x86/include/asm/kvm_host.h | 21 +- + arch/x86/include/asm/kvm_page_track.h | 10 +- + arch/x86/kvm/Kconfig | 3 + + arch/x86/kvm/cpuid.c | 10 +- + arch/x86/kvm/hyperv.c | 18 +- + arch/x86/kvm/ioapic.c | 2 +- + arch/x86/kvm/ioapic.h | 4 +- + arch/x86/kvm/mmu.h | 84 +++- + arch/x86/kvm/mmu/mmu.c | 460 +++++++++------------ + arch/x86/kvm/mmu/mmu_internal.h | 21 +- + arch/x86/kvm/mmu/mmutrace.h | 18 +- + arch/x86/kvm/mmu/page_track.c | 76 +++- + arch/x86/kvm/mmu/paging_tmpl.h | 168 ++++---- + arch/x86/kvm/mmu/spte.c | 30 +- + arch/x86/kvm/mmu/spte.h | 14 +- + arch/x86/kvm/mmu/tdp_mmu.c | 119 ++---- + arch/x86/kvm/mmu/tdp_mmu.h | 4 +- + arch/x86/kvm/svm/nested.c | 52 ++- + arch/x86/kvm/svm/sev.c | 6 +- + arch/x86/kvm/svm/svm.c | 156 ++++--- + arch/x86/kvm/svm/svm.h | 9 +- + arch/x86/kvm/vmx/nested.c | 61 +-- + arch/x86/kvm/vmx/vmx.c | 72 ++-- + arch/x86/kvm/x86.c | 307 +++++++------- + drivers/gpu/drm/i915/Kconfig | 1 + + include/linux/kvm_host.h | 18 +- + tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 2 +- + tools/testing/selftests/kvm/lib/sparsebit.c | 2 +- + .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 3 +- + .../selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 2 +- + virt/kvm/eventfd.c | 15 +- + virt/kvm/kvm_main.c | 127 +++--- + 41 files changed, 1017 insertions(+), 903 deletions(-) +Merging kvm-arm/next (419025b3b419 Merge branch kvm-arm64/misc-5.15 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) +$ git merge -m Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (d5d7bdc80baf s390/mm: optimize reset_guest_reference_bit()) +$ 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/mm/pgtable.c +Auto-merging arch/s390/mm/gmap.c +Auto-merging arch/s390/kernel/uv.c +Merge made by the 'recursive' strategy. + arch/s390/kernel/uv.c | 2 +- + arch/s390/mm/gmap.c | 11 ++++- + arch/s390/mm/pgtable.c | 109 ++++++++++++++++++++++++++++++++++--------------- + 3 files changed, 87 insertions(+), 35 deletions(-) +Merging xen-tip/linux-next (0594c58161b6 xen/x86: fix PV trap handling on secondary processors) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (c99ca78d67a6 platform/x86: thinkpad_acpi: Switch to common use of attributes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 22 +- + drivers/platform/x86/Kconfig | 17 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 14 +- + drivers/platform/x86/amd-pmc.c | 89 +++- + drivers/platform/x86/dell/dell-wmi-base.c | 76 +++- + drivers/platform/x86/hp-wmi.c | 329 +++++++++++++- + drivers/platform/x86/ideapad-laptop.c | 27 +- + drivers/platform/x86/intel/Kconfig | 16 + + drivers/platform/x86/intel/Makefile | 1 + + drivers/platform/x86/intel/ishtp_eclite.c | 701 ++++++++++++++++++++++++++++++ + drivers/platform/x86/lg-laptop.c | 1 - + drivers/platform/x86/thinkpad_acpi.c | 139 ++---- + drivers/platform/x86/wmaa-backlight-wmi.c | 205 +++++++++ + drivers/platform/x86/wmi.c | 369 ++++++++-------- + 15 files changed, 1675 insertions(+), 332 deletions(-) + create mode 100644 drivers/platform/x86/intel/ishtp_eclite.c + create mode 100644 drivers/platform/x86/wmaa-backlight-wmi.c +Merging chrome-platform/for-next (eb057514ccca platform/chrome: cros_ec: Fix spelling mistake "responsed" -> "response") +$ 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 | 11 +++++++++++ + drivers/iio/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 | 12 +++++++----- + drivers/platform/chrome/cros_ec_sensorhub.c | 6 ++---- + drivers/platform/chrome/cros_ec_typec.c | 5 ++--- + include/linux/platform_data/cros_ec_proto.h | 2 +- + 7 files changed, 26 insertions(+), 17 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 (2a5a8fa8b231 leds: trigger: use RCU to protect the led_cdevs list) +$ 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 +++++++++++++++++++++-------------------- + include/linux/leds.h | 2 +- + 3 files changed, 23 insertions(+), 22 deletions(-) +Merging ipmi/for-next (bc7b6871360e ipmi: Add docs for the IPMI IPMB driver) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-api/ipmi.rst | 64 ++++- + drivers/char/ipmi/Kconfig | 9 + + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ipmi_devintf.c | 8 +- + drivers/char/ipmi/ipmi_ipmb.c | 510 ++++++++++++++++++++++++++++++++++++ + drivers/char/ipmi/ipmi_msghandler.c | 310 +++++++++++++++++++--- + drivers/char/ipmi/ipmi_watchdog.c | 25 +- + include/linux/ipmi.h | 3 + + include/linux/ipmi_smi.h | 59 +++++ + include/uapi/linux/ipmi.h | 16 +- + 10 files changed, 952 insertions(+), 53 deletions(-) + create mode 100644 drivers/char/ipmi/ipmi_ipmb.c +Merging driver-core/driver-core-next (bb76c823585b Merge 5.15-rc4 into driver-core-next) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Merge made by the 'recursive' strategy. + 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-gnss | 2 +- + 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 | 16 +- + 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-module | 7 + + .../ABI/testing/sysfs-platform-dell-privacy-wmi | 60 ++- + Documentation/ABI/testing/sysfs-platform-dptf | 4 + + Documentation/ABI/testing/sysfs-platform-intel-pmc | 2 + + Documentation/ABI/testing/sysfs-platform-sst-atom | 2 +- + Documentation/ABI/testing/sysfs-ptp | 30 +- + Documentation/ABI/testing/sysfs-tty | 32 +- + drivers/base/core.c | 5 + + drivers/base/platform.c | 3 +- + fs/sysfs/file.c | 140 +++--- + fs/sysfs/group.c | 15 +- + fs/sysfs/sysfs.h | 8 +- + include/linux/kernfs.h | 28 -- + include/linux/kobject.h | 1 - + lib/kobject.c | 2 +- + scripts/get_abi.pl | 484 +++++++++++++++++++-- + 57 files changed, 1505 insertions(+), 489 deletions(-) + create mode 100644 Documentation/ABI/obsolete/o2cb +Merging usb/usb-next (ae9a6149884e Merge 5.15-rc3 into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/atmel-usb.txt | 4 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/snps,dwc3.yaml | 8 ++ + drivers/usb/class/cdc-acm.c | 1 - + drivers/usb/core/devio.c | 144 ++++++++++++++++----- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/dwc3/core.c | 29 +++++ + drivers/usb/dwc3/core.h | 8 ++ + drivers/usb/dwc3/gadget.c | 4 +- + drivers/usb/gadget/epautoconf.c | 2 +- + drivers/usb/gadget/function/f_uac2.c | 16 +-- + drivers/usb/gadget/udc/goku_udc.c | 6 +- + drivers/usb/host/ehci-atmel.c | 8 ++ + drivers/usb/host/ehci-hcd.c | 11 +- + drivers/usb/host/ehci-mv.c | 2 - + drivers/usb/host/ehci-platform.c | 6 + + drivers/usb/host/ehci.h | 1 + + drivers/usb/host/ohci-hcd.c | 3 +- + drivers/usb/musb/mediatek.c | 1 + + drivers/usb/musb/tusb6010.c | 5 + + drivers/usb/typec/hd3ss3220.c | 8 +- + drivers/usb/typec/tipd/core.c | 9 +- + 22 files changed, 219 insertions(+), 64 deletions(-) +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (c8345c0500de USB: serial: kl5kusb105: drop line-status helper) +$ 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 +Merge made by the 'recursive' strategy. + drivers/usb/serial/f81232.c | 96 ++++++++++++-------------------- + drivers/usb/serial/ftdi_sio.c | 53 +++++------------- + drivers/usb/serial/keyspan_pda.c | 67 ++++++++++------------- + drivers/usb/serial/kl5kusb105.c | 115 +++++++++++++++------------------------ + drivers/usb/serial/usb-serial.c | 59 ++++++++++---------- + 5 files changed, 151 insertions(+), 239 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. + drivers/usb/chipidea/udc.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging tty/tty-next (5ecb11dd892f Merge 5.15-rc3 into tty-next) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Removing drivers/tty/moxa.h +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. + .../bindings/serial/brcm,bcm6345-uart.txt | 36 --- + .../bindings/serial/brcm,bcm6345-uart.yaml | 47 ++++ + .../devicetree/bindings/serial/samsung_uart.yaml | 1 + + .../bindings/serial/xlnx,opb-uartlite.txt | 23 -- + .../bindings/serial/xlnx,opb-uartlite.yaml | 90 ++++++ + Documentation/driver-api/serial/n_gsm.rst | 71 ++++- + 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/tty/moxa.c | 302 +++++++++++++++++++- + drivers/tty/moxa.h | 307 --------------------- + drivers/tty/n_gsm.c | 111 ++++++-- + drivers/tty/n_hdlc.c | 2 +- + drivers/tty/n_tty.c | 3 +- + drivers/tty/serial/8250/8250_fsl.c | 8 +- + drivers/tty/serial/8250/8250_pci.c | 4 +- + drivers/tty/serial/8250/8250_pnp.c | 4 - + drivers/tty/serial/8250/Kconfig | 2 +- + drivers/tty/serial/uartlite.c | 91 +++++- + drivers/tty/tty_ioctl.c | 12 +- + 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 +- + 33 files changed, 794 insertions(+), 558 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/xlnx,opb-uartlite.txt + create mode 100644 Documentation/devicetree/bindings/serial/xlnx,opb-uartlite.yaml + delete mode 100644 drivers/tty/moxa.h +Merging char-misc/char-misc-next (8bf7a12c628d Merge 5.15-rc4 into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Merge made by the 'recursive' strategy. + Documentation/virt/ne_overview.rst | 21 ++++-- + drivers/char/mem.c | 8 +- + drivers/char/xillybus/xillybus.h | 10 +-- + drivers/char/xillybus/xillybus_core.c | 4 +- + drivers/char/xillybus/xillybus_of.c | 2 +- + drivers/char/xillybus/xillybus_pcie.c | 33 ++++----- + drivers/misc/cardreader/rtsx_pcr.c | 2 +- + drivers/misc/genwqe/card_utils.c | 10 +-- + drivers/misc/hisi_hikey_usb.c | 119 ++++++++++++++++-------------- + 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/virt/nitro_enclaves/Kconfig | 8 +- + drivers/virt/nitro_enclaves/ne_misc_dev.c | 17 +++-- + drivers/virt/nitro_enclaves/ne_pci_dev.c | 2 +- + drivers/virt/nitro_enclaves/ne_pci_dev.h | 8 +- + include/uapi/linux/nitro_enclaves.h | 10 +-- + samples/nitro_enclaves/ne_ioctl_sample.c | 7 +- + scripts/tags.sh | 6 +- + 22 files changed, 165 insertions(+), 167 deletions(-) +Merging extcon/extcon-next (f83d7033d4ec 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 (717e04fba4fa phy: rockchip-inno-usb2: Make use of the helper function devm_add_action_or_reset()) +$ 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/qcom,qmp-phy.yaml | 2 +- + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + drivers/phy/broadcom/Kconfig | 4 + + drivers/phy/hisilicon/Kconfig | 10 + + drivers/phy/hisilicon/Makefile | 1 + + drivers/phy/hisilicon/phy-hi3670-pcie.c | 845 +++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp.c | 12 +- + drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 11 +- + drivers/phy/samsung/Kconfig | 16 +- + 11 files changed, 896 insertions(+), 34 deletions(-) + create mode 100644 drivers/phy/hisilicon/phy-hi3670-pcie.c +Merging soundwire/next (ccfdcb325f2a ABI: sysfs-bus-soundwire-slave: use wildcards on What definitions) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/debugfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 +Merge made by the 'recursive' strategy. + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/xdomain.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging vfio/next (d9a0cd510c33 Merge branch 'v5.16/vfio/hch-cleanup-vfio-iommu_group-creation-v6' into v5.16/vfio/next) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Merge made by the 'recursive' strategy. + drivers/s390/crypto/vfio_ap_ops.c | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 17 +- + drivers/vfio/mdev/mdev_driver.c | 45 +--- + drivers/vfio/mdev/vfio_mdev.c | 2 +- + drivers/vfio/pci/vfio_pci_core.c | 13 +- + drivers/vfio/platform/vfio_platform_common.c | 13 +- + drivers/vfio/vfio.c | 307 ++++++++++++--------------- + drivers/vfio/vfio.h | 72 +++++++ + drivers/vfio/vfio_iommu_spapr_tce.c | 6 +- + drivers/vfio/vfio_iommu_type1.c | 256 +++++++--------------- + 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 +- + 15 files changed, 304 insertions(+), 508 deletions(-) + create mode 100644 drivers/vfio/vfio.h +Merging staging/staging-next (42ce32b1ae54 staging: r8188eu: Remove unused macros and defines from odm.h) +$ 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_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_mp_ioctl.c +Removing drivers/staging/r8188eu/core/rtw_mp.c +Removing drivers/staging/r8188eu/core/rtw_io.c +Merge made by the 'recursive' strategy. + arch/mips/include/asm/mach-ralink/spaces.h | 4 +- + drivers/staging/axis-fifo/axis-fifo.c | 88 +- + drivers/staging/fbtft/fbtft-core.c | 3 +- + drivers/staging/most/dim2/dim2.c | 38 +- + drivers/staging/mt7621-dma/hsdma-mt7621.c | 6 +- + drivers/staging/mt7621-pci/pci-mt7621.c | 2 + + drivers/staging/pi433/pi433_if.c | 18 +- + drivers/staging/pi433/pi433_if.h | 23 +- + drivers/staging/r8188eu/Kconfig | 10 - + drivers/staging/r8188eu/Makefile | 4 - + drivers/staging/r8188eu/core/rtw_ap.c | 603 +----- + drivers/staging/r8188eu/core/rtw_cmd.c | 575 +---- + drivers/staging/r8188eu/core/rtw_debug.c | 26 +- + drivers/staging/r8188eu/core/rtw_efuse.c | 574 +---- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 339 +-- + drivers/staging/r8188eu/core/rtw_io.c | 299 --- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 384 ---- + drivers/staging/r8188eu/core/rtw_iol.c | 27 - + drivers/staging/r8188eu/core/rtw_led.c | 1364 +----------- + drivers/staging/r8188eu/core/rtw_mlme.c | 99 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 284 +-- + drivers/staging/r8188eu/core/rtw_mp.c | 935 -------- + drivers/staging/r8188eu/core/rtw_mp_ioctl.c | 1170 ---------- + drivers/staging/r8188eu/core/rtw_p2p.c | 27 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 124 +- + drivers/staging/r8188eu/core/rtw_recv.c | 109 +- + drivers/staging/r8188eu/core/rtw_rf.c | 17 - + drivers/staging/r8188eu/core/rtw_security.c | 197 +- + drivers/staging/r8188eu/core/rtw_sreset.c | 32 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 34 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 112 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 72 +- + drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c | 22 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 4 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 2 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 2 +- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 49 +- + drivers/staging/r8188eu/hal/hal_com.c | 23 +- + drivers/staging/r8188eu/hal/hal_intf.c | 319 +-- + drivers/staging/r8188eu/hal/odm.c | 539 +---- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 166 +- + drivers/staging/r8188eu/hal/odm_RTL8188E.c | 26 - + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 8 - + drivers/staging/r8188eu/hal/odm_interface.c | 80 - + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 20 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 6 - + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 296 +-- + 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/rtl8188eu_recv.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 60 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 197 +- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 247 +-- + drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 13 - + .../staging/r8188eu/include/Hal8188ERateAdaptive.h | 2 - + drivers/staging/r8188eu/include/HalHWImg8188E_FW.h | 16 - + drivers/staging/r8188eu/include/HalVerDef.h | 70 - + drivers/staging/r8188eu/include/drv_types.h | 14 - + drivers/staging/r8188eu/include/hal_intf.h | 249 +-- + 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 | 171 +- + drivers/staging/r8188eu/include/odm_HWConfig.h | 9 - + 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 | 86 - + drivers/staging/r8188eu/include/odm_precomp.h | 6 - + drivers/staging/r8188eu/include/odm_reg.h | 89 - + drivers/staging/r8188eu/include/odm_types.h | 18 - + drivers/staging/r8188eu/include/osdep_intf.h | 4 - + drivers/staging/r8188eu/include/osdep_service.h | 25 +- + drivers/staging/r8188eu/include/recv_osdep.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_cmd.h | 3 - + drivers/staging/r8188eu/include/rtl8188e_dm.h | 6 - + drivers/staging/r8188eu/include/rtl8188e_hal.h | 38 +- + drivers/staging/r8188eu/include/rtl8188e_led.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_rf.h | 1 - + drivers/staging/r8188eu/include/rtw_ap.h | 11 - + drivers/staging/r8188eu/include/rtw_cmd.h | 22 - + drivers/staging/r8188eu/include/rtw_debug.h | 8 - + drivers/staging/r8188eu/include/rtw_eeprom.h | 2 +- + 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 | 18 - + 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 | 107 - + drivers/staging/r8188eu/include/rtw_recv.h | 5 - + drivers/staging/r8188eu/include/rtw_rf.h | 1 - + drivers/staging/r8188eu/include/rtw_security.h | 20 +- + drivers/staging/r8188eu/include/rtw_sreset.h | 1 - + drivers/staging/r8188eu/include/rtw_xmit.h | 5 - + drivers/staging/r8188eu/include/sta_info.h | 7 - + drivers/staging/r8188eu/include/usb_ops.h | 2 - + drivers/staging/r8188eu/include/usb_ops_linux.h | 8 - + drivers/staging/r8188eu/include/usb_osintf.h | 2 - + drivers/staging/r8188eu/include/wifi.h | 52 - + drivers/staging/r8188eu/include/xmit_osdep.h | 2 - + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 2287 +------------------- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 6 - + drivers/staging/r8188eu/os_dep/os_intfs.c | 391 +--- + drivers/staging/r8188eu/os_dep/osdep_service.c | 70 - + drivers/staging/r8188eu/os_dep/recv_linux.c | 14 - + drivers/staging/r8188eu/os_dep/usb_intf.c | 222 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 22 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 4 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 23 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 99 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 24 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 67 +- + 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/rtl8723bs_recv.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 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 | 4 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 7 - + 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 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 221 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 1 - + .../interface/vchiq_arm/vchiq_connected.c | 20 +- + .../interface/vchiq_arm/vchiq_connected.h | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 6 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 178 +- + drivers/staging/wfx/bh.c | 37 +- + drivers/staging/wfx/bh.h | 4 +- + drivers/staging/wfx/bus_sdio.c | 25 +- + drivers/staging/wfx/bus_spi.c | 22 +- + drivers/staging/wfx/data_rx.c | 7 +- + drivers/staging/wfx/data_rx.h | 4 +- + drivers/staging/wfx/data_tx.c | 87 +- + drivers/staging/wfx/data_tx.h | 6 +- + drivers/staging/wfx/debug.c | 56 +- + drivers/staging/wfx/debug.h | 2 +- + drivers/staging/wfx/fwio.c | 26 +- + drivers/staging/wfx/fwio.h | 2 +- + drivers/staging/wfx/hif_api_cmd.h | 14 +- + drivers/staging/wfx/hif_api_general.h | 25 +- + drivers/staging/wfx/hif_api_mib.h | 85 +- + drivers/staging/wfx/hif_rx.c | 23 +- + drivers/staging/wfx/hif_rx.h | 3 +- + drivers/staging/wfx/hif_tx.c | 60 +- + drivers/staging/wfx/hif_tx.h | 6 +- + drivers/staging/wfx/hif_tx_mib.c | 14 +- + drivers/staging/wfx/hif_tx_mib.h | 2 +- + drivers/staging/wfx/hwio.c | 6 +- + drivers/staging/wfx/hwio.h | 20 +- + drivers/staging/wfx/key.c | 30 +- + drivers/staging/wfx/key.h | 4 +- + drivers/staging/wfx/main.c | 37 +- + drivers/staging/wfx/main.h | 3 +- + drivers/staging/wfx/queue.c | 43 +- + drivers/staging/wfx/queue.h | 6 +- + drivers/staging/wfx/scan.c | 51 +- + drivers/staging/wfx/scan.h | 4 +- + drivers/staging/wfx/sta.c | 118 +- + drivers/staging/wfx/sta.h | 8 +- + drivers/staging/wfx/traces.h | 2 +- + drivers/staging/wfx/wfx.h | 14 +- + drivers/staging/wlan-ng/hfa384x.h | 2 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- + drivers/staging/wlan-ng/p80211conv.c | 2 +- + drivers/staging/wlan-ng/p80211conv.h | 2 +- + drivers/staging/wlan-ng/p80211hdr.h | 2 +- + drivers/staging/wlan-ng/p80211ioctl.h | 2 +- + drivers/staging/wlan-ng/p80211mgmt.h | 2 +- + drivers/staging/wlan-ng/p80211msg.h | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/staging/wlan-ng/p80211netdev.h | 2 +- + drivers/staging/wlan-ng/p80211req.c | 2 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 2 +- + drivers/staging/wlan-ng/p80211wep.c | 2 +- + drivers/staging/wlan-ng/prism2mgmt.c | 2 +- + drivers/staging/wlan-ng/prism2mgmt.h | 2 +- + drivers/staging/wlan-ng/prism2mib.c | 2 +- + drivers/staging/wlan-ng/prism2sta.c | 2 +- + drivers/staging/wlan-ng/prism2usb.c | 3 +- + 201 files changed, 1956 insertions(+), 17648 deletions(-) + 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/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 +Merging iio/togreg (4c2d124b3c9d iio: imu: adis16400: Fix buffer alignment requirements.) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Removing include/linux/counter_enum.h +Auto-merging drivers/iio/imu/adis16475.c +Auto-merging drivers/iio/adc/max1027.c +Auto-merging drivers/iio/adc/aspeed_adc.c +CONFLICT (content): Merge conflict in drivers/iio/adc/aspeed_adc.c +Auto-merging drivers/iio/accel/fxls8962af-core.c +Removing drivers/counter/counter.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Resolved 'drivers/iio/adc/aspeed_adc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master eebf52e46f31] Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-counter | 38 +- + Documentation/ABI/testing/sysfs-bus-iio | 1 + + .../ABI/testing/sysfs-bus-iio-chemical-sunrise-co2 | 38 + + .../ABI/testing/sysfs-bus-iio-temperature-max31865 | 20 + + .../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 +- + .../bindings/iio/adc/aspeed,ast2600-adc.yaml | 100 ++ + .../bindings/iio/adc/atmel,sama5d2-adc.yaml | 1 + + .../bindings/iio/adc/nxp,imx8qxp-adc.yaml | 78 + + .../bindings/iio/chemical/senseair,sunrise.yaml | 55 + + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 7 + + .../bindings/iio/temperature/maxim,max31865.yaml | 52 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/driver-model/devres.rst | 1 + + Documentation/driver-api/generic-counter.rst | 358 ++++- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 33 +- + drivers/counter/104-quad-8.c | 699 +++++---- + drivers/counter/Kconfig | 6 +- + drivers/counter/Makefile | 1 + + drivers/counter/counter-chrdev.c | 578 ++++++++ + drivers/counter/counter-chrdev.h | 14 + + drivers/counter/counter-core.c | 191 +++ + drivers/counter/counter-sysfs.c | 960 +++++++++++++ + 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/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/fxls8962af-core.c | 347 ++++- + drivers/iio/accel/mma7660.c | 2 +- + 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/ad7291.c | 70 +- + drivers/iio/adc/ad7949.c | 254 +++- + drivers/iio/adc/aspeed_adc.c | 598 ++++++-- + drivers/iio/adc/at91-sama5d2_adc.c | 594 +++++--- + 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/imx8qxp-adc.c | 494 +++++++ + drivers/iio/adc/intel_mrfld_adc.c | 24 +- + drivers/iio/adc/lp8788_adc.c | 31 +- + drivers/iio/adc/max1027.c | 278 +++- + drivers/iio/adc/max1363.c | 82 +- + drivers/iio/adc/nau7802.c | 50 +- + drivers/iio/adc/rn5t618-adc.c | 13 +- + drivers/iio/adc/rockchip_saradc.c | 4 +- + drivers/iio/adc/ti-adc108s102.c | 11 +- + drivers/iio/adc/ti-ads8344.c | 27 +- + drivers/iio/adc/twl6030-gpadc.c | 6 +- + drivers/iio/chemical/Kconfig | 11 + + drivers/iio/chemical/Makefile | 1 + + drivers/iio/chemical/sunrise_co2.c | 537 +++++++ + drivers/iio/common/st_sensors/st_sensors_core.c | 34 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 - + drivers/iio/common/st_sensors/st_sensors_spi.c | 1 - + drivers/iio/common/st_sensors/st_sensors_trigger.c | 53 +- + drivers/iio/dac/ad5064.c | 49 +- + drivers/iio/dac/ad5770r.c | 2 +- + drivers/iio/dac/ad7303.c | 47 +- + drivers/iio/dac/stm32-dac-core.c | 4 +- + 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/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 | 16 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 1 - + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 17 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 6 - + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 6 - + drivers/iio/industrialio-buffer.c | 46 + + drivers/iio/inkern.c | 17 + + drivers/iio/light/max44000.c | 17 +- + drivers/iio/magnetometer/Kconfig | 2 +- + drivers/iio/magnetometer/ak8975.c | 35 + + drivers/iio/magnetometer/st_magn_core.c | 29 +- + drivers/iio/magnetometer/st_magn_i2c.c | 23 +- + drivers/iio/magnetometer/st_magn_spi.c | 23 +- + drivers/iio/pressure/st_pressure_core.c | 27 +- + drivers/iio/pressure/st_pressure_i2c.c | 23 +- + drivers/iio/pressure/st_pressure_spi.c | 23 +- + drivers/iio/temperature/Kconfig | 10 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/ltc2983.c | 16 + + drivers/iio/temperature/max31865.c | 349 +++++ + drivers/staging/iio/cdc/ad7746.c | 4 +- + drivers/staging/iio/frequency/ad9832.c | 82 +- + include/linux/counter.h | 720 +++++----- + include/linux/counter_enum.h | 45 - + include/linux/iio/buffer.h | 4 + + 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/mfd/stm32-lptimer.h | 5 + + include/linux/mfd/stm32-timers.h | 4 + + include/uapi/linux/counter.h | 154 ++ + tools/Makefile | 13 +- + tools/counter/Build | 1 + + tools/counter/Makefile | 53 + + tools/counter/counter_example.c | 92 ++ + 133 files changed, 9262 insertions(+), 4177 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-sunrise-co2 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-temperature-max31865 + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl313.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl355.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/aspeed,ast2600-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/chemical/senseair,sunrise.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/sunrise_co2.c + create mode 100644 drivers/iio/temperature/max31865.c + 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 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 +Merge made by the 'recursive' strategy. + 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 +- + 7 files changed, 4819 insertions(+), 910 deletions(-) +Merging dmaengine/next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (7ee285395b21 cgroup: Make rebind_subsystems() disable v2 controllers all at once) +$ 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 | 34 +++++++++++++------- + include/linux/misc_cgroup.h | 6 +++- + kernel/cgroup/cgroup.c | 31 +++++++++++++++--- + kernel/cgroup/cpuset.c | 56 +++++++++++++++++---------------- + kernel/cgroup/misc.c | 31 +++++++++++++----- + 5 files changed, 107 insertions(+), 51 deletions(-) +Merging scsi/for-next (b198c36ab605 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/lpfc/lpfc.h +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-fc | 27 ++++ + drivers/scsi/dc395x.c | 1 + + 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/hisi_sas/hisi_sas.h | 2 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 24 ++-- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 8 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 37 +++--- + drivers/scsi/libiscsi.c | 3 +- + drivers/scsi/libsas/sas_init.c | 5 +- + drivers/scsi/libsas/sas_scsi_host.c | 23 ++-- + drivers/scsi/lpfc/lpfc.h | 1 + + drivers/scsi/lpfc/lpfc_els.c | 41 ++++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 32 +++-- + drivers/scsi/lpfc/lpfc_init.c | 49 +++++++- + drivers/scsi/lpfc/lpfc_nvme.c | 70 +++++++++-- + drivers/scsi/lpfc/lpfc_nvmet.c | 44 ++++--- + drivers/scsi/lpfc/lpfc_scsi.c | 92 ++++++++------ + drivers/scsi/lpfc/lpfc_sli.c | 154 ++++++++++++++++++----- + drivers/scsi/lpfc/lpfc_sli4.h | 2 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/pm8001/pm8001_ctl.c | 6 +- + drivers/scsi/pm8001/pm8001_hwi.c | 7 +- + drivers/scsi/pm8001/pm8001_init.c | 12 ++ + drivers/scsi/pm8001/pm8001_sas.c | 15 +++ + drivers/scsi/pm8001/pm8001_sas.h | 6 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 60 +++++++-- + drivers/scsi/qla2xxx/qla_attr.c | 24 +++- + drivers/scsi/qla2xxx/qla_bsg.c | 48 +++++++ + drivers/scsi/qla2xxx/qla_bsg.h | 7 ++ + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 + + drivers/scsi/qla2xxx/qla_gs.c | 3 +- + drivers/scsi/qla2xxx/qla_init.c | 17 +-- + drivers/scsi/qla2xxx/qla_mbx.c | 35 +++++- + drivers/scsi/qla2xxx/qla_nvme.c | 20 ++- + drivers/scsi/qla2xxx/qla_os.c | 90 ++++++------- + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/ufs/Kconfig | 9 ++ + drivers/scsi/ufs/Makefile | 1 + + drivers/scsi/ufs/ufs-hwmon.c | 210 +++++++++++++++++++++++++++++++ + drivers/scsi/ufs/ufs-mediatek.c | 21 +++- + drivers/scsi/ufs/ufs-mediatek.h | 6 + + drivers/scsi/ufs/ufs-qcom.c | 3 +- + drivers/scsi/ufs/ufs.h | 7 ++ + drivers/scsi/ufs/ufshcd.c | 47 +++++++ + drivers/scsi/ufs/ufshcd.h | 20 +++ + drivers/scsi/ufs/ufshpb.c | 8 +- + drivers/target/target_core_xcopy.c | 14 +-- + include/scsi/scsi_cmnd.h | 1 - + 54 files changed, 1067 insertions(+), 278 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fc + create mode 100644 drivers/scsi/ufs/ufs-hwmon.c +Merging scsi-mkp/for-next (c749301ebee8 scsi: sd: Fix sd_do_mode_sense() buffer length handling) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/ufs/ufshcd.h +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/lpfc/lpfc_hw4.h +Auto-merging drivers/scsi/elx/efct/efct_lio.c +Merge made by the 'recursive' strategy. + drivers/scsi/advansys.c | 4 +-- + drivers/scsi/aic7xxx/aic79xx_osm.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 2 +- + drivers/scsi/elx/efct/efct_driver.c | 6 ++-- + drivers/scsi/elx/efct/efct_lio.c | 4 +-- + drivers/scsi/lpfc/lpfc_hw4.h | 4 +++ + drivers/scsi/lpfc/lpfc_init.c | 16 ++++++++++- + drivers/scsi/lpfc/lpfc_scsi.c | 8 +++--- + drivers/scsi/scsi_lib.c | 46 ++++++++++++++++++------------ + drivers/scsi/scsi_scan.c | 57 ------------------------------------- + drivers/scsi/sd.c | 7 +++++ + drivers/scsi/ufs/Kconfig | 12 ++++---- + drivers/scsi/ufs/ufs-qcom.c | 12 +++++++- + drivers/scsi/ufs/ufshcd.c | 4 +-- + drivers/scsi/ufs/ufshcd.h | 1 + + include/scsi/scsi_host.h | 10 ------- + 16 files changed, 86 insertions(+), 109 deletions(-) +Merging vhost/linux-next (dd7dc7e82b14 vhost_vdpa: unset vq irq before freeing irq) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/vdpa/vdpa_user/vduse_dev.c | 8 ++++++++ + drivers/vhost/vdpa.c | 8 ++++---- + 2 files changed, 12 insertions(+), 4 deletions(-) +Merging rpmsg/for-next (eb2685635cb7 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 drivers/soc/qcom/qcom_aoss.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/remoteproc/mtk,scp.txt +Merge made by the 'recursive' strategy. + .../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 | 21 +- + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/imx_rproc.c | 43 +-- + drivers/remoteproc/meson_mx_ao_arc.c | 261 ++++++++++++++++++ + drivers/remoteproc/mtk_common.h | 1 + + drivers/remoteproc/mtk_scp.c | 48 +++- + 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 | 297 ++++++++++++++++++--- + drivers/remoteproc/qcom_q6v5_pas.c | 141 ++++------ + drivers/remoteproc/qcom_q6v5_wcss.c | 5 +- + drivers/remoteproc/qcom_wcnss.c | 1 - + drivers/remoteproc/remoteproc_coredump.c | 2 +- + drivers/remoteproc/remoteproc_elf_loader.c | 4 +- + drivers/rpmsg/mtk_rpmsg.c | 2 +- + drivers/rpmsg/qcom_glink_native.c | 2 +- + include/linux/rpmsg.h | 2 +- + 26 files changed, 982 insertions(+), 245 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/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 (7687a5b0ee93 gpio: modepin: Add driver support for modepin GPIO controller) +$ 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-max77620.c | 1 - + 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 ++ + 12 files changed, 394 insertions(+), 26 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 pinctrl/for-next (5077a3240bb3 Merge tag 'renesas-pinctrl-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel) +$ 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/qcom/pinctrl-spmi-gpio.c +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/pinctrl-mt8195.yaml | 86 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 2 + + .../bindings/pinctrl/qcom,qcm2290-pinctrl.yaml | 165 +++ + .../bindings/pinctrl/qcom,sm6350-pinctrl.yaml | 148 +++ + drivers/pinctrl/mediatek/pinctrl-moore.c | 18 + + 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-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 | 6 + + drivers/pinctrl/renesas/core.c | 12 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +- + include/dt-bindings/pinctrl/mt65xx.h | 9 + + 20 files changed, 3468 insertions(+), 85 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qcm2290-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm6350-pinctrl.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-qcm2290.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm6350.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. + drivers/pinctrl/intel/Kconfig | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (fcfb63148c24 pinctrl: renesas: rzg2l: Fix missing port register 21h) +$ 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 (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (3f2b16734914 pwm: mtk-disp: Implement atomic API .get_state()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Already up to date. +Merging userns/for-next (a3be01837fc9 Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for-v5.15 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging include/linux/sched/signal.h +CONFLICT (content): Merge conflict in include/linux/sched/signal.h +Resolved 'include/linux/sched/signal.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6787d3476b6b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git +$ git diff -M --stat --summary HEAD^.. + include/linux/sched/signal.h | 1 + + 1 file changed, 1 insertion(+) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge -m Merge branch 'next' of git://git.linaro.org/kernel/coresight.git coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (27ff63eb076c rtc: msc313: fix missing include) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 49 ++++ + MAINTAINERS | 1 + + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-ds1302.c | 7 + + drivers/rtc/rtc-ds1390.c | 7 + + drivers/rtc/rtc-msc313.c | 259 +++++++++++++++++++++ + drivers/rtc/rtc-omap.c | 1 - + drivers/rtc/rtc-pcf2123.c | 9 + + drivers/rtc/rtc-rx6110.c | 2 +- + drivers/rtc/rtc-s5m.c | 1 - + 11 files changed, 344 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/mstar,msc313-rtc.yaml + create mode 100644 drivers/rtc/rtc-msc313.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 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 (e6f21e8a3c4f Merge branch 'for-next/overflow' 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 net/xfrm/xfrm_user.c +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/ieee80211.h +Auto-merging include/linux/filter.h +Auto-merging drivers/staging/r8188eu/include/ieee80211.h +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + Makefile | 6 +- + arch/arm/boot/compressed/string.c | 1 + + arch/s390/lib/string.c | 3 + + arch/x86/boot/compressed/misc.h | 2 + + arch/x86/boot/compressed/pgtable_64.c | 2 + + arch/x86/lib/string_32.c | 1 + + drivers/char/pcmcia/cm4000_cs.c | 9 +- + drivers/crypto/chelsio/chcr_crypto.h | 14 +- + drivers/cxl/cxl.h | 61 ++--- + drivers/gpu/drm/mga/mga_ioc32.c | 27 +- + drivers/hid/hid-cp2112.c | 14 +- + drivers/hid/hid-roccat-kone.c | 2 +- + drivers/hid/hid-roccat-kone.h | 12 +- + drivers/iommu/amd/init.c | 9 +- + drivers/macintosh/smu.c | 3 +- + drivers/net/can/flexcan.c | 68 ++--- + drivers/net/can/usb/etas_es58x/es581_4.h | 2 +- + drivers/net/can/usb/etas_es58x/es58x_fd.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 14 +- + drivers/net/wireless/ath/ath10k/bmi.h | 10 +- + drivers/net/wireless/ath/ath10k/htt.h | 7 +- + drivers/net/wireless/intel/iwlegacy/commands.h | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 12 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 6 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 3 +- + drivers/scsi/qla4xxx/ql4_def.h | 4 +- + drivers/staging/r8188eu/include/ieee80211.h | 6 +- + drivers/staging/rtl8712/ieee80211.h | 4 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 6 +- + fs/btrfs/root-tree.c | 6 +- + fs/hpfs/hpfs.h | 8 +- + include/linux/compiler-gcc.h | 2 - + include/linux/compiler_types.h | 5 - + include/linux/filter.h | 6 +- + include/linux/fortify-string.h | 77 ++++-- + include/linux/ieee80211.h | 30 +-- + include/linux/stddef.h | 65 ++++- + include/linux/string.h | 44 +++- + include/linux/thread_info.h | 2 +- + include/scsi/sas.h | 12 +- + include/uapi/drm/mga_drm.h | 22 +- + include/uapi/linux/dlm_device.h | 4 +- + include/uapi/linux/stddef.h | 37 +++ + include/uapi/rdma/rdma_user_rxe.h | 4 +- + include/uapi/sound/asoc.h | 4 +- + kernel/kallsyms.c | 46 +++- + 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/gcc-plugins/gcc-common.h | 131 +--------- + 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 | 5 +- + 85 files changed, 1193 insertions(+), 671 deletions(-) + create mode 100644 lib/memcpy_kunit.c + create mode 100644 lib/test_fortify/read_overflow-memchr.c + create mode 100644 lib/test_fortify/read_overflow-memchr_inv.c + create mode 100644 lib/test_fortify/read_overflow-memcmp.c + create mode 100644 lib/test_fortify/read_overflow-memscan.c + create mode 100644 lib/test_fortify/read_overflow2-memcmp.c + create mode 100644 lib/test_fortify/read_overflow2-memcpy.c + create mode 100644 lib/test_fortify/read_overflow2-memmove.c + create mode 100644 lib/test_fortify/test_fortify.h + create mode 100644 lib/test_fortify/write_overflow-memcpy.c + create mode 100644 lib/test_fortify/write_overflow-memmove.c + create mode 100644 lib/test_fortify/write_overflow-memset.c + create mode 100644 lib/test_fortify/write_overflow-strcpy-lit.c + create mode 100644 lib/test_fortify/write_overflow-strcpy.c + create mode 100644 lib/test_fortify/write_overflow-strlcpy-src.c + create mode 100644 lib/test_fortify/write_overflow-strlcpy.c + create mode 100644 lib/test_fortify/write_overflow-strncpy-src.c + create mode 100644 lib/test_fortify/write_overflow-strncpy.c + create mode 100644 lib/test_fortify/write_overflow-strscpy.c + create mode 100644 scripts/test_fortify.sh +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Merge made by the 'recursive' strategy. + drivers/gnss/mtk.c | 2 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/gnss/ubx.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (d162d84b27c8 nvmem: Fix shift-out-of-bound (UBSAN) with byte size cells) +$ 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. + drivers/nvmem/core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (9d68cd9120e4 hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (f8416aa29185 kernel: debug: Convert to SPDX identifier) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging fpga/for-next (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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging kunit/test (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (3b29021ddd10 kunit: tool: allow filtering test cases via glob) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging tools/testing/kunit/kunit.py +Auto-merging lib/kunit/executor_test.c +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/running_tips.rst | 11 ++- + lib/kunit/executor.c | 107 +++++++++++++++++++++--- + lib/kunit/executor_test.c | 109 ++++++++++++++++++++++--- + lib/kunit/kunit-test.c | 14 ++-- + tools/testing/kunit/kunit.py | 5 +- + 5 files changed, 211 insertions(+), 35 deletions(-) +Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (813272ed5238 Merge 5.14-rc5 into char-misc-next) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge -m Merge branch 'counters' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git counters/counters +Already up to date. +Merging rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/kallsyms.c +Auto-merging init/Kconfig +Auto-merging include/linux/spinlock.h +Auto-merging include/linux/kallsyms.h +CONFLICT (content): Merge conflict in include/linux/kallsyms.h +Auto-merging arch/riscv/Makefile +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/process/changes.rst +Resolved 'Makefile' using previous resolution. +Resolved 'include/linux/kallsyms.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master aec803ca5b6c] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 5 + + .rustfmt.toml | 12 + + Documentation/doc-guide/kernel-doc.rst | 3 + + Documentation/index.rst | 1 + + Documentation/kbuild/kbuild.rst | 4 + + Documentation/process/changes.rst | 13 + + Documentation/rust/arch-support.rst | 35 + + Documentation/rust/assets/favicon-16x16.png | Bin 0 -> 798 bytes + Documentation/rust/assets/favicon-32x32.png | Bin 0 -> 2076 bytes + Documentation/rust/assets/rust-logo.png | Bin 0 -> 53976 bytes + Documentation/rust/coding.rst | 92 + + Documentation/rust/docs.rst | 110 + + Documentation/rust/index.rst | 20 + + Documentation/rust/quick-start.rst | 222 ++ + MAINTAINERS | 14 + + Makefile | 158 +- + arch/arm/rust/target.json | 28 + + arch/arm64/rust/target.json | 35 + + arch/powerpc/rust/target.json | 30 + + arch/riscv/Makefile | 1 + + arch/riscv/rust/rv32ima.json | 37 + + arch/riscv/rust/rv32imac.json | 37 + + arch/riscv/rust/rv64ima.json | 37 + + arch/riscv/rust/rv64imac.json | 37 + + arch/x86/rust/target.json | 37 + + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 28 + + kernel/kallsyms.c | 7 + + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 6 + + rust/Makefile | 316 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 425 ++++ + rust/alloc/borrow.rs | 493 ++++ + rust/alloc/boxed.rs | 1728 ++++++++++++++ + rust/alloc/collections/mod.rs | 116 + + rust/alloc/fmt.rs | 587 +++++ + rust/alloc/lib.rs | 197 ++ + rust/alloc/macros.rs | 128 ++ + rust/alloc/prelude/mod.rs | 17 + + rust/alloc/prelude/v1.rs | 16 + + rust/alloc/raw_vec.rs | 612 +++++ + rust/alloc/rc.rs | 2539 +++++++++++++++++++++ + rust/alloc/slice.rs | 1271 +++++++++++ + rust/alloc/str.rs | 614 +++++ + rust/alloc/string.rs | 2847 +++++++++++++++++++++++ + rust/alloc/sync.rs | 2631 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 157 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 296 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3255 +++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 170 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 33 + + rust/compiler_builtins.rs | 146 ++ + rust/exports.c | 16 + + rust/helpers.c | 235 ++ + rust/kernel/allocator.rs | 63 + + rust/kernel/bindings.rs | 28 + + rust/kernel/bindings_helper.h | 24 + + rust/kernel/buffer.rs | 39 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 212 ++ + rust/kernel/error.rs | 272 +++ + rust/kernel/file.rs | 130 ++ + rust/kernel/file_operations.rs | 698 ++++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/iov_iter.rs | 95 + + rust/kernel/lib.rs | 220 ++ + rust/kernel/linked_list.rs | 245 ++ + rust/kernel/miscdev.rs | 113 + + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 176 ++ + rust/kernel/platdev.rs | 166 ++ + rust/kernel/prelude.rs | 28 + + rust/kernel/print.rs | 412 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 570 +++++ + rust/kernel/security.rs | 79 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/str.rs | 259 +++ + rust/kernel/sync/arc.rs | 227 ++ + rust/kernel/sync/condvar.rs | 136 ++ + rust/kernel/sync/guard.rs | 82 + + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 84 + + rust/kernel/sync/mutex.rs | 101 + + rust/kernel/sync/spinlock.rs | 109 + + rust/kernel/sysctl.rs | 198 ++ + rust/kernel/task.rs | 193 ++ + rust/kernel/traits.rs | 26 + + rust/kernel/types.rs | 249 ++ + rust/kernel/user_ptr.rs | 191 ++ + rust/macros/lib.rs | 127 ++ + rust/macros/module.rs | 754 +++++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 + + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 51 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 150 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 177 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Makefile.build | 22 + + scripts/Makefile.lib | 12 + + scripts/generate_rust_analyzer.py | 143 ++ + scripts/kallsyms.c | 33 +- + scripts/kconfig/confdata.c | 67 +- + scripts/rust-version.sh | 31 + + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 129 files changed, 29588 insertions(+), 26 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/assets/favicon-16x16.png + create mode 100644 Documentation/rust/assets/favicon-32x32.png + create mode 100644 Documentation/rust/assets/rust-logo.png + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/prelude/mod.rs + create mode 100644 rust/alloc/prelude/v1.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/rc.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/sync.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platdev.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/traits.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100755 scripts/rust-version.sh +$ git am -3 ../patches/0001-fixup-for-rust-integration-with-Makefile.clang-creat.patch +Applying: fixup for rust integration with Makefile.clang creation +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/Makefile.clang +$ git add -A . +$ git commit -v -a --amend +[master ca2e03053ee3] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Tue Oct 5 16:53:13 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/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 (27b231798da1 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/filemap.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/linux/writeback.h +Auto-merging include/linux/netfs.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. +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 1a6c56ce96c4] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/cachetlb.rst | 6 + + Documentation/core-api/mm-api.rst | 5 + + Documentation/filesystems/netfs_library.rst | 2 + + arch/arc/include/asm/cacheflush.h | 1 + + arch/arm/include/asm/cacheflush.h | 1 + + arch/mips/include/asm/cacheflush.h | 2 + + arch/nds32/include/asm/cacheflush.h | 1 + + arch/nios2/include/asm/cacheflush.h | 3 +- + arch/parisc/include/asm/cacheflush.h | 3 +- + arch/sh/include/asm/cacheflush.h | 3 +- + arch/xtensa/include/asm/cacheflush.h | 3 +- + fs/afs/write.c | 9 +- + fs/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 +-- + 72 files changed, 2903 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 dc4e114de33c] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git + Date: Tue Oct 5 17:10:27 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 fs/f2fs/segment.c +Auto-merging drivers/tty/n_tty.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/net/virtio_net.c +Auto-merging block/blk-mq.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/Kconfig +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 MAINTAINERS +Merge made by the 'recursive' strategy. + 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 | 2 - + 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(+), 441 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 akpm-current/current (dd22e0752770 ipc/ipc_sysctl.c: remove fallback for !CONFIG_PROC_SYSCTL) +$ git merge --no-ff akpm-current/current +Auto-merging security/Kconfig +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/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/percpu.c +Auto-merging mm/page_owner.c +Auto-merging mm/page_alloc.c +Auto-merging mm/nommu.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/internal.h +Auto-merging mm/hugetlb.c +Auto-merging mm/filemap.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sched/sched.h +Auto-merging 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 +Auto-merging kernel/dma/swiotlb.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging init/main.c +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/migrate.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/compiler_types.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/xen/swiotlb-xen.c +Auto-merging drivers/macintosh/smu.c +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kernel/uv.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/blockdev/zram.rst | 8 + + Documentation/admin-guide/kernel-parameters.txt | 8 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 42 +- + Documentation/admin-guide/mm/index.rst | 2 + + Documentation/admin-guide/mm/memory-hotplug.rst | 130 +++++- + 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 | 11 + + .../translations/zh_CN/core-api/memory-hotplug.rst | 4 - + Documentation/vm/damon/index.rst | 1 - + Documentation/vm/index.rst | 26 +- + Documentation/vm/page_owner.rst | 23 +- + MAINTAINERS | 2 +- + Makefile | 15 + + arch/Kconfig | 28 ++ + arch/alpha/kernel/core_irongate.c | 2 +- + arch/alpha/kernel/traps.c | 4 +- + arch/arc/mm/init.c | 2 +- + arch/arm/mach-hisi/platmcpm.c | 2 +- + arch/arm/mach-rpc/ecard.c | 2 +- + arch/arm/mm/init.c | 2 +- + arch/arm64/mm/mmu.c | 4 +- + arch/microblaze/mm/pgtable.c | 3 +- + arch/mips/mm/init.c | 2 +- + 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 | 8 +- + 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/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_pv.c | 6 +- + arch/x86/xen/p2m.c | 2 +- + arch/x86/xen/setup.c | 6 +- + drivers/base/Makefile | 2 +- + drivers/base/arch_numa.c | 10 +- + 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/macintosh/smu.c | 2 +- + drivers/mmc/core/mmc_test.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 | 4 +- + drivers/xen/swiotlb-xen.c | 2 +- + fs/binfmt_elf.c | 31 +- + fs/buffer.c | 56 ++- + fs/coda/cnode.c | 13 +- + fs/coda/coda_linux.c | 39 +- + fs/coda/coda_linux.h | 6 +- + fs/coda/dir.c | 20 +- + fs/coda/file.c | 12 +- + fs/coda/psdev.c | 14 +- + fs/coda/upcall.c | 3 +- + fs/exec.c | 4 +- + fs/hfs/inode.c | 6 +- + fs/hfsplus/catalog.c | 16 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/inode.c | 12 +- + fs/hfsplus/xattr.c | 18 +- + fs/hugetlbfs/inode.c | 14 +- + fs/inode.c | 46 +- + fs/internal.h | 1 - + fs/ocfs2/alloc.c | 48 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/super.c | 14 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/posix_acl.c | 3 +- + fs/proc/base.c | 3 + + fs/proc/fd.c | 23 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 28 +- + fs/ramfs/inode.c | 11 +- + fs/sysv/super.c | 6 +- + fs/userfaultfd.c | 12 +- + include/asm-generic/sections.h | 89 ++-- + include/linux/compiler-gcc.h | 9 + + include/linux/compiler_types.h | 5 + + include/linux/cpuhotplug.h | 4 + + include/linux/cpuset.h | 17 + + include/linux/damon.h | 6 +- + include/linux/fs.h | 1 + + include/linux/gfp.h | 2 + + include/linux/highmem.h | 28 +- + include/linux/hugetlb.h | 24 +- + include/linux/kallsyms.h | 13 +- + include/linux/kasan.h | 2 + + include/linux/kernel.h | 3 +- + include/linux/memblock.h | 23 +- + include/linux/memory.h | 19 +- + include/linux/memory_hotplug.h | 3 - + include/linux/mempolicy.h | 6 +- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 19 +- + include/linux/migrate_mode.h | 13 + + include/linux/mm.h | 54 +-- + include/linux/mmzone.h | 26 +- + include/linux/node.h | 4 +- + include/linux/page-flags.h | 2 +- + include/linux/pagemap.h | 50 +++ + include/linux/percpu.h | 3 + + include/linux/rmap.h | 8 +- + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 21 + + include/linux/slab.h | 120 +++-- + include/linux/stackdepot.h | 11 +- + include/linux/stacktrace.h | 1 + + include/linux/swap.h | 1 - + include/linux/vmalloc.h | 13 +- + init/initramfs.c | 2 +- + init/main.c | 29 +- + ipc/ipc_sysctl.c | 32 +- + 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/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/bootconfig.c | 2 +- + lib/cpumask.c | 2 +- + lib/stackdepot.c | 118 +++-- + lib/test_kasan.c | 18 +- + mm/Kconfig | 18 +- + mm/cma.c | 2 +- + mm/damon/Kconfig | 2 +- + mm/damon/core.c | 10 +- + mm/debug.c | 20 +- + mm/debug_vm_pgtable.c | 7 +- + mm/filemap.c | 20 +- + mm/gup.c | 5 +- + mm/hugetlb.c | 493 ++++++++++++++++++--- + mm/internal.h | 1 + + mm/kasan/common.c | 6 +- + mm/kasan/generic.c | 14 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/report.c | 17 +- + mm/kfence/core.c | 184 ++++++-- + mm/kfence/kfence.h | 2 + + mm/kfence/kfence_test.c | 14 +- + mm/memblock.c | 24 +- + mm/memcontrol.c | 76 ++-- + mm/memory-failure.c | 1 + + mm/memory.c | 162 +++---- + mm/memory_hotplug.c | 48 +- + mm/mempolicy.c | 12 +- + mm/memremap.c | 20 + + mm/migrate.c | 66 +-- + mm/mmap.c | 2 +- + mm/mremap.c | 50 +-- + mm/nommu.c | 6 - + mm/oom_kill.c | 9 +- + mm/page_alloc.c | 70 +-- + mm/page_isolation.c | 29 +- + mm/page_owner.c | 18 +- + mm/percpu.c | 8 +- + mm/rmap.c | 14 +- + mm/shmem.c | 6 +- + mm/slab.c | 16 - + mm/slab_common.c | 8 - + mm/slub.c | 49 +- + mm/sparse-vmemmap.c | 2 +- + mm/sparse.c | 2 +- + mm/swapfile.c | 2 +- + mm/truncate.c | 19 +- + mm/userfaultfd.c | 3 +- + mm/vmalloc.c | 47 +- + mm/vmscan.c | 10 +- + mm/vmstat.c | 73 +-- + 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 | 3 +- + scripts/const_structs.checkpatch | 4 + + scripts/spelling.txt | 16 + + security/Kconfig | 14 - + tools/testing/selftests/memory-hotplug/config | 1 - + tools/testing/selftests/vm/ksm_tests.c | 29 +- + tools/testing/selftests/vm/userfaultfd.c | 234 +++++----- + tools/vm/page_owner_sort.c | 94 +++- + 246 files changed, 2976 insertions(+), 1626 deletions(-) + rename Documentation/{vm => admin-guide/mm}/swap_numa.rst (100%) + rename Documentation/{vm => admin-guide/mm}/zswap.rst (100%) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + af06aff2a000...506ac22b3b7e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (506ac22b3b7e mm: unexport {,un}lock_page_memcg) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + mm/memcontrol.c | 4 ---- + mm/migrate.c | 6 ------ + 2 files changed, 10 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5583ac3d8982 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20211005 |