diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-10-12 20:43:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-10-12 20:43:19 +1100 |
| commit | 6d3d22efa090e7a5d3691613297aab12c6d2708a (patch) | |
| tree | d104cefdcb8e0dc6ea9c37fd5f8deabb49e7f204 | |
| parent | a6b7cf57dbd249697385ce9eab93c576250eacd7 (diff) | |
Add linux-next specific files for 20211012next-20211012
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 339 | ||||
| -rw-r--r-- | Next/Trees | 341 | ||||
| -rw-r--r-- | Next/merge.log | 10052 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 10733 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f8e538c870c9 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,339 @@ +Name SHA1 +---- ---- +origin 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc +fixes 3ca706c189db861b2ca2019a0901b94050ca49d8 +kbuild-current 0664684e1ebd7875e120d0cecd525bac4805f8ed +arc-current 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm-current 463dbba4d189750c2f576449d0bbb11c5413712e +arm64-fixes 0350419b14b98fd6f36801583360c36c8820c2e6 +arm-soc-fixes 209ee634bc0d2fa10ac8f799abf09207b5ce489a +drivers-memory-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +m68k-current 9fde0348640252c79d462c4d29a09a14e8741f5c +powerpc-fixes eb8257a12192f43ffd41bd90932c39dade958042 +s390-fixes 8e683e1ad3c23c23ced8640a3c01e29b746394e3 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current 80f6e3080bfcf865062a926817b3ca6c4a137a57 +net 732b74d647048668f0f8dc0c848f0746c69e2e2f +bpf 732b74d647048668f0f8dc0c848f0746c69e2e2f +ipsec 93ec1320b0170d7a207eda2d119c669b673401ed +netfilter 68a3765c659f809dcaac20030853a054646eb739 +ipvs 7cd8b1542a7ba0720c5a0a85ed414a122015228b +wireless-drivers 603a1621caa097be23c7784e36cb8edf23cd31db +mac80211 a2083eeb119fb9307258baea9b7c243ca9a2e0b6 +rdma-fixes 1ab52ac1e9bc9391f592c9fa8340a6e3e9c36286 +sound-current 228af5a4fa3a8293bd8b7ac5cf59548ee29627bf +sound-asoc-fixes 2a242b54080b782b7a103435f4fc7902717036c5 +regmap-fixes 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +regulator-fixes 81f2982909cdd94f8fc58f36ec2bbf91780d17c4 +spi-fixes 970283fadd182463c6fb5a5456764687ebeab0b6 +pci-current e4e737bb5c170df6135a127739a9e6148ee3da82 +driver-core.current 81967efb5f3966e8692f9173c7fa2964034ece5d +tty.current cb2282213e84f04ab7e93fd4537815da5db2f010 +usb.current ea0f69d8211963c4b2cc1998b86779a500adb502 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 11c52d250b34a0862edc29db03fbec23b30db6da +usb-chipidea-fixes f130d08a8d79fd419c339d95eb28ddff72a73f52 +phy 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +staging.current 37f12202c5d28291ba5f83ce229771447ce9148f +iio-fixes 8fc4f038fa832ec3543907fdcbe1334e1b0a8950 +char-misc.current ff53c4f6a668ee952c8a2fb494914c97ddbdaf87 +soundwire-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +thunderbolt-fixes 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc +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 3ad60b4b3570937f3278509fe6797a5093ce53f8 +mips-fixes 740da9d7ca4e25f5d87db9f80d75432681b61305 +at91-fixes dbe68bc9e82b6951ff88285ccffc191d872d9a01 +omap-fixes 80d680fdccba214e8106dc1aa33de5207ad75394 +kvm-fixes 2353e593a13ba76c82921940471ce442fe498927 +kvms390-fixes 25b5476a294cd5f7c7730f334f6b400d30bb783d +hwmon-fixes 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +nvdimm-fixes d55174cccac2e4c2a58ff68b6b573fc0836f73bd +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes d7395f03c79cd6693b9ebf838039a8e25675a133 +vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 7df227847ab562c42d318bceccebb0c911c87b04 +samsung-krzk-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +pinctrl-samsung-fixes 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +devicetree-fixes b2d70c0dbf2731a37d1c7bcc86ab2387954d5f56 +scsi-fixes 258aad75c62146453d03028a44f2f1590d58e1f6 +drm-fixes bf79045e0ef5f0fb2a0619f9d0782665d07b2d66 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes e02083f0bcc250c0556ec9e6f7ddb74220c72572 +mmc-fixes d371209acaa76aefb154c8a5c26af2e59cf17b1b +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hyperv-fixes f5c20e4a5f18677e22d8dd2846066251b006a62d +soc-fsl-fixes c1e64c0aec8cb0499e61af7ea086b59abba97945 +risc-v-fixes 3ef6ca4f354c53abf263cbeb51e7272523c294d8 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 2a2a79577ddae7d5314b2f57ca86b44d794403d5 +spdx 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +gpio-brgl-fixes 6fda593f3082ef1aa783ac13e89f673fd69a2cb6 +gpio-intel-fixes 1649b83766944e320a6f087abf1e8a221f1cd8b0 +pinctrl-intel-fixes 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc +erofs-fixes c40dd3ca2a45d5bd6e8b3f4ace5cb81493096263 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 361b57df62de249dc0b2acbf48823662a5001bcd +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 024591f9a6e0164ec23301784d1e6d8f6cacbe59 +cel-fixes 7d2a07b769330c34b4deabeed939325c77a7ec2f +irqchip-fixes b78f26926b17cc289e4f16b63363abe0aa2e8efc +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +perf-current 1da38549dd64c7f5dd22427f12dfa8db3d8a722b +drm-misc-fixes 55ec085ce470d605a8b4a01723ccadae95e6d116 +kspp-gustavo 6409e7102a9bbd1a27a74fd6bd12693f6bd92c16 +kbuild 12aaf214764045296c62ade32eb1ed66bc4cc2a3 +perf be8ecc57f180415e8a7c1cc5620c5236be2a7e56 +compiler-attributes b83a908498d68fafca931e1276e145b339cac5fb +dma-mapping 293d92cbbd2418ca2ba43fed07f1b92e884d1c77 +asm-generic 7efbbe6e141466dbe022b39fafbc81d17a8ed8be +arc 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +arm 4603664c0fe9d33bfe353fe5b51f1a76b8c64175 +arm64 52331681d687752ba06a8d47b3f00d8ec8c11faa +arm-perf e656972b69864348a747954ea187576808000c5a +arm-soc ead1660ab67ad7a4bfd01e3e759c0bb41c57a645 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 83e38509109e44b884be13fb6c6943aca1742a57 +aspeed 69890d2c55f32ea8bd82379bc00fd5e90d2a2aa4 +at91 b4af371d908f61b5367353e991fc69191cf7d239 +drivers-memory 8f086fe5f3c921ce1d448c6bde4d847cdf286111 +imx-mxs 0dfc2dd723c83d0291fdaa4dfb5ddb707923437c +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 8c62103627a86b674ccf947ae444df793257a3fd +mvebu 930af8dda7509ce6c79cb44401b79f876599faac +omap 92d190433bd8fff5595f4641510d0c63b4004632 +qcom 37f6317b18820328e968099fd0a7244d66f0ec58 +raspberrypi a036b0a5d7d6ab4bae3b9028bb1d44b677bba5f7 +renesas 321d106e70eb261bd55bee08d881cbd5468d9d64 +reset 3440b8fa067db5763f501496ec79d2856bc26060 +rockchip 9a6218fd50c15bbf027ab7b2b1e07d06dc81fa94 +samsung-krzk 6c44b39e8b122b9ab5a78ef3d66284ea8ba49e84 +scmi b92b4019a79775e8367aa5c28e6e2d2830901ab7 +stm32 3500810079160e7b3932320ad6db9eb3e8e68c3f +sunxi bb289f4c0b2bb10c7ecd51b6799cd9d1b9c409aa +tegra c45dd143ff1a587e69ba9f6c2712075099a67c08 +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new f46d16cf5b43b66de030f0e3b2f20d24ba95f369 +xilinx 7a4c31ee877a40053e39b80fe1d61c42b49f1078 +clk 1a10ca10a6752dc6065e7469e1bd361dda7a50c1 +clk-imx e8271eff5d8c8499289380edbf3bc47de83ab70b +clk-renesas 373bd6f487562e8727bc842e9983b093d57968cc +clk-samsung 2ae5c2c3f8d586b709cf67efe94488be397d7544 +csky 40e080ed8218ef15a356410d8d80fd58360af93d +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 8a3c0a74ae87473589cb881a3854948d40000b7a +m68knommu e6d94fd0794790e7a77af806473e4d4e410e651c +microblaze 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +mips 67512a8cf5a730938fdb1e48de33edfef6015e03 +nds32 07cd7745c6f2081dac0aff7f57ea2b48c86de5fa +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 72698a8789268cb11da21c018041b45233b82cbb +parisc-hd 144857444edbc57a80533bf5c67a2f539b0d820c +powerpc f9473a65719e59c45f1638cc04db7c80de8fcc1a +soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b +risc-v 9406369ae6278532cb8d9d3cf3a8f1354662fb80 +s390 6acc4d16c4bdef0ad599d4ad041e4c0434e59112 +sh 12285ff8667bf06c168113c10d3619834e423ae6 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml ab6ff1fda1e8646b27b9d87b718250f8c828ad55 +xtensa 012e974501a270d8dfd4ee2039e1fdf7579c907e +pidfd 61bc346ce64a3864ac55f5d18bdc1572cda4fb18 +fscrypt 7f595d6a6cdc336834552069a2e0a4f6d4756ddf +fscache 2bc879c792fa4d1f97d5da6846b5dcc4ff0e7b69 +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs b82c8f64d9eb9daa188f015ef463fda48420927b +ceph b96728705f91ca529f296ebe4e9d99db0733173f +cifs 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc +configfs c42dd069be8dfc9b2239a5c89e73bbd08ab35de0 +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs 71dbc5464c5c1e9d99b1c620cde6392bdfd4bb03 +exfat 50be9417e23af5a8ac860d998e1e3f06b8fd79d7 +ext3 372d1f3e1bfede719864d0d1fbf3146b1e638c88 +ext4 0288e6293e2500b118ae84ea1b8aaf36141d105c +f2fs 6663b138ded1a59e630c9e605e42aa7fde490cdc +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 9ca3f869715845a9f8e2cf5c09dd6bc7c00cfdb2 +gfs2 4efc43a399be2389d4be04f75e188cffc23a76ab +jfs c48a14dca2cb57527dde6b960adbe69953935f10 +ksmbd c6e7d82954945ce86af37c84055dc4da2c1aca67 +nfs 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +nfs-anna 8cfb9015280d49f9d92d5b0f88cedf5f0856c0fd +nfsd 35940a58f9f1db96e5688e426d713f330ead70b8 +cel c20106944eb679fa3ab7e686fe5f6ba30fbc51e5 +ntfs3 22b05f1ac0332cb47701649206997d8d9a1a7f24 +orangefs 0fdec1b3c9fbb5e856a40db5993c9eaf91c74a83 +overlayfs 1dc1eed46f9fa4cb8a07baa24fb44c96d6dd35c9 +ubifs a801fcfeef96702fa3f9b22ad56c5eb1989d9221 +v9fs 9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe +xfs f38a032b165d812b0ba8378a5cd237c0888ff65f +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 03b8df8d43ecc3c5724e6bfb80bc0b9ea2aa2612 +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks ec60f38a917867817b836f4de050e49954fc2d7c +vfs 8f40da9494cf4dedee1cbbf168b1ce107d3a484d +printk c15b5fc054c3d6c97e953617605235c5cb8ce979 +pci d53c18bef95219d533a6bf7b00df736ded8a45c4 +pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e +hid 93d455d582b0d8d3c25a59f71794e68a4e5ebc35 +i2c 26701d49482a9acf9a6c557c02430efd0c0e583a +i3c a3587e2c0578101900d4abbbd72ab3dad6d5568a +dmi f97a2103f1a75ca70f23deadb4d96a16c4d85e7d +hwmon-staging c3361ee93a648156844e3ef6cace1e2204bd5758 +jc_docs 7275423c177e5dcf53e350ab9db38f99946b8ec5 +v4l-dvb 64cdf7e5a3aac0e7c9efdb079e74e22875b0419a +v4l-dvb-next fd2eda71a47b095e81b9170c3f8b7ae82b04e785 +pm 574167bf7ed8e12be9710fc84442c5e23775f75d +cpufreq-arm b3c08d1ad2bb1a731e1d7f4eaa6b1373e5cf52d3 +cpupower 79a0dc5530a91694b1e85ef7219893397d85e5bb +devfreq 6b28c7d0781e9554cd50e5e7d4b48aea0c2bdf93 +opp 27ff8187f13ecfec8a26fb1928e906f46f326cc5 +thermal fc656fa14da7865774b4251afa88ffcf22bf02d2 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm ecd95673142ef80169a6c003b569b8a86d1e6329 +rdma 2a152512a155aaf27c3e67834ffafaed9525a7b5 +net-next ff7f0e4e7930202faed4ace6f09e303a455d0cab +bpf-next 431bfb9ee3e2ac0294d5ef58cee87683807299c0 +ipsec-next 83688aec17bf3203d8477a9dd7cce88132950798 +mlx5-next b8dfed636fc6239396c3a2ae5f812505906cf215 +netfilter-next 7b1394892de8d95748d05e3ee41e85edb4abbfa1 +ipvs-next acde891c243c1ed85b19d4d5042bdf00914f5739 +wireless-drivers-next 9b793db5fca44d01f72d3564a168171acf7c4076 +bluetooth b15bfa4df63529150df9ff0585675f728436e0c1 +mac80211-next 171964252189d8ad5672c730f2197aa73092db6e +mtd b72841e4dcd54de486fca2e4ffa00b8defc1eecc +nand c2606ddcf5ad1969ceffe3c98d427b272243e150 +spi-nor 3f491d11d8cbc3e4b4ff67bfc7f065e1cb56bcef +crypto b6f5f0c8f72d348b2d07b20d7b680ef13a7ffe98 +drm 1176d15f0f6e556d54ced510ac4a91694960332b +drm-misc 914b6f290beb0cf056d75badffa78df6e3dfb058 +amdgpu 7d89172afed6caa88148f7f68b3ad11cdbf431aa +drm-intel a94a6d76c9843c3577078ec297caf0d76b6fa12e +drm-tegra 5dccbc9de8f0071eb731b4de81d0638ea6c06a53 +drm-msm c6921fbc88e120b2279c55686a071ca312d058e9 +imx-drm 20fbfc81e390180db738c414c1b7ac85d31e24b3 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 +sound 6d27788160362a7ee6c0d317636fe4b1ddbe59a7 +sound-asoc 0fc05b31018537152bbb30ed1762c4dda1071a4f +modules ced75a2f5da71de5775fda44250e27d7b8024355 +input a41392e0877a271007e9209e63c34cab7527eb43 +block bc421898241ad6ffc9b816fdf8691032a17acf9b +device-mapper 012a67c6793277999371b1183eb6dcd081c69f13 +libata 8c0ff6af6823d3e90314a45c6725c6e8d491cd16 +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc 2318a18c3249197ec9835a2d2edf0b5763af852e +mfd f38d3e404326aa878e488120fbfbd1e8e21d2d19 +backlight 563edf85ce18a90dd0a7b39e279a691d937205f6 +battery a3d5c47c328a8002cb748d293fdcaef0c752bcdf +regulator d8b0c9f074173660f4a59fb577cbe6b4a324e0de +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity eb0782bbdfd0d7c4786216659277c3fd585afc0e +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 0550e9155dfb566e9817b776dd0ece0b3fb361f2 +smack 387ef964460f14fe1c1ea29aba70e22731ea7cf7 +tomoyo 7d2a07b769330c34b4deabeed939325c77a7ec2f +tpmdd f985911b7bc75d5c98ed24d8aaa8b94c590f7c6a +watchdog 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 +iommu 0b29edc2156722bbc6f5f2d6fd52a285938a55e8 +audit 571e5c0efcb29c5dac8cf2949d3eed84ec43056c +devicetree 387ee9fe458775e4b90172ab375e009601dd41ac +mailbox 85dfdbfc13ea9614a2168ce4a7d2cd089d84cb64 +spi 4a8f742e0d926794c1db8f1958a612428d0f8530 +tip 7413431c622fec602c030b7333f7e1a4c81b37ce +clockevents f196ae282070d798c9144771db65577910d58566 +edac 9130bd1dbe523c58f58da224f81bbd0f7565e7a1 +irqchip 6e3b473ee06445d4eae2f8b1e143db70ed66f519 +ftrace 8d6e90983ade25ec7925211ac31d9ccaf64b7edf +rcu d5e7be308018b4a3455a904982b997a40662ff7f +kvm 542a2640a2f491902fd366b5bb54a2b20ac5a2c5 +kvm-arm 1eb07f4b68538a6fba5a1ed581326e16c1c39cf2 +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 3094c9738e4b9c3f448ca5899f48e908c818dfac +xen-tip 319933a80fd4f07122466a77f93e5019d71be74c +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues 57116ce17b04fde2fe30f0859df69d8dbe5809f6 +drivers-x86 c99ca78d67a67e2828be417ed4006f1a3c0addb5 +chrome-platform eb057514ccca92d44f37be057152c7d2791cdae0 +hsi 4ef69e17eb567a3b276fcc3cb3452dcf89d8b063 +leds 2a5a8fa8b23144d14567d6f8293dd6fbeecee393 +ipmi cd921b9f0c8d0a198eaeb897fc4124a73b742b4b +driver-core d7c5bf94475b8b8fb960c7cf90682086076934df +usb 620b74d01b9d4393bef6742bf121908322c2fe0b +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial c8345c0500de4411762db5941058e34979879128 +usb-chipidea-next 78665f57c3faa09f123c4818101526e43ae9b6a4 +tty 2cb3315107b5b3312b0f434efdb3ad354274e2a5 +char-misc 424f1ac2d832f31a2814c799bd50decf6a9f8e74 +extcon f83d7033d4ec1edd02c0289e71dc77bf3f41fee6 +phy-next 759f9ec3f3761ab1b6121eb8cdc04d5c03d92d18 +soundwire ccfdcb325f2a9fd188b89bcd43bb82680823201d +thunderbolt 0a0624a26f9ceb8aae16882d87dc3b12f17f4a49 +vfio 052493d5534af4a47332193144cee8e369cce60b +staging 98f668b30e8e65324b06332e9a3e2ea340bfd7f1 +iio 4c2d124b3c9dade959740e0a842868ca4520cf46 +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc dfe14674bf7b267c44eb91d66bad076af3827a47 +dmaengine 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +cgroup 0061270307f2ad5fa01db1ac5f1da0e83410adaf +scsi 7e849b8f98a55ad9e36a319edf59eda2df48ebc3 +scsi-mkp 605ae389ea0243344713648294cd86b442d255ee +vhost dd7dc7e82b147c2424c446681a8ed46d78bd9b98 +rpmsg 0b52f666126eddbded877af82789dc96e82aeb22 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl 7687a5b0ee9358c96d85db58bad2a3aebee562b7 +gpio-intel 1649b83766944e320a6f087abf1e8a221f1cd8b0 +pinctrl 5077a3240bb3a971005afa2f30482283c0984c41 +pinctrl-intel 176412f8674be8ba9a45bb61086e224e2118324a +pinctrl-renesas 106502e232ed0296275d15054591133f168eaacd +pinctrl-samsung f9d8de699ac4a059e30cf0e84e7027f1058b9163 +pwm 3f2b16734914fa7c53ef7f8a10a63828890dbd37 +userns 3f66f86bfed33dee2e9c1d0e14486915bb0750b0 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 7caadcfa8a7c6f8e754d982b99d959a222e7f863 +nvdimm e765f13ed126fe7e41d1a6e3c60d754cd6c2af93 +at24 7629254054820bead6e18f8c3ae65c2bb01a5ae2 +ntb f96cb827ce49627543b4aabe8d54d8ea9740ae4e +seccomp d9bbdbf324cda23aa44873f505be77ed4b61d79c +kspp 7abe699d7951408e3e7dafabd361b7a3606d6244 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 0f79ce970e79ffb771733f9634d5918d0eb3e30a +fsi 9ab1428dfe2c66b51e0b41337cd0164da0ab6080 +slimbus 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +nvmem 823571f8c6f8968d8f14e91972fa350ce200f5db +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 9d68cd9120e4e3af38f843e165631c323b86b4e4 +auxdisplay 24ebc044c72ee6e88dc902a0041bac672f012537 +kgdb f8416aa29185468e0d914ba4b2a330fd53ee263f +hmm 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +fpga 57b44817a8d63e75394bc21849f585ded53de8bb +kunit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f +cfi ff1176468d368232b684f75e82563369208bc371 +kunit-next e7198adb84dcad671ad4f0e90aaa7e9fabf258dc +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 813272ed5238b37c81e448b302048e8008570121 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 5d3986cf8ed63ff8d86270e578649e71143112d6 +cxl ed97afb53365cd03dde266c9644334a558fe5a16 +folio 27b231798da13550ca64d931cbb4990b069d3189 +bitmap 785cb064e2f87b6cd2157554f50193dba0642d75 +zstd 464413496acb619a380364a26912f02c8b709d29 +akpm-current e395544898ffb76f439f842d3180339ba3acad02 +akpm 5cecc0f77c49f4039a5be62b135c977aa4a50845 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c1b77b79550e --- /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 +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 +zstd git https://github.com/terrelln/linux.git#zstd-1.4.10 +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..b55dc84cbc7e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10052 @@ +$ date -R +Tue, 12 Oct 2021 09:10:07 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 86% (5530/6387)
Updating files: 87% (5557/6387)
Updating files: 88% (5621/6387)
Updating files: 89% (5685/6387)
Updating files: 90% (5749/6387)
Updating files: 91% (5813/6387)
Updating files: 92% (5877/6387)
Updating files: 93% (5940/6387)
Updating files: 94% (6004/6387)
Updating files: 95% (6068/6387)
Updating files: 96% (6132/6387)
Updating files: 97% (6196/6387)
Updating files: 98% (6260/6387)
Updating files: 99% (6324/6387)
Updating files: 100% (6387/6387)
Updating files: 100% (6387/6387), done. +HEAD is now at efb52a7d9511 Merge tag 'powerpc-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux +Merging origin/master (64570fbc14f8 Linux 5.15-rc5) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating efb52a7d9511..64570fbc14f8 +Fast-forward (no commit created; -m option ignored) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (0350419b14b9 arm64/hugetlb: fix CMA gigantic page order for non-4K PAGE_SIZE) +$ 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 +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 1 + + arch/arm64/kernel/entry-common.c | 47 +++++++++++++++++++++------------------- + arch/arm64/mm/hugetlbpage.c | 2 +- + kernel/irq/Kconfig | 3 +++ + kernel/irq/irqdesc.c | 4 ++++ + 5 files changed, 34 insertions(+), 23 deletions(-) +Merging arm-soc-fixes/arm/fixes (209ee634bc0d Merge tag 'ffa-fixes-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + drivers/firmware/arm_ffa/bus.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) +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 (eb8257a12192 pseries/eeh: Fix the kdump kernel crash during eeh_pseries_init) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (8e683e1ad3c2 vfio-ccw: step down as maintainer) +$ 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. + MAINTAINERS | 2 -- + arch/s390/lib/string.c | 15 +++++++-------- + 2 files changed, 7 insertions(+), 10 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 (732b74d64704 virtio-net: fix for skb_over_panic inside big mode) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/snps,dwmac.yaml | 2 + + MAINTAINERS | 1 + + arch/arm/boot/dts/spear3xx.dtsi | 2 +- + drivers/isdn/capi/kcapi.c | 5 + + drivers/isdn/hardware/mISDN/netjet.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 112 ++++++++++++++++++--- + drivers/net/dsa/mv88e6xxx/chip.h | 9 ++ + drivers/net/dsa/mv88e6xxx/port.c | 21 ++++ + drivers/net/dsa/mv88e6xxx/port.h | 2 + + drivers/net/ethernet/microsoft/mana/mana_en.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 1 + + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 13 ++- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 6 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 ++ + drivers/net/phy/phy_device.c | 3 + + drivers/net/virtio_net.c | 2 +- + include/linux/dsa/mv88e6xxx.h | 13 +++ + net/dsa/dsa2.c | 4 +- + net/dsa/tag_dsa.c | 28 ++---- + net/mptcp/protocol.c | 55 +++------- + net/nfc/nci/rsp.c | 2 + + net/sched/sch_mqprio.c | 30 +++--- + net/smc/smc_cdc.c | 7 +- + net/smc/smc_core.c | 20 ++-- + net/smc/smc_llc.c | 63 +++++++++--- + net/smc/smc_tx.c | 22 +--- + net/smc/smc_wr.h | 14 +++ + 31 files changed, 327 insertions(+), 141 deletions(-) + create mode 100644 include/linux/dsa/mv88e6xxx.h +Merging bpf/master (732b74d64704 virtio-net: fix for skb_over_panic inside big mode) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/master (68a3765c659f netfilter: nf_tables: skip netdev events generated on netns removal) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/Kconfig | 2 +- + net/netfilter/nft_chain_filter.c | 9 +++------ + net/netfilter/xt_IDLETIMER.c | 2 +- + 3 files changed, 5 insertions(+), 8 deletions(-) +Merging ipvs/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/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless-drivers/master (603a1621caa0 mwifiex: avoid null-pointer-subtraction warning) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git wireless-drivers/master +Already up to date. +Merging mac80211/master (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 (1ab52ac1e9bc RDMA/mlx5: Set user priority for DCT) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/irdma/uk.c | 4 ++-- + drivers/infiniband/hw/mlx5/qp.c | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging sound-current/for-linus (228af5a4fa3a ALSA: pcm: Workaround for a wrong offset in SYNC_PTR compat ioctl) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/hda_codec.h | 1 + + sound/core/pcm_compat.c | 72 ++++++++++++++++++++++++++++++++++++++++- + sound/core/seq_device.c | 8 ++--- + sound/pci/hda/hda_bind.c | 20 ++++++------ + sound/pci/hda/hda_codec.c | 1 + + sound/pci/hda/hda_controller.c | 24 +++++++++----- + sound/pci/hda/hda_controller.h | 2 +- + sound/pci/hda/hda_intel.c | 29 +++++++++++++---- + sound/pci/hda/hda_intel.h | 4 ++- + sound/pci/hda/patch_realtek.c | 39 +++++++++++++++++++--- + sound/usb/mixer_scarlett_gen2.c | 2 ++ + sound/usb/quirks.c | 2 ++ + 12 files changed, 169 insertions(+), 35 deletions(-) +Merging sound-asoc-fixes/for-linus (2a242b54080b 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/Kconfig | 1 + + 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/codecs/wcd938x.c | 6 +++--- + sound/soc/fsl/fsl_xcvr.c | 17 +++++++++++----- + sound/soc/intel/boards/bytcht_es8316.c | 37 +++++++++++----------------------- + sound/soc/soc-core.c | 1 + + sound/soc/soc-dapm.c | 13 +++++++----- + 10 files changed, 49 insertions(+), 40 deletions(-) +Merging regmap-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/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (81f2982909cd Merge remote-tracking branch 'regulator/for-5.15' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (970283fadd18 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-bcm-qspi.c | 77 +++++++++++++--------- + 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 ++++ + 7 files changed, 106 insertions(+), 85 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 (81967efb5f39 drivers: bus: Delete CONFIG_SIMPLE_PM_BUS) +$ 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 +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/oxnas_v6_defconfig | 1 - + arch/arm/configs/shmobile_defconfig | 1 - + arch/arm/mach-omap2/Kconfig | 1 - + arch/arm64/configs/defconfig | 1 - + drivers/base/core.c | 3 ++- + drivers/bus/Kconfig | 12 ----------- + drivers/bus/Makefile | 2 +- + drivers/bus/simple-pm-bus.c | 42 ++++++++++++++++++++++++++++++++++--- + drivers/soc/canaan/Kconfig | 1 - + fs/kernfs/dir.c | 9 +++++++- + 11 files changed, 50 insertions(+), 24 deletions(-) +Merging tty.current/tty-linus (cb2282213e84 serial: 8250: allow disabling of Freescale 16550 compile test) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/8250/Kconfig | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging usb.current/usb-linus (ea0f69d82119 xhci: Enable trust tx length quirk for Fresco FL11 USB controller) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/host/xhci-dbgtty.c | 28 +++++++++++++--------------- + drivers/usb/host/xhci-pci.c | 6 +++++- + drivers/usb/host/xhci-ring.c | 39 ++++++++++++++++++++++++++++++++++----- + drivers/usb/host/xhci.c | 5 +++++ + drivers/usb/host/xhci.h | 1 + + 5 files changed, 58 insertions(+), 21 deletions(-) +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (11c52d250b34 USB: serial: qcserial: add EM9191 QDL support) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 8 ++++++++ + drivers/usb/serial/qcserial.c | 1 + + 2 files changed, 9 insertions(+) +Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle) +$ git merge -m Merge branch 'for-usb-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git usb-chipidea-fixes/for-usb-fixes +Merge made by the 'recursive' strategy. +Merging phy/fixes (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (37f12202c5d2 staging: r8188eu: prevent array underflow in rtw_hal_update_ra_mask()) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/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 +++--- + drivers/staging/r8188eu/hal/hal_intf.c | 2 +- + .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- + 16 files changed, 52 insertions(+), 18 deletions(-) +Merging iio-fixes/fixes-togreg (8fc4f038fa83 Documentation:devicetree:bindings:iio:dac: Fix val) +$ 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. + Documentation/devicetree/bindings/iio/dac/adi,ad5766.yaml | 2 +- + drivers/iio/dac/ad5766.c | 6 +++--- + drivers/iio/pressure/st_pressure_spi.c | 4 ++++ + 3 files changed, 8 insertions(+), 4 deletions(-) +Merging char-misc.current/char-misc-linus (ff53c4f6a668 Merge tag 'fpga-maintainer-update' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + drivers/fpga/ice40-spi.c | 7 +++++ + drivers/misc/Kconfig | 1 + + drivers/misc/cb710/sgbuf2.c | 2 +- + drivers/misc/eeprom/at25.c | 8 ++++++ + drivers/misc/eeprom/eeprom_93xx46.c | 18 ++++++++++++ + drivers/misc/fastrpc.c | 2 ++ + drivers/misc/gehc-achc.c | 1 + + .../misc/habanalabs/common/command_submission.c | 33 +++++++++++++--------- + drivers/misc/mei/hw-me-regs.h | 1 + + drivers/misc/mei/pci-me.c | 1 + + include/uapi/misc/habanalabs.h | 6 ++-- + 12 files changed, 63 insertions(+), 20 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 (64570fbc14f8 Linux 5.15-rc5) +$ 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 (3ad60b4b3570 reset: socfpga: add empty driver allowing consumers to probe) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + drivers/reset/Kconfig | 4 ++-- + drivers/reset/reset-brcmstb-rescal.c | 2 +- + drivers/reset/reset-socfpga.c | 26 ++++++++++++++++++++++++++ + drivers/reset/tegra/reset-bpmp.c | 9 ++++++++- + 4 files changed, 37 insertions(+), 4 deletions(-) +Merging mips-fixes/mips-fixes (740da9d7ca4e MIPS: Revert "add support for buggy MT7621S core detection") +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (dbe68bc9e82b ARM: dts: at91: sama7g5ek: to not touch slew-rate for SDMMC pins) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (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 (9e1ff307c779 Linux 5.15-rc4) +$ 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 (d7395f03c79c Merge branch 'misc-5.15' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 2 +- + fs/btrfs/dir-item.c | 48 +++++++++++++++++++++++------- + fs/btrfs/extent-tree.c | 1 + + fs/btrfs/file.c | 19 ++++++------ + fs/btrfs/tree-log.c | 79 ++++++++++++++++++++++++++++++-------------------- + 5 files changed, 97 insertions(+), 52 deletions(-) +Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/stat.c +Merge made by the 'recursive' strategy. +Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (7df227847ab5 platform/x86: int1092: Fix non sequential device mode handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/platform/mellanox/mlxreg-io.c | 4 ++-- + drivers/platform/x86/amd-pmc.c | 1 + + drivers/platform/x86/dell/Kconfig | 1 + + drivers/platform/x86/gigabyte-wmi.c | 1 + + drivers/platform/x86/intel/int1092/intel_sar.c | 23 ++++++++++++++-------- + .../x86/intel/int3472/intel_skl_int3472_discrete.c | 2 +- + drivers/platform/x86/intel_scu_ipc.c | 6 +++--- + 8 files changed, 25 insertions(+), 15 deletions(-) +Merging samsung-krzk-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (b2d70c0dbf27 dt-bindings: drm/bridge: ti-sn65dsi86: Fix reg value) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (258aad75c621 scsi: iscsi: Fix iscsi_task use after free) +$ 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 (bf79045e0ef5 Merge tag 'amd-drm-fixes-5.15-2021-10-06' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (e02083f0bcc2 drm/i915: remember to call i915_sw_fence_fini) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gt/intel_context.c | 1 + + 1 file changed, 1 insertion(+) +Merging mmc-fixes/fixes (d371209acaa7 mmc: sdhci: Map more voltage level to SDHCI_POWER_330) +$ 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/sdhci.c | 6 ++++++ + 1 file changed, 6 insertions(+) +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 (f5c20e4a5f18 x86/hyperv: Avoid erroneously sending IPI to 'self') +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (c1e64c0aec8c soc: fsl: qe: fix static checker warning) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (3ef6ca4f354c checksyscalls: Unconditionally ignore fstat{,at}64) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (2a2a79577dda fpga: ice40-spi: Add SPI device ID table) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (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 (6fda593f3082 gpio: mockup: Convert to use software nodes) +$ 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-mockup.c | 21 ++++++++++++++++++--- + drivers/gpio/gpio-pca953x.c | 16 +++++++++------- + 3 files changed, 35 insertions(+), 10 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 +Merge made by the 'recursive' strategy. +Merging pinctrl-intel-fixes/fixes (64570fbc14f8 Linux 5.15-rc5) +$ 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 (361b57df62de kunit: fix kernel-doc warnings due to mismatched arg names) +$ 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. + drivers/base/test/Makefile | 2 +- + drivers/iio/test/Makefile | 1 + + drivers/thunderbolt/Makefile | 1 + + include/kunit/test.h | 6 +++--- + lib/Makefile | 2 +- + lib/kunit/executor_test.c | 4 ++-- + scripts/Makefile.gcc-plugins | 4 ++++ + tools/testing/kunit/kunit.py | 24 ++++++++++++++++++++++-- + tools/testing/kunit/kunit_tool_test.py | 8 ++++++++ + 9 files changed, 43 insertions(+), 9 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 (1da38549dd64 Merge tag 'nfsd-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/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 (55ec085ce470 drm/r128: fix build for UML) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_edid.c | 15 ++++-- + drivers/gpu/drm/drm_fb_helper.c | 6 +++ + drivers/gpu/drm/hyperv/hyperv_drm.h | 1 + + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 1 + + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 54 +++++++++++++++++++++- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c | 2 +- + drivers/gpu/drm/r128/ati_pcigart.c | 2 +- + 7 files changed, 75 insertions(+), 6 deletions(-) +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 (12aaf2147640 [for -next only] kconfig: generate include/generated/rustc_cfg) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + 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 + + arch/sparc/boot/Makefile | 8 +- + crypto/Makefile | 2 + + lib/raid6/Makefile | 4 + + scripts/Makefile.build | 63 +++--- + scripts/Makefile.lib | 11 -- + scripts/kconfig/conf.c | 15 +- + scripts/kconfig/confdata.c | 468 +++++++++++++++++++++++++------------------- + scripts/kconfig/lexer.l | 9 +- + scripts/kconfig/lkc_proto.h | 2 +- + scripts/kconfig/menu.c | 33 ++-- + scripts/kconfig/symbol.c | 43 ---- + 17 files changed, 350 insertions(+), 322 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 +Auto-merging tools/perf/pmu-events/jevents.c +Auto-merging tools/perf/Makefile.perf +Auto-merging tools/perf/Makefile.config +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 (293d92cbbd24 dma-debug: fix sg checks in debug_dma_map_sg()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'recursive' strategy. + kernel/dma/debug.c | 12 ++++++------ + kernel/dma/mapping.c | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) +Merging asm-generic/master (7efbbe6e1414 qcom_scm: hide Kconfig symbol) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging arch/x86/Kconfig +Auto-merging arch/riscv/include/asm/syscall.h +Auto-merging arch/riscv/Kconfig +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/include/asm/syscall.h | 10 ---------- + arch/arm64/include/asm/syscall.h | 10 ---------- + arch/csky/include/asm/syscall.h | 9 --------- + arch/ia64/include/asm/syscall.h | 17 ++--------------- + arch/ia64/kernel/ptrace.c | 31 ++++++++++++------------------- + arch/microblaze/include/asm/syscall.h | 33 --------------------------------- + arch/nds32/include/asm/syscall.h | 22 ---------------------- + arch/nios2/include/asm/syscall.h | 11 ----------- + arch/openrisc/include/asm/syscall.h | 7 ------- + arch/powerpc/include/asm/syscall.h | 10 ---------- + arch/riscv/include/asm/syscall.h | 9 --------- + arch/s390/include/asm/syscall.h | 12 ------------ + arch/sh/include/asm/syscall_32.h | 12 ------------ + arch/sparc/include/asm/syscall.h | 10 ---------- + arch/um/include/asm/syscall-generic.h | 14 -------------- + arch/x86/include/asm/syscall.h | 33 --------------------------------- + arch/xtensa/include/asm/syscall.h | 11 ----------- + include/asm-generic/syscall.h | 16 ---------------- + 18 files changed, 14 insertions(+), 263 deletions(-) +Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (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/mach-imx/pm-imx6.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 (52331681d687 Merge branch 'for-next/fixes' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Removing tools/testing/selftests/arm64/fp/sve-ptrace-asm.S +Auto-merging kernel/dma/mapping.c +Removing arch/arm64/kernel/cpu-reset.h +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kasan.rst | 7 +- + arch/arm64/Kconfig | 3 +- + arch/arm64/include/asm/assembler.h | 49 ++- + arch/arm64/include/asm/kexec.h | 12 + + arch/arm64/include/asm/memory.h | 1 + + arch/arm64/include/asm/mmu_context.h | 24 + + arch/arm64/include/asm/mte-kasan.h | 5 + + arch/arm64/include/asm/mte.h | 8 +- + arch/arm64/include/asm/page.h | 1 - + arch/arm64/include/asm/pgtable.h | 5 + + arch/arm64/include/asm/sections.h | 1 + + arch/arm64/include/asm/sysreg.h | 3 + + arch/arm64/include/asm/trans_pgd.h | 14 +- + arch/arm64/include/asm/uaccess.h | 4 +- + 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/cpufeature.c | 10 + + 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 | 67 ++- + 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 | 27 +- + arch/arm64/mm/init.c | 39 -- + arch/arm64/mm/mmu.c | 5 + + arch/arm64/mm/trans_pgd-asm.S | 65 +++ + arch/arm64/mm/trans_pgd.c | 84 ++-- + arch/arm64/tools/cpucaps | 1 + + drivers/perf/Kconfig | 12 +- + drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 2 +- + drivers/perf/thunderx2_pmu.c | 2 +- + include/linux/kasan.h | 9 +- + kernel/dma/mapping.c | 4 - + kernel/scs.c | 1 + + lib/test_kasan.c | 2 +- + mm/kasan/hw_tags.c | 29 +- + mm/kasan/kasan.h | 32 +- + mm/kasan/report.c | 2 +- + 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 | 511 ++++++++++++++++------ + tools/testing/selftests/arm64/fp/vec-syscfg.c | 95 +++- + 51 files changed, 1003 insertions(+), 641 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 +Already up to date. +Merging arm-soc/for-next (ead1660ab67a soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm/mach-omap2/scrm54xx.h +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/arm/microchip.rst | 20 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../devicetree/bindings/arm/atmel-at91.yaml | 24 + + .../devicetree/bindings/arm/mediatek.yaml | 1 + + Documentation/devicetree/bindings/arm/renesas.yaml | 61 + + .../devicetree/bindings/arm/rockchip.yaml | 48 +- + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + .../devicetree/bindings/arm/sprd/sprd.yaml | 5 + + Documentation/devicetree/bindings/arm/xilinx.yaml | 17 + + .../bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml | 106 ++ + .../memory-controllers/mediatek,smi-common.yaml | 34 +- + .../memory-controllers/mediatek,smi-larb.yaml | 3 + + .../memory-controllers/renesas,rpc-if.yaml | 1 + + .../bindings/pci/nvidia,tegra194-pcie.txt | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + MAINTAINERS | 9 + + arch/arm/arm-soc-for-next-contents.txt | 79 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/am335x-pocketbeagle.dts | 1 + + 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/dra7.dtsi | 19 + + arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 + + arch/arm/boot/dts/mt7623.dtsi | 33 + + arch/arm/boot/dts/mt7623a.dtsi | 4 + + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 25 + + arch/arm/boot/dts/mt7629-rfb.dts | 3 +- + arch/arm/boot/dts/mt7629.dtsi | 45 +- + arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 2 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 23 +- + arch/arm/boot/dts/omap3-gta04a5.dts | 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/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/arm/boot/dts/sama5d29.dtsi | 16 + + arch/arm/boot/dts/sama7g5.dtsi | 16 + + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/configs/multi_v7_defconfig | 86 +- + arch/arm/mach-at91/Kconfig | 9 + + arch/arm/mach-omap2/cm-regbits-44xx.h | 101 -- + arch/arm/mach-omap2/cm1_44xx.h | 174 --- + arch/arm/mach-omap2/cm1_54xx.h | 168 --- + arch/arm/mach-omap2/cm1_7xx.h | 263 ---- + arch/arm/mach-omap2/cm2_44xx.h | 386 ----- + arch/arm/mach-omap2/cm2_54xx.h | 325 ---- + arch/arm/mach-omap2/cm2_7xx.h | 449 ------ + arch/arm/mach-omap2/cm33xx.h | 280 ---- + arch/arm/mach-omap2/omap_hwmod.c | 6 +- + arch/arm/mach-omap2/pdata-quirks.c | 36 - + arch/arm/mach-omap2/powerdomain.c | 6 +- + arch/arm/mach-omap2/prcm43xx.h | 94 -- + arch/arm/mach-omap2/prm33xx.h | 40 - + arch/arm/mach-omap2/prm44xx.h | 630 -------- + arch/arm/mach-omap2/prm54xx.h | 358 ----- + arch/arm/mach-omap2/prm7xx.h | 613 -------- + arch/arm/mach-omap2/scrm44xx.h | 141 -- + arch/arm/mach-omap2/scrm54xx.h | 228 --- + arch/arm64/boot/dts/amlogic/Makefile | 3 + + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 362 +++++ + .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 405 +++++ + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 4 +- + .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 241 +++ + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 61 + + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 2 +- + .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 2 - + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 12 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 1554 ++++++++++++++++++-- + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 506 ++++++- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 136 ++ + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 1495 +++++++++++++++++-- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 1522 +++++++++++++++++-- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 209 ++- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 876 +++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 876 +++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 81 +- + arch/arm64/boot/dts/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/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 | 931 ++++++++++++ + arch/arm64/boot/dts/xilinx/Makefile | 14 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 +- + .../arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts | 315 ++++ + .../arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts | 298 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 289 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 21 + + arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 16 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 16 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts | 18 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 298 +++- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 342 ++++- + .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 49 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 24 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 330 ++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 264 +++- + .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 320 +++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 3 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 292 +++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 250 +++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 340 ++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 274 +++- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 93 +- + arch/arm64/configs/defconfig | 15 +- + drivers/bus/ti-sysc.c | 276 +++- + drivers/cpuidle/Kconfig.arm | 2 +- + drivers/cpuidle/cpuidle-tegra.c | 3 + + drivers/firmware/tegra/bpmp-debugfs.c | 26 +- + drivers/firmware/tegra/bpmp-tegra210.c | 7 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 5 +- + drivers/memory/Kconfig | 5 +- + drivers/memory/fsl_ifc.c | 13 +- + drivers/memory/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 | 5 + + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 2 +- + drivers/memory/tegra/tegra210-emc-core.c | 6 +- + drivers/memory/tegra/tegra30-emc.c | 4 +- + drivers/soc/amlogic/meson-canvas.c | 4 +- + drivers/soc/amlogic/meson-clk-measure.c | 4 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 1 + + drivers/soc/mediatek/mt8192-mmsys.h | 76 + + drivers/soc/mediatek/mtk-mmsys.c | 79 + + drivers/soc/mediatek/mtk-mmsys.h | 2 + + drivers/soc/mediatek/mtk-mutex.c | 35 + + drivers/soc/renesas/Kconfig | 7 +- + drivers/soc/renesas/renesas-soc.c | 7 + + drivers/soc/tegra/Makefile | 1 + + drivers/soc/tegra/ari-tegra186.c | 80 + + drivers/soc/tegra/pmc.c | 28 +- + include/linux/clk/tegra.h | 24 +- + include/linux/platform_data/ti-sysc.h | 3 + + include/linux/soc/mediatek/mtk-mmsys.h | 3 + + include/memory/renesas-rpc-if.h | 1 + + include/soc/tegra/fuse.h | 31 +- + include/soc/tegra/irq.h | 9 +- + include/soc/tegra/pm.h | 2 +- + 237 files changed, 19527 insertions(+), 7447 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + 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 + delete mode 100644 arch/arm/mach-omap2/scrm54xx.h + create mode 100644 arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts + create mode 100644 arch/arm64/boot/dts/renesas/draak.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ebisu.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m0.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m4.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m5-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m5.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m6.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m7.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m8.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk356x.dtsi + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts + create mode 100644 drivers/soc/mediatek/mt8192-mmsys.h + create mode 100644 drivers/soc/tegra/ari-tegra186.c +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (83e38509109e Merge branch 'v5.16/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (69890d2c55f3 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 +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 5 + + arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 21 +- + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 182 ++- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 1571 +++++++++++++++++++--- + arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 7 + + arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts | 488 +++++++ + arch/arm/boot/dts/aspeed-g6.dtsi | 20 + + arch/arm/configs/aspeed_g5_defconfig | 1 + + 9 files changed, 2075 insertions(+), 223 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-tyan-s7106.dts +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 arch/arm/boot/dts/sama7g5.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sama7g5.dtsi +Recorded preimage for 'arch/arm/boot/dts/sama7g5.dtsi' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm/boot/dts/sama7g5.dtsi'. +[master 241a00a55a0d] Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git +$ git diff -M --stat --summary HEAD^.. +Merging drivers-memory/for-next (8f086fe5f3c9 Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (0dfc2dd723c8 Merge branch 'imx/maintainers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 98 +-- + .../bindings/serial/fsl,s32-linflexuart.txt | 22 - + .../bindings/serial/fsl,s32-linflexuart.yaml | 48 ++ + .../bindings/soc/imx/fsl,imx8mm-disp-blk-ctrl.yaml | 94 +++ + .../bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml | 76 +++ + MAINTAINERS | 8 + + arch/arm/boot/dts/Makefile | 5 +- + arch/arm/boot/dts/e60k02.dtsi | 2 +- + arch/arm/boot/dts/e70k02.dtsi | 320 ++++++++++ + arch/arm/boot/dts/imx6dl-alti6p.dts | 2 +- + arch/arm/boot/dts/imx6dl-b1x5v2.dtsi | 1 - + arch/arm/boot/dts/imx6dl-skov-revc-lt2.dts | 1 + + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 8 - + arch/arm/boot/dts/imx6q-skov-revc-lt2.dts | 1 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-skov-revc-lt2.dtsi | 99 ++++ + arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 7 +- + arch/arm/boot/dts/imx6qp-prtwd3.dts | 4 +- + arch/arm/boot/dts/imx6qp.dtsi | 2 +- + arch/arm/boot/dts/imx6sl-tolino-vision5.dts | 349 +++++++++++ + arch/arm/boot/dts/imx6sl.dtsi | 18 +- + arch/arm/boot/dts/imx6sll-kobo-librah2o.dts | 339 +++++++++++ + arch/arm/boot/dts/imx6sll.dtsi | 22 +- + arch/arm/boot/dts/imx6sx.dtsi | 6 +- + arch/arm/boot/dts/imx6ul-phytec-segin.dtsi | 1 + + arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 + + .../arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi | 185 ++++++ + arch/arm/boot/dts/imx6ull-colibri.dtsi | 32 +- + arch/arm/boot/dts/imx7-mba7.dtsi | 42 +- + arch/arm/boot/dts/imx7-tqma7.dtsi | 47 +- + arch/arm/boot/dts/imx7d-mba7.dts | 6 +- + arch/arm/boot/dts/imx7d-sdb.dts | 2 +- + arch/arm/boot/dts/imx7d-tqma7.dtsi | 4 +- + arch/arm/boot/dts/imx7d.dtsi | 7 +- + arch/arm/boot/dts/imx7s-mba7.dts | 6 +- + arch/arm/boot/dts/imx7s-tqma7.dtsi | 4 +- + arch/arm/configs/imx_v6_v7_defconfig | 45 +- + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 1 + + .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 60 +- + .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 17 +- + .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 49 +- + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 31 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 19 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 72 ++- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 40 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 40 +- + .../dts/freescale/fsl-lx2160a-bluebox3-rev-a.dts | 34 ++ + .../boot/dts/freescale/fsl-lx2160a-bluebox3.dts | 658 +++++++++++++++++++++ + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 24 +- + .../boot/dts/freescale/imx8mm-kontron-n801x-s.dts | 4 +- + .../dts/freescale/imx8mm-kontron-n801x-som.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 180 ++++++ + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 1 + + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 10 +- + arch/arm64/boot/dts/freescale/s32g2.dtsi | 124 ++++ + arch/arm64/boot/dts/freescale/s32g274a-evb.dts | 34 ++ + arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts | 40 ++ + drivers/soc/imx/Kconfig | 1 + + drivers/soc/imx/Makefile | 1 + + drivers/soc/imx/gpcv2.c | 134 +++-- + drivers/soc/imx/imx8m-blk-ctrl.c | 523 ++++++++++++++++ + include/dt-bindings/power/imx8mm-power.h | 9 + + 72 files changed, 3688 insertions(+), 386 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.txt + create mode 100644 Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-disp-blk-ctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml + create mode 100644 arch/arm/boot/dts/e70k02.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-skov-revc-lt2.dtsi + create mode 100644 arch/arm/boot/dts/imx6sl-tolino-vision5.dts + create mode 100644 arch/arm/boot/dts/imx6sll-kobo-librah2o.dts + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3-rev-a.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dts + create mode 100644 arch/arm64/boot/dts/freescale/s32g2.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/s32g274a-evb.dts + create mode 100644 arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts + create mode 100644 drivers/soc/imx/imx8m-blk-ctrl.c +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 (8c62103627a8 Merge branch 'v5.15-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 4 + + .../bindings/display/mediatek/mediatek,dsi.txt | 6 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 97 ++++++------ + arch/arm64/boot/dts/mediatek/mt6358.dtsi | 1 + + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 16 +- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 6 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 112 +++++++------- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 + + .../mt8183-kukui-audio-da7219-max98357a.dtsi | 13 ++ + .../mt8183-kukui-audio-da7219-rt1015p.dtsi | 13 ++ + .../dts/mediatek/mt8183-kukui-audio-da7219.dtsi | 54 +++++++ + .../dts/mediatek/mt8183-kukui-audio-max98357a.dtsi | 13 ++ + .../dts/mediatek/mt8183-kukui-audio-rt1015p.dtsi | 13 ++ + .../mt8183-kukui-audio-ts3a227e-max98357a.dtsi | 13 ++ + .../mt8183-kukui-audio-ts3a227e-rt1015p.dtsi | 13 ++ + .../dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi | 32 ++++ + .../dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-damu.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 1 + + .../mt8183-kukui-jacuzzi-juniper-sku16.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-kakadu.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 1 + + .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 67 ++++++++- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 99 ++++++++++++- + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 163 +++++++++++++++++++++ + drivers/watchdog/mtk_wdt.c | 6 +- + .../{reset-controller => reset}/mt2712-resets.h | 0 + include/dt-bindings/reset/mt8173-resets.h | 2 + + .../{reset-controller => reset}/mt8183-resets.h | 3 + + .../{reset-controller => reset}/mt8192-resets.h | 0 + 35 files changed, 640 insertions(+), 123 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-max98357a.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-rt1015p.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-max98357a.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015p.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-max98357a.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-rt1015p.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi + rename include/dt-bindings/{reset-controller => reset}/mt2712-resets.h (100%) + rename include/dt-bindings/{reset-controller => reset}/mt8183-resets.h (98%) + rename include/dt-bindings/{reset-controller => reset}/mt8192-resets.h (100%) +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 (92d190433bd8 Merge branch 'omap-for-v5.16/gpmc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Removing Documentation/devicetree/bindings/net/gpmc-eth.txt +Removing Documentation/devicetree/bindings/mtd/gpmc-onenand.txt +Removing Documentation/devicetree/bindings/mtd/gpmc-nor.txt +Removing Documentation/devicetree/bindings/mtd/gpmc-nand.txt +Removing Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/omap-gpmc.txt | 157 ------------- + .../bindings/memory-controllers/ti,gpmc-child.yaml | 245 +++++++++++++++++++++ + .../bindings/memory-controllers/ti,gpmc.yaml | 172 +++++++++++++++ + .../devicetree/bindings/mtd/gpmc-nand.txt | 147 ------------- + Documentation/devicetree/bindings/mtd/gpmc-nor.txt | 98 --------- + .../devicetree/bindings/mtd/gpmc-onenand.txt | 48 ---- + .../devicetree/bindings/mtd/ti,gpmc-nand.yaml | 121 ++++++++++ + .../devicetree/bindings/mtd/ti,gpmc-onenand.yaml | 81 +++++++ + Documentation/devicetree/bindings/net/gpmc-eth.txt | 97 -------- + arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 4 +- + arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 2 +- + arch/arm/boot/dts/omap-zoom-common.dtsi | 4 +- + arch/arm/boot/dts/omap2430-sdp.dts | 4 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-sb-t35.dtsi | 4 +- + 16 files changed, 631 insertions(+), 559 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti,gpmc-child.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti,gpmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nor.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/gpmc-onenand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/ti,gpmc-nand.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/ti,gpmc-onenand.yaml + delete mode 100644 Documentation/devicetree/bindings/net/gpmc-eth.txt +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 drivers/cpuidle/Kconfig.arm +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 | 18 +- + 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/pm8916.dtsi | 9 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 12 + + .../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 | 15 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 76 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 225 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 3430 +++++++++++++++----- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 182 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 + + 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/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/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 | 12 + + 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 + + 92 files changed, 9334 insertions(+), 1756 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 (a036b0a5d7d6 ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../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 (321d106e70eb Merge branch 'renesas-arm-dt-for-v5.16' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'recursive' strategy. + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 33 +++++ + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 17 +++ + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 49 +++++++ + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 143 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 62 +++++++++ + 5 files changed, 304 insertions(+) +Merging reset/reset/next (3440b8fa067d reset: uniphier: Add NX1 reset support) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Auto-merging drivers/reset/Kconfig +Merge made by the 'recursive' strategy. + .../reset/socionext,uniphier-glue-reset.yaml | 1 + + .../bindings/reset/socionext,uniphier-reset.yaml | 3 +++ + drivers/reset/Kconfig | 2 +- + drivers/reset/reset-uniphier-glue.c | 4 ++++ + drivers/reset/reset-uniphier.c | 27 ++++++++++++++++++++++ + 5 files changed, 36 insertions(+), 1 deletion(-) +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. + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 176 +++++++++++++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3399.c | 17 +-- + drivers/clk/rockchip/clk-rk3568.c | 2 +- + 3 files changed, 187 insertions(+), 8 deletions(-) +Merging samsung-krzk/for-next (6c44b39e8b12 Merge branch 'for-v5.16/dts-riscv' 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. + .../bindings/arm/samsung/samsung-boards.yaml | 6 + + 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/Makefile | 3 +- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 10 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +- + .../boot/dts/exynos/exynosautov9-pinctrl.dtsi | 1189 ++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 56 + + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 301 +++++ + .../dts/microchip/microchip-mpfs-icicle-kit.dts | 18 +- + arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 40 +- + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 2 +- + .../riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 10 +- + .../riscv/boot/dts/sifive/hifive-unmatched-a00.dts | 7 +- + drivers/soc/samsung/Kconfig | 5 +- + drivers/soc/samsung/Makefile | 3 +- + drivers/soc/samsung/exynos-chipid.c | 14 +- + drivers/soc/samsung/exynos5422-asv.c | 1 + + drivers/soc/samsung/pm_domains.c | 1 - + 25 files changed, 1641 insertions(+), 99 deletions(-) + create mode 100644 arch/arm64/boot/dts/exynos/exynosautov9-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynosautov9.dtsi +Merging scmi/for-linux-next (b92b4019a797 Merge branch 'for-next/ffa' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'recursive' strategy. + drivers/firmware/arm_scmi/virtio.c | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) +Merging stm32/stm32-next (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 (c45dd143ff1a Merge branch for-5.16/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra114.dtsi | 8 ++++-- + arch/arm/boot/dts/tegra124.dtsi | 12 ++++++--- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 7 +++-- + arch/arm/boot/dts/tegra20-paz00.dts | 2 -- + arch/arm/boot/dts/tegra20.dtsi | 13 +++++++--- + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 30 +++++++++++++++++++--- + arch/arm/boot/dts/tegra30-ouya.dts | 5 +++- + arch/arm/boot/dts/tegra30.dtsi | 12 ++++++--- + 8 files changed, 69 insertions(+), 20 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge -m Merge branch 'ti-k3-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git ti-k3/ti-k3-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (f46d16cf5b43 arm64: dts: ti: k3-j721e-sk: Add DDR carveout memory nodes) +$ git merge -m Merge branch 'ti-k3-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git ti-k3-new/ti-k3-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 15 +- + arch/arm64/boot/dts/ti/Makefile | 4 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 280 ++++++ + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am64.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 8 + + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 8 + + .../boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi | 46 + + .../boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 51 + + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 39 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 4 - + arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 + + .../dts/ti/k3-am6528-iot2050-basic-common.dtsi | 60 ++ + .../boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts | 24 + + arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 56 +- + arch/arm64/boot/dts/ti/k3-am654.dtsi | 4 + + .../dts/ti/k3-am6548-iot2050-advanced-common.dtsi | 56 ++ + .../boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts | 29 + + .../boot/dts/ti/k3-am6548-iot2050-advanced.dts | 50 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 3 + + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 7 +- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 2 + + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 3 + + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 16 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 1002 ++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 3 + + 27 files changed, 1665 insertions(+), 125 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-sk.dts +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 +Already up to date. +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 (e8271eff5d8c clk: imx: Make CLK_IMX8ULP select MXC_CLK) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/imx8ulp-cgc-clock.yaml | 43 ++ + .../bindings/clock/imx8ulp-pcc-clock.yaml | 50 ++ + drivers/clk/imx/Kconfig | 7 + + drivers/clk/imx/Makefile | 2 + + drivers/clk/imx/clk-composite-7ulp.c | 88 +++- + drivers/clk/imx/clk-composite-8m.c | 4 +- + drivers/clk/imx/clk-imx6ul.c | 9 +- + drivers/clk/imx/clk-imx7ulp.c | 20 +- + drivers/clk/imx/clk-imx8ulp.c | 569 +++++++++++++++++++++ + drivers/clk/imx/clk-pfdv2.c | 23 +- + drivers/clk/imx/clk-pllv4.c | 35 +- + drivers/clk/imx/clk.h | 457 +++++------------ + include/dt-bindings/clock/imx8ulp-clock.h | 258 ++++++++++ + include/dt-bindings/reset/imx8ulp-pcc-reset.h | 59 +++ + 14 files changed, 1276 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 (373bd6f48756 clk: renesas: r9a07g044: Add SDHI clock and reset entries) +$ 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 | 191 ++++++++++++++++++++++++++++ + drivers/clk/renesas/r9a07g044-cpg.c | 83 ++++++++++++- + drivers/clk/renesas/rcar-cpg-lib.c | 83 +++++++++++++ + drivers/clk/renesas/rcar-cpg-lib.h | 7 ++ + drivers/clk/renesas/rcar-gen3-cpg.c | 89 +------------- + drivers/clk/renesas/rzg2l-cpg.c | 212 ++++++++++++++++++++++++++++++++ + drivers/clk/renesas/rzg2l-cpg.h | 45 ++++++- + 7 files changed, 621 insertions(+), 89 deletions(-) +Merging clk-samsung/for-next (2ae5c2c3f8d5 dt-bindings: clock: Add bindings definitions for Exynos850 CMU) +$ 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-pll.c | 196 +++++++++++++++++++++++++++++++ + drivers/clk/samsung/clk-pll.h | 2 + + drivers/clk/samsung/clk-s5pv210-audss.c | 4 +- + include/dt-bindings/clock/exynos850.h | 141 ++++++++++++++++++++++ + 7 files changed, 343 insertions(+), 12 deletions(-) + create mode 100644 include/dt-bindings/clock/exynos850.h +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 (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 7 +++++-- + arch/m68k/configs/apollo_defconfig | 7 +++++-- + arch/m68k/configs/atari_defconfig | 7 +++++-- + arch/m68k/configs/bvme6000_defconfig | 7 +++++-- + arch/m68k/configs/hp300_defconfig | 7 +++++-- + arch/m68k/configs/mac_defconfig | 7 +++++-- + arch/m68k/configs/multi_defconfig | 7 +++++-- + arch/m68k/configs/mvme147_defconfig | 7 +++++-- + arch/m68k/configs/mvme16x_defconfig | 7 +++++-- + arch/m68k/configs/q40_defconfig | 7 +++++-- + arch/m68k/configs/sun3_defconfig | 7 +++++-- + arch/m68k/configs/sun3x_defconfig | 7 +++++-- + arch/m68k/lib/muldi3.c | 2 +- + 13 files changed, 61 insertions(+), 25 deletions(-) +Merging m68knommu/for-next (e6d94fd07947 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 +Auto-merging arch/mips/Kconfig +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 c606ab8483c8] 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 (f9473a65719e powerpc/pseries/cpuhp: remove obsolete comment from pseries_cpu_die) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/asm-const.h | 2 - + arch/powerpc/include/asm/atomic.h | 8 +- + arch/powerpc/include/asm/io.h | 4 +- + arch/powerpc/include/asm/paravirt.h | 40 +++- + arch/powerpc/include/asm/uaccess.h | 6 +- + arch/powerpc/kernel/firmware.c | 7 +- + arch/powerpc/kernel/sysfs.c | 3 +- + arch/powerpc/kvm/powerpc.c | 4 +- + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/platforms/44x/ppc476.c | 4 +- + arch/powerpc/platforms/85xx/Makefile | 4 +- + arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 7 +- + arch/powerpc/platforms/85xx/smp.c | 12 +- + arch/powerpc/platforms/powermac/pmac.h | 1 - + arch/powerpc/platforms/powermac/setup.c | 2 - + arch/powerpc/platforms/powernv/opal-dump.c | 2 +- + arch/powerpc/platforms/powernv/pci-sriov.c | 6 - + arch/powerpc/platforms/pseries/hotplug-cpu.c | 298 +++++++-------------------- + arch/powerpc/platforms/pseries/iommu.c | 10 +- + arch/powerpc/platforms/pseries/setup.c | 3 +- + drivers/video/fbdev/chipsfb.c | 2 +- + 21 files changed, 149 insertions(+), 278 deletions(-) +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 (9406369ae627 riscv: dts: microchip: use vendor compatible for Cadence SD4HC) +$ 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/boot/dts/microchip/microchip-mpfs.dtsi +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 10 + + arch/riscv/configs/32-bit.config | 2 + + arch/riscv/configs/64-bit.config | 2 + + arch/riscv/include/asm/csr.h | 87 +++++++ + 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 +- + 13 files changed, 327 insertions(+), 60 deletions(-) + create mode 100644 arch/riscv/configs/32-bit.config + create mode 100644 arch/riscv/configs/64-bit.config +Merging s390/for-next (6acc4d16c4bd 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 | 16 ++ + 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/barrier.h | 24 +-- + arch/s390/include/asm/debug.h | 2 +- + arch/s390/include/asm/ftrace.h | 46 +++++- + arch/s390/include/asm/jump_label.h | 2 + + arch/s390/include/asm/livepatch.h | 4 +- + arch/s390/include/asm/ptrace.h | 22 ++- + arch/s390/include/asm/text-patching.h | 16 ++ + arch/s390/kernel/alternative.c | 20 +++ + arch/s390/kernel/entry.h | 1 + + arch/s390/kernel/ftrace.c | 96 ++---------- + arch/s390/kernel/head64.S | 18 --- + arch/s390/kernel/jump_label.c | 34 +++-- + arch/s390/kernel/kprobes.c | 48 +++++- + arch/s390/kernel/mcount.S | 41 +++-- + 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/lib/test_unwind.c | 169 ++++++++++++--------- + arch/s390/mm/cmm.c | 11 +- + 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 + + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 3 + + .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 4 + + 38 files changed, 573 insertions(+), 247 deletions(-) + create mode 100644 arch/s390/include/asm/text-patching.h + create mode 100644 arch/s390/lib/test_kprobes.c + create mode 100644 arch/s390/lib/test_kprobes.h + create mode 100644 arch/s390/lib/test_kprobes_asm.S +Merging sh/for-next (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 (ab6ff1fda1e8 uml: x86: add FORCE to user_constants.h) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/include/asm/delay.h | 4 ++-- + arch/um/include/asm/irqflags.h | 4 ++-- + arch/um/include/shared/longjmp.h | 2 +- + arch/um/include/shared/os.h | 4 ++-- + arch/um/kernel/ksyms.c | 2 +- + arch/um/os-Linux/sigio.c | 6 +++--- + arch/um/os-Linux/signal.c | 8 ++++---- + arch/x86/um/Makefile | 2 +- + 8 files changed, 16 insertions(+), 16 deletions(-) +Merging xtensa/xtensa-for-next (012e974501a2 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 +Already up to date. +$ git am -3 ../patches/0001-merge-fix-for-missing-semicolon.patch +Applying: merge fix for missing semicolon +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/boot/dts/sama7g5.dtsi +$ git add -A . +$ git commit -v -a --amend +[master 192eff252fbb] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git + Date: Tue Oct 12 09:54:26 2021 +1100 +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 (2bc879c792fa Merge branch 'fscache-remove-old-io' into fscache-next) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Auto-merging fs/netfs/read_helper.c +Removing fs/cachefiles/rdwr.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/caching/backend-api.rst | 138 +-- + Documentation/filesystems/caching/netfs-api.rst | 385 +------- + fs/9p/Kconfig | 1 + + fs/9p/cache.c | 137 --- + fs/9p/cache.h | 98 +- + fs/9p/v9fs.h | 9 + + fs/9p/vfs_addr.c | 195 ++-- + fs/9p/vfs_file.c | 21 +- + fs/afs/file.c | 2 +- + fs/cachefiles/Makefile | 1 - + fs/cachefiles/interface.c | 17 +- + fs/cachefiles/internal.h | 42 +- + fs/cachefiles/io.c | 85 +- + fs/cachefiles/main.c | 1 - + fs/cachefiles/rdwr.c | 972 ------------------- + fs/ceph/cache.h | 2 +- + fs/cifs/file.c | 64 +- + fs/cifs/fscache.c | 105 +- + fs/cifs/fscache.h | 74 +- + fs/fscache/cache.c | 6 - + fs/fscache/cookie.c | 10 - + fs/fscache/internal.h | 58 +- + fs/fscache/io.c | 170 +++- + fs/fscache/object.c | 2 - + fs/fscache/page.c | 1066 --------------------- + fs/fscache/stats.c | 73 +- + fs/netfs/read_helper.c | 8 +- + fs/nfs/file.c | 14 +- + fs/nfs/fscache-index.c | 26 - + fs/nfs/fscache.c | 170 +--- + fs/nfs/fscache.h | 84 +- + fs/nfs/read.c | 25 +- + fs/nfs/write.c | 7 +- + include/linux/fscache-cache.h | 137 +-- + include/linux/fscache.h | 460 +++------ + include/linux/netfs.h | 17 +- + 36 files changed, 617 insertions(+), 4065 deletions(-) + delete mode 100644 fs/cachefiles/rdwr.c +Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (b82c8f64d9eb Merge branch 'for-next-next-v5.15-20211011' into for-next-20211011) +$ 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 | 80 ++- + fs/btrfs/block-group.h | 4 + + fs/btrfs/btrfs_inode.h | 39 +- + fs/btrfs/check-integrity.c | 4 +- + fs/btrfs/compression.c | 681 +++++++++++++++----------- + fs/btrfs/compression.h | 4 +- + fs/btrfs/ctree.c | 156 +++--- + fs/btrfs/ctree.h | 76 ++- + fs/btrfs/delayed-inode.c | 41 +- + fs/btrfs/delayed-ref.c | 19 +- + fs/btrfs/delayed-ref.h | 44 +- + fs/btrfs/disk-io.c | 45 +- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent-tree.c | 320 +++++++----- + fs/btrfs/extent_io.c | 335 ++++++++----- + fs/btrfs/extent_io.h | 10 +- + fs/btrfs/extent_map.c | 4 +- + fs/btrfs/file-item.c | 13 +- + fs/btrfs/file.c | 35 +- + fs/btrfs/free-space-cache.c | 106 +++- + fs/btrfs/free-space-cache.h | 2 + + fs/btrfs/inode.c | 569 +++++++++++----------- + 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/ref-verify.c | 4 +- + fs/btrfs/reflink.c | 4 +- + fs/btrfs/relocation.c | 77 +-- + fs/btrfs/scrub.c | 133 +++-- + fs/btrfs/send.c | 15 +- + fs/btrfs/space-info.c | 28 +- + fs/btrfs/subpage.c | 290 ++++++++--- + fs/btrfs/subpage.h | 56 ++- + fs/btrfs/super.c | 28 +- + fs/btrfs/tests/extent-buffer-tests.c | 2 +- + fs/btrfs/tests/extent-io-tests.c | 12 +- + fs/btrfs/tests/inode-tests.c | 4 +- + fs/btrfs/transaction.c | 11 +- + fs/btrfs/tree-log.c | 709 +++++++++++++++++---------- + fs/btrfs/tree-log.h | 18 +- + fs/btrfs/volumes.c | 337 +++++++------ + fs/btrfs/volumes.h | 73 +-- + fs/btrfs/xattr.c | 2 +- + fs/btrfs/zoned.c | 531 ++++++++++++++++++-- + fs/btrfs/zoned.h | 39 +- + 48 files changed, 3853 insertions(+), 2520 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 (64570fbc14f8 Linux 5.15-rc5) +$ 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 (71dbc5464c5c erofs: add multiple device support) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/erofs.rst | 12 +- + fs/erofs/Kconfig | 24 ++-- + fs/erofs/data.c | 73 +++++++++--- + fs/erofs/erofs_fs.h | 20 +++- + fs/erofs/inode.c | 2 +- + fs/erofs/internal.h | 49 +++++++-- + fs/erofs/super.c | 214 +++++++++++++++++++++++++++++------- + fs/erofs/xattr.c | 4 +- + fs/erofs/zdata.c | 28 +++-- + 9 files changed, 339 insertions(+), 87 deletions(-) +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 (0288e6293e25 ext4: convert from atomic_t to refcount_t on ext4_io_end->count) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/super.c +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 3 ++- + fs/ext4/extents.c | 77 ++++++++++++++++++++++++++----------------------------- + fs/ext4/page-io.c | 8 +++--- + fs/ext4/super.c | 9 +++---- + 4 files changed, 46 insertions(+), 51 deletions(-) +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 (9ca3f8697158 fuse: selective attribute invalidation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dax.c | 2 +- + fs/fuse/dev.c | 8 ++++---- + fs/fuse/dir.c | 21 ++++++++++++--------- + fs/fuse/file.c | 47 +++++++++++++++++++++++++++++------------------ + fs/fuse/fuse_i.h | 9 +++++++++ + fs/fuse/inode.c | 3 +++ + fs/fuse/ioctl.c | 4 ++-- + fs/fuse/readdir.c | 4 ++-- + fs/fuse/xattr.c | 10 ++++------ + 9 files changed, 66 insertions(+), 42 deletions(-) +Merging gfs2/for-next (4efc43a399be gfs2: Fix glock_hash_walk bugs) +$ 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/inode.c +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 10 +--- + fs/gfs2/glock.c | 146 +++++++++++++++++++++++++++++++++++++-------------- + fs/gfs2/glock.h | 14 +++-- + fs/gfs2/glops.c | 29 +++++----- + fs/gfs2/incore.h | 6 +-- + fs/gfs2/inode.c | 12 +++-- + fs/gfs2/rgrp.c | 70 +++++++++++------------- + fs/gfs2/rgrp.h | 2 +- + fs/gfs2/super.c | 4 +- + fs/gfs2/trace_gfs2.h | 9 ++-- + fs/gfs2/util.c | 2 + + 11 files changed, 181 insertions(+), 123 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 (c6e7d8295494 ksmbd: improve credits management) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'recursive' strategy. + fs/ksmbd/connection.c | 2 + + fs/ksmbd/smb2misc.c | 38 +++++++--- + fs/ksmbd/smb2ops.c | 3 + + fs/ksmbd/smb2pdu.c | 194 +++++++++++++++++++++++++++++--------------------- + fs/ksmbd/vfs.c | 2 +- + fs/ksmbd/vfs.h | 2 +- + 6 files changed, 148 insertions(+), 93 deletions(-) +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 +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Removing include/uapi/linux/nfsd/nfsfh.h +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfs4xdr.c +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 (c20106944eb6 NFSD: Keep existing listeners on portlist error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel/for-next +Already up to date. +Merging ntfs3/master (22b05f1ac033 fs/ntfs3: Refactor ntfs_read_mft) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/xattr.c +CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c +Auto-merging fs/ntfs3/ntfs_fs.h +Resolved 'fs/ntfs3/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cd2d42c7a4c2] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ntfs3.rst | 141 ++++---- + fs/ntfs3/attrib.c | 20 +- + fs/ntfs3/attrlist.c | 9 +- + fs/ntfs3/bitfunc.c | 10 +- + fs/ntfs3/bitmap.c | 14 +- + fs/ntfs3/debug.h | 3 + + fs/ntfs3/dir.c | 30 +- + fs/ntfs3/file.c | 12 +- + fs/ntfs3/frecord.c | 32 +- + fs/ntfs3/fslog.c | 12 +- + fs/ntfs3/fsntfs.c | 77 ++--- + fs/ntfs3/index.c | 160 +++------ + fs/ntfs3/inode.c | 159 ++++----- + 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 | 67 ++-- + fs/ntfs3/record.c | 3 - + fs/ntfs3/run.c | 2 - + fs/ntfs3/super.c | 651 ++++++++++++++++++------------------ + fs/ntfs3/upcase.c | 8 +- + fs/ntfs3/xattr.c | 249 ++++---------- + 24 files changed, 765 insertions(+), 961 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 (ec60f38a9178 Documentation: remove reference to now removed mandatory-locking doc) +$ 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. + Documentation/filesystems/index.rst | 1 - + 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 ++++ + 6 files changed, 26 insertions(+), 40 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 (d53c18bef952 Merge branch 'remotes/lorenzo/pci/xgene') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging kernel/irq/irqdomain.c +Auto-merging include/linux/irqdomain.h +Auto-merging drivers/iommu/apple-dart.c +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/powerpc/platforms/powernv/pci-sriov.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 158 ++++ + MAINTAINERS | 17 +- + 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/acpi/pci_root.c | 161 ++-- + drivers/iommu/apple-dart.c | 27 + + drivers/net/ethernet/chelsio/cxgb3/common.h | 2 - + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 38 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 98 +-- + drivers/of/irq.c | 17 +- + drivers/pci/controller/Kconfig | 17 + + drivers/pci/controller/Makefile | 1 + + drivers/pci/controller/dwc/Kconfig | 28 +- + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-dra7xx.c | 22 +- + drivers/pci/controller/dwc/pci-imx6.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 3 + + drivers/pci/controller/dwc/pcie-designware.c | 1 + + drivers/pci/controller/dwc/pcie-qcom-ep.c | 721 ++++++++++++++++++ + drivers/pci/controller/dwc/pcie-visconti.c | 5 +- + drivers/pci/controller/pci-aardvark.c | 372 ++++++---- + drivers/pci/controller/pci-xgene-msi.c | 2 +- + drivers/pci/controller/pci-xgene.c | 3 +- + drivers/pci/controller/pcie-apple.c | 822 +++++++++++++++++++++ + drivers/pci/controller/pcie-brcmstb.c | 2 +- + drivers/pci/controller/pcie-iproc.c | 2 +- + drivers/pci/controller/pcie-rcar-ep.c | 5 +- + drivers/pci/controller/pcie-rcar-host.c | 2 - + drivers/pci/controller/vmd.c | 41 +- + drivers/pci/endpoint/functions/pci-epf-ntb.c | 22 +- + drivers/pci/endpoint/pci-ep-cfs.c | 48 +- + drivers/pci/endpoint/pci-epc-core.c | 2 +- + drivers/pci/endpoint/pci-epf-core.c | 4 +- + drivers/pci/hotplug/acpiphp_glue.c | 2 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 4 +- + drivers/pci/hotplug/ibmphp.h | 4 +- + drivers/pci/hotplug/shpchp_hpc.c | 2 +- + drivers/pci/iov.c | 14 +- + drivers/pci/of.c | 10 +- + drivers/pci/p2pdma.c | 8 +- + drivers/pci/pci-driver.c | 2 +- + drivers/pci/pci-sysfs.c | 27 +- + drivers/pci/pci.c | 12 +- + drivers/pci/pcie/aer.c | 2 +- + drivers/pci/pcie/aspm.c | 4 +- + drivers/pci/pcie/portdrv_core.c | 47 +- + drivers/pci/probe.c | 35 +- + drivers/pci/quirks.c | 59 +- + drivers/pci/setup-irq.c | 26 +- + drivers/pci/switch/switchtec.c | 28 +- + drivers/pci/vpd.c | 79 +- + include/linux/acpi.h | 2 - + include/linux/irqdomain.h | 4 + + include/linux/pci.h | 4 +- + include/linux/switchtec.h | 1 + + include/uapi/linux/pci_regs.h | 6 + + kernel/irq/irqdomain.c | 7 +- + 61 files changed, 2486 insertions(+), 562 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml + create mode 100644 drivers/pci/controller/dwc/pcie-qcom-ep.c + create mode 100644 drivers/pci/controller/pcie-apple.c +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 (93d455d582b0 Merge branch 'for-5.15/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/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-cougar.c | 3 +- + drivers/hid/hid-debug.c | 10 +-- + drivers/hid/hid-ids.h | 6 ++ + drivers/hid/hid-input.c | 1 + + drivers/hid/hid-multitouch.c | 13 +++ + drivers/hid/hid-xiaomi.c | 94 ++++++++++++++++++++++ + 17 files changed, 157 insertions(+), 30 deletions(-) + create mode 100644 drivers/hid/hid-xiaomi.c +Merging i2c/i2c/for-next (26701d49482a Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/apple,i2c.yaml | 61 ++++++++ + drivers/i2c/busses/Kconfig | 16 +- + drivers/i2c/busses/Makefile | 3 + + drivers/i2c/busses/i2c-amd-mp2-pci.c | 4 +- + drivers/i2c/busses/i2c-bcm-kona.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 78 ++++------ + drivers/i2c/busses/i2c-ismt.c | 12 +- + drivers/i2c/busses/i2c-kempld.c | 3 +- + drivers/i2c/busses/i2c-mlxcpld.c | 14 +- + drivers/i2c/busses/i2c-mt65xx.c | 82 ++++++++++- + .../i2c/busses/{i2c-pasemi.c => i2c-pasemi-core.c} | 114 ++++----------- + drivers/i2c/busses/i2c-pasemi-core.h | 21 +++ + drivers/i2c/busses/i2c-pasemi-pci.c | 85 +++++++++++ + drivers/i2c/busses/i2c-pasemi-platform.c | 122 ++++++++++++++++ + drivers/i2c/busses/i2c-pxa.c | 1 - + drivers/i2c/busses/i2c-rcar.c | 6 +- + drivers/i2c/busses/i2c-xiic.c | 161 +++++++++------------ + 17 files changed, 535 insertions(+), 250 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/apple,i2c.yaml + rename drivers/i2c/busses/{i2c-pasemi.c => i2c-pasemi-core.c} (77%) + create mode 100644 drivers/i2c/busses/i2c-pasemi-core.h + create mode 100644 drivers/i2c/busses/i2c-pasemi-pci.c + create mode 100644 drivers/i2c/busses/i2c-pasemi-platform.c +Merging i3c/i3c/next (a3587e2c0578 i3c: fix incorrect address slot lookup on 64-bit) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 3 ++- + drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- + drivers/i3c/master/mipi-i3c-hci/hci.h | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (c3361ee93a64 hwmon: (adt7x10) Make adt7x10_remove() return void) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/hwmon/tmp108.txt +Removing Documentation/devicetree/bindings/hwmon/sht15.txt +Removing Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt +Removing Documentation/devicetree/bindings/hwmon/mcp3021.txt +Removing Documentation/devicetree/bindings/hwmon/ltc4151.txt +Removing Documentation/devicetree/bindings/hwmon/lm90.txt +Removing Documentation/devicetree/bindings/hwmon/lm70.txt +Removing Documentation/devicetree/bindings/hwmon/jc42.txt +Removing Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt +Removing Documentation/devicetree/bindings/hwmon/hih6130.txt +Removing Documentation/devicetree/bindings/hwmon/dps650ab.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/dps650ab.txt | 11 - + .../devicetree/bindings/hwmon/hih6130.txt | 12 - + .../devicetree/bindings/hwmon/ibm,cffps1.txt | 26 - + .../devicetree/bindings/hwmon/iio-hwmon.yaml | 37 ++ + Documentation/devicetree/bindings/hwmon/jc42.txt | 46 -- + .../devicetree/bindings/hwmon/jedec,jc42.yaml | 78 +++ + .../devicetree/bindings/hwmon/lltc,ltc4151.yaml | 41 ++ + Documentation/devicetree/bindings/hwmon/lm70.txt | 22 - + Documentation/devicetree/bindings/hwmon/lm90.txt | 51 -- + .../devicetree/bindings/hwmon/ltc4151.txt | 18 - + .../devicetree/bindings/hwmon/mcp3021.txt | 21 - + .../bindings/hwmon/microchip,mcp3021.yaml | 43 ++ + .../devicetree/bindings/hwmon/national,lm90.yaml | 78 +++ + .../devicetree/bindings/hwmon/ntc-thermistor.yaml | 141 ++++ + .../devicetree/bindings/hwmon/ntc_thermistor.txt | 44 -- + .../bindings/hwmon/pmbus/ti,lm25066.yaml | 54 ++ + .../devicetree/bindings/hwmon/sensirion,sht15.yaml | 43 ++ + Documentation/devicetree/bindings/hwmon/sht15.txt | 19 - + .../devicetree/bindings/hwmon/ti,tmp102.yaml | 47 ++ + .../devicetree/bindings/hwmon/ti,tmp108.yaml | 50 ++ + Documentation/devicetree/bindings/hwmon/tmp108.txt | 18 - + .../devicetree/bindings/trivial-devices.yaml | 26 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/lm25066.rst | 2 + + Documentation/hwmon/max6620.rst | 46 ++ + MAINTAINERS | 4 +- + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/abituguru3.c | 6 +- + drivers/hwmon/ad7414.c | 4 +- + drivers/hwmon/ad7418.c | 6 +- + drivers/hwmon/adm1021.c | 4 +- + drivers/hwmon/adm1025.c | 4 +- + drivers/hwmon/adm1026.c | 4 +- + drivers/hwmon/adm1029.c | 4 +- + drivers/hwmon/adm1031.c | 6 +- + drivers/hwmon/adt7310.c | 3 +- + drivers/hwmon/adt7410.c | 3 +- + drivers/hwmon/adt7x10.c | 3 +- + drivers/hwmon/adt7x10.h | 2 +- + drivers/hwmon/amc6821.c | 8 +- + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/asb100.c | 4 +- + drivers/hwmon/asc7621.c | 4 +- + drivers/hwmon/atxp1.c | 10 +- + drivers/hwmon/coretemp.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 2 - + drivers/hwmon/dme1737.c | 4 +- + drivers/hwmon/ds1621.c | 4 +- + drivers/hwmon/ds620.c | 4 +- + drivers/hwmon/emc6w201.c | 4 +- + drivers/hwmon/f71805f.c | 4 +- + drivers/hwmon/f71882fg.c | 4 +- + drivers/hwmon/f75375s.c | 4 +- + drivers/hwmon/fschmd.c | 4 +- + drivers/hwmon/g760a.c | 2 +- + drivers/hwmon/gl518sm.c | 4 +- + drivers/hwmon/gl520sm.c | 4 +- + drivers/hwmon/i5500_temp.c | 114 ++-- + drivers/hwmon/ibmaem.c | 2 +- + drivers/hwmon/ibmpex.c | 4 +- + drivers/hwmon/it87.c | 12 +- + drivers/hwmon/lineage-pem.c | 2 +- + drivers/hwmon/lm63.c | 6 +- + drivers/hwmon/lm77.c | 4 +- + drivers/hwmon/lm78.c | 4 +- + drivers/hwmon/lm80.c | 6 +- + drivers/hwmon/lm83.c | 4 +- + drivers/hwmon/lm85.c | 4 +- + drivers/hwmon/lm87.c | 4 +- + drivers/hwmon/lm92.c | 4 +- + drivers/hwmon/lm93.c | 4 +- + drivers/hwmon/lm95241.c | 8 +- + drivers/hwmon/ltc4151.c | 2 +- + drivers/hwmon/ltc4215.c | 2 +- + drivers/hwmon/ltc4261.c | 4 +- + drivers/hwmon/max16065.c | 2 +- + drivers/hwmon/max1619.c | 4 +- + drivers/hwmon/max1668.c | 4 +- + drivers/hwmon/max6620.c | 514 +++++++++++++++ + drivers/hwmon/max6639.c | 4 +- + drivers/hwmon/max6642.c | 2 +- + drivers/hwmon/mlxreg-fan.c | 138 ++-- + drivers/hwmon/nct6683.c | 3 + + drivers/hwmon/nct6775.c | 716 ++++++++++++++------- + drivers/hwmon/pc87360.c | 4 +- + drivers/hwmon/pmbus/ibm-cffps.c | 23 +- + drivers/hwmon/pmbus/lm25066.c | 88 ++- + drivers/hwmon/raspberrypi-hwmon.c | 2 +- + drivers/hwmon/sch5636.c | 4 +- + drivers/hwmon/sht21.c | 4 +- + drivers/hwmon/sis5595.c | 4 +- + drivers/hwmon/smm665.c | 2 +- + drivers/hwmon/smsc47b397.c | 4 +- + drivers/hwmon/smsc47m192.c | 4 +- + drivers/hwmon/thmc50.c | 4 +- + drivers/hwmon/tmp103.c | 105 ++- + drivers/hwmon/tmp401.c | 6 +- + drivers/hwmon/tmp421.c | 15 +- + drivers/hwmon/via686a.c | 4 +- + drivers/hwmon/vt1211.c | 4 +- + drivers/hwmon/vt8231.c | 4 +- + drivers/hwmon/w83627ehf.c | 8 +- + drivers/hwmon/w83627hf.c | 6 +- + drivers/hwmon/w83781d.c | 4 +- + drivers/hwmon/w83791d.c | 4 +- + drivers/hwmon/w83792d.c | 6 +- + drivers/hwmon/w83793.c | 6 +- + drivers/hwmon/w83795.c | 6 +- + drivers/hwmon/w83l785ts.c | 4 +- + drivers/hwmon/w83l786ng.c | 4 +- + 111 files changed, 2175 insertions(+), 845 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/dps650ab.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/hih6130.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/iio-hwmon.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/jc42.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/jedec,jc42.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/lltc,ltc4151.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/lm70.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/lm90.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/ltc4151.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/mcp3021.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/microchip,mcp3021.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/national,lm90.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ntc-thermistor.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/ti,lm25066.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/sensirion,sht15.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/sht15.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tmp102.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,tmp108.yaml + 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 (7275423c177e ext4: docs: Take out unneeded escaping) +$ 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 | 81 +++ + Documentation/filesystems/ext4/orphan.rst | 44 +- + 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 +- + 28 files changed, 2287 insertions(+), 66 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 (64cdf7e5a3aa media: mtk-vcodec: MT8173 h264/vp8 encoder min/max bitrate settings) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging drivers/media/platform/Kconfig +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/Kconfig | 4 + + drivers/media/cec/core/cec-pin.c | 4 +- + drivers/media/cec/platform/meson/ao-cec-g12a.c | 4 +- + drivers/media/cec/platform/meson/ao-cec.c | 4 +- + drivers/media/cec/platform/s5p/s5p_cec.c | 4 +- + drivers/media/cec/platform/sti/stih-cec.c | 4 +- + drivers/media/cec/platform/stm32/stm32-cec.c | 4 +- + drivers/media/common/siano/smscoreapi.c | 7 +- + drivers/media/common/videobuf2/videobuf2-core.c | 149 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 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 | 33 +- + 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 | 75 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 774 ++++++++++ + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 3 + + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 1 + + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 23 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 43 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 5 + + drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 +- + drivers/media/platform/mx2_emmaprp.c | 4 +- + drivers/media/platform/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 | 241 +++- + drivers/media/platform/rcar-vin/rcar-dma.c | 40 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 4 + + 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/em28xx/em28xx-core.c | 5 +- + drivers/media/usb/gspca/gspca.c | 2 + + drivers/media/usb/gspca/m5602/m5602_ov7660.h | 1 - + drivers/media/usb/gspca/sn9c20x.c | 22 +- + drivers/media/usb/pvrusb2/pvrusb2-ctrl.c | 25 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 - + drivers/media/usb/stkwebcam/stk-webcam.c | 11 +- + drivers/media/usb/tm6000/tm6000-video.c | 3 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 10 +- + drivers/media/usb/uvc/uvc_ctrl.c | 260 +++- + drivers/media/usb/uvc/uvc_driver.c | 16 +- + drivers/media/usb/uvc/uvc_metadata.c | 2 +- + drivers/media/usb/uvc/uvc_v4l2.c | 103 +- + drivers/media/usb/uvc/uvc_video.c | 5 + + drivers/media/usb/uvc/uvcvideo.h | 17 +- + drivers/media/v4l2-core/v4l2-async.c | 168 ++- + drivers/media/v4l2-core/v4l2-common.c | 3 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 9 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 6 + + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 5 + + drivers/media/v4l2-core/v4l2-fwnode.c | 83 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 77 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 37 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 + + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 70 +- + drivers/staging/media/hantro/hantro_drv.c | 12 +- + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 2 +- + drivers/staging/media/hantro/hantro_g1_regs.h | 2 + + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 3 +- + drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 52 + + drivers/staging/media/hantro/hantro_hevc.c | 21 + + drivers/staging/media/hantro/hantro_hw.h | 4 + + drivers/staging/media/imx/TODO | 5 - + drivers/staging/media/imx/imx-media-csi.c | 18 +- + 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 | 55 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 2 + + 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-dev.h | 3 +- + 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 +- + 273 files changed, 8786 insertions(+), 3820 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 (fd2eda71a47b media: remove myself from dvb media maintainers) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging drivers/media/platform/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/admin-guide/media/i2c-cardlist.rst | 8 +- + .../devicetree/bindings/media/i2c/hynix,hi846.yaml | 120 ++ + .../bindings/media/qcom,sc7280-venus.yaml | 162 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../driver-api/media/maintainer-entry-profile.rst | 2 +- + MAINTAINERS | 7 + + drivers/media/dvb-frontends/mb86a20s.c | 4 +- + drivers/media/dvb-frontends/mn88443x.c | 18 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 5 +- + drivers/media/i2c/Kconfig | 13 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/dw9714.c | 14 +- + drivers/media/i2c/hi846.c | 2190 ++++++++++++++++++++ + drivers/media/i2c/ov13858.c | 11 +- + drivers/media/i2c/ov5670.c | 11 +- + drivers/media/pci/intel/ipu3/cio2-bridge.c | 60 +- + drivers/media/pci/intel/ipu3/cio2-bridge.h | 9 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 8 +- + drivers/media/platform/Kconfig | 16 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/imx-jpeg/mxc-jpeg.c | 30 +- + drivers/media/platform/omap/omap_vout.c | 18 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 2 +- + drivers/media/platform/omap/omap_voutdef.h | 2 +- + drivers/media/platform/qcom/venus/core.c | 54 + + drivers/media/platform/qcom/venus/core.h | 2 + + drivers/media/platform/qcom/venus/firmware.c | 42 +- + drivers/media/platform/qcom/venus/helpers.c | 14 +- + drivers/media/platform/qcom/venus/hfi_cmds.c | 7 + + drivers/media/platform/qcom/venus/hfi_helper.h | 14 + + drivers/media/platform/qcom/venus/hfi_msgs.c | 7 + + .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 6 +- + drivers/media/platform/qcom/venus/hfi_platform.c | 13 - + drivers/media/platform/qcom/venus/hfi_platform.h | 2 - + .../media/platform/qcom/venus/hfi_platform_v6.c | 6 - + drivers/media/platform/qcom/venus/hfi_venus.c | 4 + + drivers/media/platform/qcom/venus/hfi_venus_io.h | 2 + + drivers/media/platform/qcom/venus/pm_helpers.c | 13 +- + drivers/media/platform/qcom/venus/vdec.c | 42 +- + drivers/media/platform/rcar-isp.c | 515 +++++ + drivers/media/platform/vsp1/vsp1_drm.c | 8 +- + drivers/media/platform/vsp1/vsp1_drv.c | 14 +- + drivers/media/platform/vsp1/vsp1_regs.h | 11 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 2 +- + drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- + drivers/staging/media/ipu3/ipu3-css.c | 19 +- + drivers/staging/media/ipu3/ipu3-css.h | 1 - + drivers/staging/media/ipu3/ipu3-v4l2.c | 13 +- + drivers/staging/media/ipu3/ipu3.h | 12 + + 49 files changed, 3423 insertions(+), 116 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/hynix,hi846.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml + create mode 100644 drivers/media/i2c/hi846.c + create mode 100644 drivers/media/platform/rcar-isp.c +Merging pm/linux-next (574167bf7ed8 Merge branches 'thermal-int340x' and 'thermal-powerclamp' 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/firmware-guide/acpi/osi.rst | 2 +- + MAINTAINERS | 20 +- + arch/x86/kernel/acpi/boot.c | 9 + + arch/x86/kernel/acpi/cstate.c | 15 ++ + drivers/acpi/Kconfig | 2 +- + drivers/acpi/acpi_pnp.c | 2 - + drivers/acpi/acpica/acglobal.h | 2 + + drivers/acpi/acpica/hwesleep.c | 8 +- + drivers/acpi/acpica/hwsleep.c | 11 +- + drivers/acpi/acpica/hwxfsleep.c | 7 + + drivers/acpi/acpica/utosi.c | 1 + + drivers/acpi/glue.c | 34 ++- + drivers/acpi/processor_idle.c | 3 +- + drivers/acpi/resource.c | 49 +++- + drivers/cpufreq/intel_pstate.c | 117 +++++++++- + drivers/cpuidle/sysfs.c | 5 +- + drivers/idle/intel_idle.c | 13 +- + drivers/pci/pci-acpi.c | 74 ++---- + drivers/pci/pci-mid.c | 37 +-- + drivers/pci/pci.c | 147 +++++------- + drivers/pci/pci.h | 96 ++++---- + drivers/pnp/system.c | 2 +- + .../intel/int340x_thermal/int3400_thermal.c | 9 +- + drivers/thermal/intel/intel_powerclamp.c | 8 +- + include/acpi/acpi_bus.h | 1 - + include/acpi/acpixf.h | 2 +- + include/acpi/actbl2.h | 251 ++++++++++++++++++++- + include/acpi/actbl3.h | 9 +- + include/acpi/actypes.h | 1 + + include/linux/pci-acpi.h | 8 + + kernel/power/suspend.c | 4 +- + kernel/power/swap.c | 2 +- + 32 files changed, 664 insertions(+), 287 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (b3c08d1ad2bb cpufreq: Fix parameter in parse_perf_domain()) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/cppc_cpufreq.c | 2 -- + drivers/cpufreq/s3c2440-cpufreq.c | 2 ++ + drivers/cpufreq/tegra186-cpufreq.c | 4 ++++ + drivers/cpufreq/tegra194-cpufreq.c | 8 +++++++- + include/linux/cpufreq.h | 2 +- + 5 files changed, 14 insertions(+), 4 deletions(-) +Merging cpupower/cpupower (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (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 (27ff8187f13e opp: Fix return in _opp_add_static_v2()) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Auto-merging drivers/devfreq/devfreq.c +Merge made by the 'recursive' strategy. + drivers/devfreq/devfreq.c | 26 +++++++++ + drivers/devfreq/governor.h | 3 ++ + drivers/devfreq/tegra30-devfreq.c | 109 ++++++++++++++++---------------------- + drivers/opp/core.c | 6 +-- + drivers/opp/of.c | 50 +++++++++++++---- + include/linux/pm_opp.h | 20 +++++-- + 6 files changed, 136 insertions(+), 78 deletions(-) +Merging thermal/thermal/linux-next (fc656fa14da7 thermal/drivers/netlink: Add the temperature when crossing a trip point) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Merge made by the 'recursive' strategy. + drivers/thermal/thermal_core.c | 6 ++++-- + drivers/thermal/thermal_mmio.c | 2 +- + drivers/thermal/thermal_netlink.c | 11 ++++++----- + drivers/thermal/thermal_netlink.h | 8 ++++---- + 4 files changed, 15 insertions(+), 12 deletions(-) +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (2a152512a155 RDMA/efa: CQ notifications) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 34 +-- + drivers/infiniband/core/cma_priv.h | 11 +- + drivers/infiniband/core/rw.c | 66 +++-- + 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/efa/efa.h | 19 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 100 +++++++- + drivers/infiniband/hw/efa/efa_admin_defs.h | 41 ++++ + drivers/infiniband/hw/efa/efa_com.c | 164 +++++++++++++ + drivers/infiniband/hw/efa/efa_com.h | 38 ++- + drivers/infiniband/hw/efa/efa_com_cmd.c | 35 ++- + drivers/infiniband/hw/efa/efa_com_cmd.h | 10 +- + drivers/infiniband/hw/efa/efa_main.c | 181 ++++++++++++-- + drivers/infiniband/hw/efa/efa_regs_defs.h | 7 +- + drivers/infiniband/hw/efa/efa_verbs.c | 67 ++++- + drivers/infiniband/hw/hfi1/efivar.c | 10 +- + 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/irdma/cm.h | 8 - + drivers/infiniband/hw/mlx5/cmd.c | 26 ++ + drivers/infiniband/hw/mlx5/cmd.h | 2 + + drivers/infiniband/hw/mlx5/main.c | 55 +++-- + drivers/infiniband/hw/mlx5/mr.c | 26 +- + drivers/infiniband/hw/mlx5/odp.c | 40 +-- + drivers/infiniband/sw/rxe/rxe_comp.c | 57 +++-- + drivers/infiniband/sw/rxe/rxe_cq.c | 28 +-- + 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 | 32 +-- + drivers/infiniband/sw/rxe/rxe_qp.c | 16 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 30 ++- + drivers/infiniband/sw/rxe/rxe_queue.h | 292 +++++++++------------- + drivers/infiniband/sw/rxe/rxe_req.c | 57 ++--- + drivers/infiniband/sw/rxe/rxe_resp.c | 50 +--- + drivers/infiniband/sw/rxe/rxe_srq.c | 3 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 100 ++------ + drivers/infiniband/sw/rxe/rxe_verbs.h | 54 ++-- + drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 49 ++-- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 11 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 6 + + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 13 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-stats.c | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 6 + + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 3 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 31 ++- + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 14 +- + include/linux/mlx5/driver.h | 2 - + include/linux/mlx5/mlx5_ifc.h | 4 +- + include/uapi/rdma/efa-abi.h | 18 +- + 66 files changed, 2058 insertions(+), 1117 deletions(-) +Merging net-next/master (ff7f0e4e7930 Merge branch 'nfc-minor-printk-cleanup') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging net/smc/smc_core.c +Auto-merging net/sched/sch_mqprio.c +Auto-merging net/mptcp/protocol.c +Auto-merging net/dsa/dsa2.c +Auto-merging include/linux/mlx5/driver.h +Removing drivers/ptp/idt8a340_reg.h +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_lif.c +Auto-merging drivers/net/ethernet/microsoft/mana/mana_en.c +Auto-merging drivers/net/ethernet/chelsio/cxgb3/t3_hw.c +Auto-merging drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +Auto-merging drivers/infiniband/hw/mlx5/odp.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 + + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 5 +- + .../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/ethtool-netlink.rst | 81 +- + 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/base/property.c | 63 - + drivers/bcma/main.c | 2 +- + drivers/bluetooth/btintel.c | 239 +- + drivers/bluetooth/btintel.h | 11 + + drivers/bluetooth/btmrvl_main.c | 6 +- + drivers/bluetooth/btmtkuart.c | 13 +- + drivers/bluetooth/btrsi.c | 1 - + drivers/bluetooth/btrtl.c | 26 +- + drivers/bluetooth/btusb.c | 64 +- + drivers/bluetooth/hci_h5.c | 35 +- + drivers/bluetooth/hci_ldisc.c | 3 + + drivers/bluetooth/hci_qca.c | 5 +- + drivers/bluetooth/hci_vhci.c | 122 + + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 2 +- + drivers/infiniband/hw/mlx5/odp.c | 1 + + drivers/infiniband/hw/qedr/main.c | 2 +- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/bonding/bond_sysfs.c | 4 +- + 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 | 301 +- + 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/apne.c | 3 +- + drivers/net/ethernet/8390/ax88796.c | 12 +- + drivers/net/ethernet/8390/axnet_cs.c | 7 +- + drivers/net/ethernet/8390/mcf8390.c | 3 +- + drivers/net/ethernet/8390/ne.c | 4 +- + drivers/net/ethernet/8390/ne2k-pci.c | 2 +- + drivers/net/ethernet/8390/pcnet_cs.c | 22 +- + drivers/net/ethernet/8390/stnic.c | 5 +- + drivers/net/ethernet/8390/zorro8390.c | 3 +- + drivers/net/ethernet/actions/owl-emac.c | 4 +- + drivers/net/ethernet/aeroflex/greth.c | 2 +- + drivers/net/ethernet/agere/et131x.c | 4 +- + drivers/net/ethernet/alacritech/slicoss.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- + drivers/net/ethernet/alteon/acenic.c | 2 +- + drivers/net/ethernet/altera/altera_tse_main.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/amd/Kconfig | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 4 +- + 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/amd/xgbe/xgbe-drv.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 +- + drivers/net/ethernet/apm/xgene-v2/main.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- + drivers/net/ethernet/arc/Kconfig | 4 +- + drivers/net/ethernet/arc/emac_main.c | 4 +- + drivers/net/ethernet/arc/emac_mdio.c | 9 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 4 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 12 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 10 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 4 +- + drivers/net/ethernet/atheros/atlx/atlx.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 6 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 4 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 4 +- + drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c | 6 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 37 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.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 | 13 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 50 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 13 - + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 62 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 8 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 195 +- + drivers/net/ethernet/broadcom/tg3.c | 59 +- + drivers/net/ethernet/brocade/bna/bnad.c | 5 +- + drivers/net/ethernet/cadence/macb.h | 7 +- + drivers/net/ethernet/cadence/macb_main.c | 18 +- + drivers/net/ethernet/cadence/macb_ptp.c | 13 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 3 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 29 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 4 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + drivers/net/ethernet/cavium/thunder/nic_main.c | 3 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 11 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 9 +- + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/subr.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/vsc7326.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 3 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 8 +- + drivers/net/ethernet/cirrus/cs89x0.c | 2 +- + 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 | 4 +- + drivers/net/ethernet/cortina/gemini.c | 4 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 15 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 35 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 9 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 39 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 11 +- + drivers/net/ethernet/dec/tulip/xircom_cb.c | 4 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 5 +- + drivers/net/ethernet/ethoc.c | 18 +- + drivers/net/ethernet/ezchip/Kconfig | 2 +- + drivers/net/ethernet/ezchip/nps_enet.c | 4 +- + drivers/net/ethernet/faraday/ftgmac100.c | 9 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-devlink.c | 21 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 13 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 5 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 2 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 323 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 4 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 22 +- + drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 14 +- + drivers/net/ethernet/freescale/fec_main.c | 4 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 4 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 4 +- + drivers/net/ethernet/google/gve/gve.h | 31 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 2 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 1 + + drivers/net/ethernet/google/gve/gve_ethtool.c | 3 +- + drivers/net/ethernet/google/gve/gve_main.c | 101 +- + drivers/net/ethernet/google/gve/gve_rx.c | 98 +- + drivers/net/ethernet/google/gve/gve_tx.c | 117 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 84 +- + drivers/net/ethernet/google/gve/gve_utils.c | 4 + + drivers/net/ethernet/hisilicon/hisi_femac.c | 4 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +- + 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 | 4 +- + drivers/net/ethernet/ibm/emac/core.c | 14 +- + 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/Kconfig | 14 + + drivers/net/ethernet/intel/e100.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 1 + + drivers/net/ethernet/intel/e1000e/netdev.c | 4 +- + 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/Makefile | 5 +- + drivers/net/ethernet/intel/ice/ice.h | 58 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 72 + + drivers/net/ethernet/intel/ice/ice_arfs.c | 2 +- + drivers/net/ethernet/intel/ice/ice_base.c | 36 +- + drivers/net/ethernet/intel/ice/ice_common.c | 42 +- + 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 | 12 +- + 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 | 255 +- + drivers/net/ethernet/intel/ice/ice_devlink.h | 8 +- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 660 + + drivers/net/ethernet/intel/ice/ice_eswitch.h | 83 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 62 +- + drivers/net/ethernet/intel/ice/ice_fdir.c | 2 +- + drivers/net/ethernet/intel/ice/ice_fdir.h | 2 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 275 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 14 + + drivers/net/ethernet/intel/ice/ice_flex_type.h | 13 + + drivers/net/ethernet/intel/ice/ice_fltr.c | 207 + + drivers/net/ethernet/intel/ice/ice_fltr.h | 7 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 43 + + drivers/net/ethernet/intel/ice/ice_lib.c | 159 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 14 + + drivers/net/ethernet/intel/ice/ice_main.c | 148 +- + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 169 + + drivers/net/ethernet/intel/ice/ice_repr.c | 386 + + drivers/net/ethernet/intel/ice/ice_repr.h | 28 + + drivers/net/ethernet/intel/ice/ice_switch.c | 2483 ++- + drivers/net/ethernet/intel/ice/ice_switch.h | 136 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 855 + + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 130 + + drivers/net/ethernet/intel/ice/ice_txrx.c | 37 + + drivers/net/ethernet/intel/ice/ice_txrx.h | 19 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 4 +- + drivers/net/ethernet/intel/ice/ice_type.h | 15 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 236 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 59 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 92 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 8 +- + drivers/net/ethernet/intel/igc/igc_main.c | 4 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- + 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 | 54 +- + .../net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 16 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 +- + drivers/net/ethernet/jme.c | 4 +- + drivers/net/ethernet/korina.c | 4 +- + drivers/net/ethernet/lantiq_etop.c | 21 +- + drivers/net/ethernet/lantiq_xrx200.c | 87 +- + drivers/net/ethernet/litex/Kconfig | 2 +- + drivers/net/ethernet/litex/litex_liteeth.c | 2 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 4 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 11 +- + drivers/net/ethernet/marvell/octeontx2/af/common.h | 1 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 5 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 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 | 60 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 12 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 13 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 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 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 52 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 18 +- + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 21 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 38 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 234 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 125 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 273 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 16 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 8 +- + .../ethernet/marvell/prestera/prestera_devlink.c | 35 +- + .../ethernet/marvell/prestera/prestera_devlink.h | 4 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 10 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 4 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 88 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- + drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/cq.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 8 + + drivers/net/ethernet/mellanox/mlx4/en_main.c | 1 - + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 40 +- + drivers/net/ethernet/mellanox/mlx4/en_port.c | 4 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 15 + + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 11 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 + + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 23 +- + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 102 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.h | 9 + + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 27 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 21 +- + .../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/tc_tun.c | 8 + + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 1 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 9 + + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 118 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 92 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 288 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 227 +- + .../ethernet/mellanox/mlx5/core/esw/bridge_priv.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 8 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 10 +- + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h | 2 - + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 36 +- + .../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 | 372 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 23 + + drivers/net/ethernet/mellanox/mlxsw/item.h | 56 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 56 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 341 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 6 - + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 328 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 45 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 432 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 27 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 315 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 6 +- + drivers/net/ethernet/micrel/ks8842.c | 5 +- + drivers/net/ethernet/micrel/ks8851_common.c | 4 +- + drivers/net/ethernet/micrel/ksz884x.c | 7 +- + drivers/net/ethernet/microchip/enc28j60.c | 7 +- + drivers/net/ethernet/microchip/encx24j600.c | 3 +- + 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/hw_channel.c | 4 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- + drivers/net/ethernet/moxa/moxart_ether.c | 2 +- + drivers/net/ethernet/mscc/Kconfig | 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 | 4 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 6 +- + 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 | 51 +- + drivers/net/ethernet/nxp/lpc_eth.c | 4 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 4 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 8 +- + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 48 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 1 - + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 4 - + .../net/ethernet/pensando/ionic/ionic_devlink.c | 9 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 38 - + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 264 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 49 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 92 +- + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 8 +- + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 241 +- + .../net/ethernet/pensando/ionic/ionic_rx_filter.h | 2 + + drivers/net/ethernet/pensando/ionic/ionic_stats.c | 121 - + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 14 - + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +- + 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 | 1391 +- + 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 | 201 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 138 +- + 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/qla3xxx.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 5 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/net/ethernet/realtek/8139cp.c | 2 +- + drivers/net/ethernet/realtek/8139too.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 | 454 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/rocker/rocker_main.c | 2 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 2 +- + drivers/net/ethernet/seeq/sgiseeq.c | 4 +- + 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 | 4 +- + drivers/net/ethernet/sgi/meth.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 6 +- + drivers/net/ethernet/smsc/smsc9420.c | 6 +- + drivers/net/ethernet/socionext/netsec.c | 30 +- + drivers/net/ethernet/socionext/sni_ave.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 +- + drivers/net/ethernet/sun/cassini.c | 7 +- + drivers/net/ethernet/sun/ldmvsw.c | 7 +- + drivers/net/ethernet/sun/niu.c | 46 +- + drivers/net/ethernet/sun/sungem.c | 15 +- + drivers/net/ethernet/sun/sunhme.c | 23 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/tehuti/tehuti.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/cpts.c | 6 +- + drivers/net/ethernet/ti/davinci_emac.c | 4 +- + drivers/net/ethernet/ti/netcp_core.c | 4 +- + 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/xilinx/xilinx_emaclite.c | 4 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/fddi/defxx.c | 6 +- + drivers/net/fddi/skfp/skfddi.c | 7 +- + drivers/net/gtp.c | 2 +- + drivers/net/hamradio/baycom_epp.c | 2 +- + drivers/net/hamradio/bpqether.c | 2 +- + drivers/net/hamradio/dmascc.c | 3 +- + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/hamradio/scc.c | 2 +- + drivers/net/hamradio/yam.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 5 +- + drivers/net/ipvlan/ipvlan_main.c | 4 +- + drivers/net/macsec.c | 2 +- + drivers/net/macvlan.c | 4 +- + drivers/net/net_failover.c | 3 +- + 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/ntb_netdev.c | 2 +- + drivers/net/phy/at803x.c | 196 +- + drivers/net/phy/bcm7xxx.c | 201 + + drivers/net/phy/broadcom.c | 106 +- + drivers/net/phy/marvell10g.c | 107 +- + drivers/net/phy/mdio_bus.c | 28 + + drivers/net/phy/micrel.c | 98 + + drivers/net/phy/phy_device.c | 10 + + drivers/net/phy/phylink.c | 45 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/team/team.c | 2 +- + 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 | 4 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kalmia.c | 2 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/mcs7830.c | 2 +- + drivers/net/usb/r8152.c | 4 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/rtl8150.c | 4 +- + drivers/net/usb/smsc75xx.c | 3 +- + drivers/net/usb/smsc95xx.c | 3 +- + drivers/net/usb/sr9700.c | 2 +- + drivers/net/usb/sr9800.c | 2 +- + drivers/net/virtio_net.c | 40 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/wan/lapbether.c | 2 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- + drivers/net/wireless/ath/ath10k/core.c | 2 +- + drivers/net/wireless/ath/ath10k/mac.c | 31 +- + drivers/net/wireless/ath/ath10k/sdio.c | 5 +- + drivers/net/wireless/ath/ath10k/wmi.c | 4 + + drivers/net/wireless/ath/ath11k/core.c | 58 +- + drivers/net/wireless/ath/ath11k/core.h | 49 +- + drivers/net/wireless/ath/ath11k/dbring.c | 16 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 25 +- + drivers/net/wireless/ath/ath11k/debugfs.h | 4 + + .../net/wireless/ath/ath11k/debugfs_htt_stats.c | 4344 ++--- + .../net/wireless/ath/ath11k/debugfs_htt_stats.h | 226 + + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 8 +- + drivers/net/wireless/ath/ath11k/dp.h | 8 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 243 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 23 +- + drivers/net/wireless/ath/ath11k/dp_tx.h | 2 +- + drivers/net/wireless/ath/ath11k/hal_desc.h | 2 + + drivers/net/wireless/ath/ath11k/hw.c | 45 + + drivers/net/wireless/ath/ath11k/hw.h | 13 +- + drivers/net/wireless/ath/ath11k/mac.c | 1443 +- + drivers/net/wireless/ath/ath11k/mac.h | 3 + + drivers/net/wireless/ath/ath11k/pci.c | 4 +- + drivers/net/wireless/ath/ath11k/peer.c | 11 + + drivers/net/wireless/ath/ath11k/qmi.c | 350 +- + drivers/net/wireless/ath/ath11k/qmi.h | 18 +- + drivers/net/wireless/ath/ath11k/reg.c | 18 +- + drivers/net/wireless/ath/ath11k/reg.h | 2 +- + drivers/net/wireless/ath/ath11k/spectral.c | 42 +- + drivers/net/wireless/ath/ath11k/trace.h | 11 +- + drivers/net/wireless/ath/ath11k/wmi.c | 152 +- + drivers/net/wireless/ath/ath11k/wmi.h | 107 +- + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 105 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 12 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 + + drivers/net/wireless/ath/ath9k/init.c | 56 + + drivers/net/wireless/ath/spectral_common.h | 1 - + drivers/net/wireless/ath/wcn36xx/debug.c | 2 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 6 +- + drivers/net/wireless/ath/wcn36xx/main.c | 11 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 99 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 3 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 12 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 10 + + .../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 - + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 2 + + drivers/net/wireless/realtek/rtw88/debug.c | 46 +- + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 54 +- + drivers/net/wireless/realtek/rtw88/fw.h | 24 + + drivers/net/wireless/realtek/rtw88/main.c | 22 +- + drivers/net/wireless/realtek/rtw88/main.h | 49 +- + drivers/net/wireless/realtek/rtw88/phy.c | 119 +- + drivers/net/wireless/realtek/rtw88/phy.h | 2 + + drivers/net/wireless/realtek/rtw88/reg.h | 6 + + drivers/net/wireless/realtek/rtw88/regd.c | 753 +- + drivers/net/wireless/realtek/rtw88/regd.h | 8 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 19 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 46 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 8 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 47 + + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 3 + + drivers/net/wireless/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 - + 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/i2c.c | 4 - + drivers/nfc/microread/mei.c | 6 +- + drivers/nfc/nfcmrvl/fw_dnld.c | 4 +- + drivers/nfc/pn533/i2c.c | 6 +- + drivers/nfc/pn533/pn533.c | 6 +- + drivers/nfc/pn533/pn533.h | 4 +- + drivers/nfc/pn533/uart.c | 4 +- + drivers/nfc/pn533/usb.c | 2 +- + drivers/nfc/pn544/mei.c | 8 +- + drivers/nfc/s3fwrn5/firmware.c | 29 +- + drivers/nfc/s3fwrn5/nci.c | 18 +- + drivers/nfc/st-nci/i2c.c | 4 - + drivers/nfc/st-nci/ndlc.c | 4 - + drivers/nfc/st-nci/se.c | 6 - + drivers/nfc/st-nci/spi.c | 4 - + drivers/nfc/st21nfca/i2c.c | 4 - + drivers/nfc/st21nfca/se.c | 4 - + drivers/nfc/trf7970a.c | 8 - + drivers/of/Kconfig | 4 - + drivers/of/Makefile | 1 - + drivers/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 | 9 +- + include/linux/ethtool.h | 23 + + include/linux/filter.h | 7 +- + include/linux/ieee80211.h | 1 + + include/linux/mdio.h | 2 + + include/linux/mfd/idt8a340_reg.h | 31 +- + include/linux/micrel_phy.h | 1 + + include/linux/mlx4/device.h | 2 +- + include/linux/mlx4/driver.h | 22 - + include/linux/mlx5/driver.h | 2 + + include/linux/mlx5/eq.h | 1 - + include/linux/mlx5/eswitch.h | 9 + + include/linux/netdevice.h | 3 +- + include/linux/netlink.h | 4 - + include/linux/of_net.h | 8 +- + include/linux/perf_event.h | 23 + + include/linux/phylink.h | 1 + + include/linux/platform_data/brcmfmac.h | 2 +- + include/linux/property.h | 5 +- + include/linux/qed/common_hsi.h | 141 +- + include/linux/qed/eth_common.h | 1 + + include/linux/qed/fcoe_common.h | 362 +- + include/linux/qed/iscsi_common.h | 360 +- + include/linux/qed/nvmetcp_common.h | 18 +- + include/linux/qed/qed_chain.h | 97 +- + include/linux/qed/qed_eth_if.h | 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/bluetooth/bluetooth.h | 90 + + include/net/bluetooth/hci.h | 117 + + include/net/bluetooth/hci_core.h | 75 +- + 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 | 68 +- + 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/ethtool.h | 29 + + include/uapi/linux/ethtool_netlink.h | 17 + + 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 + + include/uapi/linux/vm_sockets.h | 13 +- + kernel/bpf/arraymap.c | 7 +- + kernel/bpf/btf.c | 128 + + kernel/bpf/core.c | 5 + + kernel/bpf/hashtab.c | 13 +- + kernel/bpf/helpers.c | 11 +- + kernel/bpf/trampoline.c | 3 +- + kernel/bpf/verifier.c | 123 +- + kernel/events/core.c | 2 + + kernel/trace/bpf_trace.c | 84 +- + lib/test_bpf.c | 17182 ++++++++++++------- + net/802/hippi.c | 2 +- + net/8021q/vlan_dev.c | 6 +- + net/Kconfig | 2 +- + net/atm/br2684.c | 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/bpf/test_run.c | 22 +- + net/bridge/br_ioctl.c | 8 +- + net/bridge/br_stp_if.c | 2 +- + net/core/Makefile | 1 + + net/core/dev.c | 46 +- + net/core/devlink.c | 399 +- + net/core/filter.c | 21 + + net/core/flow_dissector.c | 3 +- + net/core/net-sysfs.c | 57 +- + net/core/net_namespace.c | 4 + + {drivers/of => net/core}/of_net.c | 25 + + net/core/rtnetlink.c | 4 +- + net/core/skbuff.c | 27 +- + net/core/sock.c | 104 +- + 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 | 102 +- + net/ethtool/Makefile | 2 +- + net/ethtool/ioctl.c | 16 +- + net/ethtool/module.c | 180 + + net/ethtool/netlink.c | 19 + + net/ethtool/netlink.h | 4 + + 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/netlink/af_netlink.c | 23 +- + net/netrom/nr_dev.c | 2 +- + net/nfc/hci/command.c | 16 - + net/nfc/hci/llc_shdlc.c | 35 +- + net/nfc/llcp_commands.c | 8 - + net/nfc/llcp_core.c | 5 +- + net/nfc/nci/core.c | 4 - + net/nfc/nci/hci.c | 4 - + net/nfc/nci/ntf.c | 9 - + net/nfc/nci/uart.c | 16 +- + net/qrtr/Makefile | 3 +- + net/qrtr/{qrtr.c => af_qrtr.c} | 0 + net/rose/rose_dev.c | 2 +- + net/rxrpc/rtt.c | 2 +- + net/sched/sch_api.c | 7 +- + net/sched/sch_ets.c | 12 +- + 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/vmw_vsock/af_vsock.c | 80 +- + 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/mlxsw/devlink_trap_tunnel_ipip.sh | 50 +- + .../mlxsw/spectrum-2/devlink_trap_tunnel_ipip6.sh | 250 + + .../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 + + .../net/forwarding/forwarding.config.sample | 3 + + .../selftests/net/forwarding/ip6gre_flat.sh | 65 + + .../selftests/net/forwarding/ip6gre_flat_key.sh | 65 + + .../selftests/net/forwarding/ip6gre_flat_keys.sh | 65 + + .../selftests/net/forwarding/ip6gre_hier.sh | 65 + + .../selftests/net/forwarding/ip6gre_hier_key.sh | 65 + + .../selftests/net/forwarding/ip6gre_hier_keys.sh | 65 + + .../testing/selftests/net/forwarding/ip6gre_lib.sh | 438 + + .../testing/selftests/net/forwarding/tc_common.sh | 10 + + 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 +- + tools/testing/selftests/net/tls.c | 28 +- + 1104 files changed, 64927 insertions(+), 30202 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/intel/ice/ice_eswitch.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_eswitch.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_repr.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_repr.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_tc_lib.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_tc_lib.h + 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/bluetooth/eir.c + create mode 100644 net/bluetooth/eir.h + create mode 100644 net/bluetooth/hci_codec.c + create mode 100644 net/bluetooth/hci_codec.h + rename {drivers/of => net/core}/of_net.c (85%) + create mode 100644 net/ethtool/module.c + create mode 100644 net/mctp/test/route-test.c + create mode 100644 net/mctp/test/utils.c + create mode 100644 net/mctp/test/utils.h + rename net/qrtr/{qrtr.c => af_qrtr.c} (100%) + create mode 100644 tools/lib/bpf/libbpf_version.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_tag.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/get_branch_snapshot.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/trace_vprintk.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdpwall.c + create mode 100644 tools/testing/selftests/bpf/progs/get_branch_snapshot.c + create mode 100644 tools/testing/selftests/bpf/progs/tag.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall6.c + create mode 100644 tools/testing/selftests/bpf/progs/trace_vprintk.c + create mode 100644 tools/testing/selftests/bpf/progs/xdpwall.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/devlink_trap_tunnel_ipip6.sh + create mode 100755 tools/testing/selftests/drivers/net/netdevsim/tc-mq-visibility.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_flat.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_flat_key.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_flat_keys.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_hier.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_hier_key.sh + create mode 100755 tools/testing/selftests/net/forwarding/ip6gre_hier_keys.sh + create mode 100644 tools/testing/selftests/net/forwarding/ip6gre_lib.sh + create mode 100644 tools/testing/selftests/net/mptcp/mptcp_sockopt.c +Merging bpf-next/for-next (431bfb9ee3e2 bpf, mips: Fix comment on tail call count limiting) +$ 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 samples/bpf/Makefile +Removing arch/mips/net/ebpf_jit.c +Removing arch/mips/net/bpf_jit_asm.S +Removing arch/mips/net/bpf_jit.h +Removing arch/mips/net/bpf_jit.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm/net/bpf_jit_32.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bpf/libbpf/libbpf_naming_convention.rst | 40 + + MAINTAINERS | 1 + + arch/arm/net/bpf_jit_32.c | 5 - + arch/mips/Kconfig | 15 +- + arch/mips/include/asm/uasm.h | 5 + + arch/mips/mm/uasm-mips.c | 4 +- + arch/mips/mm/uasm.c | 3 +- + arch/mips/net/Makefile | 9 +- + arch/mips/net/bpf_jit.c | 1299 ------------- + arch/mips/net/bpf_jit.h | 81 - + arch/mips/net/bpf_jit_asm.S | 285 --- + arch/mips/net/bpf_jit_comp.c | 1034 +++++++++++ + arch/mips/net/bpf_jit_comp.h | 235 +++ + arch/mips/net/bpf_jit_comp32.c | 1899 +++++++++++++++++++ + arch/mips/net/bpf_jit_comp64.c | 1060 +++++++++++ + arch/mips/net/ebpf_jit.c | 1938 -------------------- + arch/x86/net/bpf_jit_comp.c | 130 +- + include/linux/bpf.h | 8 +- + include/linux/bpf_verifier.h | 2 + + include/linux/bpfptr.h | 1 + + include/linux/btf.h | 39 + + include/trace/bpf_probe.h | 19 +- + kernel/bpf/btf.c | 55 + + kernel/bpf/core.c | 4 + + kernel/bpf/preload/Makefile | 25 +- + kernel/bpf/preload/iterators/Makefile | 38 +- + kernel/bpf/verifier.c | 231 ++- + lib/test_bpf.c | 120 +- + net/bpf/test_run.c | 7 +- + net/ipv4/bpf_tcp_ca.c | 36 +- + net/ipv4/tcp_bbr.c | 28 +- + net/ipv4/tcp_cubic.c | 26 +- + net/ipv4/tcp_dctcp.c | 26 +- + samples/bpf/.gitignore | 4 + + samples/bpf/Makefile | 44 +- + samples/bpf/xdp1_user.c | 2 +- + samples/bpf/xdp_sample_pkts_user.c | 2 +- + scripts/Makefile.modfinal | 1 + + tools/bpf/bpftool/Makefile | 39 +- + tools/bpf/bpftool/gen.c | 1 - + tools/bpf/bpftool/iter.c | 2 +- + tools/bpf/bpftool/prog.c | 3 +- + tools/bpf/resolve_btfids/Makefile | 16 +- + tools/bpf/resolve_btfids/main.c | 32 +- + tools/bpf/runqslower/Makefile | 22 +- + tools/lib/bpf/Makefile | 29 +- + tools/lib/bpf/bpf.c | 1 + + tools/lib/bpf/bpf_gen_internal.h | 16 +- + tools/lib/bpf/btf.c | 132 +- + tools/lib/bpf/btf.h | 22 + + tools/lib/bpf/gen_loader.c | 314 +++- + tools/lib/bpf/libbpf.c | 162 +- + tools/lib/bpf/libbpf.h | 36 +- + tools/lib/bpf/libbpf.map | 5 + + tools/lib/bpf/libbpf_internal.h | 3 + + tools/testing/selftests/bpf/Makefile | 35 +- + .../selftests/bpf/bpf_testmod/bpf_testmod-events.h | 15 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 33 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 5 + + tools/testing/selftests/bpf/cgroup_helpers.c | 6 +- + tools/testing/selftests/bpf/cgroup_helpers.h | 2 +- + tools/testing/selftests/bpf/prog_tests/atomics.c | 1 + + .../selftests/bpf/prog_tests/bpf_iter_setsockopt.c | 2 +- + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf_write.c | 141 +- + .../selftests/bpf/prog_tests/cg_storage_multi.c | 2 +- + .../bpf/prog_tests/cgroup_attach_autodetach.c | 2 +- + .../selftests/bpf/prog_tests/cgroup_attach_multi.c | 2 +- + .../bpf/prog_tests/cgroup_attach_override.c | 2 +- + .../testing/selftests/bpf/prog_tests/cgroup_link.c | 2 +- + .../testing/selftests/bpf/prog_tests/cgroup_v1v2.c | 2 +- + tools/testing/selftests/bpf/prog_tests/check_mtu.c | 2 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 9 +- + .../bpf/prog_tests/flow_dissector_load_bytes.c | 2 +- + .../bpf/prog_tests/flow_dissector_reattach.c | 2 +- + .../selftests/bpf/prog_tests/get_branch_snapshot.c | 36 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 3 +- + .../selftests/bpf/prog_tests/ksyms_module.c | 29 +- + .../selftests/bpf/prog_tests/ksyms_module_libbpf.c | 28 + + .../selftests/bpf/prog_tests/migrate_reuseport.c | 2 +- + .../selftests/bpf/prog_tests/modify_return.c | 3 +- + .../selftests/bpf/prog_tests/module_attach.c | 35 + + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 3 +- + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 2 +- + tools/testing/selftests/bpf/prog_tests/perf_link.c | 3 +- + .../testing/selftests/bpf/prog_tests/probe_user.c | 3 +- + .../bpf/prog_tests/raw_tp_writable_test_run.c | 3 +- + tools/testing/selftests/bpf/prog_tests/recursion.c | 10 +- + .../selftests/bpf/prog_tests/select_reuseport.c | 4 +- + .../bpf/prog_tests/send_signal_sched_switch.c | 3 +- + .../selftests/bpf/prog_tests/sk_storage_tracing.c | 2 +- + .../selftests/bpf/prog_tests/snprintf_btf.c | 2 +- + .../testing/selftests/bpf/prog_tests/sock_fields.c | 2 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 2 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 2 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 3 +- + tools/testing/selftests/bpf/prog_tests/timer_mim.c | 2 +- + .../selftests/bpf/prog_tests/tp_attach_query.c | 2 +- + .../selftests/bpf/prog_tests/trace_printk.c | 2 +- + .../selftests/bpf/prog_tests/trace_vprintk.c | 2 +- + .../selftests/bpf/prog_tests/trampoline_count.c | 3 +- + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 2 +- + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 2 +- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 2 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp_info.c | 2 +- + tools/testing/selftests/bpf/prog_tests/xdp_link.c | 2 +- + tools/testing/selftests/bpf/progs/atomics.c | 16 + + .../bpf/progs/btf_dump_test_case_bitfields.c | 10 +- + .../bpf/progs/btf_dump_test_case_packing.c | 4 +- + .../bpf/progs/btf_dump_test_case_padding.c | 2 +- + .../bpf/progs/btf_dump_test_case_syntax.c | 2 +- + .../bpf/progs/cgroup_skb_sk_lookup_kern.c | 1 - + .../testing/selftests/bpf/progs/connect4_dropper.c | 2 +- + tools/testing/selftests/bpf/progs/connect4_prog.c | 2 - + tools/testing/selftests/bpf/progs/connect6_prog.c | 2 - + .../selftests/bpf/progs/connect_force_port4.c | 1 - + .../selftests/bpf/progs/connect_force_port6.c | 1 - + tools/testing/selftests/bpf/progs/dev_cgroup.c | 1 - + tools/testing/selftests/bpf/progs/fexit_sleep.c | 4 +- + .../selftests/bpf/progs/get_cgroup_id_kern.c | 1 - + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 1 - + tools/testing/selftests/bpf/progs/netcnt_prog.c | 1 - + tools/testing/selftests/bpf/progs/recursion.c | 9 +- + tools/testing/selftests/bpf/progs/sendmsg4_prog.c | 2 - + tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 2 - + .../selftests/bpf/progs/sockmap_parse_prog.c | 2 - + .../selftests/bpf/progs/sockmap_tcp_msg_prog.c | 2 - + .../selftests/bpf/progs/sockmap_verdict_prog.c | 2 - + .../testing/selftests/bpf/progs/sockopt_inherit.c | 1 - + tools/testing/selftests/bpf/progs/tcp_rtt.c | 1 - + tools/testing/selftests/bpf/progs/test_btf_haskv.c | 2 - + tools/testing/selftests/bpf/progs/test_btf_newkv.c | 2 - + tools/testing/selftests/bpf/progs/test_btf_nokv.c | 2 - + .../selftests/bpf/progs/test_enable_stats.c | 2 +- + .../selftests/bpf/progs/test_ksyms_module.c | 46 +- + tools/testing/selftests/bpf/progs/test_l4lb.c | 2 - + .../testing/selftests/bpf/progs/test_map_in_map.c | 1 - + .../selftests/bpf/progs/test_module_attach.c | 14 + + tools/testing/selftests/bpf/progs/test_pinning.c | 2 - + .../selftests/bpf/progs/test_pinning_invalid.c | 2 - + .../testing/selftests/bpf/progs/test_pkt_access.c | 1 - + .../selftests/bpf/progs/test_queue_stack_map.h | 2 - + .../bpf/progs/test_select_reuseport_kern.c | 2 - + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 1 - + .../selftests/bpf/progs/test_skb_cgroup_id_kern.c | 2 - + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 1 - + .../selftests/bpf/progs/test_sockmap_kern.h | 1 - + .../selftests/bpf/progs/test_sockmap_listen.c | 1 - + .../selftests/bpf/progs/test_stacktrace_build_id.c | 1 - + .../testing/selftests/bpf/progs/test_tcp_estats.c | 1 - + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 1 - + .../selftests/bpf/progs/test_tcpnotify_kern.c | 2 - + .../testing/selftests/bpf/progs/test_tracepoint.c | 1 - + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 2 - + tools/testing/selftests/bpf/progs/test_xdp.c | 2 - + tools/testing/selftests/bpf/progs/test_xdp_loop.c | 2 - + .../selftests/bpf/progs/test_xdp_redirect.c | 2 - + tools/testing/selftests/bpf/test_bpftool_build.sh | 4 + + tools/testing/selftests/bpf/test_progs.c | 671 ++++++- + tools/testing/selftests/bpf/test_progs.h | 38 +- + tools/testing/selftests/bpf/test_verifier.c | 12 +- + tools/testing/selftests/bpf/verifier/calls.c | 23 + + tools/testing/selftests/bpf/verifier/jit.c | 47 + + tools/testing/selftests/bpf/xdping.c | 2 +- + 166 files changed, 6857 insertions(+), 4182 deletions(-) + delete mode 100644 arch/mips/net/bpf_jit.c + delete mode 100644 arch/mips/net/bpf_jit.h + delete mode 100644 arch/mips/net/bpf_jit_asm.S + create mode 100644 arch/mips/net/bpf_jit_comp.c + create mode 100644 arch/mips/net/bpf_jit_comp.h + create mode 100644 arch/mips/net/bpf_jit_comp32.c + create mode 100644 arch/mips/net/bpf_jit_comp64.c + delete mode 100644 arch/mips/net/ebpf_jit.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksyms_module_libbpf.c +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 (b8dfed636fc6 net/mlx5: Add priorities for counters in RDMA namespaces) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Merge made by the 'recursive' strategy. + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 54 +++++++++++++++++++---- + include/linux/mlx5/device.h | 2 + + include/linux/mlx5/fs.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 22 +++++++-- + 4 files changed, 69 insertions(+), 11 deletions(-) +Merging netfilter-next/master (7b1394892de8 netfilter: nft_dynset: relax superfluous check on set updates) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Merge made by the 'recursive' strategy. + Documentation/networking/ipvs-sysctl.rst | 11 +++++++++++ + include/net/ip_vs.h | 11 +++++++++++ + net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++++++ + net/netfilter/ipvs/ip_vs_est.c | 5 +++++ + net/netfilter/nft_dynset.c | 11 +---------- + 5 files changed, 36 insertions(+), 10 deletions(-) +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 (9b793db5fca4 b43: fix a lower bounds test) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/broadcom/b43/phy_g.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/radio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging bluetooth/master (b15bfa4df635 Bluetooth: mgmt: Fix Experimental Feature Changed event) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_vhci.c | 26 ++++++++++++++++++-------- + net/bluetooth/hci_codec.c | 18 ++++++++++++++++-- + net/bluetooth/hci_event.c | 16 ++++++++-------- + net/bluetooth/mgmt.c | 15 +++++++++------ + 4 files changed, 51 insertions(+), 24 deletions(-) +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 include/linux/ieee80211.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 (3f491d11d8cb MAINTAINERS: Add spi-nor device tree binding under SPI NOR maintainers) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging crypto/master (b6f5f0c8f72d hwrng: mtk - Force runtime pm ops for sleep ops) +$ 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 +-- + crypto/testmgr.c | 4 +- + drivers/char/hw_random/Kconfig | 12 +- + drivers/char/hw_random/ixp4xx-rng.c | 4 +- + drivers/char/hw_random/meson-rng.c | 5 +- + drivers/char/hw_random/mtk-rng.c | 9 +- + drivers/crypto/caam/caampkc.c | 19 +- + drivers/crypto/caam/regs.h | 3 + + drivers/crypto/ccree/cc_driver.c | 3 +- + drivers/crypto/hisilicon/qm.c | 74 ++++++- + drivers/crypto/hisilicon/zip/zip_main.c | 2 +- + drivers/crypto/img-hash.c | 7 +- + drivers/crypto/marvell/cesa/cesa.c | 1 - + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 35 ++- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 10 + + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 89 +------- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 13 +- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 87 +------- + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 12 -- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 29 ++- + drivers/crypto/qat/qat_common/adf_common_drv.h | 9 +- + drivers/crypto/qat/qat_common/adf_gen2_hw_data.c | 98 +++++++++ + drivers/crypto/qat/qat_common/adf_gen2_hw_data.h | 27 +++ + drivers/crypto/qat/qat_common/adf_init.c | 5 + + drivers/crypto/qat/qat_common/adf_isr.c | 190 +++++++--------- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 238 ++++++++++++--------- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.h | 9 - + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 4 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 30 +-- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 123 +++++------ + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 14 +- + lib/crypto/sm4.c | 4 +- + 44 files changed, 893 insertions(+), 1108 deletions(-) +Merging drm/drm-next (1176d15f0f6e Merge tag 'drm-intel-gt-next-2021-10-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Removing include/linux/seqno-fence.h +Removing drivers/gpu/drm/zte/zx_vou_regs.h +Removing drivers/gpu/drm/zte/zx_vou.h +Removing drivers/gpu/drm/zte/zx_vou.c +Removing drivers/gpu/drm/zte/zx_vga_regs.h +Removing drivers/gpu/drm/zte/zx_vga.c +Removing drivers/gpu/drm/zte/zx_tvenc_regs.h +Removing drivers/gpu/drm/zte/zx_tvenc.c +Removing drivers/gpu/drm/zte/zx_plane_regs.h +Removing drivers/gpu/drm/zte/zx_plane.h +Removing drivers/gpu/drm/zte/zx_plane.c +Removing drivers/gpu/drm/zte/zx_hdmi_regs.h +Removing drivers/gpu/drm/zte/zx_hdmi.c +Removing drivers/gpu/drm/zte/zx_drm_drv.h +Removing drivers/gpu/drm/zte/zx_drm_drv.c +Removing drivers/gpu/drm/zte/zx_common_regs.h +Removing drivers/gpu/drm/zte/Makefile +Removing drivers/gpu/drm/zte/Kconfig +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +Auto-merging drivers/gpu/drm/r128/ati_pcigart.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/msm/Kconfig +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gt/intel_context.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c +Removing drivers/gpu/drm/i915/gt/debugfs_gt_pm.h +Removing drivers/gpu/drm/i915/gt/debugfs_engines.h +Removing drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_ttm.c +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_audio.c +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/amd/display/include/dal_asic_id.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device.c +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 +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Removing drivers/dma-buf/seqno-fence.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/shmobile_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/gpu/drm/amd/amdkfd/kfd_migrate.c' +Recorded preimage for 'drivers/gpu/drm/i915/gem/i915_gem_ttm.c' +Recorded preimage for 'drivers/gpu/drm/i915/gt/intel_context.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdkfd/kfd_migrate.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gem/i915_gem_ttm.c'. +Recorded resolution for 'drivers/gpu/drm/i915/gt/intel_context.c'. +[master 6118b2745726] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 7 + + .../bindings/display/panel/panel-edp.yaml | 188 + + .../bindings/display/panel/samsung,s6d27a1.yaml | 98 + + .../devicetree/bindings/display/renesas,du.yaml | 51 + + Documentation/driver-api/dma-buf.rst | 6 - + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/drm-mm.rst | 84 +- + Documentation/gpu/i915.rst | 35 +- + Documentation/gpu/todo.rst | 17 - + Documentation/locking/ww-mutex-design.rst | 2 +- + 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 + + arch/x86/include/asm/mce.h | 2 +- + arch/x86/kernel/cpu/mce/amd.c | 3 +- + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf.c | 153 +- + drivers/dma-buf/dma-fence.c | 13 +- + drivers/dma-buf/dma-resv.c | 442 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/dma-buf/seqno-fence.c | 71 - + drivers/gpu/drm/Kconfig | 11 +- + drivers/gpu/drm/Makefile | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 143 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 256 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 118 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_df.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 843 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 663 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 57 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 730 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 385 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 25 +- + 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 | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 173 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umr.h | 51 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 119 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 164 +- + 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 | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 4 +- + 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 | 227 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 91 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 136 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 20 - + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 20 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 40 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 73 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 6 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 13 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 34 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 95 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 93 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 100 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 59 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 167 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 4 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 46 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 34 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 43 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 52 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 27 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 34 +- + 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 | 7 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 823 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 103 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 11 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 16 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 64 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 2 +- + drivers/gpu/drm/amd/display/dc/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 10 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 14 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 55 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 + + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 12 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 258 + + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.h | 34 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 16 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 6 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 303 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 700 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 9 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 1435 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c | 953 + + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 493 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 361 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 146 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 8 + + drivers/gpu/drm/amd/display/dc/dc.h | 79 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 297 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 19 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 22 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 16 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 15 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 39 + + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 2 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 21 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 150 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 153 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.h | 33 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 9 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 31 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 45 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 5 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 38 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 17 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 36 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_dccg.c | 84 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_dccg.h | 37 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 316 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.h | 83 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c | 107 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.h | 45 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubp.c | 150 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubp.h | 132 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 630 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.h | 46 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_init.c | 131 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_init.h | 33 + + .../amd/display/dc/dcn201/dcn201_link_encoder.c | 209 + + .../amd/display/dc/dcn201/dcn201_link_encoder.h | 59 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.c | 125 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.h | 86 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c | 72 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.h | 74 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_optc.c | 203 + + .../gpu/drm/amd/display/dc/dcn201/dcn201_optc.h | 74 + + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 1307 ++ + .../drm/amd/display/dc/dcn201/dcn201_resource.h | 50 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 24 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 4 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 18 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 59 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 6 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 39 +- + 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 | 136 +- + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 616 + + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 222 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 752 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 241 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 69 +- + 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 | 325 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c | 87 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h | 162 + + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 1 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 11 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 +- + .../dc/dml/{dcn2x/dcn2x.c => dcn20/dcn20_fpu.c} | 2 +- + .../dc/dml/{dcn2x/dcn2x.h => dcn20/dcn20_fpu.h} | 6 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 158 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.h | 4 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 156 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 4 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 236 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 156 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.h | 4 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 132 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.h | 4 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 166 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.h | 4 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 4 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 5 +- + .../amd/display/dc/dml/display_rq_dlg_helpers.c | 256 +- + .../amd/display/dc/dml/display_rq_dlg_helpers.h | 20 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 246 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.h | 10 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 195 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 36 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 29 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 99 + + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 1 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 13 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 23 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 4 + + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 97 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 87 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 2 +- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 26 +- + drivers/gpu/drm/amd/display/dc/inc/link_hwss.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 19 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 25 + + .../amd/display/dc/irq/dcn20/irq_service_dcn20.h | 2 + + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 374 + + .../amd/display/dc/irq/dcn201/irq_service_dcn201.h | 34 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 25 + + .../amd/display/dc/irq/dcn21/irq_service_dcn21.h | 2 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 4 + + drivers/gpu/drm/amd/display/dc/os_types.h | 2 + + .../display/dc/virtual/virtual_stream_encoder.c | 5 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 8 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 201 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 9 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 20 +- + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 16 + + .../drm/amd/display/include/bios_parser_types.h | 8 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 1 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 17 + + .../gpu/drm/amd/display/include/grph_object_defs.h | 12 + + .../gpu/drm/amd/display/include/grph_object_id.h | 8 + + .../drm/amd/display/include/link_service_types.h | 57 +- + drivers/gpu/drm/amd/display/include/logger_types.h | 6 + + .../drm/amd/display/modules/color/color_gamma.c | 32 +- + .../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/atomfirmware.h | 4 + + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 2 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- + .../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 | 64 +- + .../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/smu13/smu_v13_0.c | 22 +- + drivers/gpu/drm/arm/malidp_planes.c | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 2 - + drivers/gpu/drm/ast/ast_mm.c | 27 +- + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 15 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 27 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 4 +- + drivers/gpu/drm/bridge/ite-it66121.c | 21 +- + drivers/gpu/drm/bridge/panel.c | 37 + + drivers/gpu/drm/bridge/parade-ps8640.c | 292 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 6 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 25 +- + drivers/gpu/drm/drm_bridge.c | 78 +- + drivers/gpu/drm/drm_connector.c | 83 +- + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_dp_helper.c | 42 +- + drivers/gpu/drm/drm_edid.c | 367 +- + drivers/gpu/drm/drm_format_helper.c | 88 + + drivers/gpu/drm/drm_fourcc.c | 1 + + drivers/gpu/drm/drm_gem_shmem_helper.c | 23 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 1 - + drivers/gpu/drm/drm_ioctl.c | 21 +- + drivers/gpu/drm/drm_kms_helper_common.c | 11 - + drivers/gpu/drm/drm_lease.c | 39 +- + drivers/gpu/drm/drm_mipi_dsi.c | 81 + + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + drivers/gpu/drm/drm_of.c | 3 + + drivers/gpu/drm/drm_panel_orientation_quirks.c | 49 +- + drivers/gpu/drm/drm_probe_helper.c | 119 +- + drivers/gpu/drm/drm_property.c | 9 +- + drivers/gpu/drm/drm_sysfs.c | 87 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 4 +- + drivers/gpu/drm/gma500/backlight.c | 12 +- + drivers/gpu/drm/gma500/cdv_device.c | 24 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 10 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 12 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 22 +- + drivers/gpu/drm/gma500/framebuffer.c | 16 +- + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/gma500/gma_device.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 14 +- + drivers/gpu/drm/gma500/gtt.c | 18 +- + drivers/gpu/drm/gma500/intel_bios.c | 10 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 12 +- + drivers/gpu/drm/gma500/mid_bios.c | 11 +- + drivers/gpu/drm/gma500/mmu.c | 12 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 20 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 18 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 14 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 2 +- + drivers/gpu/drm/gma500/opregion.c | 14 +- + drivers/gpu/drm/gma500/power.c | 20 +- + drivers/gpu/drm/gma500/psb_device.c | 16 +- + drivers/gpu/drm/gma500/psb_drv.c | 147 +- + drivers/gpu/drm/gma500/psb_drv.h | 24 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 10 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 31 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 10 +- + drivers/gpu/drm/gma500/psb_irq.c | 26 +- + drivers/gpu/drm/gma500/psb_lid.c | 2 +- + drivers/gpu/drm/gud/Kconfig | 2 +- + drivers/gpu/drm/gud/gud_drv.c | 6 + + drivers/gpu/drm/gud/gud_internal.h | 12 + + drivers/gpu/drm/gud/gud_pipe.c | 6 + + drivers/gpu/drm/i915/Kconfig | 11 + + drivers/gpu/drm/i915/Makefile | 30 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 86 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 151 +- + 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 | 43 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 1776 ++ + drivers/gpu/drm/i915/display/intel_backlight.h | 52 + + drivers/gpu/drm/i915/display/intel_bios.c | 375 +- + 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 | 471 +- + 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 | 1729 +- + 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 | 47 +- + 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_vdsc.c | 77 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 6 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 58 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 51 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 23 + + drivers/gpu/drm/i915/gem/i915_gem_context.c | 292 +- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 19 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 42 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 75 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 26 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 33 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 4 + + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 44 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 28 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_pm.c | 91 + + drivers/gpu/drm/i915/gem/i915_gem_pm.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_region.c | 70 + + drivers/gpu/drm/i915/gem/i915_gem_region.h | 37 + + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 201 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 14 + + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 206 + + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.h | 26 + + drivers/gpu/drm/i915/gem/i915_gemfs.c | 22 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 41 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 36 +- + .../drm/i915/gem/selftests/i915_gem_execbuffer.c | 190 - + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 + + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 5 +- + drivers/gpu/drm/i915/gt/debugfs_engines.h | 14 - + drivers/gpu/drm/i915/gt/debugfs_gt_pm.h | 14 - + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 7 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.h | 4 +- + drivers/gpu/drm/i915/gt/intel_context.c | 21 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 88 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 6 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 84 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 23 + + drivers/gpu/drm/i915/gt/intel_engine_pm.h | 2 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 24 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 10 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 52 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 22 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 22 +- + drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 2 - + .../i915/gt/{debugfs_gt.c => intel_gt_debugfs.c} | 18 +- + .../i915/gt/{debugfs_gt.h => intel_gt_debugfs.h} | 14 +- + ...ebugfs_engines.c => intel_gt_engines_debugfs.c} | 10 +- + drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.h | 14 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 7 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 22 +- + .../gt/{debugfs_gt_pm.c => intel_gt_pm_debugfs.c} | 153 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h | 16 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 12 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 9 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 11 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 88 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 2 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 176 +- + drivers/gpu/drm/i915/gt/intel_mocs.h | 1 + + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 13 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ring.c | 3 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 5 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 19 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 1 + + drivers/gpu/drm/i915/gt/intel_sseu.c | 65 +- + drivers/gpu/drm/i915/gt/intel_sseu.h | 11 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 10 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 262 +- + drivers/gpu/drm/i915/gt/intel_workarounds.h | 2 +- + drivers/gpu/drm/i915/gt/mock_engine.c | 2 + + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 16 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 10 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 10 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 75 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 26 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 36 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 18 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 13 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 916 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 14 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 93 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 9 + + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 127 + + drivers/gpu/drm/i915/gvt/gtt.c | 17 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- + drivers/gpu/drm/i915/i915_buddy.c | 45 + + drivers/gpu/drm/i915/i915_buddy.h | 8 + + drivers/gpu/drm/i915/i915_config.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 242 +- + drivers/gpu/drm/i915/i915_drv.c | 15 +- + drivers/gpu/drm/i915/i915_drv.h | 168 +- + drivers/gpu/drm/i915/i915_gem.c | 2 - + drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +- + drivers/gpu/drm/i915/i915_gem_ww.h | 25 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 42 +- + drivers/gpu/drm/i915/i915_irq.c | 94 +- + drivers/gpu/drm/i915/i915_irq.h | 51 +- + drivers/gpu/drm/i915/i915_module.c | 4 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 14 +- + drivers/gpu/drm/i915/i915_pci.h | 12 +- + drivers/gpu/drm/i915/i915_query.c | 3 - + drivers/gpu/drm/i915/i915_reg.h | 161 +- + drivers/gpu/drm/i915/i915_request.c | 14 +- + drivers/gpu/drm/i915/i915_request.h | 26 +- + drivers/gpu/drm/i915/i915_trace.h | 14 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 20 +- + drivers/gpu/drm/i915/i915_utils.h | 13 - + drivers/gpu/drm/i915/i915_vma_types.h | 7 +- + drivers/gpu/drm/i915/intel_device_info.h | 1 + + drivers/gpu/drm/i915/intel_dram.c | 4 +- + drivers/gpu/drm/i915/intel_memory_region.c | 12 + + drivers/gpu/drm/i915/intel_memory_region.h | 4 + + drivers/gpu/drm/i915/intel_pm.c | 290 +- + drivers/gpu/drm/i915/intel_pm.h | 3 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 - + drivers/gpu/drm/i915/intel_uncore.c | 447 +- + drivers/gpu/drm/i915/intel_uncore.h | 20 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 299 + + drivers/gpu/drm/i915/pxp/intel_pxp.h | 64 + + drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c | 141 + + drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h | 15 + + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 78 + + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.h | 21 + + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 101 + + drivers/gpu/drm/i915/pxp/intel_pxp_irq.h | 32 + + drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 46 + + drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 24 + + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 175 + + drivers/gpu/drm/i915/pxp/intel_pxp_session.h | 15 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 172 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee.h | 17 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee_interface.h | 36 + + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 83 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 8 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_vma.c | 4 +- + .../drm/i915/selftests/intel_scheduler_helpers.c | 12 + + .../drm/i915/selftests/intel_scheduler_helpers.h | 2 + + drivers/gpu/drm/i915/selftests/intel_uncore.c | 34 +- + drivers/gpu/drm/lima/lima_gem.c | 9 +- + drivers/gpu/drm/lima/lima_sched.c | 28 +- + drivers/gpu/drm/lima/lima_sched.h | 6 +- + drivers/gpu/drm/mcde/mcde_drv.c | 4 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 4 +- + drivers/gpu/drm/meson/meson_drv.c | 3 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 - + drivers/gpu/drm/mgag200/mgag200_mm.c | 35 +- + drivers/gpu/drm/msm/Kconfig | 4 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/msm/msm_gem.h | 5 - + drivers/gpu/drm/msm/msm_gem_submit.c | 35 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 12 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 - + drivers/gpu/drm/omapdrm/Kconfig | 3 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 27 +- + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 743 +- + drivers/gpu/drm/panel/panel-edp.c | 1896 ++ + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 85 +- + drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 320 + + drivers/gpu/drm/panel/panel-simple.c | 1098 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 33 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 48 +- + drivers/gpu/drm/panfrost/panfrost_job.h | 5 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 42 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 4 +- + drivers/gpu/drm/qxl/qxl_release.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 1 - + drivers/gpu/drm/r128/ati_pcigart.c | 11 +- + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/gpu/drm/radeon/ci_dpm.c | 3 +- + drivers/gpu/drm/radeon/r600_dpm.c | 10 +- + drivers/gpu/drm/radeon/radeon_fence.c | 24 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 15 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 11 - + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 108 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 26 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 28 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 50 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.h | 7 + + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 36 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 15 +- + drivers/gpu/drm/rcar-du/rcar_lvds.h | 5 + + drivers/gpu/drm/rockchip/Kconfig | 1 - + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 3 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 14 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 - + drivers/gpu/drm/rockchip/rockchip_lvds.c | 33 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 26 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 140 +- + drivers/gpu/drm/scheduler/sched_fence.c | 62 +- + drivers/gpu/drm/scheduler/sched_main.c | 199 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 4 +- + drivers/gpu/drm/stm/ltdc.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 18 +- + drivers/gpu/drm/sun4i/sun8i_csc.h | 4 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 21 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 4 +- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/plane.c | 2 +- + drivers/gpu/drm/tiny/Kconfig | 4 +- + drivers/gpu/drm/tiny/bochs.c | 8 + + drivers/gpu/drm/ttm/ttm_bo.c | 71 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 21 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 15 +- + drivers/gpu/drm/ttm/ttm_device.c | 48 + + drivers/gpu/drm/ttm/ttm_module.c | 12 + + drivers/gpu/drm/ttm/ttm_pool.c | 42 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 8 +- + drivers/gpu/drm/ttm/ttm_resource.c | 49 + + drivers/gpu/drm/ttm/ttm_tt.c | 69 +- + drivers/gpu/drm/udl/Kconfig | 1 + + drivers/gpu/drm/v3d/Kconfig | 2 +- + drivers/gpu/drm/v3d/v3d_drv.c | 15 +- + drivers/gpu/drm/v3d/v3d_drv.h | 30 +- + drivers/gpu/drm/v3d/v3d_gem.c | 473 +- + drivers/gpu/drm/v3d/v3d_sched.c | 44 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 1 - + drivers/gpu/drm/vboxvideo/vbox_ttm.c | 17 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 15 +- + drivers/gpu/drm/vc4/vc4_drv.c | 6 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 28 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +- + drivers/gpu/drm/vgem/vgem_drv.c | 342 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 1 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 44 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 36 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 30 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 195 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 26 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 32 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 27 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 61 + + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +- + drivers/gpu/drm/zte/Kconfig | 10 - + drivers/gpu/drm/zte/Makefile | 10 - + drivers/gpu/drm/zte/zx_common_regs.h | 28 - + drivers/gpu/drm/zte/zx_drm_drv.c | 184 - + drivers/gpu/drm/zte/zx_drm_drv.h | 34 - + drivers/gpu/drm/zte/zx_hdmi.c | 760 - + drivers/gpu/drm/zte/zx_hdmi_regs.h | 66 - + drivers/gpu/drm/zte/zx_plane.c | 537 - + drivers/gpu/drm/zte/zx_plane.h | 26 - + drivers/gpu/drm/zte/zx_plane_regs.h | 120 - + drivers/gpu/drm/zte/zx_tvenc.c | 400 - + drivers/gpu/drm/zte/zx_tvenc_regs.h | 27 - + drivers/gpu/drm/zte/zx_vga.c | 527 - + drivers/gpu/drm/zte/zx_vga_regs.h | 33 - + drivers/gpu/drm/zte/zx_vou.c | 921 - + drivers/gpu/drm/zte/zx_vou.h | 64 - + drivers/gpu/drm/zte/zx_vou_regs.h | 212 - + drivers/misc/mei/Kconfig | 2 + + drivers/misc/mei/Makefile | 1 + + drivers/misc/mei/pxp/Kconfig | 13 + + drivers/misc/mei/pxp/Makefile | 7 + + drivers/misc/mei/pxp/mei_pxp.c | 229 + + drivers/misc/mei/pxp/mei_pxp.h | 18 + + drivers/regulator/core.c | 2 +- + drivers/usb/typec/altmodes/Kconfig | 1 + + drivers/usb/typec/altmodes/displayport.c | 58 +- + drivers/video/fbdev/efifb.c | 21 +- + include/drm/amd_asic_type.h | 1 + + include/drm/drm_bridge.h | 23 +- + include/drm/drm_connector.h | 37 + + include/drm/drm_displayid.h | 101 +- + include/drm/drm_dp_helper.h | 26 + + include/drm/drm_edid.h | 47 + + include/drm/drm_format_helper.h | 4 + + include/drm/drm_ioctl.h | 1 - + include/drm/drm_mipi_dsi.h | 4 + + include/drm/drm_mode_config.h | 13 +- + include/drm/drm_plane.h | 2 +- + include/drm/drm_print.h | 30 + + include/drm/drm_probe_helper.h | 1 + + include/drm/gpu_scheduler.h | 188 +- + include/drm/gud.h | 6 +- + include/drm/i915_component.h | 1 + + include/drm/i915_pciids.h | 8 +- + include/drm/i915_pxp_tee_interface.h | 42 + + include/drm/ttm/ttm_bo_api.h | 12 - + include/drm/ttm/ttm_bo_driver.h | 2 +- + include/drm/ttm/ttm_caching.h | 17 + + include/drm/ttm/ttm_device.h | 79 +- + include/drm/ttm/ttm_placement.h | 1 + + include/drm/ttm/ttm_pool.h | 5 +- + include/drm/ttm/ttm_range_manager.h | 18 +- + include/drm/ttm/ttm_resource.h | 9 +- + include/drm/ttm/ttm_tt.h | 98 +- + include/linux/dma-buf.h | 9 +- + include/linux/dma-fence.h | 32 +- + include/linux/dma-resv.h | 201 +- + include/linux/io.h | 5 + + include/linux/seqno-fence.h | 109 - + include/linux/shrinker.h | 1 + + include/linux/ww_mutex.h | 15 +- + include/uapi/drm/drm_fourcc.h | 6 + + include/uapi/drm/drm_mode.h | 4 + + include/uapi/drm/i915_drm.h | 97 + + include/uapi/drm/v3d_drm.h | 78 + + include/uapi/drm/virtgpu_drm.h | 27 + + include/uapi/linux/virtio_gpu.h | 18 +- + kernel/locking/mutex.c | 41 + + kernel/locking/test-ww_mutex.c | 86 +- + kernel/locking/ww_rt_mutex.c | 25 + + lib/devres.c | 82 + + lib/locking-selftest.c | 2 +- + mm/vmscan.c | 15 + + 814 files changed, 71800 insertions(+), 20459 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/clk_mgr/dcn201/dcn201_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dpia.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_afmt.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h + rename drivers/gpu/drm/amd/display/dc/dml/{dcn2x/dcn2x.c => dcn20/dcn20_fpu.c} (99%) + rename drivers/gpu/drm/amd/display/dc/dml/{dcn2x/dcn2x.h => dcn20/dcn20_fpu.h} (94%) + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn201/irq_service_dcn201.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_1_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/clk/clk_11_0_1_sh_mask.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_3_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_2_0_3_sh_mask.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_3_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_2_0_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_8_sh_mask.h + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight.c + create mode 100644 drivers/gpu/drm/i915/display/intel_backlight.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dpt.h + create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.c + create mode 100644 drivers/gpu/drm/i915/display/intel_drrs.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.h + delete mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c + delete mode 100644 drivers/gpu/drm/i915/gt/debugfs_engines.h + delete mode 100644 drivers/gpu/drm/i915/gt/debugfs_gt_pm.h + rename drivers/gpu/drm/i915/gt/{debugfs_gt.c => intel_gt_debugfs.c} (67%) + rename drivers/gpu/drm/i915/gt/{debugfs_gt.h => intel_gt_debugfs.h} (71%) + rename drivers/gpu/drm/i915/gt/{debugfs_engines.c => intel_gt_engines_debugfs.c} (70%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.h + rename drivers/gpu/drm/i915/gt/{debugfs_gt_pm.c => intel_gt_pm_debugfs.c} (83%) + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_cmd.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_irq.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_irq.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_pm.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_session.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_session.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_tee_interface.h + create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_types.h + create mode 100644 drivers/gpu/drm/panel/panel-edp.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6d27a1.c + delete mode 100644 drivers/gpu/drm/zte/Kconfig + delete mode 100644 drivers/gpu/drm/zte/Makefile + delete mode 100644 drivers/gpu/drm/zte/zx_common_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.c + delete mode 100644 drivers/gpu/drm/zte/zx_drm_drv.h + delete mode 100644 drivers/gpu/drm/zte/zx_hdmi.c + delete mode 100644 drivers/gpu/drm/zte/zx_hdmi_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_plane.c + delete mode 100644 drivers/gpu/drm/zte/zx_plane.h + delete mode 100644 drivers/gpu/drm/zte/zx_plane_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_tvenc.c + delete mode 100644 drivers/gpu/drm/zte/zx_tvenc_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_vga.c + delete mode 100644 drivers/gpu/drm/zte/zx_vga_regs.h + delete mode 100644 drivers/gpu/drm/zte/zx_vou.c + delete mode 100644 drivers/gpu/drm/zte/zx_vou.h + delete mode 100644 drivers/gpu/drm/zte/zx_vou_regs.h + create mode 100644 drivers/misc/mei/pxp/Kconfig + create mode 100644 drivers/misc/mei/pxp/Makefile + create mode 100644 drivers/misc/mei/pxp/mei_pxp.c + create mode 100644 drivers/misc/mei/pxp/mei_pxp.h + create mode 100644 include/drm/i915_pxp_tee_interface.h + delete mode 100644 include/linux/seqno-fence.h +Merging drm-misc/for-linux-next (ee30840ba3ba drm/v3d: fix copy_from_user() error codes) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging include/linux/dma-resv.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/lvds-codec.yaml | 33 +- + .../devicetree/bindings/display/bridge/ps8640.yaml | 19 +- + .../bindings/display/panel/panel-simple.yaml | 5 + + .../bindings/display/panel/sharp,ls060t1sx01.yaml | 56 ++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/dma-buf/dma-buf.c | 60 +--- + drivers/dma-buf/dma-resv.c | 69 ++++- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 9 +- + drivers/gpu/drm/bridge/lvds-codec.c | 76 ++++- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 17 +- + drivers/gpu/drm/drm_connector.c | 32 +- + drivers/gpu/drm/drm_gem.c | 26 +- + drivers/gpu/drm/drm_plane_helper.c | 1 - + drivers/gpu/drm/i915/i915_request.c | 34 +-- + drivers/gpu/drm/nouveau/nouveau_bo.c | 4 - + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 10 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.h | 2 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 333 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 35 +++ + drivers/gpu/drm/scheduler/sched_main.c | 26 +- + drivers/gpu/drm/ttm/ttm_bo.c | 16 +- + drivers/gpu/drm/v3d/v3d_gem.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- + drivers/video/fbdev/core/fbmem.c | 5 +- + include/linux/dma-resv.h | 25 +- + 33 files changed, 754 insertions(+), 176 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls060t1sx01.yaml + create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c +$ git reset --hard HEAD^ +HEAD is now at 6118b2745726 Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +Merging next-20211011 version of drm-misc +$ git merge -m next-20211011/drm-misc 914b6f290beb0cf056d75badffa78df6e3dfb058 +Auto-merging include/linux/dma-resv.h +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../bindings/display/bridge/lvds-codec.yaml | 33 +- + .../devicetree/bindings/display/bridge/ps8640.yaml | 19 +- + .../bindings/display/panel/panel-simple.yaml | 5 + + .../bindings/display/panel/sharp,ls060t1sx01.yaml | 56 ++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/dma-buf/dma-buf.c | 60 +--- + drivers/dma-buf/dma-resv.c | 51 ++++ + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 9 +- + drivers/gpu/drm/bridge/lvds-codec.c | 76 ++++- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 17 +- + drivers/gpu/drm/drm_connector.c | 2 + + drivers/gpu/drm/drm_gem.c | 26 +- + drivers/gpu/drm/drm_plane_helper.c | 1 - + drivers/gpu/drm/i915/i915_request.c | 34 +-- + drivers/gpu/drm/panel/Kconfig | 10 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 333 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 35 +++ + drivers/gpu/drm/scheduler/sched_main.c | 26 +- + drivers/gpu/drm/ttm/ttm_bo.c | 16 +- + drivers/video/fbdev/core/fbmem.c | 5 +- + include/linux/dma-resv.h | 20 ++ + 22 files changed, 696 insertions(+), 141 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls060t1sx01.yaml + create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c +Merging amdgpu/drm-next (b75c0a544e86 drm/amdgpu: drop navi reg init functions) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Removing drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 388 --------------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 20 -- + drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c | 54 --- + .../gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c | 51 --- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 55 --- + drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 52 --- + drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 53 --- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 20 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 21 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 293 ---------------- + drivers/gpu/drm/amd/amdgpu/nv.h | 10 - + .../gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c | 54 --- + drivers/gpu/drm/amd/amdgpu/soc15.c | 182 +--------- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 - + drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 --- + drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c | 51 --- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 17 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 81 ++++- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 73 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 17 +- + 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/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 +++++ + 37 files changed, 383 insertions(+), 1452 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c +$ git reset --hard HEAD^ +HEAD is now at cd1db2173263 next-20211011/drm-misc +Merging next-20211007 version of amdgpu +$ git merge -m next-20211007/amdgpu 7d89172afed6caa88148f7f68b3ad11cdbf431aa +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/Kconfig +Merge made by the 'recursive' strategy. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 388 ----------------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 20 -- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 17 + + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 81 +++-- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 + + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 93 ++---- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 ++++++ + 21 files changed, 278 insertions(+), 513 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +Merging drm-intel/for-linux-next (a94a6d76c984 drm/i915/mst: abstract intel_dp_mst_source_support()) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/g4x_dp.c | 2 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 7 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 3 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 +- + drivers/gpu/drm/i915/display/intel_display.c | 35 ++++ + .../gpu/drm/i915/display/intel_display_debugfs.c | 5 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 1 - + drivers/gpu/drm/i915/display/intel_dp.c | 28 ++- + .../gpu/drm/i915/display/intel_dp_link_training.c | 219 +++++++++++++++------ + .../gpu/drm/i915/display/intel_dp_link_training.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 15 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 4 +- + drivers/gpu/drm/i915/intel_pm.c | 14 -- + 13 files changed, 243 insertions(+), 95 deletions(-) +Merging drm-tegra/drm/tegra/for-next (5dccbc9de8f0 drm/tegra: dc: rgb: Allow changing PLLD rate on Tegra30+) +$ git merge -m Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/plane.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/Makefile | 3 +- + drivers/gpu/drm/tegra/dc.c | 117 ++++++++-- + drivers/gpu/drm/tegra/dc.h | 1 + + drivers/gpu/drm/tegra/drm.c | 4 + + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/gem.c | 171 +++++++++------ + drivers/gpu/drm/tegra/gr2d.c | 33 ++- + drivers/gpu/drm/tegra/hub.h | 1 - + drivers/gpu/drm/tegra/nvdec.c | 470 +++++++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/tegra/plane.c | 65 ++---- + drivers/gpu/drm/tegra/plane.h | 2 +- + drivers/gpu/drm/tegra/rgb.c | 53 ++++- + drivers/gpu/drm/tegra/submit.c | 63 ++++-- + drivers/gpu/drm/tegra/uapi.c | 68 +++--- + drivers/gpu/drm/tegra/uapi.h | 5 +- + drivers/gpu/drm/tegra/vic.c | 8 + + drivers/gpu/host1x/Kconfig | 1 + + drivers/gpu/host1x/bus.c | 79 ++++++- + drivers/gpu/host1x/dev.c | 20 ++ + drivers/gpu/host1x/dev.h | 2 + + drivers/gpu/host1x/job.c | 160 +++++--------- + drivers/gpu/host1x/job.h | 6 +- + include/linux/host1x.h | 75 +++++-- + 23 files changed, 1087 insertions(+), 321 deletions(-) + create mode 100644 drivers/gpu/drm/tegra/nvdec.c +Merging drm-msm/msm-next (c6921fbc88e1 drm/msm/dsi: fix off by one in dsi_bus_clk_enable error handling) +$ 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 +Resolved 'drivers/gpu/drm/msm/msm_gem_submit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 58d35cdfc739] 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/dpu1/dpu_hw_catalog.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 16 ++++++ + drivers/gpu/drm/msm/dp/dp_display.c | 10 ++-- + drivers/gpu/drm/msm/dsi/dsi.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 30 +++++------ + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 4 +- + 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 ++++++++++++++++++++----- + 20 files changed, 255 insertions(+), 111 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 (9e1ff307c779 Linux 5.15-rc4) +$ 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 (6d2778816036 ALSA: usb-audio: Add support for the Pioneer DJM 750MK2 Mixer/Soundcard) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + include/sound/hdaudio_ext.h | 2 + + sound/core/pcm_native.c | 25 ++++- + 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/mixer_quirks.c | 34 ++++++ + sound/usb/pcm.c | 164 ++++++++++++++++++++++------ + sound/usb/quirks-table.h | 58 ++++++++++ + sound/usb/usx2y/usbusx2yaudio.c | 11 +- + sound/virtio/virtio_pcm_msg.c | 5 +- + 16 files changed, 494 insertions(+), 171 deletions(-) +Merging sound-asoc/for-next (0fc05b310185 Merge remote-tracking branch 'asoc/for-5.16' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Removing sound/soc/sof/probe.h +Auto-merging sound/soc/sof/intel/hda-dai.c +Removing sound/soc/sof/compress.h +Auto-merging 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/max9892x.txt | 3 + + .../devicetree/bindings/sound/mt8192-afe-pcm.yaml | 100 + + .../devicetree/bindings/sound/name-prefix.txt | 24 - + .../devicetree/bindings/sound/name-prefix.yaml | 21 + + .../devicetree/bindings/sound/nau8821.txt | 55 + + .../bindings/sound/nvidia,tegra186-dspk.yaml | 9 +- + .../bindings/sound/nvidia,tegra210-adx.yaml | 76 + + .../bindings/sound/nvidia,tegra210-ahub.yaml | 20 + + .../bindings/sound/nvidia,tegra210-amx.yaml | 76 + + .../bindings/sound/nvidia,tegra210-dmic.yaml | 9 +- + .../bindings/sound/nvidia,tegra210-i2s.yaml | 9 +- + .../bindings/sound/nvidia,tegra210-mixer.yaml | 74 + + .../bindings/sound/nvidia,tegra210-mvc.yaml | 76 + + .../bindings/sound/nvidia,tegra210-sfc.yaml | 73 + + .../devicetree/bindings/sound/nxp,tfa989x.yaml | 9 +- + .../devicetree/bindings/sound/qcom,q6afe.txt | 2 +- + .../devicetree/bindings/sound/qcom,q6asm.txt | 2 +- + .../devicetree/bindings/sound/realtek,rt5682s.yaml | 117 + + .../devicetree/bindings/sound/richtek,rt9120.yaml | 59 + + .../bindings/sound/rockchip,i2s-tdm.yaml | 198 ++ + .../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 | 18 + + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 2 +- + drivers/firmware/Kconfig | 1 + + drivers/firmware/Makefile | 1 + + drivers/firmware/cirrus/Kconfig | 5 + + drivers/firmware/cirrus/Makefile | 3 + + drivers/firmware/cirrus/cs_dsp.c | 3109 +++++++++++++++++ + include/dt-bindings/sound/qcom,lpass.h | 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/sound/sof/dai-intel.h | 4 + + include/sound/sof/dai.h | 10 +- + include/uapi/sound/sof/tokens.h | 1 + + sound/hda/intel-dsp-config.c | 22 +- + sound/soc/amd/Kconfig | 2 + + sound/soc/amd/acp-da7219-max98357a.c | 6 +- + sound/soc/amd/acp-pcm-dma.c | 6 +- + sound/soc/amd/acp-rt5645.c | 2 +- + sound/soc/amd/acp.h | 2 + + sound/soc/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 | 33 + + sound/soc/codecs/Makefile | 10 + + 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/max98927.c | 25 + + sound/soc/codecs/max98927.h | 1 + + 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 | 3197 ++++++++++++++++++ + sound/soc/codecs/rt5682s.h | 1474 ++++++++ + sound/soc/codecs/rt9120.c | 489 +++ + 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 | 15 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bdw-rt5650.c | 2 +- + sound/soc/intel/boards/bdw-rt5677.c | 2 +- + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 4 +- + sound/soc/intel/boards/bxt_rt298.c | 2 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 4 +- + sound/soc/intel/boards/bytcht_da7213.c | 4 +- + sound/soc/intel/boards/bytcht_es8316.c | 4 +- + sound/soc/intel/boards/bytcht_nocodec.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 120 +- + sound/soc/intel/boards/bytcr_rt5651.c | 122 +- + sound/soc/intel/boards/bytcr_wm5102.c | 4 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 4 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 4 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 4 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 6 +- + sound/soc/intel/boards/kbl_rt5660.c | 2 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 6 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 +- + sound/soc/intel/boards/skl_rt286.c | 2 +- + sound/soc/intel/boards/sof_es8336.c | 569 ++++ + sound/soc/intel/boards/sof_rt5682.c | 122 +- + sound/soc/intel/boards/sof_sdw.c | 10 + + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 15 +- + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 6 + + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 7 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 26 +- + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 49 +- + sound/soc/intel/skylake/skl-topology.c | 6 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 1 - + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-audsys-clk.c | 152 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 8 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 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/Kconfig | 11 + + sound/soc/rockchip/Makefile | 2 + + sound/soc/rockchip/rockchip_i2s_tdm.c | 1846 ++++++++++ + sound/soc/rockchip/rockchip_i2s_tdm.h | 398 +++ + sound/soc/rockchip/rockchip_pdm.c | 112 +- + sound/soc/rockchip/rockchip_pdm.h | 6 + + sound/soc/samsung/s3c-i2s-v2.c | 2 + + sound/soc/soc-component.c | 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 | 14 +- + sound/soc/soc-topology.c | 16 +- + sound/soc/sof/Kconfig | 6 +- + sound/soc/sof/Makefile | 6 +- + sound/soc/sof/compress.c | 158 +- + sound/soc/sof/compress.h | 32 - + sound/soc/sof/control.c | 192 +- + sound/soc/sof/core.c | 35 +- + sound/soc/sof/debug.c | 87 +- + sound/soc/sof/imx/Kconfig | 2 + + sound/soc/sof/imx/imx-ops.h | 10 + + sound/soc/sof/imx/imx8.c | 47 +- + sound/soc/sof/imx/imx8m.c | 41 +- + sound/soc/sof/intel/Makefile | 5 +- + sound/soc/sof/intel/apl.c | 7 +- + sound/soc/sof/intel/atom.c | 5 +- + sound/soc/sof/intel/bdw.c | 19 +- + sound/soc/sof/intel/byt.c | 30 +- + sound/soc/sof/intel/cnl.c | 7 +- + sound/soc/sof/intel/hda-dai.c | 262 +- + sound/soc/sof/intel/hda-dsp.c | 61 +- + sound/soc/sof/intel/hda-ipc.c | 15 +- + sound/soc/sof/intel/hda-loader.c | 11 +- + .../soc/sof/intel/{hda-compress.c => hda-probes.c} | 0 + sound/soc/sof/intel/hda-stream.c | 92 +- + sound/soc/sof/intel/hda.c | 232 +- + sound/soc/sof/intel/hda.h | 52 +- + sound/soc/sof/intel/icl.c | 7 +- + sound/soc/sof/intel/pci-apl.c | 2 - + sound/soc/sof/intel/pci-cnl.c | 3 - + sound/soc/sof/intel/pci-icl.c | 2 - + sound/soc/sof/intel/pci-tgl.c | 5 - + sound/soc/sof/intel/pci-tng.c | 16 +- + sound/soc/sof/intel/tgl.c | 7 +- + sound/soc/sof/ipc.c | 217 +- + sound/soc/sof/loader.c | 161 +- + sound/soc/sof/ops.c | 3 + + sound/soc/sof/ops.h | 77 +- + sound/soc/sof/pcm.c | 71 +- + sound/soc/sof/pm.c | 12 +- + sound/soc/sof/probe.h | 85 - + sound/soc/sof/sof-audio.c | 715 +++- + sound/soc/sof/sof-audio.h | 52 +- + sound/soc/sof/sof-of-dev.c | 24 +- + sound/soc/sof/sof-priv.h | 154 +- + sound/soc/sof/{probe.c => sof-probes.c} | 280 +- + sound/soc/sof/sof-probes.h | 38 + + sound/soc/sof/{intel/intel-ipc.c => stream-ipc.c} | 56 +- + sound/soc/sof/topology.c | 417 +-- + sound/soc/sof/trace.c | 5 +- + sound/soc/sof/utils.c | 28 +- + sound/soc/sof/xtensa/core.c | 2 +- + sound/soc/tegra/Kconfig | 48 + + sound/soc/tegra/Makefile | 10 + + sound/soc/tegra/tegra210_adx.c | 531 +++ + sound/soc/tegra/tegra210_adx.h | 72 + + sound/soc/tegra/tegra210_ahub.c | 511 ++- + sound/soc/tegra/tegra210_amx.c | 600 ++++ + sound/soc/tegra/tegra210_amx.h | 93 + + sound/soc/tegra/tegra210_mixer.c | 674 ++++ + sound/soc/tegra/tegra210_mixer.h | 100 + + sound/soc/tegra/tegra210_mvc.c | 645 ++++ + sound/soc/tegra/tegra210_mvc.h | 117 + + sound/soc/tegra/tegra210_sfc.c | 3549 ++++++++++++++++++++ + sound/soc/tegra/tegra210_sfc.h | 78 + + sound/soc/tegra/tegra_asoc_machine.c | 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 +- + 306 files changed, 29811 insertions(+), 5606 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 + create mode 100644 Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/name-prefix.txt + create mode 100644 Documentation/devicetree/bindings/sound/name-prefix.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nau8821.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-amx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-mixer.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-mvc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra210-sfc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/richtek,rt9120.yaml + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,pdm.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/simple-amplifier.txt + create mode 100644 Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt + create mode 100644 Documentation/devicetree/bindings/sound/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 + create mode 100644 sound/soc/codecs/rt9120.c + create mode 100644 sound/soc/intel/boards/sof_es8336.c + create mode 100644 sound/soc/rockchip/rockchip_i2s_tdm.c + create mode 100644 sound/soc/rockchip/rockchip_i2s_tdm.h + delete mode 100644 sound/soc/sof/compress.h + create mode 100644 sound/soc/sof/imx/imx-ops.h + rename sound/soc/sof/intel/{hda-compress.c => hda-probes.c} (100%) + delete mode 100644 sound/soc/sof/probe.h + rename sound/soc/sof/{probe.c => sof-probes.c} (52%) + create mode 100644 sound/soc/sof/sof-probes.h + rename sound/soc/sof/{intel/intel-ipc.c => stream-ipc.c} (56%) + create mode 100644 sound/soc/tegra/tegra210_adx.c + create mode 100644 sound/soc/tegra/tegra210_adx.h + create mode 100644 sound/soc/tegra/tegra210_amx.c + create mode 100644 sound/soc/tegra/tegra210_amx.h + create mode 100644 sound/soc/tegra/tegra210_mixer.c + create mode 100644 sound/soc/tegra/tegra210_mixer.h + create mode 100644 sound/soc/tegra/tegra210_mvc.c + create mode 100644 sound/soc/tegra/tegra210_mvc.h + create mode 100644 sound/soc/tegra/tegra210_sfc.c + create mode 100644 sound/soc/tegra/tegra210_sfc.h +Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules/modules-next +Already up to date. +Merging input/next (a41392e0877a MAINTAINERS: rectify entry for CHIPONE ICN8318 I2C TOUCHSCREEN DRIVER) +$ 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 drivers/input/joystick/analog.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/cypress-sf.yaml | 61 +++ + MAINTAINERS | 12 +- + drivers/input/joystick/analog.c | 18 +- + drivers/input/joystick/tmdc.c | 2 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/cypress-sf.c | 224 +++++++++++ + drivers/input/keyboard/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 - + 20 files changed, 1107 insertions(+), 289 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 (bc421898241a Merge branch 'for-5.16/cdrom' 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 +Auto-merging drivers/gpu/drm/i915/i915_utils.h +Auto-merging block/genhd.c +Auto-merging block/blk-mq-debugfs.c +Auto-merging block/bdev.c +Merge made by the 'recursive' strategy. + Documentation/cdrom/cdrom-standard.rst | 11 + + Documentation/userspace-api/ioctl/cdrom.rst | 113 +-- + 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 | 6 +- + block/bio-integrity.c | 2 +- + block/blk-cgroup.c | 1 + + block/blk-core.c | 58 +- + 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 | 26 + + block/blk-mq-debugfs.c | 8 +- + block/blk-mq-sched.c | 118 ++- + block/blk-mq-sched.h | 5 +- + block/blk-mq-tag.c | 135 ++-- + block/blk-mq-tag.h | 18 +- + block/blk-mq.c | 283 ++++--- + block/blk-mq.h | 41 +- + block/blk-sysfs.c | 1 + + block/blk-throttle.c | 161 +--- + block/blk-throttle.h | 182 +++++ + block/blk.h | 64 +- + block/bounce.c | 1 + + block/elevator.c | 4 +- + {include/linux => block}/elevator.h | 21 +- + block/genhd.c | 1 + + block/holder.c | 1 + + block/keyslot-manager.c | 1 + + block/kyber-iosched.c | 6 +- + block/mq-deadline.c | 224 ++++-- + 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 | 8 +- + 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 | 1158 +++++++++++++-------------- + 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 | 483 ++++++++++- + include/linux/blk_types.h | 2 - + include/linux/blkdev.h | 765 +----------------- + 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 +- + 139 files changed, 3001 insertions(+), 2530 deletions(-) + create mode 100644 block/blk-throttle.h + rename {include/linux => block}/elevator.h (92%) + create mode 100644 include/linux/blk-integrity.h +Merging device-mapper/for-next (012a67c67932 dm: fix mempool NULL pointer race when completing IO) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-verity-target.c +Auto-merging drivers/md/dm-rq.c +Merge made by the 'recursive' strategy. + drivers/md/dm-clone-target.c | 2 +- + drivers/md/dm-rq.c | 8 ++++++++ + drivers/md/dm-verity-target.c | 15 ++++++++++++--- + drivers/md/dm.c | 17 ++++++++++------- + 4 files changed, 31 insertions(+), 11 deletions(-) +Merging libata/for-next (8c0ff6af6823 Add AHCI support for ASM1062+JBM575 cards) +$ 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 | 13 +++++-------- + 1 file changed, 5 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 (2318a18c3249 Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging drivers/mmc/host/Kconfig +Removing Documentation/devicetree/bindings/mmc/mmc-card.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 26 +++++- + 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 + + 27 files changed, 358 insertions(+), 106 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 (f38d3e404326 dt-bindings: mfd: Convert X-Powers AXP binding to a schema) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Removing include/linux/mfd/hi6421-spmi-pmic.h +Removing Documentation/devicetree/bindings/mfd/axp20x.txt +Removing Documentation/devicetree/bindings/mfd/ac100.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/maxim,max77686.txt | 4 +- + .../bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 2 +- + Documentation/devicetree/bindings/mfd/ac100.txt | 50 --- + Documentation/devicetree/bindings/mfd/axp20x.txt | 273 -------------- + .../devicetree/bindings/mfd/brcm,cru.yaml | 21 ++ + .../devicetree/bindings/mfd/brcm,misc.yaml | 60 ++++ + Documentation/devicetree/bindings/mfd/max14577.txt | 4 +- + Documentation/devicetree/bindings/mfd/max77686.txt | 2 +- + Documentation/devicetree/bindings/mfd/max77693.txt | 2 +- + .../devicetree/bindings/mfd/qcom,tcsr.txt | 1 + + .../bindings/mfd/sprd,ums512-glbreg.yaml | 68 ++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + .../devicetree/bindings/mfd/x-powers,ac100.yaml | 116 ++++++ + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 400 +++++++++++++++++++++ + .../devicetree/bindings/mfd/xylon,logicvc.yaml | 3 + + .../devicetree/bindings/regulator/max77686.txt | 2 +- + drivers/mfd/Kconfig | 8 +- + drivers/mfd/altera-a10sr.c | 8 + + drivers/mfd/cros_ec_dev.c | 1 - + drivers/mfd/da9063-i2c.c | 2 + + drivers/mfd/hi6421-spmi-pmic.c | 16 +- + drivers/mfd/intel-lpss-pci.c | 2 + + drivers/mfd/max14577.c | 6 +- + drivers/mfd/max77686.c | 3 +- + drivers/mfd/max77693.c | 12 +- + drivers/mfd/mfd-core.c | 2 + + drivers/mfd/motorola-cpcap.c | 8 + + drivers/mfd/qcom-pm8xxx.c | 39 +- + drivers/mfd/rk808.c | 4 + + drivers/mfd/sec-irq.c | 3 +- + drivers/mfd/sprd-sc27xx-spi.c | 17 + + drivers/mfd/ti_am335x_tscadc.c | 2 +- + drivers/misc/hi6421v600-irq.c | 9 +- + drivers/regulator/hi6421v600-regulator.c | 10 +- + include/linux/mfd/da9063/core.h | 1 + + include/linux/mfd/hi6421-spmi-pmic.h | 25 -- + 36 files changed, 767 insertions(+), 420 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/ac100.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/axp20x.txt + create mode 100644 Documentation/devicetree/bindings/mfd/brcm,misc.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/sprd,ums512-glbreg.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/x-powers,ac100.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml + delete mode 100644 include/linux/mfd/hi6421-spmi-pmic.h +Merging backlight/for-backlight-next (563edf85ce18 backlight: Propagate errors from get_brightness()) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/backlight.c | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) +Merging battery/for-next (a3d5c47c328a dt-bindings: power: Bindings for Samsung batteries) +$ 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 +- + .../bindings/power/supply/samsung,battery.yaml | 56 +++++++++++++++++++ + 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 +- + 11 files changed, 140 insertions(+), 63 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/samsung,battery.yaml +Merging regulator/for-next (d8b0c9f07417 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 +Auto-merging drivers/regulator/core.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt +Removing Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt +Removing Documentation/devicetree/bindings/regulator/samsung,s2mps11.txt +Removing Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt +Removing Documentation/devicetree/bindings/regulator/max8997-regulator.txt +Removing Documentation/devicetree/bindings/regulator/max8973-regulator.txt +Removing Documentation/devicetree/bindings/regulator/max8952.txt +Removing Documentation/devicetree/bindings/clock/samsung,s2mps11.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/samsung,s2mps11.txt | 49 --- + .../devicetree/bindings/clock/samsung,s2mps11.yaml | 45 +++ + .../devicetree/bindings/regulator/max8952.txt | 52 --- + .../bindings/regulator/max8973-regulator.txt | 52 --- + .../bindings/regulator/max8997-regulator.txt | 145 ------- + .../bindings/regulator/maxim,max8952.yaml | 109 +++++ + .../bindings/regulator/maxim,max8973.yaml | 139 +++++++ + .../bindings/regulator/maxim,max8997.yaml | 445 +++++++++++++++++++++ + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 4 + + .../bindings/regulator/samsung,s2mpa01.txt | 79 ---- + .../bindings/regulator/samsung,s2mpa01.yaml | 62 +++ + .../bindings/regulator/samsung,s2mps11.txt | 102 ----- + .../bindings/regulator/samsung,s2mps11.yaml | 44 ++ + .../bindings/regulator/samsung,s2mps13.yaml | 44 ++ + .../bindings/regulator/samsung,s2mps14.yaml | 44 ++ + .../bindings/regulator/samsung,s2mps15.yaml | 44 ++ + .../bindings/regulator/samsung,s2mpu02.yaml | 44 ++ + .../bindings/regulator/samsung,s5m8767.txt | 145 ------- + .../bindings/regulator/samsung,s5m8767.yaml | 74 ++++ + .../bindings/regulator/silergy,sy8106a.yaml | 52 +++ + .../bindings/regulator/sy8106a-regulator.txt | 23 -- + MAINTAINERS | 6 +- + 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/s5m8767.c | 21 +- + drivers/regulator/ti-abb-regulator.c | 31 +- + drivers/regulator/vqmmc-ipq4019-regulator.c | 4 +- + drivers/spi/spi.c | 41 ++ + 34 files changed, 1285 insertions(+), 720 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s2mps11.txt + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/max8952.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/max8973-regulator.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/max8997-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max8952.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max8973.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max8997.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpa01.txt + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpa01.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps11.txt + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps11.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps13.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps14.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mps15.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpu02.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/silergy,sy8106a.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt +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 (eb0782bbdfd0 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 | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 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 1f7655366d8b] 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 (0550e9155dfb Current code contains a lot of racy patterns when converting an ocontext's context structure to an SID. This is being done in a "lazy" fashion, such that the SID is looked up in the SID table only when it's first needed and then cached in the "sid" field of the ocontext structure. However, this is done without any locking or memory barriers and is thus unsafe.) +$ 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 +CONFLICT (content): Merge conflict in 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. +Resolved 'fs/io_uring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7adb837f8096] 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 | 145 ++++------- + security/selinux/include/classmap.h | 4 +- + security/selinux/ss/services.c | 162 ++++++------- + security/smack/smack_lsm.c | 46 ++++ + 19 files changed, 741 insertions(+), 294 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 e84a553630ba] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git + Date: Tue Oct 12 14:04:03 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 +Auto-merging drivers/iommu/apple-dart.c +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(-) +$ git am -3 ../patches/0001-fix-for-iommu-dart-Exclude-MSI-doorbell-from-PCIe-de.patch +Applying: fix for "iommu/dart: Exclude MSI doorbell from PCIe device IOVA range" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iommu/apple-dart.c +$ git add -A . +$ git commit -v -a --amend +[master 2b56ed261189] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git + Date: Tue Oct 12 14:13:09 2021 +1100 +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 +Resolved 'include/uapi/linux/audit.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 39806c2fb887] 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 (387ee9fe4587 dt-binding: usb: xilinx: Add clocking node) +$ 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 | 47 +++++ + 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 + + drivers/of/of_private.h | 8 - + scripts/Makefile.lib | 1 - + 40 files changed, 1392 insertions(+), 771 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 (4a8f742e0d92 Merge remote-tracking branch 'spi/for-5.16' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging drivers/spi/spi.c +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 +- + Documentation/spi/spi-summary.rst | 8 - + arch/mips/boot/dts/ingenic/ci20.dts | 9 +- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 44 +- + drivers/firmware/xilinx/zynqmp.c | 17 + + drivers/spi/Kconfig | 26 +- + drivers/spi/Makefile | 2 + + drivers/spi/atmel-quadspi.c | 2 +- + drivers/spi/spi-amd.c | 113 ++-- + drivers/spi/spi-bcm-qspi.c | 188 +++++- + drivers/spi/spi-cadence-quadspi.c | 214 +++++++ + drivers/spi/spi-cadence-xspi.c | 640 +++++++++++++++++++++ + drivers/spi/spi-fsi.c | 48 +- + 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 +- + drivers/spi/spi.c | 237 +++----- + include/linux/firmware/xlnx-zynqmp.h | 12 + + include/linux/spi/spi.h | 55 -- + 24 files changed, 1928 insertions(+), 342 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 (7413431c622f Merge remote-tracking branch 'tip/x86/fpu' into tip-master) +$ git merge -m Merge branch 'auto-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/auto-latest +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core_sched.c +Auto-merging kernel/sched/core.c +Removing kernel/futex.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/dma/swiotlb.c +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging arch/x86/kernel/cpu/mce/amd.c +Auto-merging arch/x86/include/asm/mce.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 8 + + Documentation/scheduler/sched-bwc.rst | 84 +- + Documentation/userspace-api/futex2.rst | 86 + + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 3 +- + arch/Kconfig | 3 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/powerpc/include/asm/mem_encrypt.h | 5 - + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/powerpc/platforms/pseries/Makefile | 2 + + arch/powerpc/platforms/pseries/cc_platform.c | 26 + + arch/powerpc/platforms/pseries/svm.c | 5 +- + arch/s390/include/asm/mem_encrypt.h | 2 - + arch/x86/Kconfig | 6 +- + arch/x86/boot/genimage.sh | 15 +- + arch/x86/boot/mtools.conf.in | 5 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/events/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/cpu_entry_area.h | 8 +- + 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/ia32.h | 2 +- + arch/x86/include/asm/insn-eval.h | 1 + + arch/x86/include/asm/io.h | 8 + + arch/x86/include/asm/irq_stack.h | 39 +- + arch/x86/include/asm/kexec.h | 2 +- + arch/x86/include/asm/mce.h | 12 - + arch/x86/include/asm/mem_encrypt.h | 12 +- + arch/x86/include/asm/msr.h | 4 +- + arch/x86/include/asm/page_32.h | 2 +- + arch/x86/include/asm/page_64_types.h | 2 +- + arch/x86/include/asm/paravirt.h | 31 +- + arch/x86/include/asm/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/uaccess.h | 2 +- + arch/x86/include/asm/xen/hypercall.h | 6 +- + arch/x86/kernel/Makefile | 6 + + arch/x86/kernel/cc_platform.c | 69 + + 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/crash_dump_64.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 6 + + arch/x86/kernel/fpu/signal.c | 146 +- + arch/x86/kernel/head64.c | 9 +- + arch/x86/kernel/irqflags.S | 2 + + arch/x86/kernel/itmt.c | 2 +- + arch/x86/kernel/kvm.c | 3 +- + arch/x86/kernel/kvmclock.c | 4 +- + arch/x86/kernel/machine_kexec_64.c | 19 +- + arch/x86/kernel/paravirt.c | 45 +- + arch/x86/kernel/pci-swiotlb.c | 9 +- + arch/x86/kernel/process.c | 1 + + arch/x86/kernel/relocate_kernel_64.S | 2 +- + arch/x86/kernel/sev-shared.c | 2 +- + arch/x86/kernel/sev.c | 38 +- + 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.c | 3 +- + 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/lib/insn.c | 5 +- + arch/x86/mm/cpu_entry_area.c | 7 + + arch/x86/mm/extable.c | 131 +- + arch/x86/mm/fault.c | 20 +- + arch/x86/mm/ioremap.c | 18 +- + arch/x86/mm/mem_encrypt.c | 55 +- + arch/x86/mm/mem_encrypt_identity.c | 9 +- + arch/x86/mm/pat/set_memory.c | 3 +- + arch/x86/net/bpf_jit_comp.c | 11 +- + arch/x86/platform/efi/efi_64.c | 9 +- + arch/x86/realmode/init.c | 8 +- + arch/x86/xen/enlighten_pv.c | 70 +- + arch/x86/xen/irq.c | 31 +- + arch/x86/xen/mmu_pv.c | 93 +- + arch/x86/xen/xen-asm.S | 79 +- + arch/x86/xen/xen-head.S | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +- + drivers/gpu/drm/drm_cache.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 6 +- + drivers/iommu/amd/init.c | 7 +- + drivers/iommu/amd/iommu.c | 3 +- + drivers/iommu/amd/iommu_v2.c | 3 +- + drivers/iommu/iommu.c | 3 +- + fs/proc/stat.c | 4 +- + fs/proc/uptime.c | 14 +- + fs/proc/vmcore.c | 6 +- + include/linux/cc_platform.h | 88 + + include/linux/context_tracking.h | 2 +- + include/linux/debug_locks.h | 2 - + include/linux/kernel.h | 13 +- + include/linux/kernel_stat.h | 1 + + include/linux/lockdep_types.h | 2 +- + include/linux/mem_encrypt.h | 4 - + include/linux/mm_types.h | 4 + + include/linux/preempt.h | 5 +- + include/linux/sched.h | 49 +- + include/linux/sched/mm.h | 29 + + include/linux/sched/task.h | 3 +- + include/linux/syscalls.h | 7 +- + include/linux/wait.h | 3 +- + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/futex.h | 25 + + kernel/Kconfig.preempt | 32 +- + kernel/Makefile | 2 +- + kernel/dma/swiotlb.c | 4 +- + kernel/exit.c | 2 + + kernel/fork.c | 2 +- + kernel/futex.c | 4272 -------------------- + kernel/futex/Makefile | 3 + + kernel/futex/core.c | 1176 ++++++ + kernel/futex/futex.h | 295 ++ + kernel/futex/pi.c | 1233 ++++++ + kernel/futex/requeue.c | 897 ++++ + kernel/futex/syscalls.c | 398 ++ + kernel/futex/waitwake.c | 708 ++++ + kernel/irq/manage.c | 6 +- + kernel/irq/spurious.c | 8 + + kernel/kprobes.c | 8 +- + kernel/kthread.c | 16 +- + kernel/livepatch/transition.c | 95 +- + kernel/locking/lockdep.c | 6 +- + kernel/locking/rtmutex.c | 19 +- + kernel/locking/rwbase_rt.c | 11 +- + kernel/locking/spinlock_rt.c | 17 +- + kernel/locking/test-ww_mutex.c | 3 +- + kernel/rcu/tasks.h | 12 +- + kernel/rcu/tree_stall.h | 8 +- + kernel/rcu/update.c | 4 +- + kernel/sched/core.c | 440 +- + kernel/sched/core_sched.c | 9 +- + kernel/sched/deadline.c | 99 +- + kernel/sched/debug.c | 101 +- + kernel/sched/fair.c | 431 +- + kernel/sched/features.h | 5 + + kernel/sched/rt.c | 130 +- + kernel/sched/sched.h | 24 +- + kernel/sched/stats.c | 104 + + kernel/sched/stats.h | 49 + + kernel/sched/stop_task.c | 4 +- + kernel/sched/topology.c | 25 +- + kernel/smp.c | 6 +- + kernel/sys_ni.c | 3 +- + lib/Kconfig.debug | 2 +- + mm/memory.c | 2 +- + scripts/sorttable.c | 4 +- + tools/arch/x86/lib/insn.c | 5 +- + tools/include/asm-generic/unaligned.h | 23 + + tools/objtool/arch/x86/decode.c | 74 +- + tools/objtool/check.c | 464 ++- + tools/objtool/include/objtool/arch.h | 5 +- + tools/objtool/include/objtool/cfi.h | 2 + + tools/objtool/include/objtool/check.h | 2 +- + tools/objtool/include/objtool/elf.h | 1 + + tools/objtool/include/objtool/objtool.h | 9 + + tools/objtool/objtool.c | 22 + + tools/objtool/orc_gen.c | 15 +- + tools/perf/util/intel-pt-decoder/Build | 2 + + .../testing/selftests/futex/functional/.gitignore | 1 + + tools/testing/selftests/futex/functional/Makefile | 3 +- + .../futex/functional/futex_wait_timeout.c | 21 +- + .../futex/functional/futex_wait_wouldblock.c | 41 +- + .../selftests/futex/functional/futex_waitv.c | 237 ++ + tools/testing/selftests/futex/functional/run.sh | 3 + + tools/testing/selftests/futex/include/futex2test.h | 22 + + tools/testing/selftests/sched/cs_prctl_test.c | 28 +- + 188 files changed, 8108 insertions(+), 5972 deletions(-) + create mode 100644 Documentation/userspace-api/futex2.rst + create mode 100644 arch/powerpc/platforms/pseries/cc_platform.c + create mode 100644 arch/x86/include/asm/extable_fixup_types.h + create mode 100644 arch/x86/kernel/cc_platform.c + create mode 100644 include/linux/cc_platform.h + delete mode 100644 kernel/futex.c + create mode 100644 kernel/futex/Makefile + create mode 100644 kernel/futex/core.c + create mode 100644 kernel/futex/futex.h + create mode 100644 kernel/futex/pi.c + create mode 100644 kernel/futex/requeue.c + create mode 100644 kernel/futex/syscalls.c + create mode 100644 kernel/futex/waitwake.c + create mode 100644 tools/include/asm-generic/unaligned.h + create mode 100644 tools/testing/selftests/futex/functional/futex_waitv.c + create mode 100644 tools/testing/selftests/futex/include/futex2test.h +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 (9130bd1dbe52 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/amd64_edac.c | 22 +++++++++++++++++++++- + drivers/edac/edac_mc.c | 42 ++++++++++++++++++------------------------ + drivers/edac/edac_mc_sysfs.c | 8 ++++---- + drivers/edac/sb_edac.c | 2 +- + drivers/edac/ti_edac.c | 7 +------ + 6 files changed, 49 insertions(+), 44 deletions(-) +Merging irqchip/irq/irqchip-next (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 (8d6e90983ade tracing: Create a sparse bitmask for pid filtering) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git ftrace/for-next +Auto-merging tools/objtool/check.c +Auto-merging kernel/kprobes.c +CONFLICT (content): Merge conflict in kernel/kprobes.c +Auto-merging arch/s390/kernel/kprobes.c +Resolved 'kernel/kprobes.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2dd02cd16249] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + arch/arc/include/asm/kprobes.h | 2 +- + arch/arc/include/asm/ptrace.h | 5 + + arch/arc/kernel/kprobes.c | 13 +- + arch/arm/probes/kprobes/core.c | 15 +- + arch/arm/probes/kprobes/opt-arm.c | 7 +- + arch/arm64/include/asm/kprobes.h | 2 +- + arch/arm64/kernel/probes/kprobes.c | 10 +- + arch/arm64/kernel/probes/kprobes_trampoline.S | 4 +- + arch/csky/include/asm/kprobes.h | 2 +- + arch/csky/kernel/probes/ftrace.c | 7 - + arch/csky/kernel/probes/kprobes.c | 14 +- + arch/csky/kernel/probes/kprobes_trampoline.S | 4 +- + arch/ia64/include/asm/ptrace.h | 5 + + arch/ia64/kernel/kprobes.c | 15 +- + arch/mips/kernel/kprobes.c | 26 +- + arch/parisc/kernel/kprobes.c | 6 +- + arch/powerpc/include/asm/kprobes.h | 2 +- + arch/powerpc/kernel/kprobes.c | 29 +- + arch/powerpc/kernel/optprobes.c | 8 +- + arch/powerpc/kernel/stacktrace.c | 2 +- + arch/riscv/include/asm/kprobes.h | 2 +- + arch/riscv/kernel/probes/kprobes.c | 15 +- + arch/riscv/kernel/probes/kprobes_trampoline.S | 4 +- + arch/s390/include/asm/kprobes.h | 2 +- + arch/s390/kernel/kprobes.c | 16 +- + arch/s390/kernel/stacktrace.c | 2 +- + arch/sh/include/asm/kprobes.h | 2 +- + arch/sh/kernel/kprobes.c | 12 +- + arch/sparc/include/asm/kprobes.h | 2 +- + arch/sparc/kernel/kprobes.c | 12 +- + arch/x86/include/asm/kprobes.h | 1 - + arch/x86/include/asm/unwind.h | 23 ++ + arch/x86/include/asm/unwind_hints.h | 5 + + arch/x86/kernel/kprobes/core.c | 71 +++- + arch/x86/kernel/kprobes/opt.c | 6 +- + arch/x86/kernel/unwind_frame.c | 3 +- + arch/x86/kernel/unwind_guess.c | 3 +- + arch/x86/kernel/unwind_orc.c | 21 +- + include/linux/kprobes.h | 113 +++--- + include/linux/objtool.h | 12 + + kernel/kprobes.c | 498 ++++++++++++++------------ + kernel/trace/Makefile | 1 + + kernel/trace/ftrace.c | 6 +- + kernel/trace/pid_list.c | 495 +++++++++++++++++++++++++ + kernel/trace/pid_list.h | 88 +++++ + kernel/trace/trace.c | 78 ++-- + kernel/trace/trace.h | 14 +- + kernel/trace/trace_events.c | 6 +- + kernel/trace/trace_kprobe.c | 2 +- + kernel/trace/trace_output.c | 17 +- + lib/error-inject.c | 3 +- + tools/include/linux/objtool.h | 12 + + tools/objtool/check.c | 2 +- + 53 files changed, 1232 insertions(+), 495 deletions(-) + create mode 100644 kernel/trace/pid_list.c + create mode 100644 kernel/trace/pid_list.h +Merging rcu/rcu/next (d5e7be308018 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 tools/testing/selftests/bpf/prog_tests/atomics.c +Auto-merging kernel/rcu/update.c +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/rcu/tasks.h +CONFLICT (content): Merge conflict in kernel/rcu/tasks.h +Auto-merging Documentation/timers/no_hz.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Recorded preimage for 'kernel/rcu/tasks.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'kernel/rcu/tasks.h'. +[master 9a95e09927fe] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git +$ git diff -M --stat --summary HEAD^.. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 69 +++-- + Documentation/RCU/stallwarn.rst | 21 +- + Documentation/admin-guide/kernel-parameters.txt | 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 (542a2640a2f4 Merge tag 'kvm-riscv-5.16-1' of git://github.com/kvm-riscv/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging MAINTAINERS +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master df8f1bc158f9] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 193 +++- + Documentation/virt/kvm/devices/xics.rst | 2 +- + Documentation/virt/kvm/devices/xive.rst | 2 +- + MAINTAINERS | 12 + + arch/arm64/include/asm/kvm_host.h | 1 - + arch/arm64/kvm/arm.c | 8 - + arch/mips/kvm/mips.c | 2 +- + arch/powerpc/include/asm/kvm_book3s.h | 2 +- + arch/powerpc/include/asm/kvm_host.h | 4 +- + arch/powerpc/kvm/book3s_xive.c | 2 +- + arch/powerpc/kvm/powerpc.c | 2 +- + arch/riscv/Kconfig | 2 + + arch/riscv/Makefile | 1 + + arch/riscv/include/asm/kvm_host.h | 266 ++++++ + arch/riscv/include/asm/kvm_types.h | 7 + + arch/riscv/include/asm/kvm_vcpu_timer.h | 44 + + arch/riscv/include/uapi/asm/kvm.h | 128 +++ + arch/riscv/kernel/asm-offsets.c | 156 ++++ + arch/riscv/kvm/Kconfig | 36 + + arch/riscv/kvm/Makefile | 25 + + arch/riscv/kvm/main.c | 118 +++ + arch/riscv/kvm/mmu.c | 802 +++++++++++++++++ + arch/riscv/kvm/tlb.S | 74 ++ + arch/riscv/kvm/vcpu.c | 997 +++++++++++++++++++++ + arch/riscv/kvm/vcpu_exit.c | 701 +++++++++++++++ + arch/riscv/kvm/vcpu_sbi.c | 185 ++++ + arch/riscv/kvm/vcpu_switch.S | 400 +++++++++ + arch/riscv/kvm/vcpu_timer.c | 225 +++++ + arch/riscv/kvm/vm.c | 97 ++ + arch/riscv/kvm/vmid.c | 120 +++ + arch/x86/include/asm/kvm_host.h | 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/clocksource/timer-riscv.c | 9 + + drivers/gpu/drm/i915/Kconfig | 1 + + include/clocksource/timer-riscv.h | 16 + + include/linux/kvm_host.h | 18 +- + include/uapi/linux/kvm.h | 8 + + 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 +-- + 65 files changed, 5630 insertions(+), 912 deletions(-) + create mode 100644 arch/riscv/include/asm/kvm_host.h + create mode 100644 arch/riscv/include/asm/kvm_types.h + create mode 100644 arch/riscv/include/asm/kvm_vcpu_timer.h + create mode 100644 arch/riscv/include/uapi/asm/kvm.h + create mode 100644 arch/riscv/kvm/Kconfig + create mode 100644 arch/riscv/kvm/Makefile + create mode 100644 arch/riscv/kvm/main.c + create mode 100644 arch/riscv/kvm/mmu.c + create mode 100644 arch/riscv/kvm/tlb.S + create mode 100644 arch/riscv/kvm/vcpu.c + create mode 100644 arch/riscv/kvm/vcpu_exit.c + create mode 100644 arch/riscv/kvm/vcpu_sbi.c + create mode 100644 arch/riscv/kvm/vcpu_switch.S + create mode 100644 arch/riscv/kvm/vcpu_timer.c + create mode 100644 arch/riscv/kvm/vm.c + create mode 100644 arch/riscv/kvm/vmid.c + create mode 100644 include/clocksource/timer-riscv.h +Merging kvm-arm/next (1eb07f4b6853 Merge branch kvm-arm64/raz-sysregs into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/kvm_asm.h | 47 +-- + arch/arm64/include/asm/kvm_host.h | 1 + + arch/arm64/kernel/smp.c | 3 +- + arch/arm64/kvm/Kconfig | 10 +- + arch/arm64/kvm/arm.c | 75 +++-- + arch/arm64/kvm/hyp/nvhe/host.S | 26 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 37 ++- + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 3 + + arch/arm64/kvm/sys_regs.c | 26 +- + arch/arm64/kvm/vgic/vgic-its.c | 4 +- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 25 +- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 6 +- + arch/arm64/kvm/vgic/vgic-v3.c | 6 +- + arch/arm64/kvm/vgic/vgic.h | 5 +- + tools/testing/selftests/kvm/aarch64/vgic_init.c | 366 +++++++++++++++++------- + 17 files changed, 452 insertions(+), 191 deletions(-) +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 (3094c9738e4b KVM: s390: pv: avoid stalls for kvm_s390_pv_init_vm) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Merge made by the 'recursive' strategy. + arch/s390/include/asm/uv.h | 5 +++ + arch/s390/kernel/uv.c | 2 +- + arch/s390/kvm/pv.c | 21 +++++---- + arch/s390/mm/gmap.c | 11 ++++- + arch/s390/mm/pgtable.c | 109 ++++++++++++++++++++++++++++++++------------- + 5 files changed, 102 insertions(+), 46 deletions(-) +Merging xen-tip/linux-next (319933a80fd4 xen/balloon: fix cancelled balloon action) +$ 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 (57116ce17b04 workqueue: fix state-dump console deadlock) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 5 ++--- + kernel/workqueue.c | 18 ++++++++++++++++-- + 2 files changed, 18 insertions(+), 5 deletions(-) +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 drivers/platform/x86/gigabyte-wmi.c +Auto-merging drivers/platform/x86/dell/Kconfig +CONFLICT (content): Merge conflict in drivers/platform/x86/dell/Kconfig +Auto-merging drivers/platform/x86/amd-pmc.c +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/platform/x86/dell/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/platform/x86/dell/Kconfig'. +[master 369f0b18ff62] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git +$ git diff -M --stat --summary HEAD^.. + 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 (cd921b9f0c8d ipmi: bt: Add ast2600 compatible string) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'recursive' strategy. + .../bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 1 + + Documentation/driver-api/ipmi.rst | 64 ++- + drivers/char/ipmi/Kconfig | 11 +- + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/bt-bmc.c | 69 +-- + drivers/char/ipmi/ipmi_devintf.c | 8 +- + drivers/char/ipmi/ipmi_ipmb.c | 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 +- + 12 files changed, 971 insertions(+), 106 deletions(-) + create mode 100644 drivers/char/ipmi/ipmi_ipmb.c +Merging driver-core/driver-core-next (d7c5bf94475b fs/sysfs/dir.c: replace S_IRWXU|S_IRUGO|S_IXUGO with 0755 sysfs_create_dir_ns()) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/base/core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/obsolete/o2cb | 11 + + Documentation/ABI/obsolete/sysfs-bus-iio | 4 + + Documentation/ABI/stable/o2cb | 2 +- + Documentation/ABI/stable/sysfs-class-infiniband | 64 +- + Documentation/ABI/stable/sysfs-class-tpm | 2 +- + Documentation/ABI/stable/sysfs-devices | 7 + + Documentation/ABI/stable/sysfs-module | 25 +- + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 42 +- + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 43 +- + Documentation/ABI/testing/evm | 5 +- + Documentation/ABI/testing/ima_policy | 2 +- + Documentation/ABI/testing/pstore | 3 +- + Documentation/ABI/testing/sysfs-ata | 2 +- + Documentation/ABI/testing/sysfs-bus-mdio | 9 + + Documentation/ABI/testing/sysfs-bus-pci | 24 +- + Documentation/ABI/testing/sysfs-bus-platform | 12 + + Documentation/ABI/testing/sysfs-bus-rapidio | 32 +- + .../ABI/testing/sysfs-bus-soundwire-master | 20 +- + .../ABI/testing/sysfs-bus-soundwire-slave | 62 +- + Documentation/ABI/testing/sysfs-bus-usb | 292 ++++++- + Documentation/ABI/testing/sysfs-class-bdi | 30 +- + Documentation/ABI/testing/sysfs-class-cxl | 15 +- + .../ABI/testing/sysfs-class-devfreq-event | 12 +- + Documentation/ABI/testing/sysfs-class-extcon | 12 +- + Documentation/ABI/testing/sysfs-class-gnss | 2 +- + Documentation/ABI/testing/sysfs-class-hwmon | 932 +++++++++++++++++++++ + Documentation/ABI/testing/sysfs-class-mei | 18 +- + Documentation/ABI/testing/sysfs-class-mic | 24 +- + Documentation/ABI/testing/sysfs-class-mux | 2 +- + Documentation/ABI/testing/sysfs-class-pwm | 20 +- + Documentation/ABI/testing/sysfs-class-rapidio | 4 +- + Documentation/ABI/testing/sysfs-class-rc | 14 +- + Documentation/ABI/testing/sysfs-class-rc-nuvoton | 2 +- + Documentation/ABI/testing/sysfs-class-typec | 2 +- + Documentation/ABI/testing/sysfs-class-uwb_rc | 26 +- + .../ABI/testing/sysfs-class-uwb_rc-wusbhc | 10 +- + .../ABI/testing/sysfs-devices-platform-dock | 10 +- + Documentation/ABI/testing/sysfs-devices-power | 36 + + Documentation/ABI/testing/sysfs-devices-removable | 8 +- + Documentation/ABI/testing/sysfs-devices-system-cpu | 68 +- + Documentation/ABI/testing/sysfs-driver-ufs | 126 +++ + Documentation/ABI/testing/sysfs-firmware-efi-esrt | 16 +- + Documentation/ABI/testing/sysfs-kernel-slab | 115 +-- + Documentation/ABI/testing/sysfs-mce | 129 +++ + Documentation/ABI/testing/sysfs-module | 7 + + .../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 +- + Documentation/hwmon/sysfs-interface.rst | 596 +------------ + Documentation/x86/x86_64/machinecheck.rst | 56 +- + MAINTAINERS | 3 + + drivers/base/arch_topology.c | 3 - + drivers/base/component.c | 1 - + drivers/base/core.c | 11 +- + drivers/base/firmware_loader/main.c | 41 +- + drivers/base/platform.c | 3 +- + drivers/pci/pci-sysfs.c | 6 +- + fs/kernfs/symlink.c | 3 +- + fs/sysfs/dir.c | 3 +- + fs/sysfs/file.c | 140 ++-- + fs/sysfs/group.c | 15 +- + fs/sysfs/sysfs.h | 8 +- + include/linux/kernfs.h | 28 - + include/linux/kobject.h | 1 - + lib/kobject.c | 2 +- + scripts/get_abi.pl | 493 ++++++++++- + 69 files changed, 2691 insertions(+), 1155 deletions(-) + create mode 100644 Documentation/ABI/obsolete/o2cb + create mode 100644 Documentation/ABI/testing/sysfs-class-hwmon + create mode 100644 Documentation/ABI/testing/sysfs-mce +Merging usb/usb-next (620b74d01b9d Merge 5.15-rc5 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 +Removing Documentation/devicetree/bindings/usb/usb3503.txt +Removing Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt +Merge made by the 'recursive' strategy. + .../bindings/phy/nvidia,tegra20-usb-phy.txt | 74 ---- + .../bindings/phy/nvidia,tegra20-usb-phy.yaml | 373 +++++++++++++++++++++ + .../devicetree/bindings/usb/atmel-usb.txt | 4 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/smsc,usb3503.yaml | 108 ++++++ + .../devicetree/bindings/usb/snps,dwc3.yaml | 18 +- + .../devicetree/bindings/usb/ti,tps6598x.yaml | 4 + + Documentation/devicetree/bindings/usb/usb3503.txt | 39 --- + arch/arm/boot/dts/stm32mp151.dtsi | 1 + + drivers/usb/atm/usbatm.c | 4 +- + drivers/usb/chipidea/udc.c | 8 + + drivers/usb/class/cdc-acm.c | 1 - + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/core/config.c | 4 +- + drivers/usb/core/devio.c | 144 ++++++-- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/dwc3/Kconfig | 7 +- + 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_mass_storage.c | 87 ++++- + drivers/usb/gadget/function/f_uac2.c | 16 +- + drivers/usb/gadget/function/uvc.h | 2 + + drivers/usb/gadget/function/uvc_v4l2.c | 49 ++- + drivers/usb/gadget/udc/amd5536udc.h | 1 - + drivers/usb/gadget/udc/core.c | 6 +- + drivers/usb/gadget/udc/goku_udc.c | 6 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 5 - + drivers/usb/gadget/udc/udc-xilinx.c | 25 ++ + drivers/usb/host/Kconfig | 6 +- + drivers/usb/host/ehci-atmel.c | 8 + + drivers/usb/host/ehci-hcd.c | 13 +- + drivers/usb/host/ehci-hub.c | 11 +- + drivers/usb/host/ehci-mv.c | 2 - + drivers/usb/host/ehci-platform.c | 6 + + drivers/usb/host/ehci.h | 1 + + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 3 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/host/xhci-mtk-sch.c | 2 +- + drivers/usb/musb/mediatek.c | 1 + + drivers/usb/musb/tusb6010.c | 5 + + drivers/usb/phy/phy-tahvo.c | 4 - + drivers/usb/phy/phy-tegra-usb.c | 198 ++++++++++- + drivers/usb/typec/hd3ss3220.c | 8 +- + drivers/usb/typec/tcpm/tcpci.c | 2 +- + drivers/usb/typec/tipd/core.c | 215 +++++++++--- + drivers/usb/typec/tipd/tps6598x.h | 12 + + drivers/usb/typec/tipd/trace.h | 23 ++ + drivers/usb/typec/ucsi/ucsi.c | 337 +++++++++---------- + drivers/usb/typec/ucsi/ucsi.h | 3 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +- + drivers/usb/usb-skeleton.c | 2 +- + include/linux/usb/tegra_usb_phy.h | 5 + + 55 files changed, 1467 insertions(+), 444 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/usb/smsc,usb3503.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb3503.txt +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (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. +Merging tty/tty-next (2cb3315107b5 serial: 8250_lpss: Enable PSE UART Auto Flow Control) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging net/nfc/nci/uart.c +Auto-merging drivers/tty/serial/8250/Kconfig +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. + .../devicetree/bindings/serial/8250_omap.yaml | 2 +- + .../bindings/serial/brcm,bcm6345-uart.txt | 36 --- + .../bindings/serial/brcm,bcm6345-uart.yaml | 47 ++++ + .../devicetree/bindings/serial/samsung_uart.yaml | 1 + + .../devicetree/bindings/serial/sprd-uart.yaml | 1 + + .../bindings/serial/xlnx,opb-uartlite.txt | 23 -- + .../bindings/serial/xlnx,opb-uartlite.yaml | 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/mxser.c | 119 ++++---- + drivers/tty/n_gsm.c | 116 ++++++-- + drivers/tty/n_hdlc.c | 2 +- + drivers/tty/n_tty.c | 3 +- + drivers/tty/serial/8250/8250_dw.c | 19 +- + drivers/tty/serial/8250/8250_dwlib.c | 10 + + drivers/tty/serial/8250/8250_dwlib.h | 1 + + drivers/tty/serial/8250/8250_fsl.c | 8 +- + drivers/tty/serial/8250/8250_lpss.c | 9 +- + drivers/tty/serial/8250/8250_pci.c | 4 +- + drivers/tty/serial/8250/8250_pnp.c | 4 - + drivers/tty/serial/8250/Kconfig | 2 +- + drivers/tty/serial/Kconfig | 9 +- + drivers/tty/serial/atmel_serial.c | 4 +- + drivers/tty/serial/samsung_tty.c | 13 +- + drivers/tty/serial/serial_core.c | 16 +- + drivers/tty/serial/sifive.c | 2 +- + drivers/tty/serial/uartlite.c | 91 +++++- + drivers/tty/sysrq.c | 2 + + drivers/tty/tty_baudrate.c | 2 +- + drivers/tty/tty_ioctl.c | 12 +- + include/linux/console.h | 2 + + 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 +- + 48 files changed, 908 insertions(+), 660 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 (424f1ac2d832 virt: acrn: Introduce interfaces for virtual device creating/destroying) +$ 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 +Auto-merging drivers/misc/fastrpc.c +Merge made by the 'recursive' strategy. + Documentation/virt/ne_overview.rst | 21 +++-- + drivers/char/mem.c | 8 +- + drivers/char/xillybus/xillybus.h | 31 +------ + drivers/char/xillybus/xillybus_core.c | 131 ++++++++++++++++++------------ + drivers/char/xillybus/xillybus_of.c | 86 +------------------- + drivers/char/xillybus/xillybus_pcie.c | 99 ++-------------------- + drivers/ipack/devices/ipoctal.c | 48 +++++------ + drivers/misc/cardreader/rtsx_pcr.c | 2 +- + drivers/misc/fastrpc.c | 20 +++-- + 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/acrn/hsm.c | 49 +++++++++++ + drivers/virt/acrn/hypercall.h | 52 ++++++++++++ + drivers/virt/nitro_enclaves/Kconfig | 8 +- + drivers/virt/nitro_enclaves/ne_misc_dev.c | 17 ++-- + drivers/virt/nitro_enclaves/ne_pci_dev.c | 2 +- + drivers/virt/nitro_enclaves/ne_pci_dev.h | 8 +- + include/uapi/linux/acrn.h | 70 ++++++++++++++++ + include/uapi/linux/nitro_enclaves.h | 10 +-- + samples/nitro_enclaves/ne_ioctl_sample.c | 7 +- + scripts/tags.sh | 6 +- + 27 files changed, 442 insertions(+), 427 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 (759f9ec3f376 phy: qcom-qmp: Add QCM2290 USB3 PHY support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/bcm-ns-usb2-phy.yaml | 25 +- + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 29 +- + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 7 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 + + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi | 1 + + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 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 | 155 +++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 2 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 5 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 11 +- + drivers/phy/samsung/Kconfig | 16 +- + 16 files changed, 1080 insertions(+), 35 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 (052493d5534a Merge branch 'v5.16/vfio/diana-fsl-reset-v2' 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/bus/fsl-mc/Makefile | 3 +- + drivers/bus/fsl-mc/fsl-mc-private.h | 39 +++- + drivers/bus/fsl-mc/obj-api.c | 103 +++++++++ + drivers/s390/crypto/vfio_ap_ops.c | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 62 +++--- + drivers/vfio/mdev/mdev_driver.c | 45 +--- + drivers/vfio/mdev/vfio_mdev.c | 2 +- + drivers/vfio/pci/vfio_pci_core.c | 13 +- + drivers/vfio/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/fsl/mc.h | 14 ++ + include/linux/mdev.h | 20 -- + include/linux/vfio.h | 53 +---- + samples/vfio-mdev/mbochs.c | 2 +- + samples/vfio-mdev/mdpy.c | 2 +- + samples/vfio-mdev/mtty.c | 2 +- + 19 files changed, 488 insertions(+), 528 deletions(-) + create mode 100644 drivers/bus/fsl-mc/obj-api.c + create mode 100644 drivers/vfio/vfio.h +Merging staging/staging-next (98f668b30e8e staging: rtl8723bs: hal: remove duplicate check) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +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 +Auto-merging drivers/staging/r8188eu/hal/hal_intf.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 +Auto-merging drivers/pci/pci.c +Merge made by the 'recursive' strategy. + arch/mips/include/asm/mach-ralink/spaces.h | 4 +- + arch/mips/include/asm/pci.h | 4 + + arch/mips/pci/pci-generic.c | 14 + + drivers/pci/pci.c | 2 + + 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-dts/mt7621.dtsi | 20 +- + 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 | 605 +---- + drivers/staging/r8188eu/core/rtw_br_ext.c | 3 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 596 +---- + drivers/staging/r8188eu/core/rtw_debug.c | 26 +- + drivers/staging/r8188eu/core/rtw_efuse.c | 582 +---- + drivers/staging/r8188eu/core/rtw_ieee80211.c | 339 +-- + drivers/staging/r8188eu/core/rtw_io.c | 299 --- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 386 +--- + drivers/staging/r8188eu/core/rtw_iol.c | 27 - + drivers/staging/r8188eu/core/rtw_led.c | 1364 +----------- + drivers/staging/r8188eu/core/rtw_mlme.c | 126 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 365 +--- + drivers/staging/r8188eu/core/rtw_mp.c | 935 -------- + drivers/staging/r8188eu/core/rtw_mp_ioctl.c | 1170 ---------- + drivers/staging/r8188eu/core/rtw_p2p.c | 43 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 130 +- + drivers/staging/r8188eu/core/rtw_recv.c | 116 +- + drivers/staging/r8188eu/core/rtw_rf.c | 17 - + drivers/staging/r8188eu/core/rtw_security.c | 197 +- + drivers/staging/r8188eu/core/rtw_sreset.c | 32 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 34 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 157 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 120 +- + 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 | 26 +- + drivers/staging/r8188eu/hal/hal_intf.c | 391 +--- + drivers/staging/r8188eu/hal/odm.c | 665 +----- + drivers/staging/r8188eu/hal/odm_HWConfig.c | 283 +-- + 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 | 26 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 14 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 305 +-- + drivers/staging/r8188eu/hal/rtl8188e_mp.c | 798 ------- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 215 +- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 226 +- + drivers/staging/r8188eu/hal/rtl8188e_sreset.c | 14 +- + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 2 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 60 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 295 +-- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 254 ++- + 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 | 24 +- + drivers/staging/r8188eu/include/hal_intf.h | 311 +-- + 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 | 187 +- + 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 | 9 - + 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 | 27 +- + 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 | 100 +- + drivers/staging/r8188eu/include/rtl8188e_led.h | 2 - + drivers/staging/r8188eu/include/rtl8188e_rf.h | 1 - + drivers/staging/r8188eu/include/rtl8188e_spec.h | 4 - + drivers/staging/r8188eu/include/rtl8188e_sreset.h | 1 - + drivers/staging/r8188eu/include/rtw_ap.h | 11 - + drivers/staging/r8188eu/include/rtw_br_ext.h | 3 +- + drivers/staging/r8188eu/include/rtw_cmd.h | 22 - + drivers/staging/r8188eu/include/rtw_debug.h | 8 - + drivers/staging/r8188eu/include/rtw_eeprom.h | 57 +- + drivers/staging/r8188eu/include/rtw_efuse.h | 21 - + drivers/staging/r8188eu/include/rtw_io.h | 87 +- + drivers/staging/r8188eu/include/rtw_ioctl_rtl.h | 63 - + drivers/staging/r8188eu/include/rtw_ioctl_set.h | 8 - + drivers/staging/r8188eu/include/rtw_iol.h | 5 - + drivers/staging/r8188eu/include/rtw_led.h | 20 - + drivers/staging/r8188eu/include/rtw_mlme.h | 11 - + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 14 - + drivers/staging/r8188eu/include/rtw_mp.h | 474 ---- + drivers/staging/r8188eu/include/rtw_mp_ioctl.h | 242 -- + .../staging/r8188eu/include/rtw_mp_phy_regdef.h | 1063 --------- + drivers/staging/r8188eu/include/rtw_p2p.h | 1 - + drivers/staging/r8188eu/include/rtw_pwrctrl.h | 107 - + drivers/staging/r8188eu/include/rtw_recv.h | 5 - + drivers/staging/r8188eu/include/rtw_rf.h | 12 - + drivers/staging/r8188eu/include/rtw_security.h | 20 +- + drivers/staging/r8188eu/include/rtw_sreset.h | 5 - + drivers/staging/r8188eu/include/rtw_xmit.h | 5 - + drivers/staging/r8188eu/include/sta_info.h | 7 - + drivers/staging/r8188eu/include/usb_ops.h | 5 - + drivers/staging/r8188eu/include/usb_ops_linux.h | 8 - + drivers/staging/r8188eu/include/usb_osintf.h | 5 +- + drivers/staging/r8188eu/include/wifi.h | 52 - + drivers/staging/r8188eu/include/xmit_osdep.h | 2 - + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 2310 +------------------- + drivers/staging/r8188eu/os_dep/mlme_linux.c | 6 - + drivers/staging/r8188eu/os_dep/os_intfs.c | 393 +--- + drivers/staging/r8188eu/os_dep/osdep_service.c | 72 +- + drivers/staging/r8188eu/os_dep/recv_linux.c | 14 - + drivers/staging/r8188eu/os_dep/usb_intf.c | 240 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 22 +- + drivers/staging/r8188eu/os_dep/xmit_linux.c | 4 - + drivers/staging/rtl8192e/rtl819x_BAProc.c | 9 +- + drivers/staging/rtl8192u/r8192U_core.c | 3 - + drivers/staging/rtl8712/rtl871x_xmit.h | 10 +- + 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 | 79 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 22 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 48 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 49 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 - + drivers/staging/rtl8723bs/include/osdep_service.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 26 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 34 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 4 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 9 +- + 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 | 294 ++- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 52 - + .../interface/vchiq_arm/vchiq_connected.c | 20 +- + .../interface/vchiq_arm/vchiq_connected.h | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 6 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 178 +- + drivers/staging/vt6655/baseband.c | 58 +- + drivers/staging/vt6655/card.c | 90 +- + drivers/staging/vt6655/channel.c | 10 +- + drivers/staging/vt6655/device.h | 6 +- + drivers/staging/vt6655/device_main.c | 150 +- + drivers/staging/vt6655/mac.c | 46 +- + drivers/staging/vt6655/mac.h | 4 +- + drivers/staging/vt6655/power.c | 24 +- + drivers/staging/vt6655/rf.c | 12 +- + drivers/staging/vt6655/rxtx.c | 12 +- + 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 +- + 225 files changed, 2470 insertions(+), 18762 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/pressure/st_pressure_spi.c +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 4f09600529e1] 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 (0061270307f2 cgroup: cgroup-v1: do not exclude cgrp_dfl_root) +$ 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-v1.c | 3 -- + kernel/cgroup/cgroup.c | 31 +++++++++++++++--- + kernel/cgroup/cpuset.c | 56 +++++++++++++++++---------------- + kernel/cgroup/misc.c | 31 +++++++++++++----- + 6 files changed, 107 insertions(+), 54 deletions(-) +Merging scsi/for-next (7e849b8f98a5 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/sd.c +Auto-merging drivers/scsi/scsi_lib.c +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/advansys.c | 4 +- + drivers/scsi/aic7xxx/aic79xx_osm.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 2 +- + drivers/scsi/dc395x.c | 1 + + drivers/scsi/elx/efct/efct_driver.c | 6 +- + drivers/scsi/elx/efct/efct_lio.c | 4 +- + drivers/scsi/elx/efct/efct_scsi.c | 3 +- + drivers/scsi/elx/libefc/efc.h | 2 +- + drivers/scsi/elx/libefc/efc_cmds.c | 7 +- + drivers/scsi/elx/libefc/efc_fabric.c | 2 +- + drivers/scsi/elx/libefc/efclib.h | 1 + + drivers/scsi/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_hw4.h | 4 + + drivers/scsi/lpfc/lpfc_init.c | 65 ++++++++-- + drivers/scsi/lpfc/lpfc_nvme.c | 70 +++++++++-- + drivers/scsi/lpfc/lpfc_nvmet.c | 44 ++++--- + drivers/scsi/lpfc/lpfc_scsi.c | 100 +++++++++------ + 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/scsi_lib.c | 46 ++++--- + drivers/scsi/scsi_scan.c | 57 --------- + drivers/scsi/sd.c | 7 ++ + drivers/scsi/ufs/Kconfig | 19 ++- + 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 | 15 ++- + drivers/scsi/ufs/ufs.h | 7 ++ + drivers/scsi/ufs/ufshcd.c | 51 +++++++- + drivers/scsi/ufs/ufshcd.h | 21 ++++ + drivers/scsi/ufs/ufshpb.c | 8 +- + drivers/target/target_core_xcopy.c | 14 +-- + include/scsi/scsi_cmnd.h | 1 - + include/scsi/scsi_host.h | 10 -- + 64 files changed, 1152 insertions(+), 386 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-fc + create mode 100644 drivers/scsi/ufs/ufs-hwmon.c +Merging scsi-mkp/for-next (605ae389ea02 scsi: smartpqi: Update version to 2.1.12-055) +$ 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/target/target_core_configfs.c +Auto-merging drivers/scsi/ufs/ufshpb.c +Auto-merging drivers/scsi/ufs/ufshcd.h +Auto-merging drivers/scsi/ufs/ufshcd.c +CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/scsi_lib.c +Resolved 'drivers/scsi/ufs/ufshcd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5203379000b4] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/ulp/srpt/ib_srpt.c | 38 +- + drivers/scsi/advansys.c | 4 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 42 +- + drivers/scsi/megaraid/megaraid_sas.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 50 ++- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 32 +- + drivers/scsi/pm8001/pm8001_hwi.c | 5 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 3 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 73 +--- + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/smartpqi/smartpqi.h | 61 ++- + drivers/scsi/smartpqi/smartpqi_init.c | 540 ++++++++++++++++++------- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 6 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 60 ++- + drivers/scsi/smartpqi/smartpqi_sis.h | 4 +- + drivers/scsi/ufs/ufshcd.c | 263 +++--------- + drivers/scsi/ufs/ufshcd.h | 14 - + drivers/scsi/ufs/ufshpb.c | 3 - + drivers/target/iscsi/iscsi_target_configfs.c | 91 ++--- + drivers/target/sbp/sbp_target.c | 30 +- + drivers/target/target_core_configfs.c | 1 + + drivers/target/target_core_fabric_configfs.c | 78 +++- + drivers/target/target_core_transport.c | 8 +- + drivers/target/target_core_user.c | 3 +- + drivers/usb/gadget/function/f_tcm.c | 31 +- + include/target/target_core_base.h | 1 + + include/target/target_core_fabric.h | 1 + + 27 files changed, 774 insertions(+), 674 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 (0b52f666126e 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 +- + drivers/rpmsg/rpmsg_char.c | 2 - + drivers/rpmsg/virtio_rpmsg_bus.c | 1 - + include/linux/rpmsg.h | 2 +- + 28 files changed, 982 insertions(+), 248 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 +Auto-merging drivers/pinctrl/qcom/Kconfig +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 (106502e232ed pinctrl: renesas: r8a779[56]x: add MediaLB pins) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'recursive' strategy. + drivers/pinctrl/renesas/pfc-r8a77950.c | 14 ++++++++++++++ + drivers/pinctrl/renesas/pfc-r8a77951.c | 18 ++++++++++++++++-- + drivers/pinctrl/renesas/pfc-r8a7796.c | 18 ++++++++++++++++-- + drivers/pinctrl/renesas/pfc-r8a77965.c | 18 ++++++++++++++++-- + 4 files changed, 62 insertions(+), 6 deletions(-) +Merging pinctrl-samsung/for-next (f9d8de699ac4 pinctrl: samsung: support ExynosAutov9 SoC pinctrl) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 108 +++++++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + 4 files changed, 112 insertions(+) +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 (3f66f86bfed3 per signal_struct coredumps) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging mm/debug.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm_types.h +Auto-merging fs/binfmt_elf.c +Auto-merging arch/ia64/include/asm/ptrace.h +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/ptrace.h | 4 +- + arch/sparc/include/asm/ptrace.h | 8 ++-- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/coredump.c | 88 ++++++----------------------------------- + fs/exec.c | 14 +++---- + fs/proc/array.c | 6 +-- + include/linux/mm_types.h | 13 ------ + include/linux/ptrace.h | 22 +++++------ + include/linux/sched.h | 1 + + include/linux/sched/signal.h | 13 ++++++ + kernel/exit.c | 76 +++++++++++++++++++---------------- + kernel/fork.c | 4 +- + kernel/signal.c | 49 ++++------------------- + mm/debug.c | 4 +- + mm/oom_kill.c | 6 +-- + 16 files changed, 106 insertions(+), 208 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (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 (7caadcfa8a7c rtc: m41t80: return NULL rather than a plain 0 integer) +$ 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-m41t80.c | 2 +- + drivers/rtc/rtc-mcp795.c | 7 + + drivers/rtc/rtc-msc313.c | 259 +++++++++++++++++++++ + drivers/rtc/rtc-omap.c | 1 - + drivers/rtc/rtc-pcf2123.c | 9 + + drivers/rtc/rtc-rx6110.c | 2 +- + drivers/rtc/rtc-s5m.c | 1 - + 13 files changed, 352 insertions(+), 4 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 (7abe699d7951 Merge branch 'for-next/thread_info/cpu' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging net/xfrm/xfrm_user.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/sched.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/ieee80211.h +Auto-merging include/linux/filter.h +Auto-merging drivers/staging/r8188eu/include/ieee80211.h +Auto-merging drivers/iommu/amd/init.c +Auto-merging arch/s390/lib/string.c +Auto-merging arch/riscv/kernel/asm-offsets.c +Auto-merging arch/arm64/kernel/asm-offsets.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + Makefile | 6 +- + arch/arm/boot/compressed/string.c | 1 + + arch/arm64/include/asm/thread_info.h | 1 + + arch/arm64/kernel/asm-offsets.c | 2 +- + arch/arm64/kernel/head.S | 2 +- + arch/powerpc/Makefile | 11 - + arch/powerpc/include/asm/smp.h | 17 +- + arch/powerpc/include/asm/thread_info.h | 3 + + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/riscv/kernel/asm-offsets.c | 1 - + arch/riscv/kernel/entry.S | 5 - + arch/riscv/kernel/head.S | 1 - + arch/s390/include/asm/thread_info.h | 1 + + arch/s390/lib/string.c | 3 + + arch/x86/boot/compressed/misc.h | 2 + + arch/x86/boot/compressed/pgtable_64.c | 2 + + arch/x86/include/asm/thread_info.h | 3 + + arch/x86/lib/string_32.c | 1 + + drivers/char/pcmcia/cm4000_cs.c | 9 +- + drivers/crypto/chelsio/chcr_crypto.h | 14 +- + drivers/cxl/cxl.h | 61 ++--- + drivers/gpu/drm/mga/mga_ioc32.c | 27 +- + drivers/hid/hid-cp2112.c | 14 +- + drivers/hid/hid-roccat-kone.c | 2 +- + drivers/hid/hid-roccat-kone.h | 12 +- + drivers/iommu/amd/init.c | 9 +- + drivers/macintosh/smu.c | 3 +- + drivers/net/can/flexcan.c | 68 ++--- + drivers/net/can/usb/etas_es58x/es581_4.h | 2 +- + drivers/net/can/usb/etas_es58x/es58x_fd.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 14 +- + drivers/net/wireless/ath/ath10k/bmi.h | 10 +- + drivers/net/wireless/ath/ath10k/htt.h | 7 +- + drivers/net/wireless/intel/iwlegacy/commands.h | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 12 +- + drivers/scsi/aic94xx/aic94xx_sds.c | 6 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 3 +- + drivers/scsi/qla4xxx/ql4_def.h | 4 +- + drivers/staging/r8188eu/include/ieee80211.h | 6 +- + drivers/staging/rtl8712/ieee80211.h | 4 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 6 +- + fs/btrfs/root-tree.c | 6 +- + fs/hpfs/hpfs.h | 8 +- + include/linux/compiler-gcc.h | 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/sched.h | 13 +- + include/linux/stddef.h | 65 ++++- + include/linux/string.h | 44 +++- + include/linux/thread_info.h | 2 +- + include/scsi/sas.h | 12 +- + include/uapi/drm/mga_drm.h | 22 +- + include/uapi/linux/dlm_device.h | 4 +- + include/uapi/linux/stddef.h | 37 +++ + include/uapi/rdma/rdma_user_rxe.h | 4 +- + include/uapi/sound/asoc.h | 4 +- + kernel/kallsyms.c | 46 +++- + kernel/sched/sched.h | 4 - + lib/.gitignore | 2 + + lib/Kconfig.debug | 11 + + lib/Makefile | 34 +++ + lib/memcpy_kunit.c | 289 +++++++++++++++++++++ + lib/string.c | 210 +-------------- + lib/string_helpers.c | 195 ++++++++++++++ + lib/test_fortify/read_overflow-memchr.c | 5 + + lib/test_fortify/read_overflow-memchr_inv.c | 5 + + lib/test_fortify/read_overflow-memcmp.c | 5 + + lib/test_fortify/read_overflow-memscan.c | 5 + + lib/test_fortify/read_overflow2-memcmp.c | 5 + + lib/test_fortify/read_overflow2-memcpy.c | 5 + + lib/test_fortify/read_overflow2-memmove.c | 5 + + lib/test_fortify/test_fortify.h | 35 +++ + lib/test_fortify/write_overflow-memcpy.c | 5 + + lib/test_fortify/write_overflow-memmove.c | 5 + + lib/test_fortify/write_overflow-memset.c | 5 + + lib/test_fortify/write_overflow-strcpy-lit.c | 5 + + lib/test_fortify/write_overflow-strcpy.c | 5 + + lib/test_fortify/write_overflow-strlcpy-src.c | 5 + + lib/test_fortify/write_overflow-strlcpy.c | 5 + + lib/test_fortify/write_overflow-strncpy-src.c | 5 + + lib/test_fortify/write_overflow-strncpy.c | 5 + + lib/test_fortify/write_overflow-strscpy.c | 5 + + net/xfrm/xfrm_policy.c | 4 +- + net/xfrm/xfrm_user.c | 2 +- + scripts/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 +- + 100 files changed, 1207 insertions(+), 727 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 (823571f8c6f8 nvmem: imx-ocotp: add support for post processing) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'recursive' strategy. + drivers/nvmem/core.c | 152 ++++++++++++++++++++++++++++------------- + drivers/nvmem/imx-ocotp.c | 25 +++++++ + include/linux/nvmem-provider.h | 5 ++ + 3 files changed, 134 insertions(+), 48 deletions(-) +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 +Already up to date. +Merging kunit/test (6880fa6c5660 Linux 5.15-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (e7198adb84dc kunit: tool: yield output from run_kernel in real time) +$ 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_tool_test.py +Auto-merging tools/testing/kunit/kunit.py +CONFLICT (content): Merge conflict in tools/testing/kunit/kunit.py +Auto-merging lib/kunit/executor_test.c +Resolved 'tools/testing/kunit/kunit.py' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c7e7944fd259] Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + Documentation/dev-tools/kunit/running_tips.rst | 11 +- + lib/kunit/executor.c | 152 ++++++++++++++++++++++--- + lib/kunit/executor_test.c | 110 +++++++++++++++--- + lib/kunit/kunit-test.c | 14 ++- + tools/testing/kunit/kunit.py | 140 +++++++++++++++-------- + tools/testing/kunit/kunit_kernel.py | 92 ++++++++------- + tools/testing/kunit/kunit_tool_test.py | 79 +++++++++++-- + 7 files changed, 466 insertions(+), 132 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/kconfig/confdata.c +CONFLICT (content): Merge conflict in scripts/kconfig/confdata.c +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. +Resolved 'scripts/kconfig/confdata.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ab583bc285aa] 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/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 +- + 128 files changed, 29522 insertions(+), 25 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 009347975fc9] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Tue Oct 12 18:18:22 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/memory.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/mm_types.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/io_uring.c +CONFLICT (modify/delete): fs/cachefiles/rdwr.c deleted in HEAD and modified in folio/for-next. Version folio/for-next of fs/cachefiles/rdwr.c left in tree. +Auto-merging fs/afs/write.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/cachefiles/rdwr.c +rm 'fs/cachefiles/rdwr.c' +$ git commit --no-edit -v -a +[master 1dc5a4a96cd2] 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 d5b190ae8776] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git + Date: Tue Oct 12 18:35:34 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/pci/controller/dwc/pci-dra7xx.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 zstd/zstd-1.4.10 (464413496acb MAINTAINERS: Add maintainer entry for zstd) +$ git merge -m Merge branch 'zstd-1.4.10' of https://github.com/terrelln/linux.git zstd/zstd-1.4.10 +Removing lib/zstd/zstd_opt.h +Removing lib/zstd/zstd_internal.h +Removing lib/zstd/zstd_common.c +Removing lib/zstd/mem.h +Removing lib/zstd/huf_decompress.c +Removing lib/zstd/huf_compress.c +Removing lib/zstd/huf.h +Removing lib/zstd/fse_decompress.c +Removing lib/zstd/fse_compress.c +Removing lib/zstd/fse.h +Removing lib/zstd/error_private.h +Removing lib/zstd/entropy_common.c +Removing lib/zstd/decompress.c +Removing lib/zstd/compress.c +Removing lib/zstd/bitstream.h +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/compress.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 + + crypto/zstd.c | 28 +- + fs/btrfs/zstd.c | 68 +- + fs/f2fs/compress.c | 56 +- + fs/f2fs/super.c | 2 +- + fs/pstore/platform.c | 2 +- + fs/squashfs/zstd_wrapper.c | 16 +- + include/linux/zstd.h | 1252 ++---- + include/linux/zstd_errors.h | 77 + + include/linux/zstd_lib.h | 2432 +++++++++++ + lib/decompress_unzstd.c | 48 +- + lib/zstd/Makefile | 46 +- + lib/zstd/bitstream.h | 380 -- + lib/zstd/common/bitstream.h | 437 ++ + lib/zstd/common/compiler.h | 170 + + lib/zstd/common/cpu.h | 194 + + lib/zstd/common/debug.c | 24 + + lib/zstd/common/debug.h | 101 + + lib/zstd/common/entropy_common.c | 357 ++ + lib/zstd/common/error_private.c | 56 + + lib/zstd/common/error_private.h | 66 + + lib/zstd/common/fse.h | 710 ++++ + lib/zstd/common/fse_decompress.c | 390 ++ + lib/zstd/common/huf.h | 356 ++ + lib/zstd/common/mem.h | 259 ++ + lib/zstd/common/zstd_common.c | 83 + + lib/zstd/common/zstd_deps.h | 125 + + lib/zstd/common/zstd_internal.h | 450 +++ + lib/zstd/compress.c | 3485 ---------------- + lib/zstd/compress/fse_compress.c | 625 +++ + lib/zstd/compress/hist.c | 165 + + lib/zstd/compress/hist.h | 75 + + lib/zstd/compress/huf_compress.c | 905 +++++ + lib/zstd/compress/zstd_compress.c | 5109 ++++++++++++++++++++++++ + lib/zstd/compress/zstd_compress_internal.h | 1188 ++++++ + lib/zstd/compress/zstd_compress_literals.c | 158 + + lib/zstd/compress/zstd_compress_literals.h | 29 + + lib/zstd/compress/zstd_compress_sequences.c | 439 ++ + lib/zstd/compress/zstd_compress_sequences.h | 54 + + lib/zstd/compress/zstd_compress_superblock.c | 850 ++++ + lib/zstd/compress/zstd_compress_superblock.h | 32 + + lib/zstd/compress/zstd_cwksp.h | 482 +++ + lib/zstd/compress/zstd_double_fast.c | 519 +++ + lib/zstd/compress/zstd_double_fast.h | 32 + + lib/zstd/compress/zstd_fast.c | 496 +++ + lib/zstd/compress/zstd_fast.h | 31 + + lib/zstd/compress/zstd_lazy.c | 1414 +++++++ + lib/zstd/compress/zstd_lazy.h | 81 + + lib/zstd/compress/zstd_ldm.c | 686 ++++ + lib/zstd/compress/zstd_ldm.h | 110 + + lib/zstd/compress/zstd_ldm_geartab.h | 103 + + lib/zstd/compress/zstd_opt.c | 1346 +++++++ + lib/zstd/compress/zstd_opt.h | 50 + + lib/zstd/decompress.c | 2531 ------------ + lib/zstd/decompress/huf_decompress.c | 1206 ++++++ + lib/zstd/decompress/zstd_ddict.c | 241 ++ + lib/zstd/decompress/zstd_ddict.h | 44 + + lib/zstd/decompress/zstd_decompress.c | 2085 ++++++++++ + lib/zstd/decompress/zstd_decompress_block.c | 1540 +++++++ + lib/zstd/decompress/zstd_decompress_block.h | 62 + + lib/zstd/decompress/zstd_decompress_internal.h | 202 + + lib/zstd/decompress_sources.h | 28 + + lib/zstd/entropy_common.c | 243 -- + lib/zstd/error_private.h | 53 - + lib/zstd/fse.h | 575 --- + lib/zstd/fse_compress.c | 795 ---- + lib/zstd/fse_decompress.c | 325 -- + lib/zstd/huf.h | 212 - + lib/zstd/huf_compress.c | 773 ---- + lib/zstd/huf_decompress.c | 960 ----- + lib/zstd/mem.h | 151 - + lib/zstd/zstd_common.c | 75 - + lib/zstd/zstd_compress_module.c | 160 + + lib/zstd/zstd_decompress_module.c | 105 + + lib/zstd/zstd_internal.h | 273 -- + lib/zstd/zstd_opt.h | 1014 ----- + 76 files changed, 27373 insertions(+), 12941 deletions(-) + create mode 100644 include/linux/zstd_errors.h + create mode 100644 include/linux/zstd_lib.h + delete mode 100644 lib/zstd/bitstream.h + create mode 100644 lib/zstd/common/bitstream.h + create mode 100644 lib/zstd/common/compiler.h + create mode 100644 lib/zstd/common/cpu.h + create mode 100644 lib/zstd/common/debug.c + create mode 100644 lib/zstd/common/debug.h + create mode 100644 lib/zstd/common/entropy_common.c + create mode 100644 lib/zstd/common/error_private.c + create mode 100644 lib/zstd/common/error_private.h + create mode 100644 lib/zstd/common/fse.h + create mode 100644 lib/zstd/common/fse_decompress.c + create mode 100644 lib/zstd/common/huf.h + create mode 100644 lib/zstd/common/mem.h + create mode 100644 lib/zstd/common/zstd_common.c + create mode 100644 lib/zstd/common/zstd_deps.h + create mode 100644 lib/zstd/common/zstd_internal.h + delete mode 100644 lib/zstd/compress.c + create mode 100644 lib/zstd/compress/fse_compress.c + create mode 100644 lib/zstd/compress/hist.c + create mode 100644 lib/zstd/compress/hist.h + create mode 100644 lib/zstd/compress/huf_compress.c + create mode 100644 lib/zstd/compress/zstd_compress.c + create mode 100644 lib/zstd/compress/zstd_compress_internal.h + create mode 100644 lib/zstd/compress/zstd_compress_literals.c + create mode 100644 lib/zstd/compress/zstd_compress_literals.h + create mode 100644 lib/zstd/compress/zstd_compress_sequences.c + create mode 100644 lib/zstd/compress/zstd_compress_sequences.h + create mode 100644 lib/zstd/compress/zstd_compress_superblock.c + create mode 100644 lib/zstd/compress/zstd_compress_superblock.h + create mode 100644 lib/zstd/compress/zstd_cwksp.h + create mode 100644 lib/zstd/compress/zstd_double_fast.c + create mode 100644 lib/zstd/compress/zstd_double_fast.h + create mode 100644 lib/zstd/compress/zstd_fast.c + create mode 100644 lib/zstd/compress/zstd_fast.h + create mode 100644 lib/zstd/compress/zstd_lazy.c + create mode 100644 lib/zstd/compress/zstd_lazy.h + create mode 100644 lib/zstd/compress/zstd_ldm.c + create mode 100644 lib/zstd/compress/zstd_ldm.h + create mode 100644 lib/zstd/compress/zstd_ldm_geartab.h + create mode 100644 lib/zstd/compress/zstd_opt.c + create mode 100644 lib/zstd/compress/zstd_opt.h + delete mode 100644 lib/zstd/decompress.c + create mode 100644 lib/zstd/decompress/huf_decompress.c + create mode 100644 lib/zstd/decompress/zstd_ddict.c + create mode 100644 lib/zstd/decompress/zstd_ddict.h + create mode 100644 lib/zstd/decompress/zstd_decompress.c + create mode 100644 lib/zstd/decompress/zstd_decompress_block.c + create mode 100644 lib/zstd/decompress/zstd_decompress_block.h + create mode 100644 lib/zstd/decompress/zstd_decompress_internal.h + create mode 100644 lib/zstd/decompress_sources.h + delete mode 100644 lib/zstd/entropy_common.c + delete mode 100644 lib/zstd/error_private.h + delete mode 100644 lib/zstd/fse.h + delete mode 100644 lib/zstd/fse_compress.c + delete mode 100644 lib/zstd/fse_decompress.c + delete mode 100644 lib/zstd/huf.h + delete mode 100644 lib/zstd/huf_compress.c + delete mode 100644 lib/zstd/huf_decompress.c + delete mode 100644 lib/zstd/mem.h + delete mode 100644 lib/zstd/zstd_common.c + create mode 100644 lib/zstd/zstd_compress_module.c + create mode 100644 lib/zstd/zstd_decompress_module.c + delete mode 100644 lib/zstd/zstd_internal.h + delete mode 100644 lib/zstd/zstd_opt.h +Merging akpm-current/current (e395544898ff ipc/ipc_sysctl.c: remove fallback for !CONFIG_PROC_SYSCTL) +$ git merge --no-ff akpm-current/current +Auto-merging security/Kconfig +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/ipv4/tcp.c +Auto-merging mm/workingset.c +Auto-merging mm/vmscan.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap.c +Auto-merging mm/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/oom_kill.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/kasan/report.c +Auto-merging mm/kasan/kasan.h +Auto-merging mm/internal.h +Auto-merging mm/hugetlb.c +Auto-merging mm/filemap.c +Auto-merging mm/debug.c +Auto-merging lib/vsprintf.c +Auto-merging lib/test_kasan.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/workqueue.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +CONFLICT (content): Merge conflict in kernel/sched/core.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +CONFLICT (content): Merge conflict in kernel/exit.c +Auto-merging kernel/dma/swiotlb.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging init/main.c +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched/mm.h +CONFLICT (content): Merge conflict in include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/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/kernel.h +Auto-merging include/linux/kasan.h +Auto-merging include/linux/kallsyms.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/gfp.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/ramfs/inode.c +Auto-merging fs/proc/vmcore.c +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/exec.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/kernel/unwind_orc.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sh/boards/mach-se/7724/setup.c +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Auto-merging arch/s390/kernel/uv.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/powerpc/platforms/pseries/svm.c +Auto-merging arch/powerpc/platforms/pseries/setup.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'include/linux/sched/mm.h' using previous resolution. +Resolved 'kernel/exit.c' using previous resolution. +Resolved 'kernel/sched/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 00dd12d9acff] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/blockdev/zram.rst | 8 + + Documentation/admin-guide/kernel-parameters.txt | 8 +- + Documentation/admin-guide/mm/damon/start.rst | 11 + + Documentation/admin-guide/mm/damon/usage.rst | 51 ++- + 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 | 16 +- + Makefile | 15 + + arch/Kconfig | 28 ++ + arch/alpha/kernel/core_irongate.c | 2 +- + arch/alpha/kernel/traps.c | 4 +- + arch/arc/mm/init.c | 6 +- + arch/arm/mach-hisi/platmcpm.c | 2 +- + arch/arm/mach-rpc/ecard.c | 2 +- + arch/arm/mm/init.c | 2 +- + arch/arm64/Kconfig | 4 + + arch/arm64/mm/kasan_init.c | 16 + + arch/arm64/mm/mmu.c | 4 +- + arch/ia64/mm/contig.c | 2 +- + arch/ia64/mm/init.c | 2 +- + arch/m68k/mm/mcfmmu.c | 3 +- + arch/m68k/mm/motorola.c | 6 +- + arch/microblaze/mm/pgtable.c | 3 +- + arch/mips/loongson64/init.c | 4 +- + arch/mips/mm/init.c | 2 +- + arch/mips/sgi-ip27/ip27-memory.c | 3 +- + arch/mips/sgi-ip30/ip30-setup.c | 6 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/powerpc/include/asm/machdep.h | 2 +- + arch/powerpc/include/asm/sections.h | 13 - + arch/powerpc/kernel/dt_cpu_ftrs.c | 4 +- + arch/powerpc/kernel/paca.c | 8 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + arch/powerpc/mm/hugetlbpage.c | 9 +- + arch/powerpc/mm/pgtable_32.c | 7 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 4 +- + arch/powerpc/platforms/pseries/setup.c | 2 +- + arch/powerpc/platforms/pseries/svm.c | 3 +- + arch/riscv/kernel/setup.c | 4 +- + arch/s390/include/asm/sections.h | 12 - + arch/s390/kernel/setup.c | 11 +- + arch/s390/kernel/smp.c | 4 +- + arch/s390/kernel/uv.c | 2 +- + arch/s390/mm/init.c | 3 - + arch/s390/mm/kasan_init.c | 2 +- + arch/sh/boards/mach-ap325rxa/setup.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 4 +- + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 4 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/um/kernel/mem.c | 2 +- + arch/x86/Kconfig | 6 +- + arch/x86/kernel/aperture_64.c | 13 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/unwind_orc.c | 2 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/init_32.c | 45 +- + arch/x86/mm/kasan_init_64.c | 4 +- + arch/x86/mm/numa.c | 2 +- + arch/x86/mm/numa_emulation.c | 2 +- + arch/x86/xen/mmu_hvm.c | 37 +- + arch/x86/xen/mmu_pv.c | 6 +- + arch/x86/xen/p2m.c | 2 +- + arch/x86/xen/setup.c | 6 +- + drivers/base/Makefile | 2 +- + drivers/base/arch_numa.c | 92 +++- + drivers/base/node.c | 9 +- + drivers/block/zram/zram_drv.c | 66 ++- + drivers/firmware/efi/memmap.c | 2 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 5 +- + drivers/gpu/drm/drm_mm.c | 5 +- + drivers/gpu/drm/i915/i915_vma.c | 5 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 20 +- + drivers/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 | 301 +++++++++---- + drivers/xen/swiotlb-xen.c | 2 +- + fs/binfmt_elf.c | 56 ++- + fs/buffer.c | 56 ++- + fs/coda/cnode.c | 13 +- + fs/coda/coda_linux.c | 39 +- + fs/coda/coda_linux.h | 6 +- + fs/coda/dir.c | 20 +- + fs/coda/file.c | 12 +- + fs/coda/psdev.c | 14 +- + fs/coda/upcall.c | 3 +- + fs/exec.c | 4 +- + fs/hfs/inode.c | 6 +- + fs/hfsplus/catalog.c | 16 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/inode.c | 12 +- + fs/hfsplus/xattr.c | 18 +- + fs/hugetlbfs/inode.c | 7 +- + fs/inode.c | 46 +- + fs/internal.h | 1 - + fs/kernel_read_file.c | 2 +- + fs/ocfs2/alloc.c | 48 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/inode.c | 4 +- + fs/ocfs2/journal.c | 26 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/super.c | 54 +-- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/posix_acl.c | 3 +- + fs/proc/base.c | 21 +- + fs/proc/fd.c | 23 +- + fs/proc/page.c | 40 +- + fs/proc/task_mmu.c | 28 +- + fs/proc/vmcore.c | 105 +++-- + fs/ramfs/inode.c | 11 +- + fs/seq_file.c | 16 - + fs/sysv/super.c | 6 +- + fs/userfaultfd.c | 12 +- + include/asm-generic/sections.h | 89 ++-- + include/linux/cma.h | 1 + + include/linux/compiler-gcc.h | 8 + + include/linux/compiler_attributes.h | 10 + + include/linux/compiler_types.h | 12 + + include/linux/cpuhotplug.h | 4 + + include/linux/cpuset.h | 17 + + include/linux/crash_dump.h | 26 +- + include/linux/damon.h | 92 +++- + include/linux/elfcore.h | 2 +- + include/linux/fs.h | 1 + + include/linux/gfp.h | 4 +- + include/linux/highmem.h | 28 +- + include/linux/hugetlb.h | 17 +- + include/linux/kallsyms.h | 13 +- + include/linux/kasan.h | 8 + + include/linux/kernel.h | 3 +- + include/linux/memblock.h | 48 +- + include/linux/memory.h | 20 +- + 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 | 56 +-- + 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 | 6 +- + include/linux/rmap.h | 8 +- + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 21 + + include/linux/secretmem.h | 2 +- + include/linux/seq_file.h | 17 +- + include/linux/slab.h | 135 ++++-- + include/linux/stackdepot.h | 11 +- + include/linux/stacktrace.h | 1 + + include/linux/string_helpers.h | 1 + + include/linux/swap.h | 1 - + include/linux/vmalloc.h | 24 +- + include/trace/events/mmap_lock.h | 48 +- + 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/kexec_file.c | 5 + + kernel/kthread.c | 21 +- + kernel/locking/lockdep.c | 18 +- + kernel/printk/printk.c | 4 +- + kernel/resource.c | 54 ++- + kernel/sched/core.c | 35 +- + kernel/sched/sched.h | 4 +- + kernel/sched/topology.c | 1 - + kernel/stacktrace.c | 30 ++ + kernel/sysctl.c | 8 +- + kernel/trace/ftrace.c | 2 +- + kernel/tsacct.c | 2 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 8 +- + lib/bootconfig.c | 2 +- + lib/cpumask.c | 2 +- + lib/stackdepot.c | 118 +++-- + lib/test_kasan.c | 26 +- + lib/test_kasan_module.c | 2 + + lib/vsprintf.c | 3 +- + mm/Kconfig | 18 +- + mm/cma.c | 26 +- + mm/damon/Kconfig | 2 +- + mm/damon/core.c | 137 +++++- + mm/damon/dbgfs.c | 166 ++++++- + mm/damon/vaddr.c | 58 +++ + mm/debug.c | 20 +- + mm/debug_vm_pgtable.c | 7 +- + mm/filemap.c | 20 +- + mm/gup.c | 5 +- + mm/hugetlb.c | 495 +++++++++++++++++++-- + mm/internal.h | 1 + + mm/kasan/common.c | 8 +- + mm/kasan/generic.c | 14 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/report.c | 17 +- + mm/kasan/shadow.c | 5 + + mm/kfence/core.c | 184 ++++++-- + mm/kfence/kfence.h | 2 + + mm/kfence/kfence_test.c | 14 +- + mm/memblock.c | 37 +- + mm/memcontrol.c | 138 +++--- + mm/memory-failure.c | 1 + + mm/memory.c | 162 +++---- + mm/memory_hotplug.c | 59 +-- + mm/mempolicy.c | 28 +- + 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_ext.c | 2 +- + 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 | 56 +-- + mm/sparse-vmemmap.c | 2 +- + mm/sparse.c | 2 +- + mm/swap.c | 23 +- + mm/swapfile.c | 6 +- + mm/truncate.c | 19 +- + mm/userfaultfd.c | 3 +- + mm/vmalloc.c | 106 +++-- + 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 | 4 +- + scripts/const_structs.checkpatch | 4 + + scripts/decodecode | 2 +- + scripts/spelling.txt | 16 + + security/Kconfig | 14 - + tools/testing/selftests/damon/debugfs_attrs.sh | 13 + + tools/testing/selftests/memory-hotplug/config | 1 - + tools/testing/selftests/proc/.gitignore | 1 + + tools/testing/selftests/proc/Makefile | 2 + + tools/testing/selftests/proc/proc-tid0.c | 81 ++++ + tools/testing/selftests/vm/ksm_tests.c | 29 +- + tools/testing/selftests/vm/userfaultfd.c | 180 ++++---- + tools/vm/page-types.c | 38 +- + tools/vm/page_owner_sort.c | 94 +++- + 287 files changed, 4318 insertions(+), 2009 deletions(-) + rename Documentation/{vm => admin-guide/mm}/swap_numa.rst (100%) + rename Documentation/{vm => admin-guide/mm}/zswap.rst (100%) + create mode 100644 tools/testing/selftests/proc/proc-tid0.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +Rebasing (1/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 + + 17e9f73b8452...5cecc0f77c49 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5cecc0f77c49 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..89eda15834a8 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20211012 |