diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-08-20 19:20:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-08-20 19:20:53 +1000 |
| commit | 86ed57fd8c93fdfaabb4f58e78455180fa7d8a84 (patch) | |
| tree | f17db5667fbdbc03288aae27b9dd91679b539f99 | |
| parent | 19ae86dc6f228bf141ab20ae768863761719f9ec (diff) | |
| download | linux-next-86ed57fd8c93fdfaabb4f58e78455180fa7d8a84.tar.gz | |
Add linux-next specific files for 20210820next-20210820
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 335 | ||||
| -rw-r--r-- | Next/Trees | 337 | ||||
| -rw-r--r-- | Next/merge.log | 12514 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 13187 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..d53e8e35e648 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,335 @@ +Name SHA1 +---- ---- +origin f87d64319e6f980c82acfc9b95ed523d053fb7ac +fixes 614124bea77e452aa6df7a8714e8bc820b489922 +kbuild-current 36a21d51725af2ce0700c6ebcb6b9594aac658a6 +arc-current 7c60610d476766e128cc4284bb6349732cbd6606 +arm-current 463dbba4d189750c2f576449d0bbb11c5413712e +arm64-fixes bde8fff82e4a4b0f000dbf4d5eadab2079be0b56 +arm-soc-fixes 1e16a40211208d2d6e217e5013607219f4272dff +drivers-memory-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +m68k-current 21ed49265986931b8921a2404394426870245bd2 +powerpc-fixes 9f7853d7609d59172eecfc5e7ccf503bc1b690bd +s390-fixes 2a671f77ee49f3e78997b77fdee139467ff6a598 +sparc 05a59d79793d482f628a31753c671f2e92178a21 +fscrypt-current d19d8d345eecd9247cbe6cbf27aef271bd88aba7 +net f87d64319e6f980c82acfc9b95ed523d053fb7ac +bpf 316749009fdf9a3d4a9641a257bbd7ec496c7c90 +ipsec 480e93e12aa04d857f7cc2e6fcec181c0d690404 +netfilter e3245a7b7b34bd2e97f744fd79463add6e9d41f4 +ipvs 269fc69533de73a9065c0b7971bcd109880290b3 +wireless-drivers abf3d98dee7c4038152ce88833ddc2189f68cbd4 +mac80211 0a298d133893c72c96e2156ed7cb0f0c4a306a3e +rdma-fixes 17f2569dce1848080825b8336e6b7c6900193b44 +sound-current 65ca89c2b12cca0d473f3dd54267568ad3af55cc +sound-asoc-fixes 70212c4c657fd2f475bdf619728b0f002964435f +regmap-fixes ff1176468d368232b684f75e82563369208bc371 +regulator-fixes 3f00f451f6d158b678aedb48677b8ac82a1743be +spi-fixes 80b3a98085574e451ef041a819d592f542ea4d56 +pci-current 045a9277b5615846c7b662ffaba84e781f08a172 +driver-core.current 36a21d51725af2ce0700c6ebcb6b9594aac658a6 +tty.current 36a21d51725af2ce0700c6ebcb6b9594aac658a6 +usb.current 5571ea3117ca22849072adb58074fb5a2fd12c00 +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 8da0e55c7988ef9f08a708c38e5c75ecd8862cf8 +usb-chipidea-fixes 5df09c15bab98463203c83ecab88b9321466e626 +phy e73f0f0ee7541171d89f2e2491130c7771ba58d3 +staging.current 7c60610d476766e128cc4284bb6349732cbd6606 +iio-fixes a5056c0bc24f6c9982cfe6f4e3301f3c7d682191 +char-misc.current d30836a9528906ee9d42b7cd59108f3bb4e16b01 +soundwire-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +thunderbolt-fixes 7c60610d476766e128cc4284bb6349732cbd6606 +input-current 818b26588994d9d95743fca0a427f08ec6c1c41d +crypto-current 5261cdf457ce3635bf18d393a3c1991dcfaf9d02 +vfio-fixes dc51ff91cf2d1e9a2d941da483602f71d4a51472 +kselftest-fixes 567c39047dbee341244fe3bf79fea24ee0897ff9 +modules-fixes 055f23b74b20f2824ce33047b4cf2e2aa856bf3b +dmaengine-fixes 7199ddede9f0f2f68d41e6928e1c6c4bca9c39c0 +backlight-fixes a38fd8748464831584a19438cbb3082b5a2dab15 +mtd-fixes b48027083a78b13356695555a05b0e085e378687 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes f1de1c7803595e937ce9b922807f499851225021 +reset-fixes 1435f82689e1d195e56ce8b19c81aa7b1a3bd0b0 +mips-fixes 6aa32467299e9e12280a6aec9dbc21bf2db830b0 +at91-fixes 6efb943b8616ec53a5e444193dccf1af9ad627b5 +omap-fixes e879f855e590b40fe3c79f2fbd8f65ca3c724120 +kvm-fixes c7dfa4009965a9b2d7b329ee970eb8da0d32f0bc +kvms390-fixes cd4220d23bf3f43cf720e82bdee681f383433ae2 +hwmon-fixes 03726fd90f4bc4ea309f9bf6faf24960d6d2e986 +nvdimm-fixes 96dcb97d0a40a60b9aee9f2c7a44ce8a1b6704bc +cxl-fixes fae8817ae804a682c6823ad1672438f39fc46c28 +btrfs-fixes 01e9fcf19c1329a46a924d7bf4b45968efa163b3 +vfs-fixes 173e84953eaaf17864a707efa2b8cd4c233b3129 +dma-mapping-fixes 18a3c5f7abfdf97f88536d35338ebbee119c355c +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes 1e35b8a7780a0c043cc5389420f069b69343f5d9 +samsung-krzk-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +pinctrl-samsung-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +devicetree-fixes 50d8d7e19c4398da74d028f367754e73547b078b +scsi-fixes 40d32727931cee82cdc5aaca25ce725d1f3ac864 +drm-fixes 7c60610d476766e128cc4284bb6349732cbd6606 +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes e3e86f41385b2b5d5f771de6009748b584334366 +mmc-fixes 419dd626e357e89fc9c4e3863592c8b38cfe1571 +rtc-fixes bd33335aa93d615cac77d991c448b986761e7a8d +gnss-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hyperv-fixes f5a11c69b69923a4367d24365ad4dff6d4f3fc42 +soc-fsl-fixes c1e64c0aec8cb0499e61af7ea086b59abba97945 +risc-v-fixes fdf3a7a1e0a67a52f631b055975c6ac7e0e49a65 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 1d345c3e59412bd7d732dcc6b1a22f0665263680 +spdx 36a21d51725af2ce0700c6ebcb6b9594aac658a6 +gpio-brgl-fixes 9b87f43537acfa24b95c236beba0f45901356eb2 +gpio-intel-fixes e73f0f0ee7541171d89f2e2491130c7771ba58d3 +pinctrl-intel-fixes 2f658f7a3953f6d70bab90e117aff8d0ad44e200 +erofs-fixes 0852b6ca941ef3ff75076e85738877bd3271e1cd +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +ubifs-fixes 78c7d49f55d8631b67c09f9bfbe8155211a9ea06 +memblock-fixes 024591f9a6e0164ec23301784d1e6d8f6cacbe59 +cel-fixes 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 +irqchip-fixes 1fee9db9b42d821e8007289d4eea74bdf85b1543 +renesas-fixes 432b52eea3dcf48083bafa4b2b6ef5b054ead609 +drm-misc-fixes fa0b1ef5f7a694f48e00804a391245f3471aa155 +kspp-gustavo 7bc04ce6b914a06d5823509d1de237787c58e649 +kbuild fb3fdea450305d932d933d7e75eead0477249d8e +compiler-attributes 7ed012969bbcdbd7aef5778a061681e6cbc4b402 +dma-mapping c1dec343d7abdf8e71aab2a289ab45ce8b1afb7e +asm-generic 8f76f9c46952659dd925c21c3f62a0d05a3f3e71 +arc 28bfbfd7a7138e0883d747933f0ad4a1d1ec0be5 +arm 3e9a47a713641ab19be5bfa67061241def49e12a +arm64 92b5529ab76eefb0f8a2f5327910ffcf485a4982 +arm-perf fd264b310579efc14436b2ec86defa5d4c31332e +arm-soc 4364229fd55868a856a221885d319a50c254e986 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic 6285af2a2821573b26d246b801b63e9057d695e1 +aspeed 0f32f00af3443b9199790d340942273fd8ce436f +at91 b102356e5bc1e99afc0d733015a3096440dacfdb +drivers-memory c28b584deb1bc81f8a2454b43c82cdda17ed29f6 +imx-mxs 2cb411d8967664aa09ecffd781cb2181b7a40e77 +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 69862ae4e37890fa4313d55ad51dcd5927457e7e +mvebu 930af8dda7509ce6c79cb44401b79f876599faac +omap 7911f95d1713e1e7e0a2b3ee4c1624ad9cc85847 +qcom 57249830120b710b62c0ec21cb33be995cadbda4 +raspberrypi b1f2fcb28228593be5bed5bc5ae6c3e68d760ab0 +renesas 59d7f78144a8a34a290ba84931721eaf11e66ca9 +reset bee08559701fb98b43d7061717e7c3131230aa69 +rockchip abfe14de9197eb1f18e719fbcd94ff255107ae93 +samsung-krzk 90861bf54255ebe721c25390bd101544ba408c69 +scmi 7c414a7d93c6d979d4936fde25a42365f08718bf +stm32 1e6bc5987a5252948e3411e5a2dbb434fd1ea107 +sunxi 3f1c53207cf051d9aec85e9139bd35ada6184143 +tegra cc701ccede61227107787cf8373cee12d89b6cbb +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +ti-k3-new c1fa5ac6c2f475b5140e6323801ed93c24e7e5cf +xilinx 4cddd9be7ef639a6f514b66b1c90f89757995151 +clk 765f4fa0e9f181cb786267838dcf72659a59a896 +clk-imx fb3f4bca19b362c57e1d17b0c1aedd7450f0588e +clk-renesas e8425dd55abb12881694875972465f40bb0fe41b +clk-samsung a38fd8748464831584a19438cbb3082b5a2dab15 +csky 90dc8c0e664efcb14e2f133309d84bfdcb0b3d24 +h8300 1ec10274d436fbe77b821fbdf095b45d0888e46d +m68k 2189e928b62e91d8efbc9826ae7c0968f0d55790 +m68knommu 07c4e80124d106cd9966ac138e48ffb5c11399f5 +microblaze 14a832498c23cf480243222189066a8006182b9d +mips 4d2ee1be4c2a5552f083b6d7db4be224f96313b5 +nds32 40e0dd851e7b7afe219820fb270b09016e41d4fc +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 94effcedaa543825ad9c80831450d4fbfa284880 +parisc-hd ca2b19a4bdb6200dc1d64619ea4b8de2a84a0439 +powerpc 8b893ef190b0c440877de04f767efca4bf4d6af8 +soc-fsl 242b0b398ccd34f73772120bd27a87a1bf00e30b +risc-v 8ba1a8b77ba1eb3aef441ed2caf28ab2b1261f5f +s390 54157006715d6c48d7265d23a2293517005946ba +sh 2882b7626f4903a8e9250b328cdf7396a6deecac +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 1aee020155f364ef538370d3392969f1077b9bae +xtensa 7b7cec477fc3cd42ce565dfc3e53f144504fc95c +pidfd f4dd02cd86310749b53061767382cd9c9d2e2cf4 +fscrypt 38ef66b05cfa3560323344a0b3e09e583f1eb974 +fscache 5193f26aef591d289b74fcf2055fef002bd25432 +afs 7af08140979a6e7e12b78c93b8625c8d25b084e2 +btrfs b61bdbb49be3b183b751c788e3276a9238d462bd +ceph 8434ffe71c874b9c4e184b88d25de98c2bf5fe3f +cifs 1c2809b3d6e68ad1612160ec3cba15dbb11c3bf4 +cifsd bdbb7400523b3467015de3b9daa56220fd526b13 +configfs 769f52676756b8c5feb302d2d95af59577fc69ec +ecryptfs 682a8e2b41effcaf2e80697e395d47f77c91273f +erofs eadcd6b5a1eb39866ab8d8a3e4f2e51bc51a2350 +exfat 50be9417e23af5a8ac860d998e1e3f06b8fd79d7 +ext3 a95dc17633ab71f8f487075ae3574bb9cb0ebc33 +ext4 6c6ce4d7146559511fe4ed70f2bc69a89c2c7a88 +f2fs bbe1da7e34ac5a830163bfdfa09cbe3dadfda3ce +fsverity 07c99001312cbf90a357d4877a358f796eede65b +fuse 76224355db7570cbe6b6f75c8929a1558828dd55 +gfs2 98fd6514d37b47db3c30612682a62d77408f4653 +jfs 5d299f44d7658f4423e33a0b9915bc8d81687511 +nfs 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +nfs-anna ca7d1d1a0b975d3d8aaaeab008a07bb3d3c5ec7e +nfsd ab1016d39cc052064e32f25ad18ef8767a0ee3b8 +cel 729580ddc53efd8093371788721487024c9b2f71 +ntfs3 96b18047a7172037ff4206720f4e889670030b41 +orangefs 0fdec1b3c9fbb5e856a40db5993c9eaf91c74a83 +overlayfs 332f606b32b6291a944c8cf23b91f53a6e676525 +ubifs a801fcfeef96702fa3f9b22ad56c5eb1989d9221 +v9fs 732b33d0dbf17e9483f0b50385bf606f724f50a2 +xfs a437b9b488e36e41026888fc0aa20ec83f39a643 +zonefs 95b115332a835fb0cbd36dfabacf1c57d915e705 +iomap 742dd4b8c5bbf1547c3090d42be76cb92a33feb1 +djw-vfs d03ef4daf33a33da8d7c397102fff8ae87d04a93 +file-locks e1cc6e8c1969a598119b7a5578a08f6d9d0d14c4 +vfs d75b9fa053e4cd278281386d860c26fdbfbe9d03 +printk 23d8adcf8022b9483605531d8985f5b77533cb3a +pci 7fc74df20a8779d6676113cbfb9fcbf97a1c6d19 +pstore c5d4fb2539cad2e62c5a3f0d8237613c394f297e +hid e2e4893180f321a23795827af3305ccfc68c1556 +i2c ec1127b4dd61e802d90b92d879d811db317f526f +i3c e73f0f0ee7541171d89f2e2491130c7771ba58d3 +dmi 3cb4d29a2633170208c96240c7e85148679ceee3 +hwmon-staging b51f752c586c2a5b93790896093713e5537f849f +jc_docs 37397b092e7f4b520a257aaafe83f868cd3d5e27 +v4l-dvb 9c3a0f285248899dfa81585bc5d5bc9ebdb8fead +v4l-dvb-next 19e95228c722ad458ef03f4a45e7740a640252f7 +pm 10bc7fbefe3a9ab4a8e7531752e200ceff5919c7 +cpufreq-arm 86afc1df661a99dcd6b8d264cae171f1ead2b7b8 +cpupower 5499f2b80b562c07b5aee157dee51d083083ab97 +devfreq e73f0f0ee7541171d89f2e2491130c7771ba58d3 +opp e122d7edf1a289acdfe1cd0b95db454e7a4c95f3 +thermal 0284b52e85341e3cd4b70c8b2423fd23b8a003a8 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm aee742c9928ab4f5f4e0b00f41fb2d2cffae179e +swiotlb a449ffaf9181b5a2dc705d8a06b13e0068207fd4 +rdma d2b10794fc1312f856d67d0a6454aaa3ae96c595 +net-next 9e5f10fe577be7974c721c0c2050fa6c967d4565 +bpf-next f2a6ee924d26527dc55a745dc917a820f34e64e5 +ipsec-next 5d8dbb7fb82b8661c16d496644b931c0e2e3a12e +mlx5-next 598fe77df855feeeca9dfda2ffe622ac7724e5c3 +netfilter-next 6f45933dfed0c1d90c2d9acfe6b782c5560ee038 +ipvs-next 9344988d2979ce9eefe136a69efcf692615ebba8 +wireless-drivers-next d249ff28b1d8478419caf347c4836361a47b0c5b +bluetooth 61969ef867d48fc76551fe50cefe0501e624766e +mac80211-next c448f0fd2ce59947b3b8b8d6b56e15036449d1f1 +mtd a89d69a44e282be95ae76125dddc79515541efeb +nand 0792ec82175ec45a0f45af6e0f2d3cb49c527cd4 +spi-nor 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +crypto 9491923e4a68d696f7d0817a02829ed238783716 +drm 397ab98e2d69cede84444a28eab77a171983d14e +drm-misc d03a493f6782b94b7002388d470cb583e061816a +amdgpu 06a631a080508d047fbcf1ed71e7f87499d87331 +drm-intel c00e14cd4d3fbc5469d6e367371f9e4786a08c03 +drm-tegra fed0289394173509b3150617e17739d0094ce88e +drm-msm cb0927ab80d224c9074f53d1a55b087d12ec5a85 +imx-drm 59e4e762a17daf34307d5cf90fdad2725bfccb54 +etnaviv 81fd23e2b3ccf71c807e671444e8accaba98ca53 +regmap cc15156265f035702859a87380eff977a7a94210 +sound d2d837563743590cbf07bf786941e73a8c40b031 +sound-asoc dc392f00eb585b0054735c2329a6b18350b474d9 +modules ced75a2f5da71de5775fda44250e27d7b8024355 +input 76ba1900cb67390d963e07457ebf679c56c59094 +block 39916d4054e787c824300fe94b49e4344b250163 +device-mapper 528b16bfc3ae5f11638e71b3b63a81f9999df727 +pcmcia e39cdacf2f664b09029e7c1eb354c91a20c367af +mmc 7d6fab2c3ea8a5e18571ee176663ef7ea1eeeb34 +mfd be722576fd63246b6bb60a29c3c8f78652d376da +backlight 79fad92f2e596f5a8dd085788a24f540263ef887 +battery eaa2c490514d2d49c3ef1764530234d07f422289 +regulator aa9f92097dcc83848ee7e4ea5ddbdd15db5eff64 +security 047843bdb3160e8fb225f3752616ac7257033fe4 +apparmor d108370c644b153382632b3e5511ade575c91c86 +integrity d07eeeb8745973389e1d772b3b654f5860441589 +keys e377c31f788fc98815e1ab90b5a35704ce35843a +safesetid 1b8b719229197b7afa1b1191e083fb41ace095c5 +selinux 893c47d1964f5c9b00c5468f2cd1a1e9351fbb6a +smack bfc3cac0c76126995737f1b858d2cdb476be5b1d +tomoyo ff1176468d368232b684f75e82563369208bc371 +tpmdd ada16d6b0f0a0d50647999a636a867d87df2760f +watchdog cf813c67d9619fd474c785698cbed543b94209dd +iommu cf1f65a86d4525fccbc0285d8c9903638bd53d2d +audit d97e99386ad0dcae08cb0f0c70efa806a2d4811c +devicetree ec6c6c9c1386ac05a47cc4da554c6cb742d5f7a3 +mailbox 4f197188da668180d5ea7d808ae6221ce66cfe33 +spi 5d14499b5016f5d84ae25be6e525b34c1fa44111 +tip a27fdfde0570b552d0ba088938c6cf5833e5dbe1 +clockevents 631c7c0df0ef691ac93622819028760bc2e993c0 +edac 7d07deb3b838ae93994003cf824515acb352eef3 +irqchip cf39e60c83f1eddcf93d36fe01f1440a91d25214 +ftrace db396be6ddc4b953db3a725e19945fd4f151cfe9 +rcu 213605c149ff869a7206db53eefbee14fd22a78d +kvm 5a4bfabcc865644b63bd64f46fdd5ceb0287b677 +kvm-arm f2267b87ecd5071a8cd2b52e2b5c5a72387daeae +kvm-ppc 72476aaa469179222b92c380de60c76b4cb9a318 +kvms390 1f703d2cf20464338c3d5279dddfb65ac79b8782 +xen-tip 88ca2521bd5b4e8b83743c01a2d4cb09325b51e9 +percpu a81a52b325ec886eb004ca28b943480dae0353c7 +workqueues bdb0a6548d2233dada752109a71bcf4c9b8ae6d6 +drivers-x86 2010319b3c438ba428e9a5c54998c5b05631cf78 +chrome-platform e73f0f0ee7541171d89f2e2491130c7771ba58d3 +hsi e73f0f0ee7541171d89f2e2491130c7771ba58d3 +leds 3d3d65bd27645830a6f23af29d0f9ebe5cc8bcb2 +ipmi bf064c7bec3bfe7e28889774dc9e0ca4f7236775 +driver-core bd1e336aa8535a99f339e2d66a611984262221ce +usb e4788edc730a0d2b26e1ae1f08fbb3f635b92dbb +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 4e9340bb551a5ad664196465ba7620009d835dbc +usb-chipidea-next 956df1bb0ab8bb823541e66d186ed65559541b69 +tty 88c1d2478ec8a420cf60a3c25503e37b34fea5aa +char-misc b2159182dd498fdb0f49e371ccc94efbc12d1f8e +extcon 07de34f5ce1e76811d8567b41ccfff244d78874c +phy-next 34633219b8947314d369ddf7bc2e45ac5aec7765 +soundwire dd81e7c3f0bb4fbe48b770b389ab6ccb95058dab +thunderbolt 42716425ad7e1b6529ec61c260c11176841f4b5f +vfio eb24c1007e6852e024dc33b0dd9617b8500a1291 +staging 093991aaadf0fbb34184fa37a46e7a157da3f386 +iio d484c21bacfa8bd2fa9fc26393ec59108f508c4c +mux 3516bd729358a2a9b090c1905bd2a3fa926e24c6 +icc 8bf5d31c4f06d806ae24a3ba998a2f4eaccfa7c1 +dmaengine 9760383b22edbfa407a1647969c26d62a501631f +cgroup c5b6c8a56ef3fda7ab7d6d573f445ba9028cb696 +scsi 52e22d4d4e3707b029e4b77eea9cff67ac18c7dd +scsi-mkp 848ade90ba9c1e2bc2f7869fbe5d08bb32f3db09 +vhost 879753c816dbbdb2a9a395aa4448d29feee92d1a +rpmsg c93ca5f21d9362aac84438e06b5280460a038319 +gpio 7ac554888233468a9fd7c4f28721396952dd9959 +gpio-brgl d0ef631d40baa2be1951d122ca59d0cf6e39cf46 +gpio-intel 5111c2b6b0194b509f47e6338c4deeeb4497bda8 +pinctrl 04853352952b7dd17f355ed54bd81305b341af55 +pinctrl-intel 2f658f7a3953f6d70bab90e117aff8d0ad44e200 +pinctrl-renesas c4c4637eb57f2a25c445421aadeb689a2538b20b +pinctrl-samsung cdd3d945dcec0d0dab845175dc9400ab54512aa6 +pwm 7954f76161eab5b87f3f60a3d1326e798dd44b7d +userns 534471c614f871483333be68516fe926c6e2ca22 +ktest 170f4869e66275f498ae4736106fb54c0fdcd036 +kselftest 2734d6c1b1a089fb593ef6a23d4b70903526fe0c +livepatching cd2d68f2d6b2e5cee0b49c13cef052baca8c0b76 +coresight 1efbcec2ef8c037f1e801c76e4b9434ee2400be7 +rtc 8158da6a33f2656c2a98c30eb9185a44e215a6b6 +nvdimm 30c10d32152dd09c2158e9cab8a6c7adaa09278e +at24 658ae44345c1b9b9e055c2e40464dc0260878462 +ntb 28293b6c68cd93178f021f51b1b504f3ec33f463 +seccomp b4d8a58f8dcfcc890f296696cadb76e77be44b5f +kspp b88972649fa071caa5633a12c64f9b03504d6503 +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 0f79ce970e79ffb771733f9634d5918d0eb3e30a +fsi 9ab1428dfe2c66b51e0b41337cd0164da0ab6080 +slimbus e5c578adcdd974f73380f0e5a5595354fcab0d60 +nvmem 80c3356bea4e90ffa420a57c1e689738ebaf3d63 +xarray 2c7e57a02708a69d0194f9ef2a7b7e54f5a0484a +hyperv 7aff79e297ee1aa0126924921fd87a4ae59d2467 +auxdisplay 24ebc044c72ee6e88dc902a0041bac672f012537 +kgdb e868f0a3c4b9c1d7721f08b703142a876814a3f8 +hmm fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +fpga 4f45f3404960109843eaa92c8a4a850d6bdd9981 +kunit e73f0f0ee7541171d89f2e2491130c7771ba58d3 +cfi ff1176468d368232b684f75e82563369208bc371 +kunit-next acd8e8407b8fcc3229d6d8558cac338bea801aed +trivial 9ff9b0d392ea08090cd1780fb196f36dbb586529 +mhi 813272ed5238b37c81e448b302048e8008570121 +memblock e888fa7bb882a1f305526d8f49d7016a7bc5f5ca +init 38b082236e77d403fed23ac2d30d570598744ec3 +counters e71ba9452f0b5b2e8dc8aa5445198cd9214a6a62 +rust 5d3986cf8ed63ff8d86270e578649e71143112d6 +cxl ceeb0da0a0322bcba4c50ab3cf97fe9a7aa8a2e4 +folio 1a90e9dae32ce26de43c1c5eddb3ecce27f2a640 +akpm-current 2832d098abfdcfc48d19042adb7121b91a2ccc64 +akpm 652afd45cf138e4831b1ef11b7275ce6d10436fb diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..27f06675e963 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,337 @@ +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 +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 +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti-k3 git git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux.git#ti-k3-next +ti-k3-new git git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git#ti-k3-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +cifsd git https://github.com/smfrench/smb3-kernel.git#cifsd-for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +cel git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#for-usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git#for-next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +counters git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#counters +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..e00879e7ff7a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12514 @@ +$ date -R +Fri, 20 Aug 2021 08:43:36 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 75% (6117/8070)
Updating files: 76% (6134/8070)
Updating files: 77% (6214/8070)
Updating files: 78% (6295/8070)
Updating files: 79% (6376/8070)
Updating files: 80% (6456/8070)
Updating files: 81% (6537/8070)
Updating files: 82% (6618/8070)
Updating files: 83% (6699/8070)
Updating files: 84% (6779/8070)
Updating files: 85% (6860/8070)
Updating files: 86% (6941/8070)
Updating files: 87% (7021/8070)
Updating files: 88% (7102/8070)
Updating files: 89% (7183/8070)
Updating files: 90% (7263/8070)
Updating files: 91% (7344/8070)
Updating files: 92% (7425/8070)
Updating files: 93% (7506/8070)
Updating files: 94% (7586/8070)
Updating files: 95% (7667/8070)
Updating files: 96% (7748/8070)
Updating files: 97% (7828/8070)
Updating files: 98% (7909/8070)
Updating files: 99% (7990/8070)
Updating files: 100% (8070/8070)
Updating files: 100% (8070/8070), done. +HEAD is now at d6d09a694205 Merge tag 'for-5.14-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux +Merging origin/master (f87d64319e6f Merge tag 'net-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge origin/master +Updating d6d09a694205..f87d64319e6f +Fast-forward + drivers/net/dsa/sja1105/sja1105_mdio.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 113 ++++++++++++++------- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 36 +++---- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 +- + drivers/net/ethernet/intel/iavf/iavf.h | 1 + + drivers/net/ethernet/intel/iavf/iavf_main.c | 1 + + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 47 ++++++++- + drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 5 +- + drivers/net/ethernet/mscc/ocelot.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 20 ++++ + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +- + drivers/net/hamradio/6pack.c | 6 ++ + drivers/net/mdio/mdio-mux.c | 37 ++++--- + drivers/net/usb/asix_common.c | 70 ++++++------- + drivers/net/usb/r8152.c | 23 ++++- + drivers/net/virtio_net.c | 14 +-- + drivers/net/vrf.c | 4 + + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 25 +++-- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 70 ++++++++++++- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 3 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 3 +- + drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c | 7 +- + drivers/platform/x86/asus-nb-wmi.c | 28 +++++ + drivers/platform/x86/gigabyte-wmi.c | 2 + + drivers/ptp/Kconfig | 3 +- + include/net/flow_offload.h | 12 +-- + kernel/bpf/helpers.c | 22 ++-- + kernel/bpf/verifier.c | 1 + + net/mac80211/main.c | 2 + + net/mptcp/options.c | 10 +- + net/mptcp/pm_netlink.c | 44 +++----- + net/openvswitch/vport.c | 1 + + net/rds/ib_frmr.c | 4 +- + net/sched/sch_cake.c | 2 +- + net/tipc/socket.c | 2 +- + tools/testing/selftests/bpf/verifier/dead_code.c | 12 +++ + 41 files changed, 448 insertions(+), 206 deletions(-) +Merging fixes/fixes (614124bea77e Linux 5.13-rc5) +$ git merge fixes/fixes +Already up to date. +Merging kbuild-current/fixes (36a21d51725a Linux 5.14-rc5) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (7c60610d4767 Linux 5.14-rc6) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (463dbba4d189 ARM: 9104/2: Fix Keystone 2 kernel mapping regression) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/include/asm/memory.h | 7 ++++--- + arch/arm/kernel/head.S | 17 ++++++++++++++--- + arch/arm/mm/mmu.c | 9 ++++++++- + arch/arm/mm/pv-fixup-asm.S | 2 +- + 4 files changed, 27 insertions(+), 8 deletions(-) +Merging arm64-fixes/for-next/fixes (bde8fff82e4a arm64: initialize all of CNTHCTL_EL2) +$ git merge arm64-fixes/for-next/fixes +Merge made by the 'recursive' strategy. + arch/arm64/Makefile | 2 ++ + arch/arm64/include/asm/el2_setup.h | 3 +-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging arm-soc-fixes/arm/fixes (1e16a4021120 Merge tag 'omap-for-v5.14/gpt12-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes) +$ git merge arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/configs/nhk8815_defconfig | 8 +-- + arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 48 ++++++------- + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 12 ++++ + .../arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 4 ++ + arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 4 +- + drivers/bus/ti-sysc.c | 4 +- + drivers/pci/controller/pci-ixp4xx.c | 8 +-- + drivers/soc/fsl/qe/qe_ic.c | 84 ++++++++++++---------- + 10 files changed, 103 insertions(+), 75 deletions(-) +Merging drivers-memory-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge drivers-memory-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (21ed49265986 m68k: MAC should select HAVE_PATA_PLATFORM) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (9f7853d7609d powerpc/mm: Fix set_memory_*() against concurrent accesses) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/book3s/32/kup.h | 20 ++++++++++++++++++++ + arch/powerpc/mm/pageattr.c | 23 ++++++++++------------- + arch/powerpc/sysdev/xive/common.c | 2 +- + 3 files changed, 31 insertions(+), 14 deletions(-) +Merging s390-fixes/fixes (2a671f77ee49 s390/pci: fix use after free of zpci_dev) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/pci/pci.c | 6 ++++++ + arch/s390/pci/pci_bus.h | 5 +++++ + 2 files changed, 11 insertions(+) +Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (f87d64319e6f Merge tag 'net-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge net/master +Already up to date. +Merging bpf/master (316749009fdf Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (480e93e12aa0 net: xfrm: Fix end of loop tests for list_for_each_entry) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (e3245a7b7b34 netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nft_ct.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) +Merging ipvs/master (269fc69533de netfilter: nfnetlink_hook: translate inet ingress to netdev) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (abf3d98dee7c mt76: fix enum type mismatch) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (0a298d133893 net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (17f2569dce18 RDMA/bnxt_re: Add missing spin lock initialization) +$ git merge rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/uverbs_std_types_mr.c | 3 +++ + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 + + drivers/infiniband/hw/mlx5/main.c | 3 ++- + 3 files changed, 6 insertions(+), 1 deletion(-) +Merging sound-current/for-linus (65ca89c2b12c ASoC: intel: atom: Fix breakage for PCM buffer address setup) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 11 +++++++++-- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- + 2 files changed, 10 insertions(+), 3 deletions(-) +Merging sound-asoc-fixes/for-linus (70212c4c657f Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/rt5682.c | 1 - + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) +Merging regmap-fixes/for-linus (ff1176468d36 Linux 5.14-rc3) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (3f00f451f6d1 Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/hi6421v600-regulator.c | 36 ++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 18 deletions(-) +Merging spi-fixes/for-linus (80b3a9808557 Merge remote-tracking branch 'spi/for-5.14' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-coldfire-qspi.c | 2 +- + drivers/spi/spi-orion.c | 22 ++++++++++++++++------ + 2 files changed, 17 insertions(+), 7 deletions(-) +Merging pci-current/for-linus (045a9277b561 PCI/sysfs: Use correct variable for the legacy_mem sysfs object) +$ git merge pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 17 +++++++++++++++++ + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/quirks.c | 1 + + 3 files changed, 19 insertions(+), 1 deletion(-) +Merging driver-core.current/driver-core-linus (36a21d51725a Linux 5.14-rc5) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (36a21d51725a Linux 5.14-rc5) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (5571ea3117ca usb: typec: tcpm: Fix VDMs sometimes not being forwarded to alt-mode drivers) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/typec/tcpm/tcpm.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (8da0e55c7988 USB: serial: ftdi_sio: add device ID for Auto-M3 OP-COM v2) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/for-usb-fixes (5df09c15bab9 usb: cdnsp: Fix the IMAN_IE_SET and IMAN_IE_CLEAR macro) +$ git merge usb-chipidea-fixes/for-usb-fixes +Already up to date. +Merging phy/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (7c60610d4767 Linux 5.14-rc6) +$ git merge staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (a5056c0bc24f Merge tag 'iio-fixes-5.14a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge iio-fixes/fixes-togreg +Already up to date. +Merging char-misc.current/char-misc-linus (d30836a95289 Merge tag 'icc-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-linus) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/interconnect/qcom/icc-rpmh.c | 10 +++--- + drivers/ipack/carriers/tpci200.c | 60 +++++++++++++++++++----------------- + drivers/slimbus/messaging.c | 7 +++-- + drivers/slimbus/qcom-ngd-ctrl.c | 22 +++++++------ + 4 files changed, 54 insertions(+), 45 deletions(-) +Merging soundwire-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (7c60610d4767 Linux 5.14-rc6) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (818b26588994 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (5261cdf457ce crypto: drbg - select SHA512) +$ git merge crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (567c39047dbe selftests/sgx: Fix Q1 and Q2 calculation in sigstruct.c) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (7199ddede9f0 dmaengine: imx-dma: configure the generic DMA type to make it work) +$ git merge dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (b48027083a78 mtd: rawnand: Fix probe failure due to of_get_nand_secure_regions()) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (f1de1c780359 media: atmel: fix build when ISC=m and XISC=y) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (1435f82689e1 reset: RESET_MCHP_SPARX5 should depend on ARCH_SPARX5) +$ git merge reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + drivers/reset/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mips-fixes/mips-fixes (6aa32467299e MIPS: check return value of pgtable_pmd_page_ctor) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (e879f855e590 bus: ti-sysc: Add break in switch statement in sysc_init_soc()) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/bus/ti-sysc.c | 1 + + 1 file changed, 1 insertion(+) +Merging kvm-fixes/master (c7dfa4009965 KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656)) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (03726fd90f4b hwmon: sht4x: update Documentation for Malformed table) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/sht4x.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (96dcb97d0a40 Merge branch 'for-5.14/dax' into libnvdimm-fixes) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) +$ git merge cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (01e9fcf19c13 Merge branch 'misc-5.14' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date. +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) +$ git merge vfs-fixes/fixes +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 dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (1e35b8a7780a platform/x86: gigabyte-wmi: add support for B450M S2H V2) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (50d8d7e19c43 dt-bindings: display: renesas,du: Make resets optional on R-Car H1) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (40d32727931c scsi: mpt3sas: Fix incorrectly assigned error return and check) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (7c60610d4767 Linux 5.14-rc6) +$ git merge 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 amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (e3e86f41385b drm/i915/dp: remove superfluous EXPORT_SYMBOL()) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 24 +++++++++++----------- + drivers/gpu/drm/i915/display/intel_display_power.c | 16 +++++++-------- + .../gpu/drm/i915/display/intel_dp_link_training.c | 1 - + drivers/gpu/drm/i915/i915_irq.c | 21 ------------------- + 4 files changed, 20 insertions(+), 42 deletions(-) +Merging mmc-fixes/fixes (419dd626e357 mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/dw_mmc.c | 6 +++--- + drivers/mmc/host/mmci_stm32_sdmmc.c | 7 +++++-- + drivers/mmc/host/sdhci-iproc.c | 21 ++++++++++++++++++++- + drivers/mmc/host/sdhci-msm.c | 18 ++++++++++++++++++ + 4 files changed, 46 insertions(+), 6 deletions(-) +Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-cmos.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (f5a11c69b699 Revert "x86/hyperv: fix logical processor creation") +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (c1e64c0aec8c soc: fsl: qe: fix static checker warning) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (fdf3a7a1e0a6 riscv: Fix comment regarding kernel mapping overlapping with IS_ERR_VALUE) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge pidfd-fixes/fixes +Auto-merging fs/file.c +Merge made by the 'recursive' strategy. + fs/file.c | 64 +++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 24 deletions(-) +Merging fpga-fixes/fixes (1d345c3e5941 fpga: machxo2-spi: Fix missing error code in machxo2_write_complete()) +$ git merge fpga-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/fpga/machxo2-spi.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging spdx/spdx-linus (36a21d51725a Linux 5.14-rc5) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (9b87f43537ac gpio: tqmx86: really make IRQ optional) +$ git merge gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster) +$ git merge erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) +$ git merge 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 memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12) +$ git merge cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (1fee9db9b42d irqchip/mips: Fix RCU violation when using irqdomain lookup on interrupt entry) +$ git merge irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) +$ git merge renesas-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (fa0b1ef5f7a6 drm: Copy drm_wait_vblank to user before returning) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_ioc32.c | 4 +--- + drivers/gpu/drm/ttm/ttm_device.c | 2 -- + 2 files changed, 1 insertion(+), 5 deletions(-) +Merging kspp-gustavo/for-next/kspp (7bc04ce6b914 Makefile: Enable -Wimplicit-fallthrough for Clang) +$ git merge kspp-gustavo/for-next/kspp +Merge made by the 'recursive' strategy. + Makefile | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging kbuild/for-next (fb3fdea45030 kbuild: Fix 'no symbols' warning when CONFIG_TRIM_UNUSD_KSYMS=y) +$ git merge kbuild/for-next +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/kbuild/llvm.rst | 25 +++++- + MAINTAINERS | 2 + + Makefile | 92 ++++++++++++---------- + arch/arm/kernel/process.c | 2 - + arch/arm/mach-bcm/bcm_kona_smc.c | 2 - + arch/arm64/kernel/process.c | 3 - + arch/arm64/lib/Makefile | 2 + + arch/mips/Makefile | 2 +- + arch/nds32/Makefile | 2 + + arch/openrisc/kernel/process.c | 2 - + arch/parisc/kernel/firmware.c | 2 +- + arch/parisc/kernel/process.c | 3 - + arch/powerpc/kernel/prom.c | 1 - + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/rtas.c | 2 +- + arch/powerpc/kernel/udbg.c | 2 +- + arch/powerpc/lib/Makefile | 2 + + arch/riscv/Makefile | 2 +- + arch/s390/boot/pgm_check_info.c | 2 +- + arch/sparc/kernel/process_32.c | 3 - + arch/sparc/kernel/process_64.c | 3 - + arch/um/Makefile | 6 +- + arch/um/drivers/rtc_user.c | 1 + + arch/um/drivers/vector_user.c | 1 + + arch/um/include/shared/irq_user.h | 1 - + arch/um/include/shared/os.h | 1 - + arch/um/os-Linux/signal.c | 2 +- + arch/um/os-Linux/util.c | 1 + + arch/x86/Makefile | 2 +- + arch/x86/boot/boot.h | 2 +- + crypto/Makefile | 2 + + drivers/block/xen-blkback/xenbus.c | 1 - + drivers/firmware/efi/libstub/efi-stub-helper.c | 2 +- + drivers/firmware/efi/libstub/vsprintf.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 1 - + drivers/gpu/drm/drm_print.c | 2 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.h | 1 - + drivers/isdn/capi/capiutil.c | 2 +- + drivers/macintosh/macio-adb.c | 1 - + drivers/macintosh/via-cuda.c | 2 +- + drivers/macintosh/via-macii.c | 2 - + drivers/macintosh/via-pmu.c | 2 +- + drivers/net/wireless/intersil/orinoco/hermes.c | 1 - + drivers/net/wwan/iosm/iosm_ipc_imem.h | 1 - + drivers/pinctrl/aspeed/pinmux-aspeed.h | 1 - + drivers/scsi/elx/efct/efct_driver.h | 1 - + .../pci/hive_isp_css_common/host/isp_local.h | 2 - + .../pci/hive_isp_css_include/print_support.h | 2 +- + drivers/staging/media/atomisp/pci/ia_css_env.h | 2 +- + .../pci/runtime/debug/interface/ia_css_debug.h | 2 +- + .../staging/media/atomisp/pci/sh_css_internal.h | 2 +- + drivers/xen/xen-scsiback.c | 2 - + fs/befs/debug.c | 2 +- + fs/reiserfs/prints.c | 2 +- + fs/ufs/super.c | 2 +- + include/acpi/platform/acgcc.h | 2 +- + include/linux/filter.h | 2 - + include/linux/kernel.h | 2 +- + include/linux/mISDNif.h | 1 - + include/linux/printk.h | 2 +- + include/linux/stdarg.h | 11 +++ + include/linux/string.h | 2 +- + kernel/debug/kdb/kdb_support.c | 1 - + lib/Kconfig.debug | 2 + + lib/debug_info.c | 3 +- + lib/kasprintf.c | 2 +- + lib/kunit/string-stream.h | 2 +- + lib/raid6/Makefile | 4 + + lib/vsprintf.c | 2 +- + mm/kfence/report.c | 2 +- + net/batman-adv/log.c | 2 +- + scripts/Kbuild.include | 13 ++- + scripts/Makefile.build | 27 ++++++- + scripts/Makefile.clang | 35 ++++++++ + scripts/Makefile.lib | 7 ++ + scripts/Makefile.modfinal | 21 +---- + scripts/Makefile.modpost | 22 +----- + scripts/as-version.sh | 8 +- + scripts/checkdeclares.pl | 0 + scripts/gcc-plugins/gen-random-seed.sh | 0 + scripts/gen_autoksyms.sh | 12 --- + scripts/gen_ksymdeps.sh | 8 +- + scripts/kconfig/merge_config.sh | 15 ++++ + scripts/syscallnr.sh | 0 + scripts/xen-hypercalls.sh | 0 + sound/aoa/codecs/onyx.h | 1 - + sound/aoa/codecs/tas.c | 1 - + sound/core/info.c | 1 - + 89 files changed, 248 insertions(+), 184 deletions(-) + create mode 100644 include/linux/stdarg.h + create mode 100644 scripts/Makefile.clang + mode change 100644 => 100755 scripts/checkdeclares.pl + mode change 100644 => 100755 scripts/gcc-plugins/gen-random-seed.sh + mode change 100644 => 100755 scripts/syscallnr.sh + mode change 100644 => 100755 scripts/xen-hypercalls.sh +Merging compiler-attributes/compiler-attributes (7ed012969bbc Compiler Attributes: fix __has_attribute(__no_sanitize_coverage__) for GCC 4) +$ git merge compiler-attributes/compiler-attributes +Auto-merging include/linux/compiler_attributes.h +CONFLICT (content): Merge conflict in include/linux/compiler_attributes.h +Resolved 'include/linux/compiler_attributes.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bb4d6097112b] Merge remote-tracking branch 'compiler-attributes/compiler-attributes' +$ git diff -M --stat --summary HEAD^.. + include/linux/compiler_attributes.h | 1 + + 1 file changed, 1 insertion(+) +Merging dma-mapping/for-next (c1dec343d7ab hexagon: use the generic global coherent pool) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci_iommu.c | 10 +- + arch/arm/Kconfig | 5 +- + arch/arm/mm/dma-mapping-nommu.c | 173 ++------------------------------ + arch/arm/mm/dma-mapping.c | 26 +++-- + arch/hexagon/Kconfig | 1 + + arch/hexagon/kernel/dma.c | 57 ++--------- + arch/ia64/hp/common/sba_iommu.c | 4 +- + arch/mips/jazz/jazzdma.c | 2 +- + arch/powerpc/kernel/iommu.c | 6 +- + arch/powerpc/platforms/ps3/system-bus.c | 2 +- + arch/powerpc/platforms/pseries/vio.c | 5 +- + arch/s390/pci/pci_dma.c | 13 +-- + arch/sparc/kernel/iommu.c | 6 +- + arch/sparc/kernel/pci_sun4v.c | 6 +- + arch/sparc/mm/iommu.c | 2 +- + arch/x86/kernel/amd_gart_64.c | 18 ++-- + drivers/iommu/dma-iommu.c | 22 ++-- + drivers/iommu/iommu.c | 15 ++- + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/sba_iommu.c | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + include/linux/dma-map-ops.h | 23 +++-- + include/linux/dma-mapping.h | 44 +++----- + include/linux/iommu.h | 22 ++-- + kernel/dma/Kconfig | 4 + + kernel/dma/coherent.c | 161 ++++++++++++++--------------- + kernel/dma/debug.c | 21 ++-- + kernel/dma/direct.c | 17 +++- + kernel/dma/dummy.c | 2 +- + kernel/dma/mapping.c | 80 +++++++++++++-- + 30 files changed, 310 insertions(+), 443 deletions(-) +Merging asm-generic/master (8f76f9c46952 bitops/non-atomic: make @nr unsigned to avoid any DIV) +$ git merge asm-generic/master +Auto-merging lib/Kconfig +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig +Auto-merging arch/ia64/Kconfig +Removing arch/hexagon/mm/strnlen_user.S +Removing arch/h8300/lib/strncpy.S +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/alpha/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/Kconfig | 2 - + arch/arc/include/asm/uaccess.h | 72 ----------------- + arch/arc/mm/extable.c | 12 --- + arch/arm/Kconfig | 2 - + arch/arm64/Kconfig | 2 - + arch/csky/include/asm/uaccess.h | 6 -- + arch/csky/lib/usercopy.c | 102 ------------------------ + arch/h8300/kernel/h8300_ksyms.c | 2 - + arch/h8300/lib/Makefile | 2 +- + arch/h8300/lib/strncpy.S | 35 --------- + arch/hexagon/include/asm/uaccess.h | 31 -------- + arch/hexagon/kernel/hexagon_ksyms.c | 1 - + arch/hexagon/mm/Makefile | 2 +- + arch/hexagon/mm/strnlen_user.S | 126 ------------------------------ + arch/ia64/Kconfig | 2 + + arch/m68k/Kconfig | 2 - + arch/microblaze/include/asm/uaccess.h | 21 +---- + arch/microblaze/kernel/microblaze_ksyms.c | 1 - + arch/microblaze/lib/uaccess_old.S | 90 --------------------- + arch/mips/Kconfig | 2 + + arch/nds32/Kconfig | 2 - + arch/nios2/Kconfig | 2 - + arch/openrisc/Kconfig | 2 - + arch/parisc/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 - + arch/riscv/Kconfig | 2 - + arch/s390/include/asm/uaccess.h | 18 +---- + arch/s390/lib/uaccess.c | 52 ------------ + arch/sh/Kconfig | 2 - + arch/sparc/Kconfig | 2 - + arch/um/Kconfig | 2 + + arch/um/include/asm/uaccess.h | 5 +- + arch/um/kernel/skas/uaccess.c | 14 +++- + arch/x86/Kconfig | 2 - + arch/xtensa/Kconfig | 3 +- + arch/xtensa/include/asm/uaccess.h | 3 +- + arch/xtensa/kernel/xtensa_ksyms.c | 2 +- + include/asm-generic/bitops/builtin-ffs.h | 2 +- + include/asm-generic/bitops/ffs.h | 2 +- + include/asm-generic/bitops/non-atomic.h | 14 ++-- + include/asm-generic/uaccess.h | 53 +++---------- + lib/Kconfig | 10 ++- + 42 files changed, 56 insertions(+), 657 deletions(-) + delete mode 100644 arch/h8300/lib/strncpy.S + delete mode 100644 arch/hexagon/mm/strnlen_user.S +Merging arc/for-next (28bfbfd7a713 ARC: mm: move MMU specific bits out of entry code ...) +$ git merge arc/for-next +Removing arch/arc/include/asm/tlb-mmu1.h +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 37 +-- + arch/arc/include/asm/atomic-llsc.h | 97 +++++++ + arch/arc/include/asm/atomic-spinlock.h | 102 ++++++++ + arch/arc/include/asm/atomic.h | 444 ++------------------------------- + arch/arc/include/asm/atomic64-arcv2.h | 250 +++++++++++++++++++ + arch/arc/include/asm/bitops.h | 188 +------------- + arch/arc/include/asm/cache.h | 4 - + arch/arc/include/asm/cmpxchg.h | 233 ++++++++--------- + arch/arc/include/asm/entry-compact.h | 8 - + arch/arc/include/asm/mmu.h | 53 ++-- + arch/arc/include/asm/mmu_context.h | 28 +-- + arch/arc/include/asm/page.h | 54 ++-- + arch/arc/include/asm/pgalloc.h | 14 +- + arch/arc/include/asm/pgtable.h | 58 +---- + arch/arc/include/asm/setup.h | 12 +- + arch/arc/include/asm/smp.h | 14 -- + arch/arc/include/asm/tlb-mmu1.h | 101 -------- + arch/arc/kernel/entry-arcv2.S | 1 + + arch/arc/kernel/entry.S | 7 +- + arch/arc/kernel/intc-compact.c | 2 +- + arch/arc/kernel/smp.c | 4 +- + arch/arc/kernel/stacktrace.c | 2 +- + arch/arc/mm/cache.c | 112 ++------- + arch/arc/mm/fault.c | 2 +- + arch/arc/mm/ioremap.c | 3 +- + arch/arc/mm/tlb.c | 227 +++-------------- + arch/arc/mm/tlbex.S | 62 +---- + 27 files changed, 721 insertions(+), 1398 deletions(-) + create mode 100644 arch/arc/include/asm/atomic-llsc.h + create mode 100644 arch/arc/include/asm/atomic-spinlock.h + create mode 100644 arch/arc/include/asm/atomic64-arcv2.h + delete mode 100644 arch/arc/include/asm/tlb-mmu1.h +Merging arm/for-next (3e9a47a71364 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 56 +++++++++++++++++++-------------------- + arch/arm/Makefile | 3 ++- + arch/arm/boot/Makefile | 14 +--------- + arch/arm/boot/compressed/Makefile | 2 ++ + arch/arm/crypto/curve25519-glue.c | 8 +++--- + arch/arm/include/asm/gpio.h | 4 --- + 6 files changed, 37 insertions(+), 50 deletions(-) +Merging arm64/for-next/core (92b5529ab76e Merge branch 'for-next/entry' into for-next/core) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/Makefile +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 17 + + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/arm64/booting.rst | 22 + + Documentation/arm64/memory-tagging-extension.rst | 48 +- + arch/arm64/Makefile | 7 +- + arch/arm64/boot/Makefile | 8 - + arch/arm64/include/asm/cpufeature.h | 9 +- + arch/arm64/include/asm/exception.h | 5 +- + arch/arm64/include/asm/fpsimd.h | 1 - + arch/arm64/include/asm/memory.h | 2 - + arch/arm64/include/asm/mmu.h | 29 +- + arch/arm64/include/asm/mte-kasan.h | 17 - + arch/arm64/include/asm/mte.h | 6 - + arch/arm64/include/asm/pointer_auth.h | 12 +- + arch/arm64/include/asm/processor.h | 10 +- + arch/arm64/include/asm/sysreg.h | 47 +- + arch/arm64/include/asm/tlbflush.h | 13 +- + arch/arm64/kernel/asm-offsets.c | 2 +- + arch/arm64/kernel/cpufeature.c | 7 +- + arch/arm64/kernel/entry-common.c | 219 +++++--- + arch/arm64/kernel/entry.S | 114 ++-- + arch/arm64/kernel/fpsimd.c | 4 +- + arch/arm64/kernel/idreg-override.c | 2 + + arch/arm64/kernel/mte.c | 180 ++++--- + arch/arm64/kernel/pointer_auth.c | 10 +- + arch/arm64/kernel/process.c | 31 +- + arch/arm64/kernel/signal.c | 3 +- + arch/arm64/kernel/suspend.c | 1 - + arch/arm64/lib/insn.c | 4 +- + arch/arm64/mm/fault.c | 15 +- + arch/arm64/mm/proc.S | 3 +- + include/linux/kasan-tags.h | 15 + + include/uapi/linux/prctl.h | 11 +- + lib/test_kasan.c | 2 - + mm/kasan/hw_tags.c | 8 - + mm/kasan/kasan.h | 22 +- + tools/testing/selftests/arm64/fp/.gitignore | 2 + + tools/testing/selftests/arm64/fp/Makefile | 11 +- + tools/testing/selftests/arm64/fp/TODO | 4 + + tools/testing/selftests/arm64/fp/rdvl-sve.c | 14 + + tools/testing/selftests/arm64/fp/rdvl.S | 10 + + tools/testing/selftests/arm64/fp/rdvl.h | 8 + + tools/testing/selftests/arm64/fp/sve-probe-vls.c | 5 + + tools/testing/selftests/arm64/fp/vec-syscfg.c | 593 +++++++++++++++++++++ + tools/testing/selftests/arm64/mte/.gitignore | 1 + + 45 files changed, 1171 insertions(+), 386 deletions(-) + create mode 100644 include/linux/kasan-tags.h + create mode 100644 tools/testing/selftests/arm64/fp/TODO + create mode 100644 tools/testing/selftests/arm64/fp/rdvl-sve.c + create mode 100644 tools/testing/selftests/arm64/fp/rdvl.S + create mode 100644 tools/testing/selftests/arm64/fp/rdvl.h + create mode 100644 tools/testing/selftests/arm64/fp/vec-syscfg.c +Merging arm-perf/for-next/perf (fd264b310579 arm64/perf: Replace '0xf' instances with ID_AA64DFR0_PMUVER_IMP_DEF) +$ git merge arm-perf/for-next/perf +Auto-merging arch/arm64/include/asm/cpufeature.h +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/cpufeature.h | 2 +- + arch/arm64/kernel/perf_event.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging arm-soc/for-next (4364229fd558 soc: document merges) +$ git merge arm-soc/for-next +Auto-merging drivers/bus/ti-sysc.c +Removing arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi +Removing arch/arm/mach-ixp4xx/wg302v2-setup.c +Removing arch/arm/mach-ixp4xx/wg302v2-pci.c +Removing arch/arm/mach-ixp4xx/vulcan-setup.c +Removing arch/arm/mach-ixp4xx/vulcan-pci.c +Removing arch/arm/mach-ixp4xx/omixp-setup.c +Removing arch/arm/mach-ixp4xx/nslu2-setup.c +Removing arch/arm/mach-ixp4xx/nslu2-pci.c +Removing arch/arm/mach-ixp4xx/nas100d-setup.c +Removing arch/arm/mach-ixp4xx/nas100d-pci.c +Removing arch/arm/mach-ixp4xx/miccpt-pci.c +Removing arch/arm/mach-ixp4xx/ixdpg425-pci.c +Removing arch/arm/mach-ixp4xx/ixdp425-setup.c +Removing arch/arm/mach-ixp4xx/ixdp425-pci.c +Removing arch/arm/mach-ixp4xx/gtwx5715-setup.c +Removing arch/arm/mach-ixp4xx/gtwx5715-pci.c +Removing arch/arm/mach-ixp4xx/fsg-setup.c +Removing arch/arm/mach-ixp4xx/fsg-pci.c +Removing arch/arm/mach-ixp4xx/dsmg600-setup.c +Removing arch/arm/mach-ixp4xx/dsmg600-pci.c +Removing arch/arm/mach-ixp4xx/coyote-setup.c +Removing arch/arm/mach-ixp4xx/coyote-pci.c +Removing arch/arm/mach-ixp4xx/avila-setup.c +Removing arch/arm/mach-ixp4xx/avila-pci.c +Removing arch/arm/mach-ep93xx/crunch.c +Removing arch/arm/mach-ep93xx/crunch-bits.S +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt +Removing Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.yaml | 5 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 14 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 29 + + Documentation/devicetree/bindings/arm/qcom.yaml | 10 + + Documentation/devicetree/bindings/arm/renesas.yaml | 50 +- + Documentation/devicetree/bindings/arm/tegra.yaml | 1 + + .../bindings/ata/intel,ixp4xx-compact-flash.yaml | 61 + + .../bus/intel,ixp4xx-expansion-bus-controller.yaml | 168 +++ + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + + .../devicetree/bindings/firmware/arm,scmi.yaml | 8 +- + .../devicetree/bindings/gpio/aspeed,sgpio.yaml | 77 ++ + .../devicetree/bindings/gpio/sgpio-aspeed.txt | 46 - + .../devicetree/bindings/i2c/renesas,riic.yaml | 30 +- + .../devicetree/bindings/mailbox/mtk-gce.txt | 15 + + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 19 +- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt | 87 -- + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 114 ++ + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 3 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + .../devicetree/bindings/soc/ti/ti,pruss.yaml | 41 +- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + MAINTAINERS | 11 +- + arch/arm/Kconfig.debug | 10 + + arch/arm/arm-soc-for-next-contents.txt | 136 ++ + arch/arm/boot/dts/Makefile | 41 +- + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 10 +- + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 8 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 8 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 5 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 17 +- + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 135 -- + arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi | 141 ++ + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 3 +- + arch/arm/boot/dts/am335x-boneblack.dts | 1 + + arch/arm/boot/dts/am335x-boneblue.dts | 143 +- + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 2 +- + arch/arm/boot/dts/am335x-chiliboard.dts | 13 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 13 +- + arch/arm/boot/dts/am335x-evm.dts | 4 + + arch/arm/boot/dts/am335x-evmsk.dts | 4 + + arch/arm/boot/dts/am335x-icev2.dts | 4 + + arch/arm/boot/dts/am335x-igep0033.dtsi | 12 +- + arch/arm/boot/dts/am335x-lxm.dts | 14 +- + arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 12 +- + arch/arm/boot/dts/am335x-moxa-uc-2101.dts | 7 +- + arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 16 +- + arch/arm/boot/dts/am335x-myirtech-myc.dtsi | 25 +- + arch/arm/boot/dts/am335x-myirtech-myd.dts | 18 +- + arch/arm/boot/dts/am335x-nano.dts | 13 +- + arch/arm/boot/dts/am335x-netcan-plus-1xx.dts | 10 +- + arch/arm/boot/dts/am335x-netcom-plus-2xx.dts | 10 +- + arch/arm/boot/dts/am335x-netcom-plus-8xx.dts | 10 +- + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 13 +- + arch/arm/boot/dts/am335x-pcm-953.dtsi | 10 +- + arch/arm/boot/dts/am335x-pdu001.dts | 14 +- + arch/arm/boot/dts/am335x-pepper.dts | 14 +- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 14 +- + arch/arm/boot/dts/am335x-regor.dtsi | 11 +- + arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi | 67 + + arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts | 50 + + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 96 +- + arch/arm/boot/dts/am335x-shc.dts | 38 +- + arch/arm/boot/dts/am335x-sl50.dts | 12 +- + arch/arm/boot/dts/am335x-wega.dtsi | 11 +- + arch/arm/boot/dts/am33xx-l4.dtsi | 82 ++ + arch/arm/boot/dts/am33xx.dtsi | 4 +- + arch/arm/boot/dts/am4372.dtsi | 165 +++ + arch/arm/boot/dts/am437x-cm-t43.dts | 4 + + arch/arm/boot/dts/am437x-gp-evm.dts | 4 + + arch/arm/boot/dts/am437x-idk-evm.dts | 4 + + arch/arm/boot/dts/am437x-sk-evm.dts | 4 + + arch/arm/boot/dts/am43x-epos-evm.dts | 4 + + arch/arm/boot/dts/am57-pruss.dtsi | 178 ++- + arch/arm/boot/dts/am571x-idk.dts | 8 + + arch/arm/boot/dts/am572x-idk.dts | 8 + + arch/arm/boot/dts/am5748.dtsi | 6 +- + arch/arm/boot/dts/am574x-idk.dts | 10 +- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 8 + + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 8 + + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 4 + + .../boot/dts/aspeed-bmc-facebook-cloudripper.dts | 544 ++++++++ + arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts | 185 +++ + arch/arm/boot/dts/aspeed-bmc-facebook-fuji.dts | 1251 +++++++++++++++++ + .../arm/boot/dts/aspeed-bmc-facebook-galaxy100.dts | 4 - + arch/arm/boot/dts/aspeed-bmc-facebook-minipack.dts | 8 +- + arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts | 5 + + arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 4 - + arch/arm/boot/dts/aspeed-bmc-facebook-wedge400.dts | 48 +- + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 4 +- + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +- + arch/arm/boot/dts/aspeed-bmc-inspur-nf5280m6.dts | 691 ++++++++++ + arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 2 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 1 - + arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 4 +- + arch/arm/boot/dts/aspeed-g6.dtsi | 28 + + .../boot/dts/ast2400-facebook-netbmc-common.dtsi | 4 + + .../boot/dts/ast2600-facebook-netbmc-common.dtsi | 169 +++ + arch/arm/boot/dts/at91-kizbox3_common.dtsi | 2 +- + arch/arm/boot/dts/at91-sam9x60ek.dts | 18 +- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 6 +- + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 2 +- + arch/arm/boot/dts/at91-sama5d2_icp.dts | 8 +- + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 2 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 31 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 32 +- + arch/arm/boot/dts/at91-sama7g5ek.dts | 656 +++++++++ + arch/arm/boot/dts/dra74x-p.dtsi | 27 + + arch/arm/boot/dts/dra76x.dtsi | 12 - + arch/arm/boot/dts/exynos3250.dtsi | 11 + + arch/arm/boot/dts/exynos4210.dtsi | 11 + + arch/arm/boot/dts/exynos4412.dtsi | 17 + + arch/arm/boot/dts/exynos5250.dtsi | 11 + + arch/arm/boot/dts/exynos5260.dtsi | 38 +- + arch/arm/boot/dts/exynos5420-cpus.dtsi | 32 + + arch/arm/boot/dts/exynos5422-cpus.dtsi | 32 + + .../boot/dts/facebook-bmc-flash-layout-128.dtsi | 60 + + arch/arm/boot/dts/imx6dl-dhcom-picoitx.dts | 20 + + arch/arm/boot/dts/imx6dl-skov-revc-lt2.dts | 13 + + arch/arm/boot/dts/imx6dl-skov-revc-lt6.dts | 106 ++ + arch/arm/boot/dts/imx6dl-solidsense.dts | 54 + + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 270 +--- + arch/arm/boot/dts/imx6q-skov-revc-lt2.dts | 36 + + arch/arm/boot/dts/imx6q-skov-revc-lt6.dts | 128 ++ + .../boot/dts/imx6q-skov-reve-mi1010ait-1cp1.dts | 127 ++ + arch/arm/boot/dts/imx6q-solidsense.dts | 54 + + arch/arm/boot/dts/imx6q.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-dhcom-drc02.dtsi | 139 ++ + arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi | 361 +++++ + arch/arm/boot/dts/imx6qdl-dhcom-picoitx.dtsi | 69 + + ...imx6q-dhcom-som.dtsi => imx6qdl-dhcom-som.dtsi} | 631 ++++++--- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-skov-cpu-revc.dtsi | 54 + + arch/arm/boot/dts/imx6qdl-skov-cpu.dtsi | 477 +++++++ + arch/arm/boot/dts/imx6qdl-solidsense.dtsi | 160 +++ + arch/arm/boot/dts/imx6qdl.dtsi | 8 +- + arch/arm/boot/dts/imx6qp-prtwd3.dts | 2 + + arch/arm/boot/dts/imx6s-dhcom-drc02.dts | 30 + + arch/arm/boot/dts/imx7d-remarkable2.dts | 91 ++ + arch/arm/boot/dts/imx7s.dtsi | 28 + + arch/arm/boot/dts/intel-ixp42x-adi-coyote.dts | 110 ++ + arch/arm/boot/dts/intel-ixp42x-arcom-vulcan.dts | 167 +++ + arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts | 145 ++ + arch/arm/boot/dts/intel-ixp42x-freecom-fsg-3.dts | 158 +++ + .../arm/boot/dts/intel-ixp42x-gateworks-gw2348.dts | 172 +++ + arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts | 146 ++ + arch/arm/boot/dts/intel-ixp42x-ixdp425.dts | 72 + + arch/arm/boot/dts/intel-ixp42x-ixdpg425.dts | 125 ++ + arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts | 30 +- + arch/arm/boot/dts/intel-ixp42x-linksys-wrv54g.dts | 173 +++ + arch/arm/boot/dts/intel-ixp42x-netgear-wg302v2.dts | 95 ++ + .../arm/boot/dts/intel-ixp42x-welltech-epbx100.dts | 84 +- + arch/arm/boot/dts/intel-ixp42x.dtsi | 5 + + .../arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts | 81 +- + arch/arm/boot/dts/intel-ixp43x-kixrp435.dts | 68 + + arch/arm/boot/dts/intel-ixp43x.dtsi | 6 + + arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi | 11 + + arch/arm/boot/dts/intel-ixp46x-ixdp465.dts | 38 + + .../boot/dts/intel-ixp4xx-reference-design.dtsi | 132 ++ + arch/arm/boot/dts/intel-ixp4xx.dtsi | 44 +- + arch/arm/boot/dts/meson.dtsi | 12 + + arch/arm/boot/dts/meson8.dtsi | 68 + + arch/arm/boot/dts/meson8b-ec100.dts | 48 +- + arch/arm/boot/dts/meson8b-mxq.dts | 4 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 4 +- + arch/arm/boot/dts/meson8b.dtsi | 63 + + arch/arm/boot/dts/mt7623.dtsi | 2 +- + arch/arm/boot/dts/omap4-l4-abe.dtsi | 38 +- + arch/arm/boot/dts/owl-s500-roseapplepi.dts | 45 + + arch/arm/boot/dts/owl-s500.dtsi | 10 + + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 23 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 20 +- + arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts | 25 + + arch/arm/boot/dts/qcom-msm8226.dtsi | 147 ++ + arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts | 11 + + .../boot/dts/qcom-msm8974-sony-xperia-castor.dts | 81 ++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 9 + + arch/arm/boot/dts/r7s72100.dtsi | 8 + + arch/arm/boot/dts/r7s9210.dtsi | 8 + + arch/arm/boot/dts/r8a73a4.dtsi | 44 - + arch/arm/boot/dts/r8a7742.dtsi | 4 +- + arch/arm/boot/dts/r8a7743.dtsi | 4 +- + arch/arm/boot/dts/r8a7744.dtsi | 4 +- + arch/arm/boot/dts/sama7g5-pinfunc.h | 923 +++++++++++++ + arch/arm/boot/dts/sama7g5.dtsi | 528 +++++++ + arch/arm/boot/dts/ste-ab8500.dtsi | 8 +- + arch/arm/boot/dts/ste-ab8505.dtsi | 6 + + arch/arm/boot/dts/ste-db8500.dtsi | 7 +- + arch/arm/boot/dts/ste-db8520.dtsi | 7 +- + arch/arm/boot/dts/ste-db9500.dtsi | 9 +- + arch/arm/boot/dts/ste-dbx5x0-pinctrl.dtsi | 18 + + arch/arm/boot/dts/ste-href.dtsi | 4 + + arch/arm/boot/dts/ste-snowball.dts | 2 + + arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 863 ++++++++++++ + arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 854 ++++++++++++ + arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 2 + + arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 2 + + arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 664 +++++++++ + arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 2 + + arch/arm/boot/dts/stih407-b2120.dts | 1 - + arch/arm/boot/dts/stih407-clock.dtsi | 128 +- + arch/arm/boot/dts/stih407-family.dtsi | 15 + + arch/arm/boot/dts/stih410-b2120.dts | 1 - + arch/arm/boot/dts/stih410-b2260.dts | 1 - + arch/arm/boot/dts/stih410-clock.dtsi | 138 +- + arch/arm/boot/dts/stih418-b2199.dts | 1 - + arch/arm/boot/dts/stih418-b2264.dts | 151 ++ + arch/arm/boot/dts/stih418-clock.dtsi | 136 +- + arch/arm/boot/dts/stih418.dtsi | 12 + + arch/arm/boot/dts/stm32mp157c-ed1.dts | 4 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-drc02.dtsi | 4 + + arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 25 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 6 +- + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 12 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 2 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 2 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 2 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 90 +- + arch/arm/boot/dts/tegra20-paz00.dts | 4 + + arch/arm/boot/dts/tegra20-tamonten.dtsi | 14 +- + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 60 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30-ouya.dts | 13 +- + arch/arm/boot/dts/tegra30.dtsi | 87 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 - + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/imx_v6_v7_defconfig | 3 +- + arch/arm/configs/multi_v7_defconfig | 7 + + arch/arm/configs/sama7_defconfig | 209 +++ + arch/arm/configs/tegra_defconfig | 25 +- + arch/arm/include/asm/fpstate.h | 8 - + arch/arm/include/asm/thread_info.h | 8 - + arch/arm/include/asm/ucontext.h | 14 - + arch/arm/include/uapi/asm/hwcap.h | 2 +- + arch/arm/include/uapi/asm/ptrace.h | 4 +- + arch/arm/kernel/asm-offsets.c | 3 - + arch/arm/kernel/entry-armv.S | 6 - + arch/arm/kernel/ptrace.c | 36 - + arch/arm/kernel/signal.c | 42 - + arch/arm/mach-at91/Kconfig | 18 + + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/generic.h | 2 + + arch/arm/mach-at91/pm.c | 343 +++-- + arch/arm/mach-at91/pm.h | 3 + + arch/arm/mach-at91/pm_data-offsets.c | 2 + + arch/arm/mach-at91/pm_suspend.S | 827 ++++++++--- + arch/arm/mach-at91/sama7.c | 33 + + arch/arm/mach-ep93xx/Kconfig | 5 - + arch/arm/mach-ep93xx/Makefile | 3 - + arch/arm/mach-ep93xx/adssphere.c | 1 - + arch/arm/mach-ep93xx/core.c | 5 - + arch/arm/mach-ep93xx/crunch-bits.S | 310 ----- + arch/arm/mach-ep93xx/crunch.c | 86 -- + arch/arm/mach-ep93xx/edb93xx.c | 8 - + arch/arm/mach-ep93xx/gesbc9312.c | 1 - + arch/arm/mach-ep93xx/micro9.c | 4 - + arch/arm/mach-ep93xx/platform.h | 7 - + arch/arm/mach-ep93xx/simone.c | 1 - + arch/arm/mach-ep93xx/snappercl15.c | 1 - + arch/arm/mach-ep93xx/ts72xx.c | 2 - + arch/arm/mach-ep93xx/vision_ep9307.c | 1 - + arch/arm/mach-ixp4xx/Kconfig | 158 --- + arch/arm/mach-ixp4xx/Makefile | 26 - + arch/arm/mach-ixp4xx/avila-pci.c | 79 -- + arch/arm/mach-ixp4xx/avila-setup.c | 210 --- + arch/arm/mach-ixp4xx/coyote-pci.c | 62 - + arch/arm/mach-ixp4xx/coyote-setup.c | 144 -- + arch/arm/mach-ixp4xx/dsmg600-pci.c | 77 -- + arch/arm/mach-ixp4xx/dsmg600-setup.c | 304 ----- + arch/arm/mach-ixp4xx/fsg-pci.c | 73 - + arch/arm/mach-ixp4xx/fsg-setup.c | 311 ----- + arch/arm/mach-ixp4xx/gtwx5715-pci.c | 72 - + arch/arm/mach-ixp4xx/gtwx5715-setup.c | 167 --- + arch/arm/mach-ixp4xx/ixdp425-pci.c | 75 - + arch/arm/mach-ixp4xx/ixdp425-setup.c | 339 ----- + arch/arm/mach-ixp4xx/ixdpg425-pci.c | 56 - + arch/arm/mach-ixp4xx/miccpt-pci.c | 75 - + arch/arm/mach-ixp4xx/nas100d-pci.c | 73 - + arch/arm/mach-ixp4xx/nas100d-setup.c | 353 ----- + arch/arm/mach-ixp4xx/nslu2-pci.c | 69 - + arch/arm/mach-ixp4xx/nslu2-setup.c | 341 ----- + arch/arm/mach-ixp4xx/omixp-setup.c | 298 ---- + arch/arm/mach-ixp4xx/vulcan-pci.c | 70 - + arch/arm/mach-ixp4xx/vulcan-setup.c | 282 ---- + arch/arm/mach-ixp4xx/wg302v2-pci.c | 60 - + arch/arm/mach-ixp4xx/wg302v2-setup.c | 114 -- + arch/arm/mach-omap2/Kconfig | 23 - + arch/arm/mach-omap2/pm34xx.c | 5 - + arch/arm/mach-s3c/mach-gta02.c | 3 +- + arch/arm/mach-tegra/pm.c | 2 +- + arch/arm/mach-tegra/pm.h | 6 - + arch/arm/mach-tegra/tegra.c | 2 - + .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 27 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 13 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 61 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 + + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 3 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 61 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 102 ++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 37 +- + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts | 8 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 7 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 9 + + .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 389 ++++++ + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 18 + + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi | 80 ++ + .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 64 +- + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 5 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 15 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 911 +++++++++++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 9 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 884 ++++++++++++ + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 31 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 14 +- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 213 +++ + .../boot/dts/freescale/imx8mq-nitrogen-som.dtsi | 275 ++++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 105 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-img.dtsi | 12 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-img.dtsi | 13 + + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 4 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 +- + arch/arm64/boot/dts/marvell/Makefile | 5 + + .../boot/dts/marvell/armada-3720-turris-mox.dts | 17 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 4 +- + arch/arm64/boot/dts/marvell/cn9130-crb-A.dts | 38 + + arch/arm64/boot/dts/marvell/cn9130-crb-B.dts | 46 + + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 222 +++ + arch/arm64/boot/dts/marvell/cn9130-db-B.dts | 22 + + arch/arm64/boot/dts/marvell/cn9130-db.dts | 403 +----- + arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 410 ++++++ + arch/arm64/boot/dts/marvell/cn9131-db-B.dts | 22 + + arch/arm64/boot/dts/marvell/cn9131-db.dts | 197 +-- + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 206 +++ + arch/arm64/boot/dts/marvell/cn9132-db-B.dts | 22 + + arch/arm64/boot/dts/marvell/cn9132-db.dts | 218 +-- + arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 227 +++ + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 10 + + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 4 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 + + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +- + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 718 ++++++++++ + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 91 ++ + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 6 +- + arch/arm64/boot/dts/qcom/Makefile | 9 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 1 + + arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 8 + + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 8 + + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 157 ++- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 54 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 3 +- + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 313 +++++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 27 + + arch/arm64/boot/dts/qcom/msm8994.dtsi | 8 +- + arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 8 + + .../qcom/msm8996-pmi8996-sony-xperia-tone-dora.dts | 11 + + .../msm8996-pmi8996-sony-xperia-tone-kagura.dts | 11 + + .../msm8996-pmi8996-sony-xperia-tone-keyaki.dts | 11 + + .../dts/qcom/msm8996-sony-xperia-tone-dora.dts | 27 + + .../dts/qcom/msm8996-sony-xperia-tone-kagura.dts | 15 + + .../dts/qcom/msm8996-sony-xperia-tone-keyaki.dts | 26 + + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 956 +++++++++++++ + arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi | 63 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 44 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm660.dtsi | 133 ++ + arch/arm64/boot/dts/qcom/pm660l.dtsi | 54 + + arch/arm64/boot/dts/qcom/pm8004.dtsi | 2 - + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 6 + + arch/arm64/boot/dts/qcom/pmi8996.dtsi | 15 + + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 60 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 62 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 102 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 241 +--- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 341 +++++ + arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 23 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 419 +++++- + .../dts/qcom/sdm630-sony-xperia-ganges-kirin.dts | 14 +- + .../boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi | 40 - + .../dts/qcom/sdm630-sony-xperia-nile-discovery.dts | 1 + + .../dts/qcom/sdm630-sony-xperia-nile-pioneer.dts | 1 + + .../dts/qcom/sdm630-sony-xperia-nile-voyager.dts | 1 + + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 527 ++++++- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 1441 ++++++++++++++++++-- + .../dts/qcom/sdm636-sony-xperia-ganges-mermaid.dts | 14 +- + arch/arm64/boot/dts/qcom/sdm636.dtsi | 23 + + .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 2 - + arch/arm64/boot/dts/qcom/sdm660.dtsi | 519 +++---- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 3 + + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 11 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 + + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 139 ++ + arch/arm64/boot/dts/qcom/sm6125.dtsi | 566 ++++++++ + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 797 ++++++++++- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 217 ++- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 53 +- + arch/arm64/boot/dts/renesas/Makefile | 8 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 8 + + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 8 +- + .../arm64/boot/dts/renesas/r8a77950-salvator-x.dts | 73 - + arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 2 + + .../arm64/boot/dts/renesas/r8a77951-salvator-x.dts | 73 - + .../boot/dts/renesas/r8a77951-salvator-xs.dts | 122 -- + arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77951-ulcb.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 5 + + arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77961-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 3 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 29 + + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 14 - + arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77965-ulcb.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 50 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 6 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 169 ++- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 158 +++ + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 26 +- + .../boot/dts/renesas/r8a779m1-salvator-xs.dts | 53 + + arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dts | 19 + + arch/arm64/boot/dts/renesas/r8a779m1-ulcb.dts | 54 + + arch/arm64/boot/dts/renesas/r8a779m1.dtsi | 12 + + .../boot/dts/renesas/r8a779m3-salvator-xs.dts | 46 + + arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dts | 18 + + arch/arm64/boot/dts/renesas/r8a779m3-ulcb.dts | 45 + + arch/arm64/boot/dts/renesas/r8a779m3.dtsi | 12 + + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 184 +++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 76 +- + arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 56 + + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 114 ++ + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 56 + + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 64 + + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/hwcap.h | 2 +- + drivers/ata/pata_ixp4xx_cf.c | 264 ++-- + drivers/bus/Kconfig | 11 + + drivers/bus/Makefile | 1 + + drivers/bus/intel-ixp4xx-eb.c | 429 ++++++ + drivers/bus/ti-sysc.c | 17 +- + drivers/clocksource/timer-ixp4xx.c | 48 +- + drivers/dma/imx-sdma.c | 93 +- + drivers/firmware/Kconfig | 36 +- + drivers/firmware/Makefile | 3 +- + drivers/firmware/arm_scmi/Kconfig | 95 ++ + drivers/firmware/arm_scmi/Makefile | 8 +- + drivers/firmware/arm_scmi/common.h | 113 +- + drivers/firmware/arm_scmi/driver.c | 686 ++++++++-- + drivers/firmware/arm_scmi/mailbox.c | 2 +- + drivers/firmware/arm_scmi/msg.c | 111 ++ + drivers/firmware/arm_scmi/smc.c | 3 +- + drivers/firmware/arm_scmi/virtio.c | 491 +++++++ + drivers/firmware/qcom_scm.c | 8 +- + drivers/firmware/tegra/bpmp-debugfs.c | 58 +- + drivers/iommu/Kconfig | 2 + + drivers/memory/omap-gpmc.c | 191 ++- + drivers/memory/tegra/tegra186.c | 2 + + drivers/net/wireless/ath/ath10k/Kconfig | 1 + + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 31 +- + drivers/soc/aspeed/aspeed-p2a-ctrl.c | 2 +- + drivers/soc/aspeed/aspeed-socinfo.c | 1 + + drivers/soc/mediatek/mt8173-pm-domains.h | 1 + + drivers/soc/mediatek/mt8183-mmsys.h | 21 +- + drivers/soc/mediatek/mt8365-mmsys.h | 60 + + drivers/soc/mediatek/mtk-mmsys.c | 18 +- + drivers/soc/mediatek/mtk-mmsys.h | 137 +- + drivers/soc/mediatek/mtk-pm-domains.h | 2 +- + drivers/soc/qcom/cpr.c | 43 +- + drivers/soc/qcom/mdt_loader.c | 18 +- + drivers/soc/qcom/qcom-geni-se.c | 30 +- + drivers/soc/qcom/qcom_aoss.c | 9 +- + drivers/soc/qcom/rpmhpd.c | 5 +- + drivers/soc/qcom/rpmpd.c | 28 + + drivers/soc/qcom/smd-rpm.c | 1 + + drivers/soc/qcom/smsm.c | 28 +- + drivers/soc/qcom/socinfo.c | 4 +- + drivers/soc/renesas/Kconfig | 2 + + drivers/soc/renesas/r8a779a0-sysc.c | 6 +- + drivers/soc/renesas/rcar-sysc.c | 6 +- + drivers/soc/renesas/renesas-soc.c | 4 + + drivers/soc/tegra/fuse/fuse-tegra.c | 60 + + drivers/soc/tegra/fuse/fuse-tegra20.c | 11 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 16 +- + drivers/soc/tegra/fuse/fuse.h | 2 + + drivers/soc/tegra/pmc.c | 14 +- + drivers/soc/tegra/powergate-bpmp.c | 1 - + drivers/soc/ti/pruss.c | 1 + + drivers/soc/ti/smartreflex.c | 52 +- + drivers/spi/spi-imx.c | 41 +- + drivers/watchdog/Kconfig | 1 + + drivers/watchdog/ixp4xx_wdt.c | 283 ++-- + include/dt-bindings/clock/r9a07g044-cpg.h | 1 + + include/dt-bindings/power/qcom-rpmpd.h | 10 + + include/linux/clk/at91_pmc.h | 26 + + include/linux/omap-gpmc.h | 3 - + include/linux/platform_data/pata_ixp4xx_cf.h | 4 +- + include/linux/power/smartreflex.h | 2 + + include/linux/qcom-geni-se.h | 19 +- + include/soc/at91/sama7-ddr.h | 80 ++ + include/soc/at91/sama7-sfrbu.h | 34 + + include/soc/tegra/pm.h | 6 + + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_scmi.h | 24 + + 538 files changed, 32642 insertions(+), 9383 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/intel,ixp4xx-compact-flash.yaml + create mode 100644 Documentation/devicetree/bindings/bus/intel,ixp4xx-expansion-bus-controller.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/aspeed,sgpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi + create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-cloudripper.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-elbert.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-fuji.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-inspur-nf5280m6.dts + create mode 100644 arch/arm/boot/dts/ast2600-facebook-netbmc-common.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama7g5ek.dts + create mode 100644 arch/arm/boot/dts/dra74x-p.dtsi + create mode 100644 arch/arm/boot/dts/facebook-bmc-flash-layout-128.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-dhcom-picoitx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-skov-revc-lt2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-skov-revc-lt6.dts + create mode 100644 arch/arm/boot/dts/imx6dl-solidsense.dts + create mode 100644 arch/arm/boot/dts/imx6q-skov-revc-lt2.dts + create mode 100644 arch/arm/boot/dts/imx6q-skov-revc-lt6.dts + create mode 100644 arch/arm/boot/dts/imx6q-skov-reve-mi1010ait-1cp1.dts + create mode 100644 arch/arm/boot/dts/imx6q-solidsense.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-dhcom-drc02.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-dhcom-pdk2.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-dhcom-picoitx.dtsi + rename arch/arm/boot/dts/{imx6q-dhcom-som.dtsi => imx6qdl-dhcom-som.dtsi} (57%) + create mode 100644 arch/arm/boot/dts/imx6qdl-skov-cpu-revc.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-skov-cpu.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-solidsense.dtsi + create mode 100644 arch/arm/boot/dts/imx6s-dhcom-drc02.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-adi-coyote.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-arcom-vulcan.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-freecom-fsg-3.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-gateworks-gw2348.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-ixdp425.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-ixdpg425.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-linksys-wrv54g.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x-netgear-wg302v2.dts + create mode 100644 arch/arm/boot/dts/intel-ixp43x-kixrp435.dts + create mode 100644 arch/arm/boot/dts/intel-ixp46x-ixdp465.dts + create mode 100644 arch/arm/boot/dts/intel-ixp4xx-reference-design.dtsi + create mode 100644 arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts + create mode 100644 arch/arm/boot/dts/qcom-msm8226.dtsi + create mode 100644 arch/arm/boot/dts/sama7g5-pinfunc.h + create mode 100644 arch/arm/boot/dts/sama7g5.dtsi + create mode 100644 arch/arm/boot/dts/ste-ux500-samsung-codina.dts + create mode 100644 arch/arm/boot/dts/ste-ux500-samsung-gavini.dts + create mode 100644 arch/arm/boot/dts/ste-ux500-samsung-kyle.dts + create mode 100644 arch/arm/boot/dts/stih418-b2264.dts + create mode 100644 arch/arm/configs/sama7_defconfig + create mode 100644 arch/arm/mach-at91/sama7.c + delete mode 100644 arch/arm/mach-ep93xx/crunch-bits.S + delete mode 100644 arch/arm/mach-ep93xx/crunch.c + delete mode 100644 arch/arm/mach-ixp4xx/avila-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/avila-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/coyote-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/coyote-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/dsmg600-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/dsmg600-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/fsg-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/gtwx5715-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/gtwx5715-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/ixdp425-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/ixdp425-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/ixdpg425-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/miccpt-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/nas100d-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/nas100d-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/nslu2-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/nslu2-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/omixp-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/vulcan-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/vulcan-setup.c + delete mode 100644 arch/arm/mach-ixp4xx/wg302v2-pci.c + delete mode 100644 arch/arm/mach-ixp4xx/wg302v2-setup.c + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7902.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-venice-gw7902.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-nitrogen-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-img.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-ss-img.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb-A.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb-B.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-B.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-B.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-B.dts + create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-dora.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-kagura.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-keyaki.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-kagura.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-keyaki.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmi8996.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-idp.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-idp2.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm636.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm6125.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m1-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m1-ulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m1-ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m1.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m3-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m3-ulcb-kf.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m3-ulcb.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779m3.dtsi + create mode 100644 drivers/bus/intel-ixp4xx-eb.c + create mode 100644 drivers/firmware/arm_scmi/Kconfig + create mode 100644 drivers/firmware/arm_scmi/msg.c + create mode 100644 drivers/firmware/arm_scmi/virtio.c + create mode 100644 drivers/soc/mediatek/mt8365-mmsys.h + create mode 100644 include/soc/at91/sama7-ddr.h + create mode 100644 include/soc/at91/sama7-sfrbu.h + create mode 100644 include/uapi/linux/virtio_scmi.h +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (6285af2a2821 Merge tags 'amlogic-arm-configs-for-v5.15', 'amlogic-arm64-dt-for-v5.15' and 'amlogic-arm-dt-for-v5.15' into for-next) +$ git merge amlogic/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (0f32f00af344 Merge branches 'dt-for-v5.15', 'soc-for-v5.15' and 'defconfig-for-v5.15' into for-next) +$ git merge aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +- + arch/arm/configs/aspeed_g4_defconfig | 16 +++++----------- + arch/arm/configs/aspeed_g5_defconfig | 25 +++++++++---------------- + 3 files changed, 15 insertions(+), 28 deletions(-) +Merging at91/at91-next (b102356e5bc1 Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (c28b584deb1b Merge branch 'for-v5.15/omap-gpmc' into for-next) +$ git merge drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (2cb411d89676 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge keystone/next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (69862ae4e378 Merge branch 'v5.14-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (930af8dda750 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging omap/for-next (7911f95d1713 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging qcom/for-next (57249830120b Merge remote-tracking branch 'refs/remotes/origin/for-next' into for-next) +$ git merge qcom/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging raspberrypi/for-next (b1f2fcb28228 ARM: dts: bcm283x: Fix VEC address for BCM2711) +$ git merge raspberrypi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2711.dtsi | 8 ++++++++ + arch/arm/boot/dts/bcm2835-common.dtsi | 8 ++++++++ + arch/arm/boot/dts/bcm283x.dtsi | 8 -------- + 3 files changed, 16 insertions(+), 8 deletions(-) +Merging renesas/next (59d7f78144a8 Merge branches 'renesas-arm-dt-for-v5.15' and 'renesas-drivers-for-v5.15' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 1 + + 1 file changed, 1 insertion(+) +Merging reset/reset/next (bee08559701f reset: renesas: Add RZ/G2L usbphy control driver) +$ git merge reset/reset/next +Auto-merging drivers/reset/Kconfig +Removing Documentation/devicetree/bindings/reset/uniphier-reset.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/qcom,aoss-reset.yaml | 5 + + .../devicetree/bindings/reset/qcom,pdc-global.yaml | 4 + + .../bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml | 65 ++++++++ + .../reset/socionext,uniphier-glue-reset.yaml | 88 +++++++++++ + .../devicetree/bindings/reset/uniphier-reset.txt | 61 ------- + drivers/reset/Kconfig | 7 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-qcom-pdc.c | 62 ++++++-- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 175 +++++++++++++++++++++ + include/dt-bindings/reset/qcom,sdm845-pdc.h | 2 + + 10 files changed, 398 insertions(+), 72 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml + create mode 100644 Documentation/devicetree/bindings/reset/socionext,uniphier-glue-reset.yaml + delete mode 100644 Documentation/devicetree/bindings/reset/uniphier-reset.txt + create mode 100644 drivers/reset/reset-rzg2l-usbphy-ctrl.c +Merging rockchip/for-next (abfe14de9197 Merge branch 'v5.15-armsoc/drivers' into for-next) +$ git merge rockchip/for-next +Removing Documentation/devicetree/bindings/power/rockchip-io-domain.txt +Removing Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 48 +- + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + .../bindings/clock/rockchip,rk3399-cru.txt | 68 -- + .../bindings/clock/rockchip,rk3399-cru.yaml | 92 ++ + .../bindings/power/rockchip-io-domain.txt | 135 --- + .../bindings/power/rockchip-io-domain.yaml | 360 ++++++++ + .../devicetree/bindings/soc/rockchip/grf.yaml | 19 +- + arch/arm/boot/dts/rk3066a.dtsi | 10 +- + arch/arm/boot/dts/rk3188.dtsi | 13 +- + arch/arm/boot/dts/rk3288.dtsi | 6 - + arch/arm/boot/dts/rv1108.dtsi | 49 +- + arch/arm64/boot/dts/rockchip/Makefile | 6 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 73 ++ + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 37 + + arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts | 3 - + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 16 + + arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 110 +++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 5 - + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 5 - + .../boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts | 41 + + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 36 + + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 6 +- + .../arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 218 +++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 54 ++ + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 + + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 47 ++ + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 29 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 47 +- + 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 | 308 +++++++ + arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi | 9 + + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 644 ++------------ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 930 +++++++++++++++++++++ + drivers/clk/rockchip/clk-pll.c | 2 +- + drivers/clk/rockchip/clk-rk3036.c | 5 +- + drivers/clk/rockchip/clk-rk3308.c | 1 + + drivers/soc/rockchip/Kconfig | 4 +- + drivers/soc/rockchip/io-domain.c | 88 +- + include/dt-bindings/clock/rk3036-cru.h | 1 + + 42 files changed, 3225 insertions(+), 837 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml + delete mode 100644 Documentation/devicetree/bindings/power/rockchip-io-domain.txt + create mode 100644 Documentation/devicetree/bindings/power/rockchip-io-domain.yaml + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-dumo.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk356x.dtsi +Merging samsung-krzk/for-next (90861bf54255 Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging scmi/for-linux-next (7c414a7d93c6 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge scmi/for-linux-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 12 ------------ + drivers/firmware/arm_scmi/Kconfig | 2 +- + 2 files changed, 1 insertion(+), 13 deletions(-) +Merging stm32/stm32-next (1e6bc5987a52 ARM: dts: stm32: Update AV96 adv7513 node per dtbs_check) +$ git merge stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging tegra/for-next (cc701ccede61 Merge branch for-5.15/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-tegra-periph.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) +Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) +$ git merge ti-k3/ti-k3-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging ti-k3-new/ti-k3-next (c1fa5ac6c2f4 arm64: dts: ti: k3-am642-sk: Add pwm nodes) +$ git merge ti-k3-new/ti-k3-next +Already up to date. +Merging xilinx/for-next (4cddd9be7ef6 Merge branch 'zynq/soc' of https://github.com/Xilinx/linux-xlnx into for-next) +$ git merge xilinx/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/xilinx.yaml | 1 + + arch/arm/boot/dts/zynq-7000.dtsi | 21 ++ + arch/arm/boot/dts/zynq-ebaz4205.dts | 12 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm64/boot/dts/xilinx/Makefile | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 13 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 16 +- + arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 16 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 292 +++++++++++++++++- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 335 ++++++++++++++++++++- + .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 9 +- + .../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 | 254 +++++++++++++++- + .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts | 15 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 315 ++++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 3 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 286 +++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 244 ++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 335 ++++++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 269 ++++++++++++++++- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 29 +- + 22 files changed, 2739 insertions(+), 82 deletions(-) + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dts +Merging clk/clk-next (765f4fa0e9f1 Merge branch 'clk-qcom' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + + .../arm/mediatek/mediatek,mt8192-clock.yaml | 199 +++ + .../arm/mediatek/mediatek,mt8192-sys-clock.yaml | 65 + + .../devicetree/bindings/clock/qcom,a53pll.yaml | 3 + + .../devicetree/bindings/clock/qcom,gpucc.yaml | 7 +- + .../devicetree/bindings/clock/qcom,rpmcc.txt | 4 + + .../bindings/clock/qcom,sc7280-dispcc.yaml | 94 ++ + .../devicetree/bindings/clock/qcom,videocc.yaml | 6 +- + drivers/acpi/acpi_lpss.c | 6 +- + drivers/clk/bcm/clk-bcm2835.c | 9 +- + drivers/clk/clk-divider.c | 23 + + drivers/clk/clk-lmk04832.c | 18 - + drivers/clk/clk-palmas.c | 10 +- + drivers/clk/clk-stm32f4.c | 8 +- + drivers/clk/clk-stm32h7.c | 8 +- + drivers/clk/clk-stm32mp1.c | 10 +- + drivers/clk/imx/clk-imx6q.c | 2 +- + drivers/clk/mediatek/Kconfig | 105 +- + drivers/clk/mediatek/Makefile | 13 + + drivers/clk/mediatek/clk-cpumux.c | 2 +- + drivers/clk/mediatek/clk-mt8192-aud.c | 118 ++ + drivers/clk/mediatek/clk-mt8192-cam.c | 107 ++ + drivers/clk/mediatek/clk-mt8192-img.c | 70 ++ + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 119 ++ + drivers/clk/mediatek/clk-mt8192-ipe.c | 57 + + drivers/clk/mediatek/clk-mt8192-mdp.c | 82 ++ + drivers/clk/mediatek/clk-mt8192-mfg.c | 50 + + drivers/clk/mediatek/clk-mt8192-mm.c | 108 ++ + drivers/clk/mediatek/clk-mt8192-msdc.c | 85 ++ + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 50 + + drivers/clk/mediatek/clk-mt8192-vdec.c | 94 ++ + drivers/clk/mediatek/clk-mt8192-venc.c | 53 + + drivers/clk/mediatek/clk-mt8192.c | 1326 ++++++++++++++++++++ + drivers/clk/mediatek/clk-mtk.c | 25 +- + drivers/clk/mediatek/clk-mtk.h | 28 +- + drivers/clk/mediatek/clk-mux.c | 11 +- + drivers/clk/mediatek/clk-mux.h | 18 +- + drivers/clk/mediatek/clk-pll.c | 31 +- + drivers/clk/mediatek/reset.c | 2 +- + drivers/clk/qcom/Kconfig | 25 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/a53-pll.c | 68 +- + drivers/clk/qcom/apcs-msm8916.c | 10 +- + drivers/clk/qcom/clk-smd-rpm.c | 158 +++ + drivers/clk/qcom/dispcc-sc7280.c | 908 ++++++++++++++ + drivers/clk/qcom/dispcc-sm8250.c | 22 +- + drivers/clk/qcom/gdsc.c | 54 +- + drivers/clk/qcom/gpucc-sc7280.c | 491 ++++++++ + drivers/clk/qcom/gpucc-sm8150.c | 12 + + drivers/clk/qcom/videocc-sc7280.c | 325 +++++ + drivers/clk/renesas/Makefile | 2 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a774e1-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 5 +- + drivers/clk/renesas/r9a07g044-cpg.c | 72 +- + .../renesas/{renesas-rzg2l-cpg.c => rzg2l-cpg.c} | 22 +- + .../renesas/{renesas-rzg2l-cpg.h => rzg2l-cpg.h} | 0 + drivers/clk/socfpga/clk-agilex.c | 19 +- + drivers/clk/x86/Makefile | 2 +- + drivers/clk/x86/{clk-lpt.c => clk-lpss-atom.c} | 12 +- + include/dt-bindings/clock/mt8192-clk.h | 585 +++++++++ + include/dt-bindings/clock/qcom,dispcc-sc7280.h | 55 + + include/dt-bindings/clock/qcom,gcc-sc7280.h | 2 +- + include/dt-bindings/clock/qcom,gpucc-sc7280.h | 35 + + include/dt-bindings/clock/qcom,rpmcc.h | 10 + + include/dt-bindings/clock/qcom,videocc-sc7280.h | 27 + + include/linux/clk-provider.h | 10 +- + include/linux/platform_data/x86/clk-lpss.h | 2 +- + include/linux/soc/qcom/smd-rpm.h | 1 + + 72 files changed, 5805 insertions(+), 168 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-clock.yaml + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8192-sys-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7280-dispcc.yaml + create mode 100644 drivers/clk/mediatek/clk-mt8192-aud.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-ipe.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-mdp.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-msdc.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-scp_adsp.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8192.c + create mode 100644 drivers/clk/qcom/dispcc-sc7280.c + create mode 100644 drivers/clk/qcom/gpucc-sc7280.c + create mode 100644 drivers/clk/qcom/videocc-sc7280.c + rename drivers/clk/renesas/{renesas-rzg2l-cpg.c => rzg2l-cpg.c} (98%) + rename drivers/clk/renesas/{renesas-rzg2l-cpg.h => rzg2l-cpg.h} (100%) + rename drivers/clk/x86/{clk-lpt.c => clk-lpss-atom.c} (76%) + create mode 100644 include/dt-bindings/clock/mt8192-clk.h + create mode 100644 include/dt-bindings/clock/qcom,dispcc-sc7280.h + create mode 100644 include/dt-bindings/clock/qcom,gpucc-sc7280.h + create mode 100644 include/dt-bindings/clock/qcom,videocc-sc7280.h +Merging clk-imx/for-next (fb3f4bca19b3 clk: imx: clk-divider-gate: Switch to clk_divider.determine_rate) +$ git merge clk-imx/for-next +Merge made by the 'recursive' strategy. + drivers/clk/imx/clk-divider-gate.c | 10 +++++----- + drivers/clk/imx/clk-imx8mm.c | 4 ++-- + drivers/clk/imx/clk-imx8mn.c | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging clk-renesas/renesas-clk (e8425dd55abb clk: renesas: Make CLK_R9A06G032 invisible) +$ git merge clk-renesas/renesas-clk +Merge made by the 'recursive' strategy. + drivers/clk/renesas/Kconfig | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (90dc8c0e664e csky: Kconfig: Remove unused selects) +$ git merge csky/linux-next +Already up to date. +Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) +$ git merge h8300/h8300-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +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 (2189e928b62e m68k: Fix invalid RMW_INSNS on CPUs that lack CAS) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.cpu | 8 +++++++- + arch/m68k/configs/amiga_defconfig | 6 ++++-- + arch/m68k/configs/apollo_defconfig | 4 +++- + arch/m68k/configs/atari_defconfig | 6 ++++-- + arch/m68k/configs/bvme6000_defconfig | 4 +++- + arch/m68k/configs/hp300_defconfig | 4 +++- + arch/m68k/configs/mac_defconfig | 6 ++++-- + arch/m68k/configs/multi_defconfig | 6 ++++-- + arch/m68k/configs/mvme147_defconfig | 4 +++- + arch/m68k/configs/mvme16x_defconfig | 4 +++- + arch/m68k/configs/q40_defconfig | 6 ++++-- + arch/m68k/configs/sun3_defconfig | 4 +++- + arch/m68k/configs/sun3x_defconfig | 4 +++- + arch/m68k/emu/nfeth.c | 4 ++-- + 14 files changed, 50 insertions(+), 20 deletions(-) +Merging m68knommu/for-next (07c4e80124d1 m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.bus | 2 +- + arch/m68k/Kconfig.machine | 1 + + arch/m68k/coldfire/clk.c | 2 +- + arch/m68k/coldfire/device.c | 44 +++++++++++++++++++++++++++++++++++++++ + arch/m68k/coldfire/m5441x.c | 8 +++---- + arch/m68k/coldfire/stmark2.c | 6 ++++-- + arch/m68k/include/asm/m5441xsim.h | 19 +++++++++++++++++ + 7 files changed, 74 insertions(+), 8 deletions(-) +Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistake "vesion" -> "version") +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (4d2ee1be4c2a MIPS: generic: Return true/false (not 1/0) from bool functions) +$ git merge mips/mips-next +Removing arch/mips/pistachio/time.c +Removing arch/mips/pistachio/irq.c +Removing arch/mips/pistachio/init.c +Removing arch/mips/pistachio/Platform +Removing arch/mips/pistachio/Makefile +Removing arch/mips/pistachio/Kconfig +Removing arch/mips/configs/pistachio_defconfig +Auto-merging arch/mips/Makefile +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 30 -- + arch/mips/Makefile | 3 + + arch/mips/alchemy/devboards/db1200.c | 2 +- + arch/mips/boot/dts/Makefile | 2 +- + arch/mips/boot/dts/img/Makefile | 3 +- + arch/mips/boot/dts/img/pistachio.dtsi | 10 + + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 10 +- + arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 33 +-- + .../cavium-octeon/executive/cvmx-helper-board.c | 8 +- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 12 +- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 8 +- + .../executive/cvmx-interrupt-decodes.c | 17 +- + arch/mips/cavium-octeon/executive/cvmx-l2c.c | 9 +- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 22 +- + arch/mips/cavium-octeon/executive/cvmx-spi.c | 20 +- + arch/mips/cavium-octeon/flash_setup.c | 2 +- + arch/mips/cavium-octeon/setup.c | 81 ++---- + arch/mips/cavium-octeon/smp.c | 14 +- + arch/mips/configs/generic/board-marduk.config | 53 ++++ + arch/mips/configs/pistachio_defconfig | 316 --------------------- + arch/mips/generic/Kconfig | 6 + + arch/mips/generic/Platform | 1 + + arch/mips/generic/board-ingenic.c | 21 ++ + arch/mips/generic/board-marduk.its.S | 22 ++ + arch/mips/generic/board-ocelot.c | 6 +- + arch/mips/include/asm/atomic.h | 2 +- + arch/mips/include/asm/bootinfo.h | 3 + + arch/mips/include/asm/cpu.h | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 10 +- + arch/mips/kernel/process.c | 4 +- + arch/mips/kvm/Makefile | 19 +- + arch/mips/loongson2ef/common/Makefile | 4 +- + arch/mips/mm/c-octeon.c | 29 +- + arch/mips/netlogic/xlr/fmn-config.c | 15 +- + arch/mips/pistachio/Kconfig | 14 - + arch/mips/pistachio/Makefile | 2 - + arch/mips/pistachio/Platform | 6 - + arch/mips/pistachio/init.c | 125 -------- + arch/mips/pistachio/irq.c | 24 -- + arch/mips/pistachio/time.c | 55 ---- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 2 +- + drivers/clk/pistachio/Kconfig | 8 + + drivers/clocksource/Kconfig | 3 +- + drivers/phy/Kconfig | 2 +- + drivers/pinctrl/Kconfig | 5 +- + 47 files changed, 282 insertions(+), 767 deletions(-) + create mode 100644 arch/mips/configs/generic/board-marduk.config + delete mode 100644 arch/mips/configs/pistachio_defconfig + create mode 100644 arch/mips/generic/board-marduk.its.S + delete mode 100644 arch/mips/pistachio/Kconfig + delete mode 100644 arch/mips/pistachio/Makefile + delete mode 100644 arch/mips/pistachio/Platform + delete mode 100644 arch/mips/pistachio/init.c + delete mode 100644 arch/mips/pistachio/irq.c + delete mode 100644 arch/mips/pistachio/time.c + create mode 100644 drivers/clk/pistachio/Kconfig +Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) +$ git merge nds32/next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (94effcedaa54 openrisc: Fix compiler warnings in setup) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/pgtable.h | 6 +++--- + arch/openrisc/include/asm/setup.h | 15 +++++++++++++++ + arch/openrisc/include/asm/thread_info.h | 2 +- + arch/openrisc/kernel/entry.S | 6 ++++-- + arch/openrisc/kernel/head.S | 6 +++--- + arch/openrisc/kernel/setup.c | 20 +++----------------- + arch/openrisc/lib/Makefile | 2 +- + arch/openrisc/mm/fault.c | 2 +- + 8 files changed, 31 insertions(+), 28 deletions(-) + create mode 100644 arch/openrisc/include/asm/setup.h +Merging parisc-hd/for-next (ca2b19a4bdb6 parisc: Increase gcc stack frame check to 2048 for 32- and 64-bit) +$ git merge parisc-hd/for-next +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + drivers/parisc/led.c | 4 ++-- + lib/Kconfig.debug | 5 ++--- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging powerpc/next (8b893ef190b0 powerpc/pseries: Fix build error when NUMA=n) +$ git merge powerpc/next +Auto-merging arch/powerpc/sysdev/xive/common.c +CONFLICT (content): Merge conflict in arch/powerpc/sysdev/xive/common.c +Auto-merging arch/powerpc/platforms/pseries/setup.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/prom_init.c +Removing arch/powerpc/include/asm/debugfs.h +Resolved 'arch/powerpc/sysdev/xive/common.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 10cea19ff09c] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/powerpc/associativity.rst | 104 +++++ + arch/powerpc/Makefile | 4 +- + arch/powerpc/boot/Makefile | 10 - + arch/powerpc/boot/dts/wii.dts | 13 +- + arch/powerpc/boot/install.sh | 27 +- + arch/powerpc/configs/microwatt_defconfig | 1 + + arch/powerpc/configs/wii_defconfig | 1 + + arch/powerpc/include/asm/book3s/64/kup.h | 2 +- + arch/powerpc/include/asm/bug.h | 61 ++- + arch/powerpc/include/asm/debugfs.h | 13 - + arch/powerpc/include/asm/drmem.h | 1 + + arch/powerpc/include/asm/extable.h | 14 + + arch/powerpc/include/asm/firmware.h | 7 +- + arch/powerpc/include/asm/kvm_ppc.h | 4 +- + arch/powerpc/include/asm/membarrier.h | 3 +- + arch/powerpc/include/asm/mmu.h | 2 +- + arch/powerpc/include/asm/pci-bridge.h | 5 + + arch/powerpc/include/asm/pnv-pci.h | 2 +- + arch/powerpc/include/asm/ppc_asm.h | 11 +- + arch/powerpc/include/asm/prom.h | 3 +- + arch/powerpc/include/asm/sections.h | 8 - + arch/powerpc/include/asm/smp.h | 6 + + arch/powerpc/include/asm/topology.h | 6 +- + arch/powerpc/include/asm/xics.h | 3 +- + arch/powerpc/include/asm/xive-regs.h | 3 + + arch/powerpc/include/asm/xive.h | 2 + + arch/powerpc/kernel/Makefile | 3 +- + arch/powerpc/kernel/cacheinfo.c | 124 +++--- + arch/powerpc/kernel/dawr.c | 3 +- + arch/powerpc/kernel/eeh.c | 16 +- + arch/powerpc/kernel/eeh_cache.c | 4 +- + arch/powerpc/kernel/entry_64.S | 2 +- + arch/powerpc/kernel/fadump.c | 4 +- + arch/powerpc/kernel/head_64.S | 2 + + arch/powerpc/kernel/hw_breakpoint.c | 1 - + arch/powerpc/kernel/kdebugfs.c | 14 + + arch/powerpc/kernel/misc_32.S | 2 +- + arch/powerpc/kernel/pci-common.c | 6 + + arch/powerpc/kernel/prom_init.c | 3 +- + arch/powerpc/kernel/rtasd.c | 4 +- + arch/powerpc/kernel/security.c | 16 +- + arch/powerpc/kernel/setup-common.c | 13 - + arch/powerpc/kernel/setup_64.c | 1 - + arch/powerpc/kernel/smp.c | 70 ++-- + arch/powerpc/kernel/stacktrace.c | 1 + + arch/powerpc/kernel/traps.c | 13 +- + arch/powerpc/kexec/core_64.c | 10 +- + arch/powerpc/kvm/book3s_hv.c | 20 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 10 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 8 +- + arch/powerpc/kvm/book3s_xics.c | 6 +- + arch/powerpc/kvm/book3s_xive.c | 74 +++- + arch/powerpc/kvm/book3s_xive.h | 11 +- + arch/powerpc/kvm/book3s_xive_native.c | 24 +- + arch/powerpc/mm/book3s64/hash_native.c | 2 +- + arch/powerpc/mm/book3s64/hash_utils.c | 4 +- + arch/powerpc/mm/book3s64/pgtable.c | 8 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 3 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 16 +- + arch/powerpc/mm/drmem.c | 46 +++ + arch/powerpc/mm/numa.c | 445 ++++++++++++++++----- + arch/powerpc/mm/ptdump/bats.c | 4 +- + arch/powerpc/mm/ptdump/segment_regs.c | 4 +- + arch/powerpc/perf/core-book3s.c | 9 + + arch/powerpc/platforms/4xx/uic.c | 4 +- + arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 23 +- + arch/powerpc/platforms/52xx/media5200.c | 9 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 7 +- + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 6 +- + arch/powerpc/platforms/cell/axon_msi.c | 4 +- + arch/powerpc/platforms/cell/interrupt.c | 8 +- + arch/powerpc/platforms/cell/spider-pic.c | 11 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 15 +- + arch/powerpc/platforms/powernv/idle.c | 4 +- + arch/powerpc/platforms/powernv/memtrace.c | 3 +- + arch/powerpc/platforms/powernv/opal-imc.c | 12 +- + arch/powerpc/platforms/powernv/opal-irqchip.c | 11 +- + arch/powerpc/platforms/powernv/opal-lpc.c | 4 +- + arch/powerpc/platforms/powernv/opal-xscom.c | 4 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 260 ++++++++++-- + arch/powerpc/platforms/powernv/pci.c | 67 ---- + arch/powerpc/platforms/powernv/pci.h | 6 - + arch/powerpc/platforms/ps3/htab.c | 3 +- + arch/powerpc/platforms/ps3/mm.c | 8 +- + arch/powerpc/platforms/pseries/dtl.c | 4 +- + arch/powerpc/platforms/pseries/firmware.c | 3 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 173 ++++++-- + arch/powerpc/platforms/pseries/hotplug-memory.c | 6 + + arch/powerpc/platforms/pseries/lpar.c | 18 +- + arch/powerpc/platforms/pseries/msi.c | 296 ++++++++++---- + arch/powerpc/platforms/pseries/pci_dlpar.c | 4 + + arch/powerpc/platforms/pseries/pseries.h | 2 + + arch/powerpc/platforms/pseries/setup.c | 2 + + arch/powerpc/sysdev/fsl_mpic_err.c | 11 +- + arch/powerpc/sysdev/fsl_msi.c | 12 +- + arch/powerpc/sysdev/xics/ics-native.c | 13 +- + arch/powerpc/sysdev/xics/ics-opal.c | 40 +- + arch/powerpc/sysdev/xics/ics-rtas.c | 40 +- + arch/powerpc/sysdev/xics/xics-common.c | 131 ++++-- + arch/powerpc/sysdev/xive/common.c | 103 +++-- + arch/powerpc/sysdev/xive/native.c | 10 + + arch/powerpc/xmon/xmon.c | 6 +- + drivers/cpufreq/powernv-cpufreq.c | 16 +- + drivers/cpuidle/cpuidle-pseries.c | 77 ++-- + kernel/irq/irqdomain.c | 1 + + scripts/mod/modpost.c | 2 +- + .../selftests/powerpc/primitives/asm/extable.h | 1 + + 107 files changed, 1907 insertions(+), 855 deletions(-) + create mode 100644 Documentation/powerpc/associativity.rst + delete mode 100644 arch/powerpc/include/asm/debugfs.h + create mode 100644 arch/powerpc/kernel/kdebugfs.c + create mode 120000 tools/testing/selftests/powerpc/primitives/asm/extable.h +Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (8ba1a8b77ba1 riscv: Support allocating gigantic hugepages using CMA) +$ git merge risc-v/for-next +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/include/asm/page.h +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/riscv/starfive.yaml | 27 +++++ + arch/riscv/Kconfig | 4 + + arch/riscv/include/asm/page.h | 21 +--- + arch/riscv/include/asm/processor.h | 8 ++ + arch/riscv/kernel/probes/decode-insn.c | 5 +- + arch/riscv/kernel/probes/simulate-insn.c | 112 ++++++++++++++++++ + arch/riscv/mm/init.c | 130 +++++++++------------ + 7 files changed, 216 insertions(+), 91 deletions(-) + create mode 100644 Documentation/devicetree/bindings/riscv/starfive.yaml +Merging s390/for-next (54157006715d Merge branch 'features' into for-next) +$ git merge s390/for-next +Auto-merging arch/s390/boot/pgm_check_info.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 2 + + arch/s390/Makefile | 3 +- + arch/s390/boot/Makefile | 7 +- + arch/s390/boot/boot.h | 14 +- + arch/s390/boot/compressed/Makefile | 1 + + arch/s390/boot/compressed/decompressor.c | 5 - + arch/s390/boot/compressed/decompressor.h | 5 + + arch/s390/boot/compressed/vmlinux.lds.S | 35 +-- + arch/s390/boot/head.S | 56 +--- + arch/s390/boot/ipl_report.c | 6 +- + arch/s390/boot/kaslr.c | 6 +- + arch/s390/boot/mem_detect.c | 8 +- + arch/s390/boot/pgm_check_info.c | 5 +- + arch/s390/boot/sclp_early_core.c | 9 + + arch/s390/boot/startup.c | 60 +--- + arch/s390/boot/uv.c | 40 ++- + arch/s390/boot/uv.h | 19 ++ + arch/s390/hypfs/hypfs_diag0c.c | 12 +- + arch/s390/include/asm/cio.h | 1 - + arch/s390/include/asm/cpacf.h | 208 +++++++------ + arch/s390/include/asm/cpufeature.h | 2 +- + arch/s390/include/asm/ctl_reg.h | 17 ++ + arch/s390/include/asm/debug.h | 34 --- + arch/s390/include/asm/diag.h | 15 +- + arch/s390/include/asm/elf.h | 76 +++-- + arch/s390/include/asm/extable.h | 4 +- + arch/s390/include/asm/ftrace.h | 46 +-- + arch/s390/include/asm/ftrace.lds.h | 21 ++ + arch/s390/include/asm/ipl.h | 1 + + arch/s390/include/asm/kfence.h | 42 +++ + arch/s390/include/asm/linkage.h | 4 +- + arch/s390/include/asm/module.h | 14 +- + arch/s390/include/asm/page.h | 3 - + arch/s390/include/asm/pgtable.h | 10 +- + arch/s390/include/asm/qdio.h | 19 +- + arch/s390/include/asm/sclp.h | 10 +- + arch/s390/include/asm/sections.h | 4 +- + arch/s390/include/asm/set_memory.h | 6 + + arch/s390/include/asm/setup.h | 46 +-- + arch/s390/include/asm/syscall.h | 59 ++++ + arch/s390/include/asm/uv.h | 8 - + arch/s390/include/asm/vdso/gettimeofday.h | 22 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/asm-offsets.c | 7 + + arch/s390/kernel/crash_dump.c | 46 +-- + arch/s390/kernel/diag.c | 27 +- + arch/s390/kernel/dis.c | 2 + + arch/s390/kernel/early.c | 4 + + arch/s390/kernel/entry.h | 9 + + arch/s390/kernel/ftrace.c | 222 +++++++++++++- + arch/s390/kernel/ftrace.h | 26 ++ + arch/s390/kernel/head64.S | 17 ++ + arch/s390/kernel/ipl.c | 2 +- + arch/s390/kernel/ipl_vmparm.c | 2 + + arch/s390/kernel/irq.c | 4 +- + arch/s390/kernel/jump_label.c | 2 +- + arch/s390/kernel/machine_kexec.c | 4 +- + arch/s390/kernel/module.c | 45 +++ + arch/s390/kernel/os_info.c | 2 +- + arch/s390/kernel/perf_cpum_cf.c | 4 +- + arch/s390/kernel/processor.c | 177 ++++++++++- + arch/s390/kernel/setup.c | 277 +++++++---------- + arch/s390/kernel/smp.c | 14 +- + .../{boot/text_dma.S => kernel/text_amode31.S} | 56 ++-- + arch/s390/kernel/topology.c | 4 +- + arch/s390/kernel/traps.c | 2 +- + arch/s390/kernel/uv.c | 15 - + arch/s390/kernel/vdso32/Makefile | 1 + + arch/s390/kernel/vdso64/Makefile | 1 + + arch/s390/kernel/vmlinux.lds.S | 35 +++ + arch/s390/lib/delay.c | 11 +- + arch/s390/mm/dump_pagetables.c | 16 + + arch/s390/mm/fault.c | 13 +- + arch/s390/mm/init.c | 3 +- + arch/s390/mm/kasan_init.c | 2 +- + arch/s390/mm/maccess.c | 4 +- + arch/s390/mm/page-states.c | 43 --- + arch/s390/mm/pageattr.c | 19 +- + arch/s390/mm/vmem.c | 2 +- + arch/s390/pci/pci.c | 5 +- + arch/s390/purgatory/Makefile | 1 + + arch/s390/tools/opcodes.txt | 18 ++ + arch/x86/include/asm/kfence.h | 4 + + drivers/s390/block/dasd_ioctl.c | 4 +- + drivers/s390/char/sclp.h | 2 - + drivers/s390/char/sclp_cmd.c | 2 +- + drivers/s390/char/sclp_config.c | 4 +- + drivers/s390/char/sclp_early_core.c | 19 +- + drivers/s390/char/zcore.c | 2 +- + drivers/s390/cio/css.c | 30 ++ + drivers/s390/cio/qdio.h | 40 +-- + drivers/s390/cio/qdio_debug.c | 3 - + drivers/s390/cio/qdio_main.c | 331 +++++---------------- + drivers/s390/cio/qdio_setup.c | 114 ++----- + drivers/s390/crypto/zcrypt_ccamisc.c | 8 +- + drivers/s390/net/qeth_core_main.c | 10 +- + drivers/s390/scsi/zfcp_qdio.c | 5 +- + include/linux/ftrace.h | 16 + + kernel/kcsan/debugfs.c | 2 +- + kernel/trace/ftrace.c | 4 +- + mm/kfence/kfence_test.c | 13 +- + 101 files changed, 1503 insertions(+), 1221 deletions(-) + create mode 100644 arch/s390/boot/uv.h + create mode 100644 arch/s390/include/asm/ftrace.lds.h + create mode 100644 arch/s390/include/asm/kfence.h + create mode 100644 arch/s390/kernel/ftrace.h + rename arch/s390/{boot/text_dma.S => kernel/text_amode31.S} (71%) +Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) +$ git merge sh/for-next +Auto-merging drivers/sh/maple/maple.c +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 sparc-next/master +Already up to date. +Merging uml/linux-next (1aee020155f3 um: remove unneeded semicolon in um_arch.c) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (7b7cec477fc3 xtensa: move core-y in arch/xtensa/Makefile to arch/xtensa/Kbuild) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kbuild | 1 + + arch/xtensa/Kconfig | 2 +- + arch/xtensa/Makefile | 12 ------------ + arch/xtensa/kernel/traps.c | 7 +++++++ + arch/xtensa/platforms/Makefile | 4 ++++ + arch/xtensa/platforms/iss/console.c | 6 +++--- + 6 files changed, 16 insertions(+), 16 deletions(-) + create mode 100644 arch/xtensa/platforms/Makefile +Merging pidfd/for-next (f4dd02cd8631 Merge branch 'kernel.sys' into for-next) +$ git merge pidfd/for-next +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/idmappings.rst | 1026 ++++++++++++++++++++ + Documentation/filesystems/index.rst | 1 + + fs/namespace.c | 77 +- + include/uapi/linux/mount.h | 3 +- + kernel/sys.c | 3 +- + tools/testing/selftests/Makefile | 1 + + .../selftests/move_mount_set_group/.gitignore | 1 + + .../selftests/move_mount_set_group/Makefile | 7 + + .../testing/selftests/move_mount_set_group/config | 1 + + .../move_mount_set_group_test.c | 375 +++++++ + 10 files changed, 1492 insertions(+), 3 deletions(-) + create mode 100644 Documentation/filesystems/idmappings.rst + create mode 100644 tools/testing/selftests/move_mount_set_group/.gitignore + create mode 100644 tools/testing/selftests/move_mount_set_group/Makefile + create mode 100644 tools/testing/selftests/move_mount_set_group/config + create mode 100644 tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c +Merging fscrypt/master (38ef66b05cfa fscrypt: document struct fscrypt_operations) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + Documentation/filesystems/fscrypt.rst | 15 ++--- + fs/crypto/fname.c | 106 +++++++++++++++++++------------ + fs/crypto/hooks.c | 44 +++++++++++++ + fs/ext4/symlink.c | 12 +++- + fs/f2fs/namei.c | 12 +++- + fs/ubifs/file.c | 13 +++- + include/linux/fscrypt.h | 116 ++++++++++++++++++++++++++++++++-- + 7 files changed, 260 insertions(+), 58 deletions(-) +Merging fscache/fscache-next (5193f26aef59 fscache: Use refcount_t for the cookie refcount instead of atomic_t) +$ git merge fscache/fscache-next +Removing fs/fscache/object-list.c +Removing fs/fscache/histogram.c +Removing fs/cachefiles/proc.c +Merge made by the 'recursive' strategy. + fs/cachefiles/Kconfig | 19 -- + fs/cachefiles/Makefile | 2 - + fs/cachefiles/bind.c | 2 - + fs/cachefiles/interface.c | 6 +- + fs/cachefiles/internal.h | 25 --- + fs/cachefiles/io.c | 6 +- + fs/cachefiles/key.c | 2 +- + fs/cachefiles/main.c | 7 - + fs/cachefiles/namei.c | 61 ++---- + fs/cachefiles/proc.c | 114 ----------- + fs/cachefiles/xattr.c | 4 +- + fs/fscache/Kconfig | 25 +-- + fs/fscache/Makefile | 2 - + fs/fscache/cache.c | 11 +- + fs/fscache/cookie.c | 201 +++++++++++++----- + fs/fscache/fsdef.c | 3 +- + fs/fscache/histogram.c | 87 -------- + fs/fscache/internal.h | 57 ++---- + fs/fscache/main.c | 39 ++++ + fs/fscache/netfs.c | 2 +- + fs/fscache/object-list.c | 414 -------------------------------------- + fs/fscache/object.c | 8 - + fs/fscache/operation.c | 3 - + fs/fscache/page.c | 6 - + fs/fscache/proc.c | 20 +- + include/linux/fscache-cache.h | 4 - + include/linux/fscache.h | 4 +- + include/linux/netfs.h | 2 +- + include/trace/events/cachefiles.h | 68 +++---- + include/trace/events/fscache.h | 160 +++++++-------- + include/trace/events/netfs.h | 2 +- + 31 files changed, 368 insertions(+), 998 deletions(-) + delete mode 100644 fs/cachefiles/proc.c + delete mode 100644 fs/fscache/histogram.c + delete mode 100644 fs/fscache/object-list.c +Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (b61bdbb49be3 Merge branch 'for-next-next-v5.14-20210817' into for-next-20210817) +$ git merge btrfs/for-next +Merge made by the 'recursive' strategy. + block/bio.c | 12 +- + fs/9p/vfs_file.c | 7 +- + fs/btrfs/Makefile | 1 + + fs/btrfs/acl.c | 11 +- + fs/btrfs/backref.c | 6 +- + fs/btrfs/backref.h | 2 +- + fs/btrfs/block-group.c | 114 +++++- + fs/btrfs/btrfs_inode.h | 27 +- + fs/btrfs/check-integrity.c | 60 +-- + fs/btrfs/compression.c | 169 ++++----- + fs/btrfs/compression.h | 5 +- + fs/btrfs/ctree.c | 62 +-- + fs/btrfs/ctree.h | 99 +++-- + fs/btrfs/delayed-inode.c | 227 ++++------- + fs/btrfs/dir-item.c | 76 ++-- + fs/btrfs/disk-io.c | 21 +- + fs/btrfs/extent-tree.c | 12 +- + fs/btrfs/extent_io.c | 338 +++++++++++------ + fs/btrfs/extent_io.h | 2 +- + fs/btrfs/file-item.c | 5 +- + fs/btrfs/file.c | 25 +- + fs/btrfs/free-space-cache.c | 26 +- + fs/btrfs/inode.c | 301 ++++++++++----- + fs/btrfs/ioctl.c | 280 +++++++------- + fs/btrfs/lzo.c | 236 +++++------- + fs/btrfs/ordered-data.c | 5 +- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/qgroup.c | 8 +- + fs/btrfs/raid56.c | 18 +- + fs/btrfs/ref-verify.c | 10 +- + fs/btrfs/relocation.c | 306 +++++++++------ + fs/btrfs/scrub.c | 2 +- + fs/btrfs/send.c | 35 +- + fs/btrfs/space-info.c | 123 +++++- + fs/btrfs/struct-funcs.c | 8 +- + fs/btrfs/subpage.c | 24 +- + fs/btrfs/subpage.h | 3 + + fs/btrfs/super.c | 58 ++- + fs/btrfs/sysfs.c | 108 +++++- + fs/btrfs/tests/qgroup-tests.c | 30 +- + fs/btrfs/transaction.c | 11 +- + fs/btrfs/tree-checker.c | 38 +- + fs/btrfs/tree-log.c | 120 ++++-- + fs/btrfs/verity.c | 811 ++++++++++++++++++++++++++++++++++++++++ + fs/btrfs/volumes.c | 349 +++++++---------- + fs/btrfs/volumes.h | 32 +- + fs/btrfs/zlib.c | 54 +-- + fs/btrfs/zoned.c | 22 +- + fs/btrfs/zoned.h | 1 - + fs/btrfs/zstd.c | 39 +- + fs/fs-writeback.c | 19 +- + fs/namei.c | 43 ++- + include/linux/bio.h | 2 +- + include/linux/blk_types.h | 1 + + include/linux/fs.h | 3 +- + include/linux/namei.h | 1 + + include/trace/events/btrfs.h | 21 +- + include/uapi/linux/btrfs.h | 1 + + include/uapi/linux/btrfs_tree.h | 35 ++ + mm/filemap.c | 36 +- + 60 files changed, 2926 insertions(+), 1577 deletions(-) + create mode 100644 fs/btrfs/verity.c +Merging ceph/master (8434ffe71c87 ceph: take snap_empty_lock atomically with snaprealm refcount change) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (1c2809b3d6e6 cifs: fix wrong release in sess_alloc_buffer() failed path) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 3 +- + fs/cifs/Makefile | 4 +- + fs/cifs/cifs_unicode.c | 9 +- + fs/cifs/cifsencrypt.c | 81 ----------- + fs/cifs/cifsfs.c | 1 - + fs/cifs/cifsproto.h | 9 -- + fs/cifs/cifssmb.c | 1 + + fs/cifs/connect.c | 162 ---------------------- + fs/cifs/file.c | 15 +- + fs/cifs/fscache.c | 41 ++++-- + fs/cifs/fscache.h | 23 ++++ + fs/cifs/inode.c | 6 + + fs/cifs/ntlmssp.h | 1 + + fs/cifs/sess.c | 7 +- + fs/cifs/smb1ops.c | 362 +++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/smbencrypt.c | 114 ---------------- + 16 files changed, 451 insertions(+), 388 deletions(-) +Merging cifsd/cifsd-for-next (bdbb7400523b Merge pull request #65 from namjaejeon/cifsd-for-next) +$ git merge cifsd/cifsd-for-next +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/index.rst | 10 + + Documentation/filesystems/cifs/ksmbd.rst | 165 + + Documentation/filesystems/index.rst | 2 +- + MAINTAINERS | 12 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ksmbd/Kconfig | 68 + + fs/ksmbd/Makefile | 20 + + fs/ksmbd/asn1.c | 343 ++ + fs/ksmbd/asn1.h | 21 + + fs/ksmbd/auth.c | 1364 +++++ + fs/ksmbd/auth.h | 67 + + fs/ksmbd/connection.c | 413 ++ + fs/ksmbd/connection.h | 213 + + fs/ksmbd/crypto_ctx.c | 282 + + fs/ksmbd/crypto_ctx.h | 74 + + fs/ksmbd/glob.h | 49 + + fs/ksmbd/ksmbd_netlink.h | 395 ++ + fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 | 31 + + fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 | 19 + + fs/ksmbd/ksmbd_work.c | 80 + + fs/ksmbd/ksmbd_work.h | 117 + + fs/ksmbd/mgmt/ksmbd_ida.c | 46 + + fs/ksmbd/mgmt/ksmbd_ida.h | 34 + + fs/ksmbd/mgmt/share_config.c | 238 + + fs/ksmbd/mgmt/share_config.h | 81 + + fs/ksmbd/mgmt/tree_connect.c | 121 + + fs/ksmbd/mgmt/tree_connect.h | 56 + + fs/ksmbd/mgmt/user_config.c | 69 + + fs/ksmbd/mgmt/user_config.h | 66 + + fs/ksmbd/mgmt/user_session.c | 369 ++ + fs/ksmbd/mgmt/user_session.h | 106 + + fs/ksmbd/misc.c | 338 ++ + fs/ksmbd/misc.h | 35 + + fs/ksmbd/ndr.c | 340 ++ + fs/ksmbd/ndr.h | 22 + + fs/ksmbd/nterr.h | 543 ++ + fs/ksmbd/ntlmssp.h | 169 + + fs/ksmbd/oplock.c | 1709 ++++++ + fs/ksmbd/oplock.h | 131 + + fs/ksmbd/server.c | 633 +++ + fs/ksmbd/server.h | 70 + + fs/ksmbd/smb2misc.c | 438 ++ + fs/ksmbd/smb2ops.c | 312 ++ + fs/ksmbd/smb2pdu.c | 8372 ++++++++++++++++++++++++++++++ + fs/ksmbd/smb2pdu.h | 1698 ++++++ + fs/ksmbd/smb_common.c | 674 +++ + fs/ksmbd/smb_common.h | 542 ++ + fs/ksmbd/smbacl.c | 1356 +++++ + fs/ksmbd/smbacl.h | 212 + + fs/ksmbd/smbfsctl.h | 91 + + fs/ksmbd/smbstatus.h | 1822 +++++++ + fs/ksmbd/transport_ipc.c | 874 ++++ + fs/ksmbd/transport_ipc.h | 47 + + fs/ksmbd/transport_rdma.c | 2058 ++++++++ + fs/ksmbd/transport_rdma.h | 63 + + fs/ksmbd/transport_tcp.c | 618 +++ + fs/ksmbd/transport_tcp.h | 13 + + fs/ksmbd/unicode.c | 384 ++ + fs/ksmbd/unicode.h | 357 ++ + fs/ksmbd/uniupr.h | 268 + + fs/ksmbd/vfs.c | 1900 +++++++ + fs/ksmbd/vfs.h | 198 + + fs/ksmbd/vfs_cache.c | 725 +++ + fs/ksmbd/vfs_cache.h | 178 + + fs/ksmbd/xattr.h | 122 + + 66 files changed, 32243 insertions(+), 2 deletions(-) + create mode 100644 Documentation/filesystems/cifs/index.rst + create mode 100644 Documentation/filesystems/cifs/ksmbd.rst + create mode 100644 fs/ksmbd/Kconfig + create mode 100644 fs/ksmbd/Makefile + create mode 100644 fs/ksmbd/asn1.c + create mode 100644 fs/ksmbd/asn1.h + create mode 100644 fs/ksmbd/auth.c + create mode 100644 fs/ksmbd/auth.h + create mode 100644 fs/ksmbd/connection.c + create mode 100644 fs/ksmbd/connection.h + create mode 100644 fs/ksmbd/crypto_ctx.c + create mode 100644 fs/ksmbd/crypto_ctx.h + create mode 100644 fs/ksmbd/glob.h + create mode 100644 fs/ksmbd/ksmbd_netlink.h + create mode 100644 fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 + create mode 100644 fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 + create mode 100644 fs/ksmbd/ksmbd_work.c + create mode 100644 fs/ksmbd/ksmbd_work.h + create mode 100644 fs/ksmbd/mgmt/ksmbd_ida.c + create mode 100644 fs/ksmbd/mgmt/ksmbd_ida.h + create mode 100644 fs/ksmbd/mgmt/share_config.c + create mode 100644 fs/ksmbd/mgmt/share_config.h + create mode 100644 fs/ksmbd/mgmt/tree_connect.c + create mode 100644 fs/ksmbd/mgmt/tree_connect.h + create mode 100644 fs/ksmbd/mgmt/user_config.c + create mode 100644 fs/ksmbd/mgmt/user_config.h + create mode 100644 fs/ksmbd/mgmt/user_session.c + create mode 100644 fs/ksmbd/mgmt/user_session.h + create mode 100644 fs/ksmbd/misc.c + create mode 100644 fs/ksmbd/misc.h + create mode 100644 fs/ksmbd/ndr.c + create mode 100644 fs/ksmbd/ndr.h + create mode 100644 fs/ksmbd/nterr.h + create mode 100644 fs/ksmbd/ntlmssp.h + create mode 100644 fs/ksmbd/oplock.c + create mode 100644 fs/ksmbd/oplock.h + create mode 100644 fs/ksmbd/server.c + create mode 100644 fs/ksmbd/server.h + create mode 100644 fs/ksmbd/smb2misc.c + create mode 100644 fs/ksmbd/smb2ops.c + create mode 100644 fs/ksmbd/smb2pdu.c + create mode 100644 fs/ksmbd/smb2pdu.h + create mode 100644 fs/ksmbd/smb_common.c + create mode 100644 fs/ksmbd/smb_common.h + create mode 100644 fs/ksmbd/smbacl.c + create mode 100644 fs/ksmbd/smbacl.h + create mode 100644 fs/ksmbd/smbfsctl.h + create mode 100644 fs/ksmbd/smbstatus.h + create mode 100644 fs/ksmbd/transport_ipc.c + create mode 100644 fs/ksmbd/transport_ipc.h + create mode 100644 fs/ksmbd/transport_rdma.c + create mode 100644 fs/ksmbd/transport_rdma.h + create mode 100644 fs/ksmbd/transport_tcp.c + create mode 100644 fs/ksmbd/transport_tcp.h + create mode 100644 fs/ksmbd/unicode.c + create mode 100644 fs/ksmbd/unicode.h + create mode 100644 fs/ksmbd/uniupr.h + create mode 100644 fs/ksmbd/vfs.c + create mode 100644 fs/ksmbd/vfs.h + create mode 100644 fs/ksmbd/vfs_cache.c + create mode 100644 fs/ksmbd/vfs_cache.h + create mode 100644 fs/ksmbd/xattr.h +Merging configfs/for-next (769f52676756 configfs: restore the kernel v5.13 text attribute write behavior) +$ git merge 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 ecryptfs/next +Already up to date. +Merging erofs/dev (eadcd6b5a1eb erofs: add fiemap support with iomap) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/erofs.rst | 3 + + fs/erofs/Kconfig | 1 + + fs/erofs/data.c | 345 ++++++++++++++++-------------------- + fs/erofs/inode.c | 10 +- + fs/erofs/internal.h | 17 +- + fs/erofs/namei.c | 1 + + fs/erofs/super.c | 61 ++++++- + fs/erofs/zdata.c | 6 +- + fs/erofs/zmap.c | 133 +++++++++++++- + fs/iomap/buffered-io.c | 169 +++++++++--------- + fs/iomap/direct-io.c | 10 +- + include/linux/iomap.h | 18 ++ + 12 files changed, 475 insertions(+), 299 deletions(-) +Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block) +$ git merge exfat/dev +Already up to date. +Merging ext3/for_next (a95dc17633ab Pull utf8 handling fixes from Pali Rohar) +$ git merge ext3/for_next +Auto-merging mm/madvise.c +Auto-merging mm/filemap.c +Auto-merging include/linux/fs.h +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/fuse/dax.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/locking.rst | 79 +++++++---- + fs/ceph/addr.c | 9 +- + fs/ceph/file.c | 2 + + fs/cifs/smb2ops.c | 2 + + fs/ext2/Kconfig | 1 + + fs/ext2/ext2.h | 11 -- + fs/ext2/file.c | 7 +- + fs/ext2/inode.c | 27 ++-- + fs/ext2/super.c | 3 - + fs/ext4/ext4.h | 10 -- + fs/ext4/extents.c | 25 ++-- + fs/ext4/file.c | 13 +- + fs/ext4/inode.c | 47 +++---- + fs/ext4/ioctl.c | 4 +- + fs/ext4/super.c | 13 +- + fs/ext4/truncate.h | 8 +- + fs/f2fs/data.c | 8 +- + fs/f2fs/f2fs.h | 1 - + fs/f2fs/file.c | 62 ++++----- + fs/f2fs/super.c | 1 - + fs/fuse/dax.c | 50 ++++--- + fs/fuse/dir.c | 11 +- + fs/fuse/file.c | 10 +- + fs/fuse/fuse_i.h | 7 - + fs/fuse/inode.c | 1 - + fs/hpfs/Kconfig | 1 + + fs/hpfs/file.c | 51 ++++++- + fs/inode.c | 2 + + fs/ioctl.c | 203 --------------------------- + fs/isofs/inode.c | 27 ++-- + fs/isofs/isofs.h | 1 - + fs/isofs/joliet.c | 4 +- + fs/notify/fanotify/fanotify_user.c | 251 ++++++++++++++++++++++++---------- + fs/notify/fsnotify.c | 6 +- + fs/notify/fsnotify.h | 15 ++ + fs/notify/mark.c | 52 +++++-- + fs/udf/dir.c | 5 +- + fs/udf/ecma_167.h | 44 +++--- + fs/udf/inode.c | 3 +- + fs/udf/namei.c | 13 +- + fs/udf/osta_udf.h | 22 +-- + fs/udf/super.c | 75 +++++----- + fs/udf/udf_sb.h | 2 - + fs/udf/udfdecl.h | 4 + + fs/udf/unicode.c | 4 +- + fs/xfs/xfs_bmap_util.c | 15 +- + fs/xfs/xfs_file.c | 13 +- + fs/xfs/xfs_inode.c | 121 ++++++++-------- + fs/xfs/xfs_inode.h | 3 +- + fs/xfs/xfs_super.c | 2 - + fs/zonefs/super.c | 23 +--- + fs/zonefs/zonefs.h | 7 +- + include/linux/fanotify.h | 3 + + include/linux/fiemap.h | 4 - + include/linux/fs.h | 46 ++++++- + include/linux/fsnotify.h | 9 ++ + include/linux/pid.h | 1 + + include/uapi/linux/fanotify.h | 13 ++ + kernel/pid.c | 15 +- + mm/filemap.c | 145 ++++++++++++++++---- + mm/madvise.c | 2 +- + mm/memory-failure.c | 2 +- + mm/readahead.c | 2 + + mm/rmap.c | 41 +++--- + mm/shmem.c | 20 +-- + mm/truncate.c | 9 +- + 66 files changed, 910 insertions(+), 783 deletions(-) +Merging ext4/dev (6c6ce4d71465 jbd2: add sparse annotations for add_transaction_credits()) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 2 + + fs/ext4/ext4_extents.h | 5 +- + fs/ext4/extents.c | 5 +- + fs/ext4/fast_commit.c | 27 ++---- + fs/ext4/inode.c | 8 +- + fs/ext4/mballoc.c | 249 ++++++++++++++++++++++++++++++++----------------- + fs/ext4/super.c | 8 ++ + fs/jbd2/recovery.c | 29 +++--- + fs/jbd2/transaction.c | 19 +++- + 9 files changed, 229 insertions(+), 123 deletions(-) +Merging f2fs/dev (bbe1da7e34ac f2fs: compress: do sanity check on cluster) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 23 ++++- + Documentation/filesystems/f2fs.rst | 17 +++- + fs/f2fs/Kconfig | 16 ++- + fs/f2fs/checkpoint.c | 35 +++++-- + fs/f2fs/compress.c | 85 +++++++++++++++- + fs/f2fs/data.c | 162 +++++++++++++++++++----------- + fs/f2fs/debug.c | 39 +++++++- + fs/f2fs/dir.c | 18 ++-- + fs/f2fs/extent_cache.c | 46 ++++++++- + fs/f2fs/f2fs.h | 81 ++++++++++++--- + fs/f2fs/file.c | 52 +++++++++- + fs/f2fs/gc.c | 9 +- + fs/f2fs/node.c | 63 +++++++++--- + fs/f2fs/recovery.c | 3 +- + fs/f2fs/segment.c | 111 ++++++++++++++------- + fs/f2fs/segment.h | 4 +- + fs/f2fs/super.c | 172 +++++++++++++++++++++++--------- + fs/f2fs/sysfs.c | 50 +++++++++- + fs/f2fs/xattr.c | 3 +- + 19 files changed, 768 insertions(+), 221 deletions(-) +$ git am -3 ../patches/0001-fxup-for-f2fs-Convert-to-using-invalidate_lock.patch +Applying: fxup for "f2fs: Convert to using invalidate_lock" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/data.c +$ git add -A . +$ git commit -v -a --amend +[master 0156e25f695c] Merge remote-tracking branch 'f2fs/dev' + Date: Fri Aug 20 10:04:08 2021 +1000 +Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (76224355db75 fuse: truncate pagecache on atomic_o_trunc) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/control.c | 10 ++-- + fs/fuse/dev.c | 4 +- + fs/fuse/file.c | 7 ++- + fs/fuse/fuse_i.h | 1 + + fs/fuse/inode.c | 143 ++++++++++++++++++++++++++++++++-------------------- + fs/fuse/virtio_fs.c | 12 ++--- + 6 files changed, 107 insertions(+), 70 deletions(-) +Merging gfs2/for-next (98fd6514d37b gfs2: Remove redundant check from gfs2_glock_dq) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 9 +---- + fs/gfs2/glock.c | 13 +++---- + fs/gfs2/glops.c | 27 +++++++------ + fs/gfs2/incore.h | 2 +- + fs/gfs2/lock_dlm.c | 5 +++ + fs/gfs2/log.c | 2 +- + fs/gfs2/lops.c | 44 +++++++++++++-------- + fs/gfs2/meta_io.c | 7 ++-- + fs/gfs2/ops_fstype.c | 53 +++++++++++++++++++++++++ + fs/gfs2/super.c | 107 +++++++++------------------------------------------ + fs/gfs2/super.h | 3 +- + fs/gfs2/util.c | 3 +- + fs/gfs2/util.h | 5 +++ + 13 files changed, 139 insertions(+), 141 deletions(-) +Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy()) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (ca7d1d1a0b97 NFSv4.2: remove restriction of copy size for inter-server copy.) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 2 + + fs/nfs/callback.c | 4 ++ + fs/nfs/callback_xdr.c | 61 +++++++++++++++-------------- + fs/nfs/nfs4file.c | 10 ++--- + fs/nfs/pnfs.c | 20 +++++----- + include/linux/sunrpc/clnt.h | 3 +- + include/linux/sunrpc/svc.h | 3 +- + include/linux/sunrpc/svcauth.h | 4 +- + include/linux/sunrpc/xprt.h | 1 + + include/trace/events/rpcrdma.h | 74 ++++++++++++++++++++++++++++++++---- + include/trace/events/sunrpc.h | 60 ++++++++--------------------- + net/sunrpc/auth_gss/gss_rpc_upcall.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 47 ++++++++++++----------- + net/sunrpc/clnt.c | 55 +++++++++++++++++---------- + net/sunrpc/debugfs.c | 2 +- + net/sunrpc/rpc_pipe.c | 2 +- + net/sunrpc/svc.c | 39 ++++++------------- + net/sunrpc/svcauth.c | 8 ++-- + net/sunrpc/svcauth_unix.c | 18 +++++---- + net/sunrpc/sysfs.c | 32 +++++++++++++++- + net/sunrpc/xprt.c | 32 ++++++++++------ + net/sunrpc/xprtrdma/backchannel.c | 2 +- + net/sunrpc/xprtrdma/frwr_ops.c | 14 ++++++- + net/sunrpc/xprtrdma/transport.c | 13 +++---- + net/sunrpc/xprtrdma/verbs.c | 28 ++++---------- + net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- + net/sunrpc/xprtsock.c | 2 +- + 27 files changed, 307 insertions(+), 233 deletions(-) +Merging nfsd/nfsd-next (ab1016d39cc0 nfsd: fix NULL dereference in nfs3svc_encode_getaclres) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/for-next (729580ddc53e svcrdma: xpt_bc_xprt is already clear in __svc_rdma_free()) +$ git merge cel/for-next +Auto-merging net/sunrpc/svc.c +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Auto-merging include/trace/events/sunrpc.h +Auto-merging include/linux/sunrpc/svc.h +Auto-merging fs/lockd/svc.c +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 2 +- + fs/lockd/svclock.c | 2 +- + fs/nfsd/nfs4state.c | 4 +-- + fs/nfsd/trace.h | 17 ++++----- + fs/nfsd/vfs.c | 21 +++-------- + include/linux/sunrpc/msg_prot.h | 1 + + include/linux/sunrpc/svc.h | 5 +++ + include/linux/sunrpc/svc_rdma.h | 7 ++-- + include/linux/sunrpc/xdr.h | 1 + + include/linux/sysctl.h | 2 ++ + include/trace/events/sunrpc.h | 8 ++--- + include/trace/trace_events.h | 22 ++++++++++++ + include/uapi/linux/nfsd/nfsfh.h | 1 - + kernel/sysctl.c | 42 ++++++++++++++++++++++ + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/svc.c | 36 +++++++++++++++++++ + net/sunrpc/svc_xprt.c | 3 ++ + net/sunrpc/xprtrdma/svc_rdma_rw.c | 56 ++++++++++++++++++++---------- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 41 ++++++++++++---------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 11 ++---- + samples/trace_events/trace-events-sample.h | 27 ++++++++++++++ + 21 files changed, 226 insertions(+), 85 deletions(-) +Merging ntfs3/master (96b18047a717 fs/ntfs3: Add MAINTAINERS) +$ git merge ntfs3/master +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/filesystems/index.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/ntfs3.rst | 106 + + MAINTAINERS | 9 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ntfs3/Kconfig | 46 + + fs/ntfs3/Makefile | 36 + + fs/ntfs3/attrib.c | 2096 ++++++++++++++ + fs/ntfs3/attrlist.c | 456 +++ + fs/ntfs3/bitfunc.c | 135 + + fs/ntfs3/bitmap.c | 1519 ++++++++++ + fs/ntfs3/debug.h | 64 + + fs/ntfs3/dir.c | 596 ++++ + fs/ntfs3/file.c | 1252 +++++++++ + fs/ntfs3/frecord.c | 3071 +++++++++++++++++++++ + fs/ntfs3/fslog.c | 5182 +++++++++++++++++++++++++++++++++++ + fs/ntfs3/fsntfs.c | 2551 +++++++++++++++++ + fs/ntfs3/index.c | 2647 ++++++++++++++++++ + fs/ntfs3/inode.c | 2029 ++++++++++++++ + fs/ntfs3/lib/decompress_common.c | 332 +++ + fs/ntfs3/lib/decompress_common.h | 352 +++ + fs/ntfs3/lib/lib.h | 26 + + fs/ntfs3/lib/lzx_decompress.c | 683 +++++ + fs/ntfs3/lib/xpress_decompress.c | 155 ++ + fs/ntfs3/lznt.c | 452 +++ + fs/ntfs3/namei.c | 539 ++++ + fs/ntfs3/ntfs.h | 1238 +++++++++ + fs/ntfs3/ntfs_fs.h | 1092 ++++++++ + fs/ntfs3/record.c | 609 ++++ + fs/ntfs3/run.c | 1111 ++++++++ + fs/ntfs3/super.c | 1504 ++++++++++ + fs/ntfs3/upcase.c | 105 + + fs/ntfs3/xattr.c | 1128 ++++++++ + 33 files changed, 31124 insertions(+) + create mode 100644 Documentation/filesystems/ntfs3.rst + create mode 100644 fs/ntfs3/Kconfig + create mode 100644 fs/ntfs3/Makefile + create mode 100644 fs/ntfs3/attrib.c + create mode 100644 fs/ntfs3/attrlist.c + create mode 100644 fs/ntfs3/bitfunc.c + create mode 100644 fs/ntfs3/bitmap.c + create mode 100644 fs/ntfs3/debug.h + create mode 100644 fs/ntfs3/dir.c + create mode 100644 fs/ntfs3/file.c + create mode 100644 fs/ntfs3/frecord.c + create mode 100644 fs/ntfs3/fslog.c + create mode 100644 fs/ntfs3/fsntfs.c + create mode 100644 fs/ntfs3/index.c + create mode 100644 fs/ntfs3/inode.c + create mode 100644 fs/ntfs3/lib/decompress_common.c + create mode 100644 fs/ntfs3/lib/decompress_common.h + create mode 100644 fs/ntfs3/lib/lib.h + create mode 100644 fs/ntfs3/lib/lzx_decompress.c + create mode 100644 fs/ntfs3/lib/xpress_decompress.c + create mode 100644 fs/ntfs3/lznt.c + create mode 100644 fs/ntfs3/namei.c + create mode 100644 fs/ntfs3/ntfs.h + create mode 100644 fs/ntfs3/ntfs_fs.h + create mode 100644 fs/ntfs3/record.c + create mode 100644 fs/ntfs3/run.c + create mode 100644 fs/ntfs3/super.c + create mode 100644 fs/ntfs3/upcase.c + create mode 100644 fs/ntfs3/xattr.c +Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (332f606b32b6 ovl: enable RCU'd ->get_acl()) +$ git merge overlayfs/overlayfs-next +Auto-merging include/linux/fs.h +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/acl.c +Auto-merging Documentation/filesystems/locking.rst +Merge made by the 'recursive' strategy. + Documentation/filesystems/locking.rst | 2 +- + Documentation/filesystems/overlayfs.rst | 3 + + Documentation/filesystems/vfs.rst | 2 +- + fs/9p/acl.c | 5 +- + fs/9p/acl.h | 2 +- + fs/bad_inode.c | 2 +- + fs/btrfs/acl.c | 5 +- + fs/btrfs/ctree.h | 2 +- + fs/ceph/acl.c | 5 +- + fs/ceph/super.h | 2 +- + fs/erofs/xattr.c | 5 +- + fs/erofs/xattr.h | 2 +- + fs/ext2/acl.c | 5 +- + fs/ext2/acl.h | 2 +- + fs/ext4/acl.c | 5 +- + fs/ext4/acl.h | 2 +- + fs/f2fs/acl.c | 5 +- + fs/f2fs/acl.h | 2 +- + fs/fuse/acl.c | 5 +- + fs/fuse/fuse_i.h | 2 +- + fs/gfs2/acl.c | 5 +- + fs/gfs2/acl.h | 2 +- + fs/jffs2/acl.c | 5 +- + fs/jffs2/acl.h | 2 +- + fs/jfs/acl.c | 5 +- + fs/jfs/jfs_acl.h | 2 +- + fs/nfs/nfs3_fs.h | 2 +- + fs/nfs/nfs3acl.c | 5 +- + fs/ocfs2/acl.c | 5 +- + fs/ocfs2/acl.h | 2 +- + fs/orangefs/acl.c | 5 +- + fs/orangefs/inode.c | 7 +-- + fs/orangefs/orangefs-kernel.h | 2 +- + fs/overlayfs/copy_up.c | 83 ++++++++++++++++++++----- + fs/overlayfs/dir.c | 16 +++-- + fs/overlayfs/inode.c | 105 +++++++++++++++++++++++++------- + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 44 +++++++++++-- + fs/overlayfs/super.c | 4 +- + fs/overlayfs/util.c | 92 ++++++++++++++++++++++++++-- + fs/posix_acl.c | 15 ++++- + fs/reiserfs/acl.h | 2 +- + fs/reiserfs/xattr_acl.c | 5 +- + fs/stat.c | 18 ++++++ + fs/xfs/xfs_acl.c | 5 +- + fs/xfs/xfs_acl.h | 4 +- + include/linux/fs.h | 8 ++- + include/linux/posix_acl.h | 3 +- + include/linux/stat.h | 4 ++ + 49 files changed, 424 insertions(+), 102 deletions(-) +$ git am -3 ../patches/0001-ntfs3-fix-up-for-vfs-add-rcu-argument-to-get_acl-cal.patch +Applying: ntfs3: fix up for "vfs: add rcu argument to ->get_acl() callback" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs3/ntfs_fs.h +M fs/ntfs3/xattr.c +$ git add -A . +$ git commit -v -a --amend +[master fcc23d2b1d8d] Merge remote-tracking branch 'overlayfs/overlayfs-next' + Date: Fri Aug 20 10:04:13 2021 +1000 +Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (732b33d0dbf1 9p/xen: Fix end of loop tests for list_for_each_entry) +$ git merge v9fs/9p-next +Merge made by the 'recursive' strategy. + net/9p/trans_virtio.c | 4 +++- + net/9p/trans_xen.c | 4 ++-- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging xfs/for-next (a437b9b488e3 xfs: remove support for untagged lookups in xfs_icwalk*) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_inode.h +Auto-merging fs/xfs/xfs_inode.c +Merge made by the 'recursive' strategy. + fs/xfs/kmem.c | 64 ---- + fs/xfs/kmem.h | 2 - + fs/xfs/libxfs/xfs_alloc.c | 6 +- + fs/xfs/libxfs/xfs_alloc.h | 10 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 94 ++--- + fs/xfs/libxfs/xfs_attr.c | 37 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 4 +- + fs/xfs/libxfs/xfs_attr_remote.c | 3 +- + fs/xfs/libxfs/xfs_attr_remote.h | 2 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 48 +-- + fs/xfs/libxfs/xfs_bmap_btree.h | 7 +- + fs/xfs/libxfs/xfs_btree.c | 84 ++--- + fs/xfs/libxfs/xfs_btree.h | 56 +-- + fs/xfs/libxfs/xfs_btree_staging.c | 14 +- + fs/xfs/libxfs/xfs_format.h | 17 +- + fs/xfs/libxfs/xfs_ialloc.c | 6 +- + fs/xfs/libxfs/xfs_ialloc.h | 3 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 70 ++-- + fs/xfs/libxfs/xfs_log_recover.h | 2 + + fs/xfs/libxfs/xfs_quota_defs.h | 30 +- + fs/xfs/libxfs/xfs_refcount.c | 4 +- + fs/xfs/libxfs/xfs_refcount.h | 2 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 48 +-- + fs/xfs/libxfs/xfs_rmap.c | 28 +- + fs/xfs/libxfs/xfs_rmap.h | 11 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 64 ++-- + fs/xfs/libxfs/xfs_rmap_btree.h | 2 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 14 +- + fs/xfs/libxfs/xfs_trans_resv.c | 30 -- + fs/xfs/libxfs/xfs_trans_resv.h | 2 - + fs/xfs/scrub/agheader.c | 27 +- + fs/xfs/scrub/agheader_repair.c | 41 ++- + fs/xfs/scrub/alloc.c | 2 +- + fs/xfs/scrub/attr.c | 14 +- + fs/xfs/scrub/attr.h | 3 - + fs/xfs/scrub/bmap.c | 31 +- + fs/xfs/scrub/btree.c | 2 +- + fs/xfs/scrub/btree.h | 4 +- + fs/xfs/scrub/common.c | 61 ++- + fs/xfs/scrub/common.h | 18 +- + fs/xfs/scrub/fscounters.c | 2 +- + fs/xfs/scrub/ialloc.c | 2 +- + fs/xfs/scrub/inode.c | 2 +- + fs/xfs/scrub/quota.c | 2 +- + fs/xfs/scrub/refcount.c | 4 +- + fs/xfs/scrub/repair.c | 20 +- + fs/xfs/scrub/rmap.c | 2 +- + fs/xfs/scrub/rtbitmap.c | 2 +- + fs/xfs/scrub/scrub.c | 3 - + fs/xfs/scrub/scrub.h | 1 - + fs/xfs/xfs_aops.c | 17 - + fs/xfs/xfs_bmap_item.c | 14 +- + fs/xfs/xfs_buf.c | 3 +- + fs/xfs/xfs_buf.h | 6 - + fs/xfs/xfs_dquot.c | 3 - + fs/xfs/xfs_dquot.h | 10 + + fs/xfs/xfs_dquot_item.c | 134 ------- + fs/xfs/xfs_dquot_item.h | 17 - + fs/xfs/xfs_error.h | 12 + + fs/xfs/xfs_extfree_item.c | 3 + + fs/xfs/xfs_fsmap.c | 64 ++-- + fs/xfs/xfs_fsops.c | 66 ++-- + fs/xfs/xfs_icache.c | 736 ++++++++++++++++++++++++++++--------- + fs/xfs/xfs_icache.h | 14 +- + fs/xfs/xfs_icreate_item.c | 4 +- + fs/xfs/xfs_inode.c | 53 +++ + fs/xfs/xfs_inode.h | 22 +- + fs/xfs/xfs_ioctl.c | 2 +- + fs/xfs/xfs_iops.c | 4 +- + fs/xfs/xfs_itable.c | 42 ++- + fs/xfs/xfs_iwalk.c | 33 +- + fs/xfs/xfs_log.c | 664 +++++++++++++++++---------------- + fs/xfs/xfs_log.h | 7 +- + fs/xfs/xfs_log_cil.c | 446 +++++++++++++++------- + fs/xfs/xfs_log_priv.h | 66 ++-- + fs/xfs/xfs_log_recover.c | 142 ++++--- + fs/xfs/xfs_mount.c | 171 ++++++++- + fs/xfs/xfs_mount.h | 76 +++- + fs/xfs/xfs_qm.c | 78 ++-- + fs/xfs/xfs_qm.h | 3 - + fs/xfs/xfs_qm_syscalls.c | 251 ++----------- + fs/xfs/xfs_quota.h | 2 + + fs/xfs/xfs_quotaops.c | 30 +- + fs/xfs/xfs_refcount_item.c | 3 + + fs/xfs/xfs_rmap_item.c | 3 + + fs/xfs/xfs_rtalloc.h | 13 +- + fs/xfs/xfs_super.c | 328 +++++++++++------ + fs/xfs/xfs_sysfs.c | 1 + + fs/xfs/xfs_trace.c | 2 + + fs/xfs/xfs_trace.h | 147 +++++++- + fs/xfs/xfs_trans.c | 9 +- + fs/xfs/xfs_trans_ail.c | 11 +- + fs/xfs/xfs_trans_dquot.c | 49 +-- + include/linux/cpuhotplug.h | 1 + + include/linux/mm.h | 2 + + mm/util.c | 15 + + 96 files changed, 2806 insertions(+), 1980 deletions(-) +Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) +$ git merge zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. +Merging iomap/iomap-for-next (742dd4b8c5bb mm/swap: consider max pages in iomap_swapfile_add_extent) +$ git merge iomap/iomap-for-next +Removing fs/iomap/apply.c +Auto-merging fs/dax.c +Auto-merging fs/btrfs/inode.c +Merge made by the 'recursive' strategy. + fs/btrfs/inode.c | 5 +- + fs/buffer.c | 4 +- + fs/dax.c | 578 +++++++++++++++++++++++-------------------------- + fs/gfs2/bmap.c | 5 +- + fs/internal.h | 4 +- + fs/iomap/Makefile | 2 +- + fs/iomap/apply.c | 99 --------- + fs/iomap/buffered-io.c | 361 +++++++++++++++--------------- + fs/iomap/direct-io.c | 164 +++++++------- + fs/iomap/fiemap.c | 101 ++++----- + fs/iomap/iter.c | 80 +++++++ + fs/iomap/seek.c | 98 +++++---- + fs/iomap/swapfile.c | 44 ++-- + fs/iomap/trace.h | 35 ++- + include/linux/iomap.h | 77 +++++-- + 15 files changed, 807 insertions(+), 850 deletions(-) + delete mode 100644 fs/iomap/apply.c + create mode 100644 fs/iomap/iter.c +Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID) +$ git merge djw-vfs/vfs-for-next +Auto-merging fs/ioctl.c +Merge made by the 'recursive' strategy. + fs/ioctl.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging file-locks/locks-next (e1cc6e8c1969 fcntl: fix potential deadlock for &fasync_struct.fa_lock) +$ git merge file-locks/locks-next +Auto-merging fs/fcntl.c +Merge made by the 'recursive' strategy. + fs/fcntl.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) +Merging vfs/for-next (d75b9fa053e4 gfs2: Switch to may_setattr in gfs2_setattr) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/attr.c | 50 +++++++++++++++++++++++++++++++------------------- + fs/gfs2/inode.c | 4 ++-- + include/linux/fs.h | 2 ++ + 3 files changed, 35 insertions(+), 21 deletions(-) +Merging printk/for-next (23d8adcf8022 Merge branch 'rework/printk_safe-removal' into for-next) +$ git merge printk/for-next +Auto-merging kernel/trace/trace.c +Auto-merging init/Kconfig +Auto-merging include/linux/printk.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging drivers/base/core.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/openrisc/kernel/entry.S +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 9 + + Documentation/core-api/printk-basics.rst | 5 +- + MAINTAINERS | 5 + + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/smp.c | 4 +- + arch/arm/lib/backtrace-clang.S | 2 +- + arch/arm/lib/backtrace.S | 2 +- + arch/arm/mach-rpc/io-acorn.S | 2 +- + arch/arm/vfp/vfphw.S | 6 +- + arch/ia64/include/uapi/asm/cmpxchg.h | 4 +- + arch/mips/include/asm/asm.h | 2 +- + arch/openrisc/kernel/entry.S | 6 +- + arch/powerpc/kernel/head_fsl_booke.S | 2 +- + arch/powerpc/kernel/traps.c | 1 - + arch/powerpc/kernel/watchdog.c | 5 - + arch/powerpc/kexec/crash.c | 2 +- + arch/um/include/shared/user.h | 3 +- + arch/x86/kernel/head_32.S | 2 +- + drivers/base/core.c | 6 +- + include/asm-generic/vmlinux.lds.h | 13 + + include/linux/dev_printk.h | 66 +++-- + include/linux/hardirq.h | 2 - + include/linux/module.h | 5 + + include/linux/printk.h | 171 ++++++++--- + init/Kconfig | 19 +- + kernel/kexec_core.c | 1 - + kernel/module.c | 5 + + kernel/panic.c | 3 - + kernel/printk/Makefile | 1 + + kernel/printk/index.c | 195 +++++++++++++ + kernel/printk/internal.h | 31 +- + kernel/printk/printk.c | 361 +++++++++++++---------- + kernel/printk/printk_safe.c | 364 +----------------------- + kernel/trace/trace.c | 2 - + lib/nmi_backtrace.c | 13 +- + lib/string_helpers.c | 4 + + lib/test-string_helpers.c | 14 +- + lib/test_scanf.c | 4 +- + 38 files changed, 687 insertions(+), 657 deletions(-) + create mode 100644 kernel/printk/index.c +Merging pci/next (7fc74df20a87 Merge branch 'remotes/lorenzo/pci/tools') +$ git merge pci/next +Auto-merging drivers/pci/quirks.c +Merge made by the 'recursive' strategy. + Documentation/PCI/endpoint/pci-endpoint-cfs.rst | 12 +- + .../devicetree/bindings/pci/mediatek-pcie-cfg.yaml | 39 +++ + .../devicetree/bindings/pci/mediatek-pcie.txt | 206 ++++++------ + Documentation/devicetree/bindings/pci/pci-ep.yaml | 7 + + .../devicetree/bindings/pci/xilinx-nwl-pcie.txt | 1 + + arch/x86/pci/numachip.c | 1 + + drivers/misc/pci_endpoint_test.c | 1 + + drivers/pci/controller/Kconfig | 1 + + drivers/pci/controller/cadence/pcie-cadence-ep.c | 194 ++++++++--- + drivers/pci/controller/cadence/pcie-cadence.h | 11 + + drivers/pci/controller/dwc/Kconfig | 11 + + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-dra7xx.c | 16 +- + drivers/pci/controller/dwc/pci-keystone.c | 14 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 7 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 36 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 9 +- + drivers/pci/controller/dwc/pcie-designware-plat.c | 1 - + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 276 ++++++++++++++++ + drivers/pci/controller/dwc/pcie-tegra194.c | 54 +-- + drivers/pci/controller/dwc/pcie-uniphier.c | 8 +- + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 15 +- + drivers/pci/controller/pci-aardvark.c | 130 +++++++- + drivers/pci/controller/pci-ftpci100.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 67 +++- + drivers/pci/controller/pci-tegra.c | 38 +-- + drivers/pci/controller/pci-xgene-msi.c | 10 +- + drivers/pci/controller/pcie-altera-msi.c | 10 +- + drivers/pci/controller/pcie-altera.c | 10 +- + drivers/pci/controller/pcie-brcmstb.c | 9 +- + drivers/pci/controller/pcie-iproc-bcma.c | 16 +- + drivers/pci/controller/pcie-iproc-msi.c | 4 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 13 +- + drivers/pci/controller/pcie-mediatek.c | 12 +- + drivers/pci/controller/pcie-microchip-host.c | 18 +- + drivers/pci/controller/pcie-rcar-ep.c | 23 +- + drivers/pci/controller/pcie-rcar-host.c | 94 +++++- + drivers/pci/controller/pcie-rcar.h | 7 + + drivers/pci/controller/pcie-rockchip-ep.c | 18 +- + drivers/pci/controller/pcie-rockchip-host.c | 8 +- + drivers/pci/controller/pcie-xilinx-cpm.c | 4 +- + drivers/pci/controller/pcie-xilinx-nwl.c | 25 +- + drivers/pci/controller/pcie-xilinx.c | 9 +- + drivers/pci/endpoint/functions/pci-epf-ntb.c | 89 +++-- + drivers/pci/endpoint/functions/pci-epf-test.c | 74 +++-- + drivers/pci/endpoint/pci-ep-cfs.c | 24 ++ + drivers/pci/endpoint/pci-epc-core.c | 134 +++++--- + drivers/pci/endpoint/pci-epf-core.c | 144 +++++++- + drivers/pci/of.c | 2 +- + drivers/pci/pci-bridge-emul.h | 2 +- + drivers/pci/pci.c | 34 +- + drivers/pci/probe.c | 1 - + drivers/pci/quirks.c | 60 +++- + drivers/pci/syscall.c | 7 +- + drivers/pci/vpd.c | 361 ++++++++------------- + include/linux/pci-epc.h | 57 ++-- + include/linux/pci-epf.h | 16 +- + include/linux/pci.h | 9 +- + include/linux/pci_ids.h | 3 +- + tools/pci/pcitest.c | 2 +- + 60 files changed, 1687 insertions(+), 780 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie-cfg.yaml + create mode 100644 drivers/pci/controller/dwc/pcie-dw-rockchip.c +Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) +$ git merge 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 (e2e4893180f3 Merge branch 'for-5.14/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 5 +- + drivers/hid/hid-apple.c | 32 ++++++++---- + drivers/hid/hid-cmedia.c | 90 +++++++++++++++++++++++++++++++- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 2 - + drivers/hid/hid-magicmouse.c | 52 +++++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 92 ++++++++++++++++++++++++++++----- + drivers/hid/usbhid/hid-core.c | 13 ++++- + drivers/hid/wacom_sys.c | 9 +++- + drivers/hid/wacom_wac.c | 50 +++++++++++++----- + drivers/hid/wacom_wac.h | 2 + + 11 files changed, 306 insertions(+), 42 deletions(-) +Merging i2c/i2c/for-next (ec1127b4dd61 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging include/uapi/linux/virtio_ids.h +CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h +Removing drivers/i2c/busses/i2c-pmcmsp.c +Auto-merging MAINTAINERS +Resolved 'include/uapi/linux/virtio_ids.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d60b1bedf9c2] Merge remote-tracking branch 'i2c/i2c/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 9 + + drivers/i2c/busses/Kconfig | 20 +- + drivers/i2c/busses/Makefile | 2 +- + drivers/i2c/busses/i2c-at91-core.c | 19 +- + drivers/i2c/busses/i2c-at91-master.c | 4 +- + drivers/i2c/busses/i2c-designware-common.c | 8 +- + drivers/i2c/busses/i2c-designware-core.h | 4 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 5 +- + drivers/i2c/busses/i2c-highlander.c | 2 +- + drivers/i2c/busses/i2c-hix5hd2.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 46 +-- + drivers/i2c/busses/i2c-imx.c | 6 +- + drivers/i2c/busses/i2c-iop3xx.c | 6 +- + drivers/i2c/busses/i2c-mxs.c | 4 +- + drivers/i2c/busses/i2c-parport.c | 36 +- + drivers/i2c/busses/i2c-pmcmsp.c | 600 ---------------------------- + drivers/i2c/busses/i2c-qup.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 4 +- + drivers/i2c/busses/i2c-sun6i-p2wi.c | 2 +- + drivers/i2c/busses/i2c-synquacer.c | 2 +- + drivers/i2c/busses/i2c-virtio.c | 290 ++++++++++++++ + drivers/i2c/i2c-dev.c | 22 +- + include/linux/units.h | 16 + + include/uapi/linux/virtio_i2c.h | 41 ++ + include/uapi/linux/virtio_ids.h | 1 + + 26 files changed, 438 insertions(+), 717 deletions(-) + delete mode 100644 drivers/i2c/busses/i2c-pmcmsp.c + create mode 100644 drivers/i2c/busses/i2c-virtio.c + create mode 100644 include/uapi/linux/virtio_i2c.h +Merging i3c/i3c/next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) +$ git merge dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (b51f752c586c hwmon: (dell-smm) Rework SMM function debugging) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/amd,sbrmi.yaml | 53 ++ + .../devicetree/bindings/hwmon/winbond,w83781d.yaml | 41 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/sbrmi.rst | 79 ++ + Documentation/hwmon/scpi-hwmon.rst | 2 +- + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/axi-fan-control.c | 117 ++- + drivers/hwmon/dell-smm-hwmon.c | 910 ++++++++++----------- + drivers/hwmon/fam15h_power.c | 4 +- + drivers/hwmon/intel-m10-bmc-hwmon.c | 116 +++ + drivers/hwmon/k10temp.c | 2 + + drivers/hwmon/ntc_thermistor.c | 20 +- + drivers/hwmon/pmbus/bpa-rs600.c | 68 +- + drivers/hwmon/pmbus/ibm-cffps.c | 6 +- + drivers/hwmon/sbrmi.c | 359 ++++++++ + drivers/hwmon/w83627ehf.c | 122 +-- + drivers/hwmon/w83781d.c | 11 + + 18 files changed, 1303 insertions(+), 619 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/amd,sbrmi.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/winbond,w83781d.yaml + create mode 100644 Documentation/hwmon/sbrmi.rst + create mode 100644 drivers/hwmon/sbrmi.c +Merging jc_docs/docs-next (37397b092e7f docs: sphinx-requirements: Move sphinx_rtd_theme to top) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cputopology.rst | 10 +- + .../admin-guide/hw-vuln/core-scheduling.rst | 10 +- + Documentation/admin-guide/sysrq.rst | 12 +- + Documentation/arm/marvell.rst | 18 + + Documentation/conf.py | 121 +- + Documentation/core-api/cpu_hotplug.rst | 38 +- + Documentation/core-api/printk-formats.rst | 1 + + Documentation/features/vm/THP/arch-support.txt | 2 +- + Documentation/firmware-guide/acpi/dsd/graph.rst | 2 +- + .../ethernet/freescale/dpaa2/dpio-driver.rst | 1 + + Documentation/process/deprecated.rst | 4 +- + Documentation/process/submitting-patches.rst | 10 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 2 +- + Documentation/sphinx/requirements.txt | 3 +- + Documentation/translations/conf.py | 12 + + Documentation/translations/index.rst | 1 + + .../it_IT/core-api/symbol-namespaces.rst | 26 +- + .../translations/it_IT/kernel-hacking/hacking.rst | 4 +- + .../translations/it_IT/process/deprecated.rst | 8 +- + .../it_IT/process/stable-kernel-rules.rst | 6 - + .../it_IT/process/submitting-patches.rst | 57 +- + Documentation/translations/ja_JP/howto.rst | 8 + + Documentation/translations/ja_JP/index.rst | 5 + + Documentation/translations/ko_KR/howto.rst | 8 + + Documentation/translations/ko_KR/index.rst | 2 + + .../translations/zh_CN/accounting/index.rst | 25 + + .../translations/zh_CN/accounting/psi.rst | 155 +++ + .../translations/zh_CN/core-api/cpu_hotplug.rst | 348 +++++ + .../translations/zh_CN/core-api/genericirq.rst | 409 ++++++ + .../translations/zh_CN/core-api/index.rst | 7 +- + .../translations/zh_CN/core-api/memory-hotplug.rst | 126 ++ + .../zh_CN/core-api/protection-keys.rst | 99 ++ + .../translations/zh_CN/dev-tools/index.rst | 5 + + .../zh_CN/dev-tools/testing-overview.rst | 109 ++ + Documentation/translations/zh_CN/index.rst | 16 +- + .../translations/zh_CN/infiniband/core_locking.rst | 115 ++ + .../translations/zh_CN/infiniband/index.rst | 40 + + .../translations/zh_CN/infiniband/ipoib.rst | 111 ++ + .../translations/zh_CN/infiniband/opa_vnic.rst | 156 +++ + .../translations/zh_CN/infiniband/sysfs.rst | 21 + + .../translations/zh_CN/infiniband/tag_matching.rst | 63 + + .../translations/zh_CN/infiniband/user_mad.rst | 164 +++ + .../translations/zh_CN/infiniband/user_verbs.rst | 72 ++ + .../translations/zh_CN/process/coding-style.rst | 3 +- + .../translations/zh_CN/virt/acrn/cpuid.rst | 56 + + .../translations/zh_CN/virt/acrn/index.rst | 25 + + .../translations/zh_CN/virt/acrn/introduction.rst | 52 + + .../translations/zh_CN/virt/acrn/io-request.rst | 99 ++ + .../translations/zh_CN/virt/guest-halt-polling.rst | 87 ++ + Documentation/translations/zh_CN/virt/index.rst | 38 + + .../translations/zh_CN/virt/ne_overview.rst | 88 ++ + .../translations/zh_CN/virt/paravirt_ops.rst | 41 + + Documentation/translations/zh_TW/IRQ.txt | 41 + + .../translations/zh_TW/admin-guide/README.rst | 351 +++++ + .../translations/zh_TW/admin-guide/bug-bisect.rst | 85 ++ + .../translations/zh_TW/admin-guide/bug-hunting.rst | 344 +++++ + .../zh_TW/admin-guide/clearing-warn-once.rst | 16 + + .../translations/zh_TW/admin-guide/cpu-load.rst | 112 ++ + .../translations/zh_TW/admin-guide/index.rst | 135 ++ + .../translations/zh_TW/admin-guide/init.rst | 58 + + .../zh_TW/admin-guide/reporting-issues.rst | 1337 ++++++++++++++++++++ + .../zh_TW/admin-guide/security-bugs.rst | 78 ++ + .../zh_TW/admin-guide/tainted-kernels.rst | 161 +++ + .../translations/zh_TW/admin-guide/unicode.rst | 174 +++ + .../translations/zh_TW/disclaimer-zh_TW.rst | 11 + + Documentation/translations/zh_TW/gpio.txt | 651 ++++++++++ + Documentation/translations/zh_TW/index.rst | 168 +++ + Documentation/translations/zh_TW/io_ordering.txt | 68 + + Documentation/translations/zh_TW/oops-tracing.txt | 212 ++++ + .../translations/zh_TW/process/1.Intro.rst | 199 +++ + .../translations/zh_TW/process/2.Process.rst | 369 ++++++ + .../translations/zh_TW/process/3.Early-stage.rst | 172 +++ + .../translations/zh_TW/process/4.Coding.rst | 297 +++++ + .../translations/zh_TW/process/5.Posting.rst | 251 ++++ + .../translations/zh_TW/process/6.Followthrough.rst | 156 +++ + .../zh_TW/process/7.AdvancedTopics.rst | 137 ++ + .../translations/zh_TW/process/8.Conclusion.rst | 74 ++ + .../process/code-of-conduct-interpretation.rst | 112 ++ + .../translations/zh_TW/process/code-of-conduct.rst | 76 ++ + .../translations/zh_TW/process/coding-style.rst | 958 ++++++++++++++ + .../zh_TW/process/development-process.rst | 30 + + .../translations/zh_TW/process/email-clients.rst | 252 ++++ + .../zh_TW/process/embargoed-hardware-issues.rst | 232 ++++ + Documentation/translations/zh_TW/process/howto.rst | 500 ++++++++ + Documentation/translations/zh_TW/process/index.rst | 67 + + .../zh_TW/process/kernel-driver-statement.rst | 203 +++ + .../zh_TW/process/kernel-enforcement-statement.rst | 155 +++ + .../translations/zh_TW/process/license-rules.rst | 374 ++++++ + .../translations/zh_TW/process/magic-number.rst | 148 +++ + .../zh_TW/process/management-style.rst | 211 +++ + .../zh_TW/process/programming-language.rst | 76 ++ + .../zh_TW/process/stable-api-nonsense.rst | 159 +++ + .../zh_TW/process/stable-kernel-rules.rst | 68 + + .../zh_TW/process/submit-checklist.rst | 109 ++ + .../zh_TW/process/submitting-drivers.rst | 164 +++ + .../zh_TW/process/submitting-patches.rst | 686 ++++++++++ + .../zh_TW/process/volatile-considered-harmful.rst | 110 ++ + Documentation/translations/zh_TW/sparse.txt | 91 ++ + Documentation/virt/kvm/api.rst | 32 +- + MAINTAINERS | 8 + + scripts/kernel-doc | 8 +- + 101 files changed, 13257 insertions(+), 130 deletions(-) + create mode 100644 Documentation/translations/conf.py + create mode 100644 Documentation/translations/zh_CN/accounting/index.rst + create mode 100644 Documentation/translations/zh_CN/accounting/psi.rst + create mode 100644 Documentation/translations/zh_CN/core-api/cpu_hotplug.rst + create mode 100644 Documentation/translations/zh_CN/core-api/genericirq.rst + create mode 100644 Documentation/translations/zh_CN/core-api/memory-hotplug.rst + create mode 100644 Documentation/translations/zh_CN/core-api/protection-keys.rst + create mode 100644 Documentation/translations/zh_CN/dev-tools/testing-overview.rst + create mode 100644 Documentation/translations/zh_CN/infiniband/core_locking.rst + create mode 100644 Documentation/translations/zh_CN/infiniband/index.rst + create mode 100644 Documentation/translations/zh_CN/infiniband/ipoib.rst + create mode 100644 Documentation/translations/zh_CN/infiniband/opa_vnic.rst + create mode 100644 Documentation/translations/zh_CN/infiniband/sysfs.rst + create mode 100644 Documentation/translations/zh_CN/infiniband/tag_matching.rst + create mode 100644 Documentation/translations/zh_CN/infiniband/user_mad.rst + create mode 100644 Documentation/translations/zh_CN/infiniband/user_verbs.rst + create mode 100644 Documentation/translations/zh_CN/virt/acrn/cpuid.rst + create mode 100644 Documentation/translations/zh_CN/virt/acrn/index.rst + create mode 100644 Documentation/translations/zh_CN/virt/acrn/introduction.rst + create mode 100644 Documentation/translations/zh_CN/virt/acrn/io-request.rst + create mode 100644 Documentation/translations/zh_CN/virt/guest-halt-polling.rst + create mode 100644 Documentation/translations/zh_CN/virt/index.rst + create mode 100644 Documentation/translations/zh_CN/virt/ne_overview.rst + create mode 100644 Documentation/translations/zh_CN/virt/paravirt_ops.rst + create mode 100644 Documentation/translations/zh_TW/IRQ.txt + create mode 100644 Documentation/translations/zh_TW/admin-guide/README.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/bug-bisect.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/bug-hunting.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/clearing-warn-once.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/cpu-load.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/index.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/init.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/reporting-issues.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/security-bugs.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/tainted-kernels.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/unicode.rst + create mode 100644 Documentation/translations/zh_TW/disclaimer-zh_TW.rst + create mode 100644 Documentation/translations/zh_TW/gpio.txt + create mode 100644 Documentation/translations/zh_TW/index.rst + create mode 100644 Documentation/translations/zh_TW/io_ordering.txt + create mode 100644 Documentation/translations/zh_TW/oops-tracing.txt + create mode 100644 Documentation/translations/zh_TW/process/1.Intro.rst + create mode 100644 Documentation/translations/zh_TW/process/2.Process.rst + create mode 100644 Documentation/translations/zh_TW/process/3.Early-stage.rst + create mode 100644 Documentation/translations/zh_TW/process/4.Coding.rst + create mode 100644 Documentation/translations/zh_TW/process/5.Posting.rst + create mode 100644 Documentation/translations/zh_TW/process/6.Followthrough.rst + create mode 100644 Documentation/translations/zh_TW/process/7.AdvancedTopics.rst + create mode 100644 Documentation/translations/zh_TW/process/8.Conclusion.rst + create mode 100644 Documentation/translations/zh_TW/process/code-of-conduct-interpretation.rst + create mode 100644 Documentation/translations/zh_TW/process/code-of-conduct.rst + create mode 100644 Documentation/translations/zh_TW/process/coding-style.rst + create mode 100644 Documentation/translations/zh_TW/process/development-process.rst + create mode 100644 Documentation/translations/zh_TW/process/email-clients.rst + create mode 100644 Documentation/translations/zh_TW/process/embargoed-hardware-issues.rst + create mode 100644 Documentation/translations/zh_TW/process/howto.rst + create mode 100644 Documentation/translations/zh_TW/process/index.rst + create mode 100644 Documentation/translations/zh_TW/process/kernel-driver-statement.rst + create mode 100644 Documentation/translations/zh_TW/process/kernel-enforcement-statement.rst + create mode 100644 Documentation/translations/zh_TW/process/license-rules.rst + create mode 100644 Documentation/translations/zh_TW/process/magic-number.rst + create mode 100644 Documentation/translations/zh_TW/process/management-style.rst + create mode 100644 Documentation/translations/zh_TW/process/programming-language.rst + create mode 100644 Documentation/translations/zh_TW/process/stable-api-nonsense.rst + create mode 100644 Documentation/translations/zh_TW/process/stable-kernel-rules.rst + create mode 100644 Documentation/translations/zh_TW/process/submit-checklist.rst + create mode 100644 Documentation/translations/zh_TW/process/submitting-drivers.rst + create mode 100644 Documentation/translations/zh_TW/process/submitting-patches.rst + create mode 100644 Documentation/translations/zh_TW/process/volatile-considered-harmful.rst + create mode 100644 Documentation/translations/zh_TW/sparse.txt +Merging v4l-dvb/master (9c3a0f285248 Merge tag 'v5.14-rc4' into media_tree) +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Removing Documentation/driver-api/media/csi2.rst +Merge made by the 'recursive' strategy. + .../bindings/media/amlogic,meson-ir-tx.yaml | 60 + + .../devicetree/bindings/media/i2c/adv7180.yaml | 8 + + .../devicetree/bindings/media/i2c/ovti,ov9282.yaml | 91 ++ + .../devicetree/bindings/media/i2c/sony,imx335.yaml | 91 ++ + .../devicetree/bindings/media/i2c/sony,imx412.yaml | 91 ++ + .../devicetree/bindings/media/nxp,imx7-csi.yaml | 12 +- + .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 174 +++ + .../devicetree/bindings/media/rockchip-vpu.yaml | 1 + + Documentation/driver-api/media/camera-sensor.rst | 45 +- + Documentation/driver-api/media/cec-core.rst | 9 +- + Documentation/driver-api/media/csi2.rst | 94 -- + Documentation/driver-api/media/index.rst | 2 +- + Documentation/driver-api/media/tx-rx.rst | 133 ++ + .../userspace-api/media/cec.h.rst.exceptions | 2 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 22 +- + .../media/v4l/ext-ctrls-image-process.rst | 29 +- + MAINTAINERS | 27 + + drivers/media/cec/core/cec-pin-priv.h | 4 +- + drivers/media/cec/core/cec-pin.c | 20 +- + drivers/media/cec/platform/stm32/stm32-cec.c | 26 +- + drivers/media/cec/platform/tegra/tegra_cec.c | 10 +- + drivers/media/dvb-frontends/cx24117.c | 1 - + drivers/media/dvb-frontends/dib8000.c | 58 +- + drivers/media/i2c/Kconfig | 42 + + drivers/media/i2c/Makefile | 4 +- + drivers/media/i2c/adv7180.c | 66 +- + drivers/media/i2c/ccs/ccs-core.c | 58 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 5 +- + drivers/media/i2c/imx258.c | 4 +- + drivers/media/i2c/imx335.c | 1129 +++++++++++++++++ + drivers/media/i2c/imx412.c | 1272 ++++++++++++++++++++ + drivers/media/i2c/ov2740.c | 26 +- + drivers/media/i2c/ov5640.c | 4 + + drivers/media/i2c/ov8856.c | 27 +- + drivers/media/i2c/ov9282.c | 1137 +++++++++++++++++ + drivers/media/i2c/ov9734.c | 24 +- + drivers/media/i2c/tda1997x.c | 11 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/mc/mc-device.c | 4 +- + drivers/media/pci/ivtv/ivtv-cards.h | 68 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 16 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 4 +- + drivers/media/pci/saa7134/saa7134-core.c | 7 +- + drivers/media/pci/saa7164/saa7164-cmd.c | 3 - + drivers/media/pci/tw5864/tw5864-reg.h | 2 +- + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 17 + + drivers/media/platform/coda/coda-bit.c | 18 +- + drivers/media/platform/davinci/vpfe_capture.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 13 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- + drivers/media/platform/omap3isp/isp.c | 4 +- + drivers/media/platform/qcom/venus/core.h | 2 + + drivers/media/platform/qcom/venus/helpers.c | 3 + + drivers/media/platform/qcom/venus/hfi_cmds.c | 8 + + drivers/media/platform/qcom/venus/hfi_helper.h | 5 + + drivers/media/platform/qcom/venus/hfi_msgs.c | 2 +- + drivers/media/platform/qcom/venus/venc.c | 40 + + drivers/media/platform/qcom/venus/venc_ctrls.c | 38 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 4 +- + drivers/media/platform/rockchip/rga/rga.c | 27 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 12 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 6 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 3 +- + .../media/platform/rockchip/rkisp1/rkisp1-stats.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 3 +- + drivers/media/platform/ti-vpe/cal-camerarx.c | 247 ++-- + drivers/media/platform/ti-vpe/cal-video.c | 176 ++- + drivers/media/platform/ti-vpe/cal.c | 278 +++-- + drivers/media/platform/ti-vpe/cal.h | 66 +- + drivers/media/platform/ti-vpe/cal_regs.h | 53 +- + drivers/media/platform/vsp1/vsp1_entity.c | 4 +- + drivers/media/rc/Kconfig | 10 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/ene_ir.c | 2 +- + drivers/media/rc/lirc_dev.c | 6 +- + drivers/media/rc/mceusb.c | 2 +- + drivers/media/rc/meson-ir-tx.c | 407 +++++++ + drivers/media/rc/rc-loopback.c | 82 +- + drivers/media/rc/rc-main.c | 2 +- + drivers/media/rc/redrat3.c | 2 +- + drivers/media/rc/streamzap.c | 2 - + drivers/media/spi/cxd2880-spi.c | 7 +- + drivers/media/test-drivers/vivid/vivid-cec.c | 2 +- + drivers/media/usb/dvb-usb-v2/Kconfig | 2 + + drivers/media/usb/dvb-usb-v2/af9035.c | 1 + + drivers/media/usb/dvb-usb-v2/dvbsky.c | 37 +- + drivers/media/usb/dvb-usb/dvb-usb-i2c.c | 9 +- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 2 +- + drivers/media/usb/dvb-usb/nova-t-usb2.c | 6 +- + drivers/media/usb/dvb-usb/vp702x.c | 12 +- + drivers/media/usb/em28xx/em28xx-input.c | 1 - + drivers/media/usb/go7007/go7007-driver.c | 26 - + drivers/media/usb/go7007/go7007-usb.c | 2 +- + drivers/media/usb/gspca/Kconfig | 1 - + drivers/media/usb/gspca/vc032x.c | 6 +- + drivers/media/usb/gspca/zc3xx.c | 134 +-- + drivers/media/usb/stkwebcam/stk-webcam.c | 6 +- + drivers/media/usb/uvc/uvc_v4l2.c | 34 +- + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 2 + + drivers/media/v4l2-core/v4l2-dv-timings.c | 4 +- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 80 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 13 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 22 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 2 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_compat.h | 2 - + .../media/atomisp/pci/atomisp_compat_css20.c | 38 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 3 +- + drivers/staging/media/atomisp/pci/atomisp_drvfs.c | 6 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 8 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 4 +- + .../pci/hive_isp_css_common/host/input_system.c | 62 - + .../media/atomisp/pci/input_system_ctrl_defs.h | 2 +- + .../pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 4 +- + .../media/atomisp/pci/isp2400_input_system_local.h | 32 +- + .../media/atomisp/pci/isp_acquisition_defs.h | 2 +- + .../staging/media/atomisp/pci/isp_capture_defs.h | 2 +- + .../media/atomisp/pci/runtime/isys/src/rx.c | 14 +- + drivers/staging/media/atomisp/pci/sh_css.c | 47 +- + .../staging/media/atomisp/pci/sh_css_firmware.c | 6 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 69 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 171 ++- + drivers/staging/media/atomisp/pci/sh_css_sp.c | 108 +- + drivers/staging/media/atomisp/pci/sh_css_version.c | 3 +- + drivers/staging/media/hantro/Makefile | 1 + + drivers/staging/media/hantro/hantro.h | 4 +- + drivers/staging/media/hantro/hantro_drv.c | 11 +- + drivers/staging/media/hantro/hantro_g1_h264_dec.c | 48 +- + drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 31 +- + drivers/staging/media/hantro/hantro_h264.c | 24 + + drivers/staging/media/hantro/hantro_hw.h | 8 + + .../media/hantro/rockchip_vpu2_hw_h264_dec.c | 491 ++++++++ + .../media/hantro/rockchip_vpu2_hw_vp8_dec.c | 32 +- + drivers/staging/media/hantro/rockchip_vpu_hw.c | 43 +- + drivers/staging/media/hantro/sama5d4_vdec_hw.c | 6 - + drivers/staging/media/imx/Makefile | 1 + + drivers/staging/media/imx/imx7-media-csi.c | 36 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 6 +- + drivers/staging/media/imx/imx8mq-mipi-csi2.c | 991 +++++++++++++++ + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 26 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 1 + + drivers/staging/media/tegra-video/vi.c | 4 +- + include/media/dvb-usb-ids.h | 2 + + include/media/hevc-ctrls.h | 3 +- + include/media/rc-core.h | 5 +- + include/media/v4l2-async.h | 30 +- + include/media/v4l2-subdev.h | 27 +- + include/uapi/linux/cec.h | 2 +- + include/uapi/linux/v4l2-controls.h | 1 + + 150 files changed, 7973 insertions(+), 1339 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/amlogic,meson-ir-tx.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml + create mode 100644 Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml + delete mode 100644 Documentation/driver-api/media/csi2.rst + create mode 100644 Documentation/driver-api/media/tx-rx.rst + create mode 100644 drivers/media/i2c/imx335.c + create mode 100644 drivers/media/i2c/imx412.c + create mode 100644 drivers/media/i2c/ov9282.c + create mode 100644 drivers/media/rc/meson-ir-tx.c + create mode 100644 drivers/staging/media/hantro/rockchip_vpu2_hw_h264_dec.c + create mode 100644 drivers/staging/media/imx/imx8mq-mipi-csi2.c +Merging v4l-dvb-next/master (19e95228c722 media: netup_unidvb: handle interrupt properly according to the firmware) +$ git merge v4l-dvb-next/master +Auto-merging drivers/media/platform/atmel/atmel-isc-base.c +Auto-merging drivers/media/common/videobuf2/videobuf2-core.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/i2c/mt9p031.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/media/ivtv.rst | 2 +- + .../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/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 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 57 ++ + .../userspace-api/media/v4l/pixfmt-reserved.rst | 29 +- + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 50 +- + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 6 + + .../userspace-api/media/videodev2.h.rst.exceptions | 2 + + MAINTAINERS | 1 + + drivers/media/common/siano/smscoreapi.c | 7 +- + drivers/media/common/videobuf2/videobuf2-core.c | 23 +- + drivers/media/dvb-frontends/cxd2820r_priv.h | 2 +- + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/max9286.c | 17 +- + drivers/media/i2c/mt9p031.c | 80 +- + drivers/media/i2c/st-mipid02.c | 22 +- + drivers/media/i2c/tda1997x.c | 4 +- + drivers/media/pci/cx18/cx18-ioctl.c | 4 +- + drivers/media/pci/cx18/cx18-streams.c | 8 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 17 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 8 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 27 +- + drivers/media/platform/Kconfig | 3 + + drivers/media/platform/am437x/am437x-vpfe.c | 19 +- + drivers/media/platform/atmel/atmel-isc-base.c | 4 +- + drivers/media/platform/atmel/atmel-isi.c | 17 +- + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 15 +- + drivers/media/platform/atmel/atmel-sama7g5-isc.c | 15 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 14 +- + drivers/media/platform/davinci/vpif_capture.c | 21 +- + drivers/media/platform/exynos4-is/media-dev.c | 20 +- + 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 | 6 +- + 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 | 140 ++- + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 69 +- + .../platform/mtk-vcodec/vdec/vdec_h264_req_if.c | 774 ++++++++++++++ + drivers/media/platform/mtk-vcodec/vdec_drv_if.c | 3 + + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 1 + + drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h | 23 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.c | 43 +- + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 5 + + drivers/media/platform/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 | 8 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 8 +- + drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 8 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 3 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 2 +- + drivers/media/platform/qcom/camss/camss.c | 18 +- + drivers/media/platform/rcar-vin/rcar-core.c | 1077 +++++++++++--------- + drivers/media/platform/rcar-vin/rcar-csi2.c | 210 +++- + drivers/media/platform/rcar-vin/rcar-dma.c | 22 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 25 +- + drivers/media/platform/rcar_drif.c | 14 +- + drivers/media/platform/renesas-ceu.c | 29 +- + .../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 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 1 - + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 1 - + drivers/media/platform/stm32/stm32-dcmi.c | 18 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 12 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 29 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 2 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 2 +- + drivers/media/platform/ti-vpe/cal.c | 16 +- + drivers/media/platform/video-mux.c | 17 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 17 +- + drivers/media/rc/imon.c | 2 + + drivers/media/rc/ir_toy.c | 34 +- + drivers/media/rc/mceusb.c | 1 + + drivers/media/rc/streamzap.c | 1 + + drivers/media/spi/cxd2880-spi.c | 2 +- + drivers/media/test-drivers/vivid/vivid-core.c | 14 +- + drivers/media/tuners/mxl5007t.c | 9 - + drivers/media/usb/dvb-usb/az6027.c | 1 + + drivers/media/usb/em28xx/em28xx-cards.c | 5 +- + drivers/media/usb/gspca/sn9c20x.c | 22 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 10 +- + drivers/media/v4l2-core/v4l2-async.c | 168 ++- + drivers/media/v4l2-core/v4l2-common.c | 3 + + drivers/media/v4l2-core/v4l2-ctrls-core.c | 6 + + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 4 + + drivers/media/v4l2-core/v4l2-fwnode.c | 83 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 6 +- + drivers/staging/media/hantro/hantro_drv.c | 8 +- + 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/imx-media-csi.c | 17 +- + drivers/staging/media/imx/imx-media-dev-common.c | 7 +- + 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 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 8 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 1 + + drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 70 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 2 + + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 6 +- + drivers/staging/media/tegra-video/vi.c | 17 +- + include/media/hevc-ctrls.h | 11 + + include/media/i2c/mt9p031.h | 1 + + include/media/v4l2-async.h | 105 +- + include/media/v4l2-fwnode.h | 12 +- + include/uapi/linux/videodev2.h | 20 +- + 130 files changed, 5292 insertions(+), 2251 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt + create mode 100644 Documentation/driver-api/media/drivers/rkisp1.rst + 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 pm/linux-next (10bc7fbefe3a Merge branch 'pm-cpufreq-fixes' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/pci/pci.c +Auto-merging drivers/cpufreq/powernv-cpufreq.c +Auto-merging drivers/base/core.c +Auto-merging arch/arm64/boot/dts/qcom/sc7180.dtsi +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform-dptf | 40 ++++++ + Documentation/ABI/testing/sysfs-platform_profile | 7 + + arch/arm64/boot/dts/qcom/sc7180.dtsi | 24 ++++ + drivers/acpi/Kconfig | 4 +- + drivers/acpi/acpi_configfs.c | 54 +++---- + drivers/acpi/acpi_pad.c | 4 +- + drivers/acpi/acpi_processor.c | 8 +- + drivers/acpi/acpica/dswexec.c | 5 +- + drivers/acpi/bus.c | 12 +- + drivers/acpi/dptf/dptf_pch_fivr.c | 9 ++ + drivers/acpi/glue.c | 51 ++----- + drivers/acpi/numa/Kconfig | 2 +- + drivers/acpi/numa/srat.c | 2 +- + drivers/acpi/platform_profile.c | 3 + + drivers/acpi/pmic/intel_pmic_xpower.c | 47 ++++++- + drivers/acpi/prmt.c | 6 + + drivers/acpi/processor_idle.c | 4 +- + drivers/acpi/spcr.c | 1 + + drivers/acpi/x86/s2idle.c | 4 +- + drivers/base/base.h | 3 + + drivers/base/core.c | 35 +++-- + drivers/base/power/domain.c | 30 +++- + drivers/base/property.c | 30 ++-- + drivers/base/swnode.c | 61 ++++---- + drivers/cpufreq/acpi-cpufreq.c | 4 +- + drivers/cpufreq/armada-37xx-cpufreq.c | 6 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 + + drivers/cpufreq/cpufreq.c | 6 +- + drivers/cpufreq/cpufreq_ondemand.c | 4 +- + drivers/cpufreq/intel_pstate.c | 4 +- + drivers/cpufreq/powernow-k8.c | 6 +- + drivers/cpufreq/powernv-cpufreq.c | 4 +- + drivers/cpufreq/scmi-cpufreq.c | 2 +- + drivers/opp/core.c | 15 -- + drivers/opp/of.c | 17 +-- + drivers/pci/pci.c | 31 +++-- + drivers/powercap/intel_rapl_common.c | 50 +++---- + include/acpi/acnames.h | 1 + + include/acpi/acoutput.h | 2 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 16 ++- + include/acpi/actbl2.h | 170 +++++++++++++++++++++++ + include/acpi/actbl3.h | 4 + + include/linux/acpi.h | 12 +- + include/linux/energy_model.h | 16 +++ + include/linux/notifier.h | 2 - + include/linux/pm_domain.h | 1 + + include/linux/property.h | 2 - + kernel/cpu_pm.c | 50 +++++-- + kernel/notifier.c | 19 --- + kernel/power/energy_model.c | 4 +- + kernel/power/main.c | 2 +- + kernel/power/suspend.c | 4 +- + kernel/power/suspend_test.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 16 ++- + 55 files changed, 636 insertions(+), 286 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (86afc1df661a cpufreq: qcom-cpufreq-hw: Add dcvs interrupt support) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Auto-merging drivers/cpufreq/cpufreq.c +Merge made by the 'recursive' strategy. + drivers/cpufreq/cpufreq-dt.c | 3 +- + drivers/cpufreq/cpufreq.c | 13 +++ + drivers/cpufreq/imx6q-cpufreq.c | 2 +- + drivers/cpufreq/mediatek-cpufreq.c | 3 +- + drivers/cpufreq/omap-cpufreq.c | 2 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 150 ++++++++++++++++++++++++++++++++- + drivers/cpufreq/scmi-cpufreq.c | 65 +++++++++----- + drivers/cpufreq/scpi-cpufreq.c | 3 +- + drivers/cpufreq/vexpress-spc-cpufreq.c | 25 +----- + include/linux/cpufreq.h | 14 +++ + 10 files changed, 226 insertions(+), 54 deletions(-) +Merging cpupower/cpupower (5499f2b80b56 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) +$ git merge 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 (e73f0f0ee754 Linux 5.14-rc1) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (e122d7edf1a2 dt-bindings: opp: Convert to DT schema) +$ git merge opp/opp/linux-next +Removing Documentation/devicetree/bindings/opp/opp.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/cpufreq/cpufreq-dt.txt | 2 +- + .../bindings/cpufreq/cpufreq-mediatek.txt | 2 +- + .../devicetree/bindings/cpufreq/cpufreq-st.txt | 6 +- + .../bindings/cpufreq/nvidia,tegra20-cpufreq.txt | 2 +- + .../devicetree/bindings/devfreq/rk3399_dmc.txt | 2 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 2 +- + .../devicetree/bindings/gpu/arm,mali-midgard.yaml | 2 +- + .../bindings/interconnect/fsl,imx8m-noc.yaml | 4 +- + .../opp/allwinner,sun50i-h6-operating-points.yaml | 4 + + Documentation/devicetree/bindings/opp/opp-v1.yaml | 51 ++ + .../devicetree/bindings/opp/opp-v2-base.yaml | 214 +++++++ + Documentation/devicetree/bindings/opp/opp-v2.yaml | 475 ++++++++++++++++ + Documentation/devicetree/bindings/opp/opp.txt | 622 --------------------- + Documentation/devicetree/bindings/opp/qcom-opp.txt | 2 +- + .../bindings/opp/ti-omap5-opp-supply.txt | 2 +- + .../devicetree/bindings/power/power-domain.yaml | 2 +- + arch/arm/boot/dts/omap34xx.dtsi | 1 - + arch/arm/boot/dts/omap36xx.dtsi | 1 - + 18 files changed, 757 insertions(+), 639 deletions(-) + create mode 100644 Documentation/devicetree/bindings/opp/opp-v1.yaml + create mode 100644 Documentation/devicetree/bindings/opp/opp-v2-base.yaml + create mode 100644 Documentation/devicetree/bindings/opp/opp-v2.yaml + delete mode 100644 Documentation/devicetree/bindings/opp/opp.txt +Merging thermal/thermal/linux-next (0284b52e8534 dt-bindings: thermal: Add dt binding for QCOM LMh) +$ git merge thermal/thermal/linux-next +Auto-merging drivers/firmware/qcom_scm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/qcom-lmh.yaml | 82 +++ + .../devicetree/bindings/thermal/thermal-zones.yaml | 2 +- + MAINTAINERS | 1 + + drivers/firmware/qcom_scm.c | 58 ++ + drivers/firmware/qcom_scm.h | 4 + + .../intel/int340x_thermal/int3400_thermal.c | 14 +- + drivers/thermal/intel/intel_powerclamp.c | 4 +- + drivers/thermal/intel/intel_tcc_cooling.c | 2 + + drivers/thermal/qcom/Kconfig | 10 + + drivers/thermal/qcom/Makefile | 1 + + drivers/thermal/qcom/lmh.c | 232 +++++++ + drivers/thermal/rcar_gen3_thermal.c | 110 +++- + drivers/thermal/samsung/exynos_tmu.c | 1 + + drivers/thermal/tegra/Kconfig | 9 +- + drivers/thermal/tegra/Makefile | 1 + + drivers/thermal/tegra/soctherm.c | 4 +- + drivers/thermal/tegra/tegra30-tsensor.c | 673 +++++++++++++++++++++ + include/linux/qcom_scm.h | 14 + + include/linux/thermal.h | 7 +- + tools/thermal/tmon/Makefile | 10 +- + 20 files changed, 1215 insertions(+), 24 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-lmh.yaml + create mode 100644 drivers/thermal/qcom/lmh.c + create mode 100644 drivers/thermal/tegra/tegra30-tsensor.c +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 4 ---- + 1 file changed, 4 deletions(-) +Merging dlm/next (aee742c9928a fs: dlm: fix return -EINTR on recovery stopped) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/dir.c | 4 +- + fs/dlm/dlm_internal.h | 2 +- + fs/dlm/lockspace.c | 2 +- + fs/dlm/lowcomms.c | 770 +++++++++++++++++++++++++------------------------- + fs/dlm/lowcomms.h | 1 + + fs/dlm/member.c | 4 +- + fs/dlm/midcomms.c | 56 +++- + fs/dlm/rcom.c | 29 +- + fs/dlm/recoverd.c | 4 +- + 9 files changed, 457 insertions(+), 415 deletions(-) +Merging swiotlb/linux-next (a449ffaf9181 powerpc/svm: Don't issue ultracalls if !mem_encrypt_active()) +$ git merge swiotlb/linux-next +Auto-merging kernel/dma/direct.c +CONFLICT (content): Merge conflict in kernel/dma/direct.c +Auto-merging kernel/dma/Kconfig +Auto-merging include/linux/device.h +Auto-merging drivers/xen/swiotlb-xen.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/base/core.c +Auto-merging arch/s390/mm/init.c +Resolved 'kernel/dma/direct.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1028e51961e1] Merge remote-tracking branch 'swiotlb/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/reserved-memory/reserved-memory.txt | 36 ++- + arch/powerpc/platforms/pseries/svm.c | 6 + + arch/s390/mm/init.c | 2 +- + drivers/base/core.c | 4 + + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- + drivers/iommu/dma-iommu.c | 12 +- + drivers/of/address.c | 33 ++ + drivers/of/device.c | 3 + + drivers/of/of_private.h | 7 + + drivers/pci/xen-pcifront.c | 2 +- + drivers/xen/swiotlb-xen.c | 8 +- + include/linux/device.h | 4 + + include/linux/swiotlb.h | 57 +++- + kernel/dma/Kconfig | 14 + + kernel/dma/direct.c | 57 +++- + kernel/dma/direct.h | 8 +- + kernel/dma/swiotlb.c | 352 +++++++++++++++------ + 18 files changed, 473 insertions(+), 136 deletions(-) +Merging rdma/for-next (d2b10794fc13 RDMA/core: Create clean QP creations interface for uverbs) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/sw/rxe/rxe_resp.c +Auto-merging drivers/infiniband/sw/rxe/rxe_net.c +Auto-merging drivers/infiniband/sw/rxe/rxe_mr.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/irdma/verbs.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_main.c +Auto-merging drivers/infiniband/hw/cxgb4/iw_cxgb4.h +Auto-merging drivers/infiniband/hw/bnxt_re/main.c +Auto-merging drivers/infiniband/hw/bnxt_re/ib_verbs.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/devices.txt | 6 +- + MAINTAINERS | 2 +- + drivers/infiniband/core/cache.c | 10 +- + drivers/infiniband/core/core_priv.h | 46 +---- + drivers/infiniband/core/device.c | 12 +- + drivers/infiniband/core/iwcm.c | 19 +- + drivers/infiniband/core/iwpm_msg.c | 34 +--- + drivers/infiniband/core/iwpm_util.c | 78 ++------ + drivers/infiniband/core/iwpm_util.h | 18 -- + drivers/infiniband/core/restrack.c | 2 +- + drivers/infiniband/core/uverbs_cmd.c | 31 +--- + drivers/infiniband/core/uverbs_std_types_qp.c | 29 +-- + drivers/infiniband/core/verbs.c | 234 +++++++++++++++--------- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 26 +-- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 7 +- + drivers/infiniband/hw/bnxt_re/main.c | 1 + + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 5 +- + drivers/infiniband/hw/cxgb4/provider.c | 1 + + drivers/infiniband/hw/cxgb4/qp.c | 37 ++-- + drivers/infiniband/hw/efa/efa.h | 5 +- + drivers/infiniband/hw/efa/efa_main.c | 1 + + drivers/infiniband/hw/efa/efa_verbs.c | 147 ++++++++------- + drivers/infiniband/hw/hfi1/chip.c | 6 +- + drivers/infiniband/hw/hfi1/file_ops.c | 6 +- + drivers/infiniband/hw/hfi1/hfi.h | 5 +- + drivers/infiniband/hw/hfi1/init.c | 9 +- + drivers/infiniband/hw/hfi1/ipoib_tx.c | 3 + + drivers/infiniband/hw/hfi1/ruc.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 5 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 1 + + drivers/infiniband/hw/hns/hns_roce_qp.c | 36 +--- + drivers/infiniband/hw/irdma/utils.c | 3 - + drivers/infiniband/hw/irdma/verbs.c | 31 ++-- + drivers/infiniband/hw/mlx4/main.c | 1 + + drivers/infiniband/hw/mlx4/mlx4_ib.h | 5 +- + drivers/infiniband/hw/mlx4/qp.c | 25 +-- + drivers/infiniband/hw/mlx5/gsi.c | 51 ++---- + drivers/infiniband/hw/mlx5/main.c | 145 ++++++--------- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 7 +- + drivers/infiniband/hw/mlx5/qp.c | 233 ++++++++++++++++++----- + drivers/infiniband/hw/mthca/mthca_provider.c | 77 +++----- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 1 + + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 25 +-- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 5 +- + drivers/infiniband/hw/qedr/main.c | 1 + + drivers/infiniband/hw/qedr/qedr_roce_cm.c | 13 +- + drivers/infiniband/hw/qedr/qedr_roce_cm.h | 5 +- + drivers/infiniband/hw/qedr/verbs.c | 67 +++---- + drivers/infiniband/hw/qedr/verbs.h | 4 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 1 + + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 34 ++-- + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h | 10 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 69 ++++--- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 5 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 1 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 53 +++--- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 5 +- + drivers/infiniband/sw/rdmavt/qp.c | 102 +++++------ + drivers/infiniband/sw/rdmavt/qp.h | 5 +- + drivers/infiniband/sw/rdmavt/vt.c | 9 + + drivers/infiniband/sw/rxe/rxe.h | 22 --- + drivers/infiniband/sw/rxe/rxe_comp.c | 4 +- + drivers/infiniband/sw/rxe/rxe_icrc.c | 124 ++++++++++++- + drivers/infiniband/sw/rxe/rxe_loc.h | 61 +----- + drivers/infiniband/sw/rxe/rxe_mr.c | 23 +-- + drivers/infiniband/sw/rxe/rxe_net.c | 59 +++++- + drivers/infiniband/sw/rxe/rxe_pool.c | 2 +- + drivers/infiniband/sw/rxe/rxe_recv.c | 23 +-- + drivers/infiniband/sw/rxe/rxe_req.c | 13 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 33 +--- + drivers/infiniband/sw/rxe/rxe_verbs.c | 59 +++--- + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 1 + + drivers/infiniband/sw/siw/siw_qp.c | 2 - + drivers/infiniband/sw/siw/siw_qp_tx.c | 44 +++-- + drivers/infiniband/sw/siw/siw_verbs.c | 54 +++--- + drivers/infiniband/sw/siw/siw_verbs.h | 5 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 11 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 - + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 6 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 19 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 2 - + drivers/infiniband/ulp/rtrs/rtrs.c | 23 ++- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 4 +- + include/linux/mlx5/mlx5_ifc.h | 14 +- + include/rdma/ib_verbs.h | 46 ++++- + include/rdma/rdmavt_qp.h | 2 +- + include/uapi/rdma/mlx5-abi.h | 17 +- + 91 files changed, 1222 insertions(+), 1283 deletions(-) +Merging net-next/master (9e5f10fe577b octeontx2-af: remove redudant second error check on variable err) +$ git merge net-next/master +Removing tools/testing/selftests/bpf/test_netcnt.c +Auto-merging tools/testing/selftests/Makefile +Auto-merging net/tipc/socket.c +Auto-merging net/sched/sch_cake.c +Auto-merging net/mptcp/pm_netlink.c +Auto-merging net/mptcp/options.c +Removing net/802/p8023.c +Auto-merging mm/memcontrol.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/helpers.c +Auto-merging init/main.c +Removing include/uapi/linux/ipx.h +Removing include/net/netns/x_tables.h +Removing include/net/ipx.h +Auto-merging include/net/flow_offload.h +Auto-merging include/linux/filter.h +Auto-merging drivers/vdpa/mlx5/net/mlx5_vnet.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/ptp/Kconfig +CONFLICT (content): Merge conflict in drivers/ptp/Kconfig +Removing drivers/net/wan/sbni.h +Removing drivers/net/wan/sbni.c +Auto-merging drivers/net/vrf.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/usb/r8152.c +Removing drivers/net/mhi/proto_mbim.c +Removing drivers/net/mhi/mhi.h +Removing drivers/net/mhi/Makefile +Auto-merging drivers/net/ethernet/smsc/Kconfig +Auto-merging drivers/net/ethernet/mscc/ocelot.c +Auto-merging drivers/net/ethernet/intel/iavf/iavf_main.c +Auto-merging drivers/net/ethernet/intel/iavf/iavf.h +Auto-merging drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.h +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/fsl-fec.txt +Removing Documentation/devicetree/bindings/net/can/c_can.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'drivers/ptp/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a56a0eaf8903] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + Documentation/admin-guide/kernel-parameters.txt | 2 - + .../devicetree/bindings/net/can/bosch,c_can.yaml | 119 + + .../devicetree/bindings/net/can/bosch,m_can.yaml | 9 + + .../devicetree/bindings/net/can/c_can.txt | 65 - + .../bindings/net/can/can-controller.yaml | 9 + + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 17 + + .../bindings/net/can/renesas,rcar-canfd.yaml | 69 +- + Documentation/devicetree/bindings/net/fsl,fec.yaml | 244 ++ + Documentation/devicetree/bindings/net/fsl-fec.txt | 95 - + Documentation/devicetree/bindings/net/macb.txt | 1 + + .../devicetree/bindings/net/qcom,ipa.yaml | 24 +- + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 15 +- + Documentation/driver-api/nfc/nfc-hci.rst | 2 +- + Documentation/networking/bonding.rst | 12 + + .../ethernet/freescale/dpaa2/index.rst | 1 + + .../ethernet/freescale/dpaa2/switch-driver.rst | 217 ++ + .../networking/devlink/devlink-params.rst | 12 + + Documentation/networking/devlink/hns3.rst | 25 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/ethtool-netlink.rst | 8 + + Documentation/networking/filter.rst | 23 +- + Documentation/networking/index.rst | 2 + + Documentation/networking/ioam6-sysctl.rst | 26 + + Documentation/networking/ip-sysctl.rst | 17 + + Documentation/networking/mctp.rst | 213 ++ + Documentation/networking/mptcp-sysctl.rst | 12 + + Documentation/networking/netdevices.rst | 29 + + Documentation/networking/timestamping.rst | 6 +- + MAINTAINERS | 37 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx6q-novena.dts | 34 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 18 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 34 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 34 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 34 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 34 +- + arch/arm/boot/dts/imx7-mba7.dtsi | 1 - + arch/arm/boot/dts/imx7d-mba7.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8qxp-ss-conn.dtsi | 4 +- + arch/arm64/include/asm/compat.h | 14 +- + arch/mips/include/asm/compat.h | 24 +- + arch/mips/include/uapi/asm/socket.h | 2 + + arch/parisc/include/asm/compat.h | 14 +- + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/powerpc/include/asm/compat.h | 11 - + arch/s390/include/asm/ccwgroup.h | 2 - + arch/s390/include/asm/compat.h | 14 +- + arch/sparc/include/asm/compat.h | 14 +- + arch/sparc/include/uapi/asm/socket.h | 2 + + arch/x86/include/asm/compat.h | 14 +- + arch/x86/include/asm/signal.h | 1 + + arch/x86/net/bpf_jit_comp.c | 19 + + drivers/atm/horizon.c | 6 +- + drivers/atm/idt77252.c | 2 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 4 +- + drivers/bus/mhi/pci_generic.c | 4 + + drivers/char/pcmcia/synclink_cs.c | 23 +- + drivers/infiniband/hw/mlx5/cq.c | 2 +- + drivers/infiniband/hw/mlx5/devx.c | 7 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 77 +- + drivers/infiniband/hw/mlx5/main.c | 44 +- + drivers/infiniband/hw/mlx5/std_types.c | 10 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 +- + drivers/net/Kconfig | 17 +- + drivers/net/Makefile | 6 +- + drivers/net/Space.c | 178 +- + drivers/net/appletalk/Kconfig | 4 +- + drivers/net/appletalk/ipddp.c | 16 +- + drivers/net/appletalk/ltpc.c | 7 +- + drivers/net/bonding/bond_3ad.c | 11 +- + drivers/net/bonding/bond_alb.c | 32 - + drivers/net/bonding/bond_main.c | 591 ++++- + drivers/net/bonding/bond_netlink.c | 16 + + drivers/net/bonding/bond_options.c | 27 + + drivers/net/bonding/bond_procfs.c | 2 + + drivers/net/bonding/bond_sysfs.c | 25 +- + drivers/net/can/Kconfig | 3 +- + drivers/net/can/at91_can.c | 137 +- + drivers/net/can/c_can/c_can.h | 25 +- + drivers/net/can/c_can/c_can_main.c | 123 +- + drivers/net/can/c_can/c_can_platform.c | 1 - + drivers/net/can/dev/dev.c | 66 + + drivers/net/can/dev/netlink.c | 11 +- + drivers/net/can/dev/rx-offload.c | 90 +- + drivers/net/can/flexcan.c | 129 +- + drivers/net/can/janz-ican3.c | 23 +- + drivers/net/can/m_can/m_can.c | 266 +- + drivers/net/can/m_can/m_can.h | 11 +- + drivers/net/can/m_can/m_can_pci.c | 11 +- + drivers/net/can/m_can/m_can_platform.c | 31 +- + drivers/net/can/m_can/tcan4x5x-core.c | 17 +- + drivers/net/can/rcar/rcar_canfd.c | 338 ++- + drivers/net/can/sja1000/peak_pci.c | 119 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 30 +- + .../net/can/spi/mcp251xfd/mcp251xfd-timestamp.c | 4 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 2 +- + drivers/net/can/ti_hecc.c | 2 + + drivers/net/can/usb/esd_usb2.c | 12 +- + drivers/net/can/usb/etas_es58x/es581_4.c | 5 +- + drivers/net/can/usb/etas_es58x/es58x_core.c | 82 +- + drivers/net/can/usb/etas_es58x/es58x_core.h | 2 +- + drivers/net/can/usb/etas_es58x/es58x_fd.c | 19 +- + drivers/net/can/usb/etas_es58x/es58x_fd.h | 23 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 228 +- + drivers/net/dsa/b53/b53_common.c | 10 - + drivers/net/dsa/b53/b53_priv.h | 2 - + drivers/net/dsa/bcm_sf2.c | 1 - + drivers/net/dsa/mt7530.c | 148 +- + drivers/net/dsa/mt7530.h | 21 +- + drivers/net/dsa/mv88e6xxx/Kconfig | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 103 +- + drivers/net/dsa/ocelot/Kconfig | 2 + + drivers/net/dsa/ocelot/felix.c | 143 +- + drivers/net/dsa/ocelot/felix.h | 2 +- + drivers/net/dsa/sja1105/Kconfig | 1 + + drivers/net/dsa/sja1105/sja1105.h | 27 +- + drivers/net/dsa/sja1105/sja1105_devlink.c | 114 +- + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 6 +- + drivers/net/dsa/sja1105/sja1105_main.c | 1917 +++++--------- + drivers/net/dsa/sja1105/sja1105_vl.c | 14 +- + drivers/net/eql.c | 24 +- + drivers/net/ethernet/3com/3c509.c | 7 +- + drivers/net/ethernet/3com/3c515.c | 3 +- + drivers/net/ethernet/3com/3c574_cs.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 4 +- + drivers/net/ethernet/3com/Kconfig | 1 + + drivers/net/ethernet/8390/Kconfig | 3 + + drivers/net/ethernet/8390/apne.c | 11 +- + drivers/net/ethernet/8390/ax88796.c | 9 +- + drivers/net/ethernet/8390/axnet_cs.c | 2 +- + drivers/net/ethernet/8390/ne.c | 5 +- + drivers/net/ethernet/8390/pcnet_cs.c | 2 +- + drivers/net/ethernet/8390/smc-ultra.c | 9 +- + drivers/net/ethernet/8390/wd.c | 7 +- + drivers/net/ethernet/8390/xsurf100.c | 9 +- + drivers/net/ethernet/actions/owl-emac.c | 6 +- + drivers/net/ethernet/adaptec/starfire.c | 2 +- + drivers/net/ethernet/agere/et131x.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/amd/Kconfig | 4 +- + drivers/net/ethernet/amd/amd8111e.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 11 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/lance.c | 6 +- + drivers/net/ethernet/amd/mvme147.c | 16 +- + drivers/net/ethernet/amd/ni65.c | 6 +- + drivers/net/ethernet/amd/pcnet32.c | 2 +- + drivers/net/ethernet/amd/sun3lance.c | 19 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 2 +- + drivers/net/ethernet/arc/emac_main.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/broadcom/Kconfig | 6 +- + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 6 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 139 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 28 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 9 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 9 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 319 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 53 + + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/cadence/Kconfig | 1 + + drivers/net/ethernet/cadence/macb_main.c | 13 +- + drivers/net/ethernet/cavium/Kconfig | 4 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 11 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 6 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + drivers/net/ethernet/cavium/thunder/nic_main.c | 8 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 10 +- + drivers/net/ethernet/chelsio/Kconfig | 1 + + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 14 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- + drivers/net/ethernet/cirrus/Kconfig | 27 +- + drivers/net/ethernet/cirrus/cs89x0.c | 31 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 11 +- + drivers/net/ethernet/dec/tulip/media.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- + drivers/net/ethernet/dlink/dl2k.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/dnet.c | 2 +- + drivers/net/ethernet/ethoc.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + drivers/net/ethernet/faraday/ftmac100.c | 2 +- + drivers/net/ethernet/fealnx.c | 2 +- + drivers/net/ethernet/freescale/Kconfig | 2 +- + drivers/net/ethernet/freescale/dpaa/Kconfig | 1 - + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/Makefile | 2 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-devlink.c | 7 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- + .../freescale/dpaa2/dpaa2-switch-ethtool.c | 56 +- + .../ethernet/freescale/dpaa2/dpaa2-switch-flower.c | 530 +++- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 367 ++- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.h | 62 +- + drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h | 19 + + drivers/net/ethernet/freescale/dpaa2/dpsw.c | 80 + + drivers/net/ethernet/freescale/dpaa2/dpsw.h | 36 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 2 +- + drivers/net/ethernet/freescale/fec.h | 31 + + drivers/net/ethernet/freescale/fec_main.c | 198 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 6 +- + drivers/net/ethernet/hisilicon/Kconfig | 4 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 81 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 8 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 138 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h | 31 + + .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 24 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 3 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 148 ++ + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.h | 15 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 40 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 3 + + .../net/ethernet/hisilicon/hns3/hns3vf/Makefile | 2 +- + .../hisilicon/hns3/hns3vf/hclgevf_devlink.c | 150 ++ + .../hisilicon/hns3/hns3vf/hclgevf_devlink.h | 15 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 8 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 3 + + drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 8 +- + drivers/net/ethernet/huawei/hinic/hinic_devlink.h | 4 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_sriov.c | 6 +- + drivers/net/ethernet/i825xx/82596.c | 24 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 17 +- + drivers/net/ethernet/ibm/emac/core.c | 4 +- + drivers/net/ethernet/ibm/ibmveth.c | 2 +- + drivers/net/ethernet/intel/Kconfig | 12 +- + drivers/net/ethernet/intel/e100.c | 6 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 2 + + drivers/net/ethernet/intel/e1000e/hw.h | 9 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 13 +- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 + + drivers/net/ethernet/intel/e1000e/netdev.c | 372 +-- + drivers/net/ethernet/intel/e1000e/ptp.c | 1 + + drivers/net/ethernet/intel/e1000e/regs.h | 1 + + drivers/net/ethernet/intel/i40e/i40e.h | 78 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 32 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 756 +++++- + drivers/net/ethernet/intel/i40e/i40e_register.h | 29 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 23 +- + drivers/net/ethernet/intel/iavf/iavf.h | 9 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 10 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 122 +- + drivers/net/ethernet/intel/ice/ice_devlink.c | 4 +- + drivers/net/ethernet/intel/ice/ice_main.c | 6 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 6 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 +- + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/igc/igc.h | 38 +- + drivers/net/ethernet/intel/igc/igc_base.c | 10 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 52 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 41 +- + drivers/net/ethernet/intel/igc/igc_main.c | 349 ++- + drivers/net/ethernet/intel/igc/igc_phy.c | 6 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 17 + + drivers/net/ethernet/intel/igc/igc_tsn.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/net/ethernet/marvell/mvneta.c | 30 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 +- + drivers/net/ethernet/marvell/octeontx2/Kconfig | 2 + + drivers/net/ethernet/marvell/octeontx2/af/common.h | 5 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 20 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 92 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 4 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 12 +- + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 115 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 148 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 51 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 36 +- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 2 + + .../net/ethernet/marvell/octeontx2/af/rvu_trace.h | 10 +- + .../net/ethernet/marvell/octeontx2/nic/Makefile | 5 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 3 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 14 + + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 23 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 33 +- + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 156 ++ + .../ethernet/marvell/octeontx2/nic/otx2_devlink.h | 20 + + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 52 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 115 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 46 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 50 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 36 +- + .../ethernet/marvell/prestera/prestera_devlink.c | 7 +- + .../ethernet/marvell/prestera/prestera_devlink.h | 2 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 5 +- + .../ethernet/marvell/prestera/prestera_switchdev.c | 12 +- + .../ethernet/marvell/prestera/prestera_switchdev.h | 3 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- + drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/Kconfig | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/qp.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 74 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 168 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 84 +- + .../net/ethernet/mellanox/mlx5/core/en/channels.c | 46 + + .../net/ethernet/mellanox/mlx5/core/en/channels.h | 16 + + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 96 +- + .../mellanox/mlx5/core/en/fs_tt_redirect.c | 30 +- + .../mellanox/mlx5/core/en/fs_tt_redirect.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/mapping.c | 45 + + .../net/ethernet/mellanox/mlx5/core/en/mapping.h | 5 + + .../net/ethernet/mellanox/mlx5/core/en/params.c | 12 + + .../net/ethernet/mellanox/mlx5/core/en/params.h | 6 + + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 329 ++- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c | 170 ++ + drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h | 42 + + drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 588 +++++ + drivers/net/ethernet/mellanox/mlx5/core/en/rss.h | 49 + + .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 690 +++++ + .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 71 + + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tir.c | 200 ++ + drivers/net/ethernet/mellanox/mlx5/core/en/tir.h | 58 + + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 27 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/pool.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 72 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.h | 4 - + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 12 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 13 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 53 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 25 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 29 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 132 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 671 +---- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 156 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 868 ++---- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 164 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 248 +- + .../mellanox/mlx5/core/esw/acl/egress_ofld.c | 16 + + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 359 ++- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.h | 46 +- + .../ethernet/mellanox/mlx5/core/esw/bridge_priv.h | 9 + + .../mlx5/core/esw/diag/bridge_tracepoint.h | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 48 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 47 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 388 ++- + drivers/net/ethernet/mellanox/mlx5/core/events.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 58 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/health.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 76 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 267 +- + drivers/net/ethernet/mellanox/mlx5/core/lag.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 602 +++++ + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 70 + + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 89 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 7 + + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 75 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 2 +- + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h | 4 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 2 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 5 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 32 +- + drivers/net/ethernet/micrel/ks8851_common.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/microchip/Kconfig | 1 + + drivers/net/ethernet/microchip/lan743x_main.c | 2 +- + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 24 +- + drivers/net/ethernet/mscc/Kconfig | 3 +- + drivers/net/ethernet/mscc/ocelot.c | 173 +- + drivers/net/ethernet/mscc/ocelot.h | 11 +- + drivers/net/ethernet/mscc/ocelot_net.c | 360 ++- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 64 +- + drivers/net/ethernet/natsemi/jazzsonic.c | 2 - + drivers/net/ethernet/natsemi/natsemi.c | 2 +- + drivers/net/ethernet/natsemi/xtsonic.c | 1 - + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/netronome/Kconfig | 1 + + drivers/net/ethernet/netronome/nfp/flower/action.c | 35 +- + .../net/ethernet/netronome/nfp/flower/conntrack.c | 620 ++++- + .../net/ethernet/netronome/nfp/flower/conntrack.h | 26 + + drivers/net/ethernet/netronome/nfp/flower/main.h | 79 +- + drivers/net/ethernet/netronome/nfp/flower/match.c | 333 +-- + .../net/ethernet/netronome/nfp/flower/metadata.c | 7 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 51 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 20 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 144 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 21 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 2 +- + drivers/net/ethernet/nxp/lpc_eth.c | 2 +- + drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 1 + + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 10 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 4 +- + drivers/net/ethernet/packetengines/hamachi.c | 63 +- + drivers/net/ethernet/packetengines/yellowfin.c | 2 +- + drivers/net/ethernet/pensando/Kconfig | 2 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 5 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 28 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 3 +- + .../net/ethernet/pensando/ionic/ionic_devlink.c | 18 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 21 + + drivers/net/ethernet/pensando/ionic/ionic_if.h | 5 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 42 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 + + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 27 +- + drivers/net/ethernet/qlogic/Kconfig | 2 +- + drivers/net/ethernet/qlogic/qed/qed.h | 15 - + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 12 +- + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 - + drivers/net/ethernet/qlogic/qed/qed_main.c | 8 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 1 - + .../net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.c | 1 - + drivers/net/ethernet/qlogic/qede/qede.h | 9 - + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 6 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 12 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 2 +- + drivers/net/ethernet/realtek/8139cp.c | 2 +- + drivers/net/ethernet/realtek/8139too.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 13 +- + drivers/net/ethernet/renesas/Kconfig | 2 +- + drivers/net/ethernet/renesas/ravb.h | 19 +- + drivers/net/ethernet/renesas/ravb_main.c | 129 +- + drivers/net/ethernet/renesas/sh_eth.c | 4 +- + drivers/net/ethernet/rocker/rocker.h | 3 +- + drivers/net/ethernet/rocker/rocker_main.c | 9 +- + drivers/net/ethernet/rocker/rocker_ofdpa.c | 19 +- + drivers/net/ethernet/samsung/Kconfig | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/sfc/Kconfig | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 2 +- + drivers/net/ethernet/sgi/meth.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 2 +- + drivers/net/ethernet/smsc/Kconfig | 1 + + drivers/net/ethernet/smsc/epic100.c | 2 +- + drivers/net/ethernet/smsc/smc9194.c | 6 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 2 +- + drivers/net/ethernet/smsc/smsc9420.c | 2 +- + drivers/net/ethernet/socionext/netsec.c | 2 +- + drivers/net/ethernet/socionext/sni_ave.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 13 + + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 18 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 7 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 67 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +- + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 8 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/tehuti/tehuti.c | 18 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 81 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 + + drivers/net/ethernet/ti/cpmac.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 6 +- + drivers/net/ethernet/ti/cpsw_new.c | 26 +- + drivers/net/ethernet/ti/davinci_emac.c | 4 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/fddi/skfp/skfddi.c | 19 +- + drivers/net/hamradio/baycom_epp.c | 9 +- + drivers/net/hamradio/baycom_par.c | 12 +- + drivers/net/hamradio/baycom_ser_fdx.c | 12 +- + drivers/net/hamradio/baycom_ser_hdx.c | 12 +- + drivers/net/hamradio/bpqether.c | 9 +- + drivers/net/hamradio/dmascc.c | 18 +- + drivers/net/hamradio/hdlcdrv.c | 20 +- + drivers/net/hamradio/scc.c | 13 +- + drivers/net/hamradio/yam.c | 19 +- + drivers/net/hippi/rrunner.c | 11 +- + drivers/net/hippi/rrunner.h | 3 +- + drivers/net/ipa/Makefile | 3 - + drivers/net/ipa/gsi.c | 241 +- + drivers/net/ipa/gsi.h | 31 +- + drivers/net/ipa/gsi_trans.c | 34 +- + drivers/net/ipa/ipa.h | 14 +- + drivers/net/ipa/ipa_clock.c | 215 +- + drivers/net/ipa/ipa_clock.h | 35 +- + drivers/net/ipa/ipa_cmd.c | 51 +- + drivers/net/ipa/ipa_cmd.h | 22 +- + drivers/net/ipa/ipa_data-v4.11.c | 15 +- + drivers/net/ipa/ipa_data-v4.5.c | 2 + + drivers/net/ipa/ipa_data-v4.9.c | 11 +- + drivers/net/ipa/ipa_endpoint.c | 40 +- + drivers/net/ipa/ipa_interrupt.c | 78 +- + drivers/net/ipa/ipa_interrupt.h | 8 +- + drivers/net/ipa/ipa_main.c | 188 +- + drivers/net/ipa/ipa_modem.c | 127 +- + drivers/net/ipa/ipa_modem.h | 4 - + drivers/net/ipa/ipa_qmi.c | 6 +- + drivers/net/ipa/ipa_qmi.h | 19 + + drivers/net/ipa/ipa_reg.h | 12 +- + drivers/net/ipa/ipa_resource.c | 3 +- + drivers/net/ipa/ipa_smp2p.c | 30 +- + drivers/net/ipa/ipa_table.c | 40 +- + drivers/net/ipa/ipa_table.h | 16 - + drivers/net/ipa/ipa_uc.c | 58 +- + drivers/net/ipa/ipa_uc.h | 22 +- + drivers/net/ipvlan/ipvlan_main.c | 1 + + drivers/net/macvlan.c | 8 +- + drivers/net/mctp/Kconfig | 8 + + drivers/net/mctp/Makefile | 0 + drivers/net/mdio/Kconfig | 3 +- + drivers/net/mdio/mdio-ipq4019.c | 44 + + drivers/net/mhi/Makefile | 3 - + drivers/net/mhi/mhi.h | 41 - + drivers/net/mhi/proto_mbim.c | 304 --- + drivers/net/{mhi/net.c => mhi_net.c} | 166 +- + drivers/net/mii.c | 6 +- + drivers/net/netdevsim/bus.c | 43 +- + drivers/net/netdevsim/dev.c | 25 +- + drivers/net/netdevsim/fib.c | 2 +- + drivers/net/netdevsim/netdev.c | 6 +- + drivers/net/netdevsim/netdevsim.h | 2 + + drivers/net/pcs/pcs-xpcs.c | 4 + + drivers/net/phy/Kconfig | 8 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/at803x.c | 18 +- + drivers/net/phy/dp83822.c | 8 +- + drivers/net/phy/intel-xway.c | 76 + + drivers/net/phy/marvell.c | 144 +- + drivers/net/phy/marvell10g.c | 89 + + drivers/net/phy/mscc/mscc_ptp.c | 8 +- + drivers/net/phy/mxl-gpy.c | 727 ++++++ + drivers/net/phy/nxp-tja11xx.c | 13 +- + drivers/net/phy/phy.c | 4 +- + drivers/net/phy/phy_device.c | 14 + + drivers/net/phy/phylink.c | 21 +- + drivers/net/plip/plip.c | 12 +- + drivers/net/ppp/ppp_generic.c | 6 +- + drivers/net/sb1000.c | 20 +- + drivers/net/slip/slip.c | 13 +- + drivers/net/usb/asix_devices.c | 12 +- + drivers/net/usb/ax88172a.c | 2 +- + drivers/net/usb/ax88179_178a.c | 2 +- + drivers/net/usb/cdc-phonet.c | 5 +- + drivers/net/usb/dm9601.c | 2 +- + drivers/net/usb/hso.c | 13 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/mcs7830.c | 2 +- + drivers/net/usb/pegasus.c | 5 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rtl8150.c | 5 +- + drivers/net/usb/smsc75xx.c | 2 +- + drivers/net/usb/smsc95xx.c | 2 +- + drivers/net/usb/sr9700.c | 2 +- + drivers/net/usb/sr9800.c | 2 +- + drivers/net/usb/usbnet.c | 8 +- + drivers/net/veth.c | 307 ++- + drivers/net/virtio_net.c | 37 +- + drivers/net/vmxnet3/Makefile | 2 +- + drivers/net/vmxnet3/upt1_defs.h | 2 +- + drivers/net/vmxnet3/vmxnet3_defs.h | 50 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 221 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 20 + + drivers/net/vmxnet3/vmxnet3_int.h | 22 +- + drivers/net/vrf.c | 21 +- + drivers/net/wan/Kconfig | 51 - + drivers/net/wan/Makefile | 1 - + drivers/net/wan/c101.c | 33 +- + drivers/net/wan/cosa.c | 15 +- + drivers/net/wan/farsync.c | 123 +- + drivers/net/wan/fsl_ucc_hdlc.c | 19 +- + drivers/net/wan/hdlc.c | 9 +- + drivers/net/wan/hdlc_cisco.c | 14 +- + drivers/net/wan/hdlc_fr.c | 40 +- + drivers/net/wan/hdlc_ppp.c | 8 +- + drivers/net/wan/hdlc_raw.c | 14 +- + drivers/net/wan/hdlc_raw_eth.c | 14 +- + drivers/net/wan/hdlc_x25.c | 16 +- + drivers/net/wan/hostess_sv11.c | 13 +- + drivers/net/wan/ixp4xx_hss.c | 22 +- + drivers/net/wan/lmc/lmc.h | 2 +- + drivers/net/wan/lmc/lmc_main.c | 33 +- + drivers/net/wan/lmc/lmc_proto.c | 7 - + drivers/net/wan/lmc/lmc_proto.h | 1 - + drivers/net/wan/n2.c | 32 +- + drivers/net/wan/pc300too.c | 44 +- + drivers/net/wan/pci200syn.c | 32 +- + drivers/net/wan/sbni.c | 1638 ------------ + drivers/net/wan/sbni.h | 147 -- + drivers/net/wan/sealevel.c | 10 +- + drivers/net/wan/wanxl.c | 21 +- + drivers/net/wireless/cisco/airo.c | 15 +- + drivers/net/wireless/intersil/hostap/hostap.h | 3 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 30 +- + drivers/net/wireless/intersil/hostap/hostap_main.c | 3 + + drivers/net/wwan/Kconfig | 12 + + drivers/net/wwan/Makefile | 1 + + drivers/net/wwan/iosm/iosm_ipc_pcie.c | 19 +- + drivers/net/wwan/mhi_wwan_mbim.c | 658 +++++ + drivers/net/wwan/wwan_core.c | 7 +- + drivers/nfc/fdp/fdp.c | 38 +- + drivers/nfc/fdp/fdp.h | 4 +- + drivers/nfc/fdp/i2c.c | 8 +- + drivers/nfc/mei_phy.c | 4 +- + drivers/nfc/mei_phy.h | 2 +- + drivers/nfc/microread/i2c.c | 4 +- + drivers/nfc/microread/microread.c | 14 +- + drivers/nfc/microread/microread.h | 6 +- + drivers/nfc/nfcmrvl/fw_dnld.c | 16 +- + drivers/nfc/nfcmrvl/i2c.c | 4 +- + drivers/nfc/nfcmrvl/main.c | 6 +- + drivers/nfc/nfcmrvl/nfcmrvl.h | 6 +- + drivers/nfc/nfcmrvl/spi.c | 4 +- + drivers/nfc/nfcmrvl/uart.c | 4 +- + drivers/nfc/nfcmrvl/usb.c | 2 +- + drivers/nfc/nfcsim.c | 4 +- + drivers/nfc/nxp-nci/core.c | 2 +- + drivers/nfc/pn533/pn533.c | 2 +- + drivers/nfc/pn544/i2c.c | 2 +- + drivers/nfc/pn544/pn544.c | 17 +- + drivers/nfc/pn544/pn544.h | 7 +- + drivers/nfc/port100.c | 47 +- + drivers/nfc/s3fwrn5/core.c | 7 +- + drivers/nfc/s3fwrn5/firmware.c | 12 +- + drivers/nfc/s3fwrn5/nci.c | 8 +- + drivers/nfc/s3fwrn5/nci.h | 2 +- + drivers/nfc/st-nci/core.c | 5 +- + drivers/nfc/st-nci/i2c.c | 2 +- + drivers/nfc/st-nci/ndlc.c | 6 +- + drivers/nfc/st-nci/ndlc.h | 8 +- + drivers/nfc/st-nci/spi.c | 2 +- + drivers/nfc/st-nci/vendor_cmds.c | 2 +- + drivers/nfc/st21nfca/core.c | 6 +- + drivers/nfc/st21nfca/i2c.c | 6 +- + drivers/nfc/st21nfca/st21nfca.h | 4 +- + drivers/nfc/st21nfca/vendor_cmds.c | 2 +- + drivers/nfc/st95hf/core.c | 2 +- + drivers/nfc/trf7970a.c | 19 +- + drivers/nfc/virtual_ncidev.c | 13 +- + drivers/ptp/Kconfig | 24 +- + drivers/ptp/ptp_ocp.c | 1283 ++++++++- + drivers/ptp/ptp_vclock.c | 2 + + drivers/s390/cio/ccwgroup.c | 22 - + drivers/s390/net/Kconfig | 10 +- + drivers/s390/net/ctcm_fsms.c | 2 +- + drivers/s390/net/ctcm_mpc.c | 2 +- + drivers/s390/net/qeth_core.h | 51 +- + drivers/s390/net/qeth_core_main.c | 189 +- + drivers/s390/net/qeth_core_mpc.c | 3 - + drivers/s390/net/qeth_core_mpc.h | 23 +- + drivers/s390/net/qeth_core_sys.c | 5 - + drivers/s390/net/qeth_ethtool.c | 7 - + drivers/s390/net/qeth_l2_main.c | 414 +-- + drivers/s390/net/qeth_l3_main.c | 19 +- + drivers/scsi/cxgbi/cxgb4i/Kconfig | 1 + + drivers/staging/octeon/ethernet.c | 12 +- + drivers/staging/qlge/qlge_main.c | 5 +- + drivers/staging/rtl8188eu/include/osdep_intf.h | 2 + + drivers/staging/rtl8188eu/include/rtw_android.h | 3 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 3 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 1 + + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 14 +- + drivers/staging/rtl8723bs/include/osdep_intf.h | 2 + + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 18 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 + + drivers/staging/wlan-ng/p80211netdev.c | 76 +- + drivers/tty/synclink_gt.c | 19 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- + include/asm-generic/compat.h | 17 + + include/linux/bitops.h | 50 + + include/linux/bpf-cgroup.h | 54 - + include/linux/bpf.h | 162 +- + include/linux/bpf_verifier.h | 19 +- + include/linux/btf.h | 1 + + include/linux/can/bittiming.h | 4 +- + include/linux/can/dev.h | 8 + + include/linux/can/platform/flexcan.h | 23 + + include/linux/can/rx-offload.h | 8 +- + include/linux/compat.h | 32 +- + include/linux/dsa/8021q.h | 44 +- + include/linux/dsa/sja1105.h | 19 +- + include/linux/ethtool.h | 4 - + include/linux/filter.h | 16 +- + include/linux/fsl/mc.h | 3 +- + include/linux/genetlink.h | 23 - + include/linux/hdlc.h | 4 +- + include/linux/hdlcdrv.h | 2 +- + include/linux/if_bridge.h | 40 +- + include/linux/igmp.h | 3 - + include/linux/inetdevice.h | 9 + + include/linux/ioam6.h | 13 + + include/linux/ioam6_genl.h | 13 + + include/linux/ioam6_iptunnel.h | 13 + + include/linux/ipv6.h | 3 + + include/linux/memcontrol.h | 3 +- + include/linux/mhi.h | 2 + + include/linux/mii.h | 2 +- + include/linux/mlx5/device.h | 71 +- + include/linux/mlx5/driver.h | 18 +- + include/linux/mlx5/eswitch.h | 16 + + include/linux/mlx5/fs.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 8 +- + include/linux/mm_types.h | 18 +- + include/linux/netdevice.h | 81 +- + include/linux/netfilter/x_tables.h | 6 +- + include/linux/netfilter_bridge/ebtables.h | 2 + + include/linux/phy.h | 1 + + include/linux/ptp_clock_kernel.h | 48 +- + include/linux/sched.h | 3 + + include/linux/skbuff.h | 21 +- + include/linux/socket.h | 6 +- + include/linux/typecheck.h | 9 + + include/net/Space.h | 10 - + include/net/act_api.h | 22 +- + include/net/af_unix.h | 15 + + include/net/ax88796.h | 3 + + include/net/bond_3ad.h | 1 + + include/net/bond_options.h | 1 + + include/net/bonding.h | 14 +- + include/net/compat.h | 27 +- + include/net/devlink.h | 58 +- + include/net/dn_fib.h | 2 +- + include/net/dsa.h | 71 +- + include/net/dst.h | 2 + + include/net/flow_offload.h | 1 + + include/net/if_inet6.h | 3 - + include/net/inet_hashtables.h | 6 + + include/net/ioam6.h | 67 + + include/net/ip.h | 22 +- + include/net/ip6_route.h | 5 +- + include/net/ip_fib.h | 2 +- + include/net/ip_tunnels.h | 3 +- + include/net/ipx.h | 171 -- + include/net/mctp.h | 232 ++ + include/net/mctpdevice.h | 36 + + include/net/net_namespace.h | 6 +- + include/net/netfilter/nf_queue.h | 4 +- + include/net/netlink.h | 2 +- + include/net/netns/ipv4.h | 1 - + include/net/netns/ipv6.h | 3 + + include/net/netns/mctp.h | 36 + + include/net/netns/netfilter.h | 1 - + include/net/netns/x_tables.h | 12 - + include/net/nfc/digital.h | 4 +- + include/net/nfc/hci.h | 6 +- + include/net/nfc/nci_core.h | 30 +- + include/net/nfc/nfc.h | 16 +- + include/net/page_pool.h | 68 +- + include/net/pkt_cls.h | 24 +- + include/net/rtnetlink.h | 3 +- + include/net/sch_generic.h | 2 +- + include/net/sock.h | 17 +- + include/net/switchdev.h | 108 + + include/net/tcp.h | 1 - + include/net/xdp.h | 5 + + include/soc/mscc/ocelot.h | 21 +- + include/trace/events/qdisc.h | 2 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 85 +- + include/uapi/linux/can/j1939.h | 9 + + include/uapi/linux/ethtool.h | 2 + + include/uapi/linux/if_arp.h | 1 + + include/uapi/linux/if_bridge.h | 46 + + include/uapi/linux/if_ether.h | 3 + + include/uapi/linux/if_link.h | 12 + + include/uapi/linux/in.h | 42 +- + include/uapi/linux/in6.h | 1 + + include/uapi/linux/ioam6.h | 133 + + include/uapi/linux/ioam6_genl.h | 52 + + include/uapi/linux/ioam6_iptunnel.h | 20 + + include/uapi/linux/ipv6.h | 3 + + include/uapi/linux/ipx.h | 87 - + include/uapi/linux/lwtunnel.h | 1 + + include/uapi/linux/mctp.h | 36 + + include/uapi/linux/mptcp.h | 1 + + include/uapi/linux/netfilter/nfnetlink_conntrack.h | 1 + + include/uapi/linux/openvswitch.h | 8 + + include/uapi/linux/pkt_cls.h | 1 + + include/uapi/linux/socket.h | 5 + + include/uapi/linux/tc_act/tc_skbmod.h | 1 + + init/main.c | 6 +- + kernel/bpf/Kconfig | 2 +- + kernel/bpf/arraymap.c | 21 + + kernel/bpf/bpf_iter.c | 22 + + kernel/bpf/btf.c | 82 +- + kernel/bpf/core.c | 2 +- + kernel/bpf/cpumap.c | 116 +- + kernel/bpf/devmap.c | 118 +- + kernel/bpf/hashtab.c | 105 +- + kernel/bpf/helpers.c | 356 ++- + kernel/bpf/local_storage.c | 20 +- + kernel/bpf/map_in_map.c | 8 + + kernel/bpf/syscall.c | 53 +- + kernel/bpf/trampoline.c | 12 +- + kernel/bpf/verifier.c | 379 ++- + kernel/fork.c | 1 + + kernel/trace/bpf_trace.c | 40 +- + lib/test_bpf.c | 2752 ++++++++++++++++++-- + mm/memcontrol.c | 26 +- + net/802/Makefile | 1 - + net/802/p8023.c | 60 - + net/8021q/vlan.c | 2 +- + net/8021q/vlan_dev.c | 6 +- + net/Kconfig | 1 + + net/Makefile | 1 + + net/appletalk/ddp.c | 4 +- + net/ax25/ax25_ip.c | 4 +- + net/ax25/ax25_out.c | 13 +- + net/ax25/ax25_route.c | 13 +- + net/batman-adv/bridge_loop_avoidance.c | 6 +- + net/batman-adv/distributed-arp-table.c | 3 +- + net/batman-adv/gateway_client.c | 3 +- + net/batman-adv/multicast.c | 9 +- + net/batman-adv/originator.c | 12 +- + net/batman-adv/translation-table.c | 9 +- + net/bpf/test_run.c | 133 +- + net/bridge/br.c | 62 +- + net/bridge/br_device.c | 16 +- + net/bridge/br_fdb.c | 28 +- + net/bridge/br_forward.c | 16 +- + net/bridge/br_if.c | 15 +- + net/bridge/br_input.c | 17 +- + net/bridge/br_ioctl.c | 83 +- + net/bridge/br_mdb.c | 177 +- + net/bridge/br_multicast.c | 1886 +++++++++----- + net/bridge/br_multicast_eht.c | 92 +- + net/bridge/br_netlink.c | 58 +- + net/bridge/br_private.h | 563 +++- + net/bridge/br_private_mcast_eht.h | 3 +- + net/bridge/br_switchdev.c | 246 +- + net/bridge/br_sysfs_br.c | 48 +- + net/bridge/br_sysfs_if.c | 2 +- + net/bridge/br_vlan.c | 135 +- + net/bridge/br_vlan_options.c | 402 +++ + net/bridge/netfilter/ebtable_broute.c | 17 +- + net/bridge/netfilter/ebtable_filter.c | 17 +- + net/bridge/netfilter/ebtable_nat.c | 17 +- + net/bridge/netfilter/ebtables.c | 109 +- + net/can/j1939/j1939-priv.h | 10 +- + net/can/j1939/socket.c | 143 +- + net/can/j1939/transport.c | 70 +- + net/can/raw.c | 8 +- + net/core/Makefile | 2 - + net/core/bpf_sk_storage.c | 4 +- + net/core/dev.c | 342 +-- + net/core/dev_ioctl.c | 264 +- + net/core/devlink.c | 680 +++-- + net/core/drop_monitor.c | 6 +- + net/core/dst.c | 6 +- + net/core/fib_rules.c | 4 +- + net/core/filter.c | 96 +- + net/core/flow_dissector.c | 12 +- + net/core/flow_offload.c | 90 +- + net/core/lwtunnel.c | 2 + + net/core/neighbour.c | 29 +- + net/core/net-procfs.c | 24 +- + net/core/net_namespace.c | 52 +- + net/core/page_pool.c | 112 +- + net/core/pktgen.c | 167 +- + net/core/rtnetlink.c | 31 +- + net/core/scm.c | 4 +- + net/core/selftests.c | 12 + + net/core/skbuff.c | 75 +- + net/core/sock.c | 30 +- + net/core/sock_map.c | 22 +- + net/dccp/proto.c | 2 +- + net/decnet/dn_dev.c | 6 +- + net/decnet/dn_fib.c | 9 +- + net/decnet/dn_route.c | 18 +- + net/dsa/Kconfig | 13 +- + net/dsa/Makefile | 3 +- + net/dsa/dsa.c | 2 +- + net/dsa/dsa2.c | 64 +- + net/dsa/dsa_priv.h | 190 +- + net/dsa/master.c | 6 +- + net/dsa/port.c | 327 ++- + net/dsa/slave.c | 219 +- + net/dsa/switch.c | 30 +- + net/dsa/tag_8021q.c | 608 +++-- + net/dsa/tag_ar9331.c | 3 +- + net/dsa/tag_brcm.c | 34 +- + net/dsa/tag_dsa.c | 95 +- + net/dsa/tag_gswip.c | 3 +- + net/dsa/tag_hellcreek.c | 5 +- + net/dsa/tag_ksz.c | 8 +- + net/dsa/tag_lan9303.c | 24 +- + net/dsa/tag_mtk.c | 19 +- + net/dsa/tag_ocelot.c | 5 +- + net/dsa/tag_ocelot_8021q.c | 9 +- + net/dsa/tag_qca.c | 16 +- + net/dsa/tag_rtl4_a.c | 21 +- + net/dsa/tag_sja1105.c | 217 +- + net/dsa/tag_trailer.c | 3 +- + net/dsa/tag_xrs700x.c | 5 +- + net/ethernet/eth.c | 8 +- + net/ethtool/ioctl.c | 157 +- + net/ethtool/netlink.c | 51 +- + net/ethtool/netlink.h | 15 +- + net/ieee802154/nl-phy.c | 3 +- + net/ieee802154/nl802154.c | 3 +- + net/ieee802154/socket.c | 7 +- + net/ipv4/af_inet.c | 6 +- + net/ipv4/devinet.c | 21 +- + net/ipv4/fib_semantics.c | 12 +- + net/ipv4/fib_trie.c | 4 +- + net/ipv4/icmp.c | 3 +- + net/ipv4/igmp.c | 30 +- + net/ipv4/inet_connection_sock.c | 3 +- + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_output.c | 18 +- + net/ipv4/ip_sockglue.c | 24 +- + net/ipv4/ip_tunnel.c | 9 +- + net/ipv4/ip_vti.c | 2 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/netfilter/arptable_filter.c | 23 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 56 +- + net/ipv4/netfilter/iptable_filter.c | 24 +- + net/ipv4/netfilter/iptable_mangle.c | 17 +- + net/ipv4/netfilter/iptable_nat.c | 20 +- + net/ipv4/netfilter/iptable_raw.c | 21 +- + net/ipv4/netfilter/iptable_security.c | 23 +- + net/ipv4/route.c | 31 +- + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_fastopen.c | 20 +- + net/ipv4/tcp_input.c | 54 +- + net/ipv4/tcp_ipv4.c | 411 ++- + net/ipv4/tcp_output.c | 3 +- + net/ipv4/tcp_recovery.c | 3 +- + net/ipv4/udp_bpf.c | 1 - + net/ipv6/Kconfig | 11 + + net/ipv6/Makefile | 3 +- + net/ipv6/addrconf.c | 55 +- + net/ipv6/af_inet6.c | 10 + + net/ipv6/exthdrs.c | 158 +- + net/ipv6/ioam6.c | 910 +++++++ + net/ipv6/ioam6_iptunnel.c | 274 ++ + net/ipv6/ip6_fib.c | 4 +- + net/ipv6/ip6_gre.c | 17 +- + net/ipv6/ip6_output.c | 80 +- + net/ipv6/ip6_tunnel.c | 21 +- + net/ipv6/ip6_vti.c | 21 +- + net/ipv6/ip6mr.c | 3 +- + net/ipv6/ipv6_sockglue.c | 18 +- + net/ipv6/mcast.c | 20 +- + net/ipv6/netfilter/ip6table_filter.c | 23 +- + net/ipv6/netfilter/ip6table_mangle.c | 22 +- + net/ipv6/netfilter/ip6table_nat.c | 16 +- + net/ipv6/netfilter/ip6table_raw.c | 24 +- + net/ipv6/netfilter/ip6table_security.c | 22 +- + net/ipv6/route.c | 25 +- + net/ipv6/sit.c | 40 +- + net/ipv6/sysctl_net_ipv6.c | 19 + + net/iucv/af_iucv.c | 72 +- + net/iucv/iucv.c | 60 +- + net/llc/af_llc.c | 6 +- + net/mctp/Kconfig | 13 + + net/mctp/Makefile | 3 + + net/mctp/af_mctp.c | 395 +++ + net/mctp/device.c | 423 +++ + net/mctp/neigh.c | 342 +++ + net/mctp/route.c | 1116 ++++++++ + net/mpls/af_mpls.c | 2 +- + net/mptcp/ctrl.c | 26 +- + net/mptcp/mib.c | 2 + + net/mptcp/mib.h | 2 + + net/mptcp/options.c | 8 +- + net/mptcp/pm.c | 21 + + net/mptcp/pm_netlink.c | 193 +- + net/mptcp/protocol.c | 187 +- + net/mptcp/protocol.h | 36 +- + net/mptcp/subflow.c | 13 +- + net/netfilter/nf_conntrack_netlink.c | 76 +- + net/netfilter/nf_flow_table_core.c | 12 +- + net/netfilter/nf_flow_table_offload.c | 4 +- + net/netfilter/nf_queue.c | 43 +- + net/netfilter/nf_tables_offload.c | 1 + + net/netfilter/nfnetlink_queue.c | 15 +- + net/netfilter/nft_compat.c | 8 +- + net/netfilter/x_tables.c | 98 +- + net/netfilter/xt_CT.c | 11 - + net/netlabel/netlabel_cipso_v4.c | 8 +- + net/netlabel/netlabel_unlabeled.c | 6 +- + net/netlink/af_netlink.c | 4 +- + net/netlink/genetlink.c | 17 +- + net/netrom/nr_loopback.c | 3 +- + net/netrom/nr_route.c | 3 +- + net/nfc/af_nfc.c | 2 +- + net/nfc/core.c | 8 +- + net/nfc/digital_core.c | 4 +- + net/nfc/hci/core.c | 14 +- + net/nfc/hci/llc.c | 4 +- + net/nfc/hci/llc.h | 6 +- + net/nfc/hci/llc_nop.c | 2 +- + net/nfc/hci/llc_shdlc.c | 12 +- + net/nfc/llcp.h | 8 +- + net/nfc/llcp_commands.c | 46 +- + net/nfc/llcp_core.c | 44 +- + net/nfc/nci/core.c | 176 +- + net/nfc/nci/data.c | 12 +- + net/nfc/nci/hci.c | 52 +- + net/nfc/nci/ntf.c | 87 +- + net/nfc/nci/rsp.c | 48 +- + net/nfc/nci/spi.c | 2 +- + net/nfc/netlink.c | 4 +- + net/nfc/nfc.h | 2 +- + net/nfc/rawsock.c | 2 +- + net/openvswitch/actions.c | 8 +- + net/openvswitch/datapath.c | 76 +- + net/openvswitch/datapath.h | 20 + + net/packet/af_packet.c | 15 +- + net/phonet/af_phonet.c | 3 +- + net/phonet/pn_dev.c | 12 +- + net/phonet/socket.c | 3 +- + net/qrtr/qrtr.c | 4 +- + net/rxrpc/Kconfig | 7 +- + net/sched/act_api.c | 73 +- + net/sched/act_bpf.c | 4 +- + net/sched/act_connmark.c | 4 +- + net/sched/act_csum.c | 7 +- + net/sched/act_ct.c | 4 +- + net/sched/act_ctinfo.c | 4 +- + net/sched/act_gact.c | 4 +- + net/sched/act_gate.c | 4 +- + net/sched/act_ife.c | 9 +- + net/sched/act_ipt.c | 21 +- + net/sched/act_mirred.c | 10 +- + net/sched/act_mpls.c | 4 +- + net/sched/act_nat.c | 6 +- + net/sched/act_pedit.c | 4 +- + net/sched/act_police.c | 4 +- + net/sched/act_sample.c | 7 +- + net/sched/act_simple.c | 4 +- + net/sched/act_skbedit.c | 4 +- + net/sched/act_skbmod.c | 47 +- + net/sched/act_tunnel_key.c | 4 +- + net/sched/act_vlan.c | 4 +- + net/sched/cls_api.c | 87 +- + net/sched/cls_basic.c | 10 +- + net/sched/cls_bpf.c | 8 +- + net/sched/cls_cgroup.c | 6 +- + net/sched/cls_flow.c | 6 +- + net/sched/cls_flower.c | 18 +- + net/sched/cls_fw.c | 13 +- + net/sched/cls_matchall.c | 17 +- + net/sched/cls_route.c | 10 +- + net/sched/cls_rsvp.h | 7 +- + net/sched/cls_tcindex.c | 10 +- + net/sched/cls_u32.c | 24 +- + net/sched/sch_api.c | 10 +- + net/sched/sch_atm.c | 2 +- + net/sched/sch_cake.c | 2 +- + net/sched/sch_cbq.c | 2 +- + net/sched/sch_drr.c | 2 +- + net/sched/sch_dsmark.c | 2 +- + net/sched/sch_ets.c | 2 +- + net/sched/sch_fq_codel.c | 2 +- + net/sched/sch_fq_pie.c | 2 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_htb.c | 2 +- + net/sched/sch_multiq.c | 2 +- + net/sched/sch_prio.c | 2 +- + net/sched/sch_qfq.c | 2 +- + net/sched/sch_sfb.c | 2 +- + net/sched/sch_sfq.c | 2 +- + net/smc/smc_core.c | 31 +- + net/smc/smc_ib.c | 3 +- + net/smc/smc_pnet.c | 3 +- + net/socket.c | 347 +-- + net/switchdev/switchdev.c | 308 +++ + net/tipc/socket.c | 34 +- + net/unix/Kconfig | 5 + + net/unix/Makefile | 1 + + net/unix/af_unix.c | 257 +- + net/unix/unix_bpf.c | 125 + + net/wireless/nl80211.c | 16 +- + net/wireless/scan.c | 3 +- + samples/bpf/.gitignore | 2 + + samples/bpf/test_override_return.sh | 1 + + samples/bpf/tracex7_user.c | 5 + + samples/bpf/xdp1_kern.c | 2 + + samples/bpf/xdp2_kern.c | 2 + + samples/bpf/xdp_redirect_cpu_user.c | 24 +- + samples/bpf/xdpsock_user.c | 20 +- + samples/pktgen/functions.sh | 2 +- + samples/pktgen/pktgen_sample04_many_flows.sh | 12 +- + samples/pktgen/pktgen_sample05_flow_per_thread.sh | 12 +- + scripts/bpf_doc.py | 2 + + security/selinux/hooks.c | 4 +- + security/selinux/include/classmap.h | 4 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 48 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 3 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 9 +- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 2 + + tools/bpf/bpftool/Documentation/bpftool-link.rst | 3 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 3 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 36 +- + .../bpftool/Documentation/bpftool-struct_ops.rst | 2 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 12 +- + tools/bpf/bpftool/bash-completion/bpftool | 66 +- + tools/bpf/bpftool/btf.c | 11 +- + tools/bpf/bpftool/btf_dumper.c | 6 +- + tools/bpf/bpftool/cgroup.c | 3 +- + tools/bpf/bpftool/common.c | 6 + + tools/bpf/bpftool/feature.c | 1 + + tools/bpf/bpftool/gen.c | 3 +- + tools/bpf/bpftool/iter.c | 2 + + tools/bpf/bpftool/link.c | 3 +- + tools/bpf/bpftool/main.c | 3 +- + tools/bpf/bpftool/main.h | 3 +- + tools/bpf/bpftool/map.c | 19 +- + tools/bpf/bpftool/net.c | 1 + + tools/bpf/bpftool/perf.c | 5 +- + tools/bpf/bpftool/prog.c | 37 +- + tools/bpf/bpftool/struct_ops.c | 2 +- + tools/bpf/resolve_btfids/main.c | 13 +- + tools/include/uapi/linux/bpf.h | 85 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/btf.c | 47 +- + tools/lib/bpf/btf.h | 31 +- + tools/lib/bpf/btf_dump.c | 871 ++++++- + tools/lib/bpf/libbpf.c | 1587 ++--------- + tools/lib/bpf/libbpf.h | 25 +- + tools/lib/bpf/libbpf.map | 8 + + tools/lib/bpf/libbpf_internal.h | 81 +- + tools/lib/bpf/relo_core.c | 1295 +++++++++ + tools/lib/bpf/relo_core.h | 100 + + tools/perf/util/bpf-event.c | 11 +- + tools/perf/util/bpf_counter.c | 12 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 3 +- + tools/testing/selftests/bpf/README.rst | 7 + + tools/testing/selftests/bpf/netcnt_common.h | 38 +- + tools/testing/selftests/bpf/network_helpers.c | 97 +- + tools/testing/selftests/bpf/network_helpers.h | 5 + + .../selftests/bpf/prog_tests/bpf_iter_setsockopt.c | 226 ++ + tools/testing/selftests/bpf/prog_tests/btf.c | 4 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 615 +++++ + .../selftests/bpf/prog_tests/core_autosize.c | 22 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 25 +- + .../selftests/bpf/prog_tests/get_func_ip_test.c | 55 + + tools/testing/selftests/bpf/prog_tests/netcnt.c | 82 + + tools/testing/selftests/bpf/prog_tests/pinning.c | 9 + + .../selftests/bpf/prog_tests/reference_tracking.c | 4 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 406 ++- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 11 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 55 + + tools/testing/selftests/bpf/prog_tests/timer_mim.c | 69 + + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 520 ++++ + .../bpf/prog_tests/xdp_context_test_run.c | 105 + + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 43 +- + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 39 +- + .../selftests/bpf/progs/bpf_iter_setsockopt.c | 72 + + tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c | 2 +- + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 6 + + .../testing/selftests/bpf/progs/get_func_ip_test.c | 84 + + tools/testing/selftests/bpf/progs/netcnt_prog.c | 8 +- + .../selftests/bpf/progs/test_map_in_map_invalid.c | 26 + + .../selftests/bpf/progs/test_sk_lookup_kern.c | 14 +- + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 1 - + .../bpf/progs/test_xdp_context_test_run.c | 20 + + tools/testing/selftests/bpf/progs/timer.c | 297 +++ + tools/testing/selftests/bpf/progs/timer_mim.c | 88 + + .../testing/selftests/bpf/progs/timer_mim_reject.c | 74 + + tools/testing/selftests/bpf/progs/xdp_tx.c | 2 +- + .../selftests/bpf/test_bpftool_synctypes.py | 586 +++++ + tools/testing/selftests/bpf/test_maps.c | 72 +- + tools/testing/selftests/bpf/test_netcnt.c | 148 -- + tools/testing/selftests/bpf/test_progs.h | 12 + + tools/testing/selftests/bpf/test_tc_tunnel.sh | 2 +- + tools/testing/selftests/bpf/test_xdp_veth.sh | 2 +- + tools/testing/selftests/nci/nci_dev.c | 416 ++- + tools/testing/selftests/net/Makefile | 4 + + tools/testing/selftests/net/af_unix/Makefile | 5 + + .../testing/selftests/net/af_unix/test_unix_oob.c | 437 ++++ + tools/testing/selftests/net/config | 1 + + tools/testing/selftests/net/fcnal-test.sh | 28 + + tools/testing/selftests/net/gro.c | 1095 ++++++++ + tools/testing/selftests/net/gro.sh | 128 + + tools/testing/selftests/net/ioam6.sh | 652 +++++ + tools/testing/selftests/net/ioam6_parser.c | 720 +++++ + tools/testing/selftests/net/mptcp/mptcp_join.sh | 292 ++- + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 16 +- + tools/testing/selftests/net/psock_snd.sh | 3 - + tools/testing/selftests/net/setup_loopback.sh | 82 + + tools/testing/selftests/net/toeplitz.c | 585 +++++ + tools/testing/selftests/net/toeplitz.sh | 199 ++ + tools/testing/selftests/net/toeplitz_client.sh | 28 + + tools/testing/selftests/net/veth.sh | 183 +- + .../tc-testing/tc-tests/actions/skbmod.json | 24 + + .../selftests/tc-testing/tc-tests/qdiscs/mq.json | 137 + + tools/testing/selftests/tc-testing/tdc_config.py | 1 + + 1265 files changed, 51714 insertions(+), 19082 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/can/bosch,c_can.yaml + delete mode 100644 Documentation/devicetree/bindings/net/can/c_can.txt + create mode 100644 Documentation/devicetree/bindings/net/fsl,fec.yaml + delete mode 100644 Documentation/devicetree/bindings/net/fsl-fec.txt + create mode 100644 Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-driver.rst + create mode 100644 Documentation/networking/devlink/hns3.rst + create mode 100644 Documentation/networking/ioam6-sysctl.rst + create mode 100644 Documentation/networking/mctp.rst + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/channels.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/channels.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rss.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rss.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tir.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/tir.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h + create mode 100644 drivers/net/mctp/Kconfig + create mode 100644 drivers/net/mctp/Makefile + delete mode 100644 drivers/net/mhi/Makefile + delete mode 100644 drivers/net/mhi/mhi.h + delete mode 100644 drivers/net/mhi/proto_mbim.c + rename drivers/net/{mhi/net.c => mhi_net.c} (74%) + create mode 100644 drivers/net/phy/mxl-gpy.c + delete mode 100644 drivers/net/wan/sbni.c + delete mode 100644 drivers/net/wan/sbni.h + create mode 100644 drivers/net/wwan/mhi_wwan_mbim.c + create mode 100644 include/linux/can/platform/flexcan.h + create mode 100644 include/linux/ioam6.h + create mode 100644 include/linux/ioam6_genl.h + create mode 100644 include/linux/ioam6_iptunnel.h + create mode 100644 include/net/ioam6.h + delete mode 100644 include/net/ipx.h + create mode 100644 include/net/mctp.h + create mode 100644 include/net/mctpdevice.h + create mode 100644 include/net/netns/mctp.h + delete mode 100644 include/net/netns/x_tables.h + create mode 100644 include/uapi/linux/ioam6.h + create mode 100644 include/uapi/linux/ioam6_genl.h + create mode 100644 include/uapi/linux/ioam6_iptunnel.h + delete mode 100644 include/uapi/linux/ipx.h + create mode 100644 include/uapi/linux/mctp.h + delete mode 100644 net/802/p8023.c + create mode 100644 net/ipv6/ioam6.c + create mode 100644 net/ipv6/ioam6_iptunnel.c + create mode 100644 net/mctp/Kconfig + create mode 100644 net/mctp/Makefile + create mode 100644 net/mctp/af_mctp.c + create mode 100644 net/mctp/device.c + create mode 100644 net/mctp/neigh.c + create mode 100644 net/mctp/route.c + create mode 100644 net/unix/unix_bpf.c + create mode 100644 tools/lib/bpf/relo_core.c + create mode 100644 tools/lib/bpf/relo_core.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/get_func_ip_test.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/netcnt.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/timer.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/timer_mim.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_bonding.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_setsockopt.c + create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_test.c + create mode 100644 tools/testing/selftests/bpf/progs/test_map_in_map_invalid.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c + create mode 100644 tools/testing/selftests/bpf/progs/timer.c + create mode 100644 tools/testing/selftests/bpf/progs/timer_mim.c + create mode 100644 tools/testing/selftests/bpf/progs/timer_mim_reject.c + create mode 100755 tools/testing/selftests/bpf/test_bpftool_synctypes.py + delete mode 100644 tools/testing/selftests/bpf/test_netcnt.c + create mode 100644 tools/testing/selftests/net/af_unix/Makefile + create mode 100644 tools/testing/selftests/net/af_unix/test_unix_oob.c + create mode 100644 tools/testing/selftests/net/gro.c + create mode 100755 tools/testing/selftests/net/gro.sh + create mode 100755 tools/testing/selftests/net/ioam6.sh + create mode 100644 tools/testing/selftests/net/ioam6_parser.c + create mode 100755 tools/testing/selftests/net/setup_loopback.sh + create mode 100644 tools/testing/selftests/net/toeplitz.c + create mode 100755 tools/testing/selftests/net/toeplitz.sh + create mode 100755 tools/testing/selftests/net/toeplitz_client.sh + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/mq.json +$ git am -3 ../patches/0001-NET_VENDOR_CIRRUS-is-not-ready-for-COMPILE_TEST.patch +Applying: NET_VENDOR_CIRRUS is not ready for COMPILE_TEST +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/cirrus/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 1a5262460035] Merge remote-tracking branch 'net-next/master' + Date: Fri Aug 20 11:34:42 2021 +1000 +Merging bpf-next/for-next (f2a6ee924d26 selftests/bpf: Add tests for {set|get} socket option from setsockopt BPF) +$ git merge bpf-next/for-next +Auto-merging net/unix/af_unix.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/helpers.c +Auto-merging include/linux/filter.h +Removing Documentation/bpf/libbpf/libbpf_api.rst +Merge made by the 'recursive' strategy. + Documentation/bpf/index.rst | 10 +- + Documentation/bpf/libbpf/{libbpf.rst => index.rst} | 8 + + Documentation/bpf/libbpf/libbpf_api.rst | 27 --- + .../bpf/libbpf/libbpf_naming_convention.rst | 2 +- + Documentation/networking/filter.rst | 4 +- + drivers/media/rc/bpf-lirc.c | 6 +- + drivers/net/ppp/ppp_generic.c | 8 +- + drivers/net/team/team_mode_loadbalance.c | 2 +- + include/linux/bpf.h | 200 +++++++++------- + include/linux/bpf_types.h | 3 + + include/linux/bpfptr.h | 12 +- + include/linux/btf_ids.h | 3 +- + include/linux/filter.h | 66 +++--- + include/linux/perf_event.h | 1 + + include/linux/trace_events.h | 7 +- + include/net/af_unix.h | 8 +- + include/uapi/linux/bpf.h | 25 ++ + kernel/bpf/bpf_iter.c | 2 +- + kernel/bpf/cgroup.c | 60 +++-- + kernel/bpf/core.c | 33 +-- + kernel/bpf/helpers.c | 14 ++ + kernel/bpf/syscall.c | 167 ++++++++++---- + kernel/bpf/trampoline.c | 2 +- + kernel/bpf/verifier.c | 2 +- + kernel/events/core.c | 77 ++++--- + kernel/trace/bpf_trace.c | 47 +++- + lib/test_bpf.c | 4 +- + net/bpf/test_run.c | 6 +- + net/core/filter.c | 18 +- + net/core/ptp_classifier.c | 2 +- + net/core/sock_map.c | 1 + + net/netfilter/xt_bpf.c | 2 +- + net/sched/act_bpf.c | 4 +- + net/sched/cls_bpf.c | 4 +- + net/unix/af_unix.c | 188 +++++++++++++-- + net/unix/unix_bpf.c | 93 ++++++-- + samples/bpf/offwaketime_kern.c | 9 +- + tools/include/uapi/linux/bpf.h | 25 ++ + tools/lib/bpf/Makefile | 10 +- + tools/lib/bpf/bpf.c | 32 ++- + tools/lib/bpf/bpf.h | 8 +- + tools/lib/bpf/libbpf.c | 229 +++++++++++++++---- + tools/lib/bpf/libbpf.h | 75 +++++- + tools/lib/bpf/libbpf.map | 3 + + tools/lib/bpf/libbpf_internal.h | 32 ++- + tools/testing/selftests/bpf/bpf_tcp_helpers.h | 18 ++ + .../selftests/bpf/prog_tests/attach_probe.c | 98 +++----- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 254 +++++++++++++++++++++ + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 16 ++ + .../testing/selftests/bpf/prog_tests/btf_module.c | 34 +++ + tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 +++ + .../selftests/bpf/prog_tests/netns_cookie.c | 61 +++++ + tools/testing/selftests/bpf/prog_tests/perf_link.c | 89 ++++++++ + .../testing/selftests/bpf/prog_tests/send_signal.c | 61 +++-- + tools/testing/selftests/bpf/prog_tests/snprintf.c | 4 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 60 +++-- + .../selftests/bpf/prog_tests/sockopt_qos_to_cc.c | 70 ++++++ + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 6 +- + tools/testing/selftests/bpf/progs/bpf_iter.h | 8 + + tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 80 +++++++ + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 4 + + .../selftests/bpf/progs/netns_cookie_prog.c | 39 ++++ + .../selftests/bpf/progs/sockopt_qos_to_cc.c | 39 ++++ + tools/testing/selftests/bpf/progs/sockopt_sk.c | 16 ++ + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 85 +++++++ + .../selftests/bpf/progs/test_core_autosize.c | 20 +- + .../testing/selftests/bpf/progs/test_ksyms_weak.c | 56 +++++ + tools/testing/selftests/bpf/progs/test_perf_link.c | 16 ++ + tools/testing/selftests/bpf/progs/test_snprintf.c | 6 +- + tools/testing/selftests/bpf/test_maps.c | 16 +- + tools/testing/selftests/bpf/test_progs.c | 107 ++++++--- + tools/testing/selftests/bpf/trace_helpers.c | 87 +++++++ + tools/testing/selftests/bpf/trace_helpers.h | 4 + + 73 files changed, 2355 insertions(+), 571 deletions(-) + rename Documentation/bpf/libbpf/{libbpf.rst => index.rst} (75%) + delete mode 100644 Documentation/bpf/libbpf/libbpf_api.rst + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_cookie.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_module.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/netns_cookie.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/perf_link.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sockopt_qos_to_cc.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_unix.c + create mode 100644 tools/testing/selftests/bpf/progs/netns_cookie_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/sockopt_qos_to_cc.c + create mode 100644 tools/testing/selftests/bpf/progs/test_bpf_cookie.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ksyms_weak.c + create mode 100644 tools/testing/selftests/bpf/progs/test_perf_link.c +Merging ipsec-next/master (5d8dbb7fb82b net: xfrm: fix shift-out-of-bounce) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging include/net/netns/xfrm.h +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 7 ++++++ + include/net/xfrm.h | 36 +++++++++++++++++++++++++----- + include/uapi/linux/xfrm.h | 11 +++++++++ + net/ipv4/esp4.c | 4 +--- + net/xfrm/xfrm_policy.c | 16 +++++++++++++ + net/xfrm/xfrm_user.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 122 insertions(+), 9 deletions(-) +Merging mlx5-next/mlx5-next (598fe77df855 net/mlx5: Lag, Create shared FDB when in switchdev mode) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (6f45933dfed0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (9344988d2979 netfilter: ctnetlink: allow to filter dump by status bits) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (d249ff28b1d8 intersil: remove obsolete prism54 wireless driver) +$ git merge wireless-drivers-next/master +Removing drivers/net/wireless/intersil/prism54/prismcompat.h +Removing drivers/net/wireless/intersil/prism54/oid_mgt.h +Removing drivers/net/wireless/intersil/prism54/oid_mgt.c +Removing drivers/net/wireless/intersil/prism54/islpci_mgt.h +Removing drivers/net/wireless/intersil/prism54/islpci_mgt.c +Removing drivers/net/wireless/intersil/prism54/islpci_hotplug.c +Removing drivers/net/wireless/intersil/prism54/islpci_eth.h +Removing drivers/net/wireless/intersil/prism54/islpci_eth.c +Removing drivers/net/wireless/intersil/prism54/islpci_dev.h +Removing drivers/net/wireless/intersil/prism54/islpci_dev.c +Removing drivers/net/wireless/intersil/prism54/isl_oid.h +Removing drivers/net/wireless/intersil/prism54/isl_ioctl.h +Removing drivers/net/wireless/intersil/prism54/isl_ioctl.c +Removing drivers/net/wireless/intersil/prism54/isl_38xx.h +Removing drivers/net/wireless/intersil/prism54/isl_38xx.c +Removing drivers/net/wireless/intersil/prism54/Makefile +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2302fa0eb0ec] Merge remote-tracking branch 'wireless-drivers-next/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 7 - + drivers/net/wireless/ath/ath10k/pci.c | 9 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 5 - + drivers/net/wireless/ath/ath11k/pci.c | 10 +- + drivers/net/wireless/ath/ath5k/pci.c | 2 +- + drivers/net/wireless/ath/ath9k/pci.c | 8 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 53 +- + drivers/net/wireless/intersil/Kconfig | 20 - + drivers/net/wireless/intersil/Makefile | 1 - + drivers/net/wireless/intersil/prism54/Makefile | 9 - + drivers/net/wireless/intersil/prism54/isl_38xx.c | 245 -- + drivers/net/wireless/intersil/prism54/isl_38xx.h | 158 -- + drivers/net/wireless/intersil/prism54/isl_ioctl.c | 2909 -------------------- + drivers/net/wireless/intersil/prism54/isl_ioctl.h | 35 - + drivers/net/wireless/intersil/prism54/isl_oid.h | 492 ---- + drivers/net/wireless/intersil/prism54/islpci_dev.c | 951 ------- + drivers/net/wireless/intersil/prism54/islpci_dev.h | 204 -- + drivers/net/wireless/intersil/prism54/islpci_eth.c | 489 ---- + drivers/net/wireless/intersil/prism54/islpci_eth.h | 59 - + .../net/wireless/intersil/prism54/islpci_hotplug.c | 316 --- + drivers/net/wireless/intersil/prism54/islpci_mgt.c | 491 ---- + drivers/net/wireless/intersil/prism54/islpci_mgt.h | 126 - + drivers/net/wireless/intersil/prism54/oid_mgt.c | 889 ------ + drivers/net/wireless/intersil/prism54/oid_mgt.h | 46 - + .../net/wireless/intersil/prism54/prismcompat.h | 30 - + drivers/net/wireless/marvell/libertas/ethtool.c | 9 +- + 26 files changed, 50 insertions(+), 7523 deletions(-) + delete mode 100644 drivers/net/wireless/intersil/prism54/Makefile + delete mode 100644 drivers/net/wireless/intersil/prism54/isl_38xx.c + delete mode 100644 drivers/net/wireless/intersil/prism54/isl_38xx.h + delete mode 100644 drivers/net/wireless/intersil/prism54/isl_ioctl.c + delete mode 100644 drivers/net/wireless/intersil/prism54/isl_ioctl.h + delete mode 100644 drivers/net/wireless/intersil/prism54/isl_oid.h + delete mode 100644 drivers/net/wireless/intersil/prism54/islpci_dev.c + delete mode 100644 drivers/net/wireless/intersil/prism54/islpci_dev.h + delete mode 100644 drivers/net/wireless/intersil/prism54/islpci_eth.c + delete mode 100644 drivers/net/wireless/intersil/prism54/islpci_eth.h + delete mode 100644 drivers/net/wireless/intersil/prism54/islpci_hotplug.c + delete mode 100644 drivers/net/wireless/intersil/prism54/islpci_mgt.c + delete mode 100644 drivers/net/wireless/intersil/prism54/islpci_mgt.h + delete mode 100644 drivers/net/wireless/intersil/prism54/oid_mgt.c + delete mode 100644 drivers/net/wireless/intersil/prism54/oid_mgt.h + delete mode 100644 drivers/net/wireless/intersil/prism54/prismcompat.h +Merging bluetooth/master (61969ef867d4 Bluetooth: Fix return value in hci_dev_do_close()) +$ git merge bluetooth/master +Auto-merging net/bluetooth/hci_sysfs.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_sysfs.c +Auto-merging net/bluetooth/hci_sock.c +Auto-merging net/bluetooth/hci_core.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c +Auto-merging include/net/bluetooth/hci_core.h +CONFLICT (content): Merge conflict in include/net/bluetooth/hci_core.h +Resolved 'include/net/bluetooth/hci_core.h' using previous resolution. +Resolved 'net/bluetooth/hci_core.c' using previous resolution. +Resolved 'net/bluetooth/hci_sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6b16ccfa38c7] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/btbcm.c | 1 + + drivers/bluetooth/btintel.c | 1314 +++++++++++++++++++++++++++++++-- + drivers/bluetooth/btintel.h | 119 ++- + drivers/bluetooth/btmrvl_sdio.c | 29 +- + drivers/bluetooth/btrsi.c | 2 +- + drivers/bluetooth/btrtl.c | 10 +- + drivers/bluetooth/btusb.c | 1510 ++++++++------------------------------ + drivers/bluetooth/hci_bcm.c | 6 + + drivers/bluetooth/hci_h5.c | 116 ++- + drivers/bluetooth/hci_serdev.c | 3 + + drivers/bluetooth/hci_uart.h | 7 +- + include/net/bluetooth/hci_core.h | 21 +- + net/6lowpan/debugfs.c | 3 +- + net/bluetooth/cmtp/cmtp.h | 2 +- + net/bluetooth/hci_core.c | 47 +- + net/bluetooth/hci_event.c | 223 ++++-- + net/bluetooth/hci_request.c | 81 +- + net/bluetooth/hci_sysfs.c | 5 +- + net/bluetooth/mgmt.c | 4 +- + net/bluetooth/rfcomm/sock.c | 8 +- + net/bluetooth/sco.c | 106 +-- + 21 files changed, 2070 insertions(+), 1547 deletions(-) +Merging mac80211-next/master (c448f0fd2ce5 cfg80211: fix BSS color notify trace enum confusion) +$ git merge mac80211-next/master +Auto-merging net/mac80211/main.c +Merge made by the 'recursive' strategy. + include/net/cfg80211.h | 92 +++++++++++++ + include/net/ieee80211_radiotap.h | 5 + + include/net/mac80211.h | 29 ++++ + include/uapi/linux/nl80211-vnd-intel.h | 77 +++++++++++ + include/uapi/linux/nl80211.h | 43 ++++++ + net/mac80211/cfg.c | 234 +++++++++++++++++++++++++++++++-- + net/mac80211/ibss.c | 15 +-- + net/mac80211/ieee80211_i.h | 12 ++ + net/mac80211/iface.c | 13 +- + net/mac80211/main.c | 2 +- + net/mac80211/rx.c | 29 ++-- + net/mac80211/sta_info.c | 2 +- + net/mac80211/status.c | 16 +-- + net/mac80211/tx.c | 33 +++-- + net/wireless/nl80211.c | 157 ++++++++++++++++++++++ + net/wireless/radiotap.c | 9 +- + net/wireless/rdev-ops.h | 13 ++ + net/wireless/trace.h | 46 +++++++ + 18 files changed, 764 insertions(+), 63 deletions(-) + create mode 100644 include/uapi/linux/nl80211-vnd-intel.h +Merging mtd/mtd/next (a89d69a44e28 mtd: mtdconcat: Check _read, _write callbacks existence before assignment) +$ git merge mtd/mtd/next +Removing drivers/mtd/maps/pmcmsp-flash.c +Removing Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt +Merge made by the 'recursive' strategy. + .../bindings/mtd/partitions/redboot-fis.txt | 27 --- + .../bindings/mtd/partitions/redboot-fis.yaml | 42 ++++ + drivers/mtd/Kconfig | 10 +- + drivers/mtd/maps/Kconfig | 23 --- + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/pmcmsp-flash.c | 227 --------------------- + drivers/mtd/mtdblock.c | 4 + + drivers/mtd/mtdblock_ro.c | 4 + + drivers/mtd/mtdconcat.c | 33 ++- + drivers/mtd/rfd_ftl.c | 44 +++- + 10 files changed, 116 insertions(+), 299 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/redboot-fis.yaml + delete mode 100644 drivers/mtd/maps/pmcmsp-flash.c +Merging nand/nand/next (0792ec82175e mtd: rawnand: intel: Fix error handling in probe) +$ git merge nand/nand/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/gpmc-nand.txt | 2 +- + MAINTAINERS | 4 +-- + drivers/mtd/nand/raw/Kconfig | 4 +-- + drivers/mtd/nand/raw/intel-nand-controller.c | 27 ++++++++++++------ + drivers/mtd/nand/raw/meson_nand.c | 4 +-- + drivers/mtd/nand/raw/nand_bbt.c | 33 ++++++++++++++++++++++ + drivers/mtd/nand/raw/omap2.c | 2 +- + drivers/mtd/nand/spi/core.c | 4 ++- + drivers/mtd/nand/spi/macronix.c | 16 +++++------ + 9 files changed, 70 insertions(+), 26 deletions(-) +Merging spi-nor/spi-nor/next (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (9491923e4a68 crypto: wp512 - correct a non-kernel-doc comment) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + arch/arm64/crypto/Kconfig | 2 +- + arch/arm64/crypto/sm4-ce-glue.c | 20 +- + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/aesni-intel_glue.c | 5 + + arch/x86/crypto/sm4-aesni-avx-asm_64.S | 589 ++++++++++++++++++++++ + arch/x86/crypto/sm4_aesni_avx_glue.c | 459 +++++++++++++++++ + crypto/Kconfig | 22 + + crypto/ecc.h | 5 +- + crypto/sm4_generic.c | 180 +------ + crypto/tcrypt.c | 26 +- + crypto/wp512.c | 2 +- + drivers/char/hw_random/Kconfig | 14 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/amd-rng.c | 8 +- + drivers/char/hw_random/arm_smccc_trng.c | 123 +++++ + drivers/char/hw_random/geode-rng.c | 8 +- + drivers/char/hw_random/intel-rng.c | 8 +- + drivers/char/hw_random/via-rng.c | 8 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 9 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 3 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 9 +- + drivers/crypto/atmel-aes.c | 154 ++++-- + drivers/crypto/atmel-tdes.c | 66 ++- + drivers/crypto/ccp/sev-dev.c | 49 +- + drivers/crypto/ccp/sp-pci.c | 12 + + drivers/crypto/hisilicon/hpre/hpre_main.c | 63 +++ + drivers/crypto/hisilicon/sec2/sec_main.c | 46 +- + drivers/crypto/hisilicon/zip/zip_main.c | 26 + + drivers/crypto/mxs-dcp.c | 81 +-- + drivers/crypto/omap-sham.c | 56 +- + drivers/crypto/virtio/virtio_crypto_core.c | 4 +- + drivers/firmware/smccc/smccc.c | 17 + + include/crypto/sm4.h | 25 +- + include/linux/padata.h | 3 +- + kernel/padata.c | 22 +- + lib/crypto/Kconfig | 3 + + lib/crypto/Makefile | 3 + + lib/crypto/blake2s.c | 8 +- + lib/crypto/chacha20poly1305.c | 8 +- + lib/crypto/curve25519.c | 8 +- + lib/crypto/sm4.c | 176 +++++++ + lib/mpi/mpiutil.c | 2 +- + 42 files changed, 1904 insertions(+), 432 deletions(-) + create mode 100644 arch/x86/crypto/sm4-aesni-avx-asm_64.S + create mode 100644 arch/x86/crypto/sm4_aesni_avx_glue.c + create mode 100644 drivers/char/hw_random/arm_smccc_trng.c + create mode 100644 lib/crypto/sm4.c +Merging drm/drm-next (397ab98e2d69 Merge tag 'drm-msm-next-2021-08-12' of https://gitlab.freedesktop.org/drm/msm into drm-next) +$ git merge drm/drm-next +Auto-merging include/linux/pci-epf.h +Auto-merging drivers/virtio/virtio.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/s390/cio/css.c +Auto-merging drivers/s390/cio/ccwgroup.c +Auto-merging drivers/pci/endpoint/pci-epf-core.c +Auto-merging drivers/net/netdevsim/bus.c +Auto-merging drivers/hid/intel-ish-hid/ishtp/bus.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +Removing drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h +Removing drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h +Removing drivers/gpu/drm/vmwgfx/device_include/svga_types.h +Removing drivers/gpu/drm/vmwgfx/device_include/svga3d_caps.h +Removing drivers/gpu/drm/vmwgfx/device_include/includeCheck.h +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/msm/dp/dp_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dp/dp_display.c +Auto-merging drivers/gpu/drm/msm/dp/dp_ctrl.c +Auto-merging drivers/gpu/drm/msm/dp/dp_catalog.c +Auto-merging drivers/gpu/drm/msm/disp/msm_disp_snapshot.h +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_plane.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dpi.c +Auto-merging drivers/gpu/drm/kmb/kmb_drv.c +Auto-merging drivers/gpu/drm/i915/intel_device_info.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pci.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Removing drivers/gpu/drm/i915/i915_globals.h +CONFLICT (modify/delete): drivers/gpu/drm/i915/i915_globals.c deleted in drm/drm-next and modified in HEAD. Version HEAD of drivers/gpu/drm/i915/i915_globals.c left in tree. +Removing drivers/gpu/drm/i915/gt/intel_context_param.c +Removing drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c +Removing drivers/gpu/drm/i915/gem/i915_gem_object_blt.h +Removing drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_internal.c +Removing drivers/gpu/drm/i915/gem/i915_gem_client_blt.h +Removing drivers/gpu/drm/i915/gem/i915_gem_client_blt.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +CONFLICT (content): Merge conflict in 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 +Removing drivers/gpu/drm/bochs/bochs_mm.c +Removing drivers/gpu/drm/bochs/bochs_kms.c +Removing drivers/gpu/drm/bochs/bochs_hw.c +Removing drivers/gpu/drm/bochs/bochs_drv.c +Removing drivers/gpu/drm/bochs/bochs.h +Removing drivers/gpu/drm/bochs/Makefile +Removing drivers/gpu/drm/bochs/Kconfig +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c +Auto-merging drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Removing drivers/gpu/drm/amd/amdgpu/dce_virtual.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +Auto-merging drivers/firmware/Makefile +CONFLICT (content): Merge conflict in drivers/firmware/Makefile +Auto-merging drivers/firmware/Kconfig +Auto-merging drivers/dma/idxd/sysfs.c +Auto-merging drivers/acpi/bus.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/platforms/pseries/vio.c +Auto-merging arch/powerpc/platforms/ps3/system-bus.c +Auto-merging arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/display/ssd1307fb.txt +Resolved 'drivers/firmware/Makefile' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_pci.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_device_info.c' using previous resolution. +Resolved 'drivers/gpu/drm/msm/dp/dp_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/gpu/drm/i915/i915_globals.c +rm 'drivers/gpu/drm/i915/i915_globals.c' +$ git commit --no-edit -v -a +[master 9ef6f8b6e8f9] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-dmabuf-buffers | 24 + + .../bindings/display/bridge/simple-bridge.yaml | 3 + + .../bindings/display/bridge/ti,sn65dsi86.yaml | 21 +- + .../devicetree/bindings/display/dp-aux-bus.yaml | 37 + + .../bindings/display/mediatek/mediatek,dsi.txt | 2 +- + .../bindings/display/msm/dsi-controller-main.yaml | 17 + + .../bindings/display/msm/dsi-phy-7nm.yaml | 72 + + .../bindings/display/panel/ilitek,ili9341.yaml | 78 + + .../bindings/display/panel/innolux,ej030na.yaml | 62 + + .../bindings/display/panel/panel-simple.yaml | 24 + + .../bindings/display/panel/samsung,lms380kf01.yaml | 99 + + .../bindings/display/panel/samsung,lms397kf04.yaml | 18 +- + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 1 + + .../bindings/display/solomon,ssd1307fb.yaml | 208 ++ + .../devicetree/bindings/display/ssd1307fb.txt | 60 - + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/driver-api/dma-buf.rst | 13 + + .../driver-api/thermal/nouveau_thermal.rst | 2 +- + Documentation/gpu/drm-kms.rst | 35 +- + Documentation/gpu/drm-uapi.rst | 22 + + Documentation/gpu/i915.rst | 15 + + Documentation/gpu/rfc/i915_parallel_execbuf.h | 122 + + Documentation/gpu/rfc/i915_scheduler.rst | 148 + + Documentation/gpu/rfc/index.rst | 4 + + Documentation/gpu/vkms.rst | 38 +- + MAINTAINERS | 25 +- + arch/arm/common/locomo.c | 3 +- + arch/arm/common/sa1111.c | 4 +- + arch/arm/include/asm/efi.h | 5 +- + arch/arm/mach-rpc/ecard.c | 4 +- + arch/arm64/include/asm/efi.h | 5 +- + arch/mips/sgi-ip22/ip22-gio.c | 3 +- + arch/parisc/kernel/drivers.c | 5 +- + arch/powerpc/platforms/ps3/system-bus.c | 3 +- + arch/powerpc/platforms/pseries/ibmebus.c | 3 +- + arch/powerpc/platforms/pseries/vio.c | 3 +- + arch/riscv/include/asm/efi.h | 5 +- + arch/s390/include/asm/eadm.h | 2 +- + arch/sparc/kernel/vio.c | 4 +- + arch/x86/Kconfig | 26 - + arch/x86/kernel/Makefile | 3 - + drivers/acpi/bus.c | 3 +- + drivers/amba/bus.c | 4 +- + drivers/base/auxiliary.c | 4 +- + drivers/base/isa.c | 4 +- + drivers/base/platform.c | 4 +- + drivers/bcma/main.c | 6 +- + drivers/bus/sunxi-rsb.c | 4 +- + drivers/cxl/core.c | 3 +- + drivers/dax/bus.c | 4 +- + drivers/dma-buf/Kconfig | 11 + + drivers/dma-buf/Makefile | 1 + + drivers/dma-buf/dma-buf-sysfs-stats.c | 205 ++ + drivers/dma-buf/dma-buf-sysfs-stats.h | 35 + + drivers/dma-buf/dma-buf.c | 26 +- + drivers/dma-buf/dma-fence-chain.c | 2 +- + drivers/dma-buf/dma-resv.c | 33 +- + drivers/dma-buf/st-dma-fence-chain.c | 16 +- + drivers/dma-buf/udmabuf.c | 59 +- + drivers/dma/idxd/sysfs.c | 4 +- + drivers/firewire/core-device.c | 4 +- + drivers/firmware/Kconfig | 32 + + drivers/firmware/Makefile | 2 + + drivers/firmware/arm_scmi/bus.c | 4 +- + drivers/firmware/efi/Makefile | 2 + + drivers/firmware/efi/efi-init.c | 90 - + .../kernel => drivers/firmware/efi}/sysfb_efi.c | 80 +- + drivers/firmware/google/coreboot_table.c | 4 +- + {arch/x86/kernel => drivers/firmware}/sysfb.c | 37 +- + .../kernel => drivers/firmware}/sysfb_simplefb.c | 33 +- + drivers/fpga/dfl.c | 4 +- + drivers/gpu/drm/Kconfig | 7 +- + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 83 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 149 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 65 - + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 239 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 641 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 116 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 1273 ++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 118 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 102 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 86 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 643 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 26 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 158 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 2 + + drivers/gpu/drm/amd/amdgpu/cik.c | 10 +- + .../gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c | 51 + + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 780 ----- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 161 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 13 + + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 21 + + drivers/gpu/drm/amd/amdgpu/nv.c | 47 +- + drivers/gpu/drm/amd/amdgpu/nv.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c | 208 ++ + .../amd/amdgpu/{dce_virtual.h => psp_v11_0_8.h} | 10 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 126 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 50 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 17 - + drivers/gpu/drm/amd/amdgpu/si.c | 8 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 324 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 14 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 +- + drivers/gpu/drm/amd/amdgpu/ta_xgmi_if.h | 14 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 15 + + drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 15 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 47 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 17 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 59 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 39 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 264 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 18 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 24 + + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 144 + + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.h | 34 + + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 12 +- + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 4 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 12 +- + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c | 16 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 25 +- + .../drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c | 10 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 118 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 127 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dpcd.c | 25 + + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 24 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 + + drivers/gpu/drm/amd/display/dc/dc.h | 120 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stat.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_trace.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 83 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 8 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 21 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 19 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 29 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 4 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 42 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 21 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 33 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 17 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 51 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 2 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 1 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 2 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 5 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 8 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 1 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 33 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h | 15 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 5 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 + + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 2 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 2 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 11 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 2 +- + drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.c | 102 + + drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.h | 34 + + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 18 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 15 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 2 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 4 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 2 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 12 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 4 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 4 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 393 ++- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 1 - + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 11 + + drivers/gpu/drm/amd/display/dc/inc/link_dpcd.h | 25 + + drivers/gpu/drm/amd/display/dc/irq_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/os_types.h | 35 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 18 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 47 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 20 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 10 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 17 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 70 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 - + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 6 - + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 3 - + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 53 +- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 12 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 4 + + .../drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h | 4 + + .../drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h | 54 + + .../drm/amd/include/asic_reg/mp/mp_11_0_8_offset.h | 352 ++ + .../amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h | 179 +- + .../gpu/drm/amd/include/cyan_skillfish_ip_offset.h | 714 ++++ + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 + + .../amd/pm/inc/smu11_driver_if_cyan_skillfish.h | 95 + + .../amd/pm/inc/smu11_driver_if_sienna_cichlid.h | 65 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 5 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h | 152 + + drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h | 70 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 + + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 246 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 76 + + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.h | 19 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 173 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 494 ++- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 28 + + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 245 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 286 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 3 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 5 - + drivers/gpu/drm/arm/hdlcd_drv.c | 174 +- + drivers/gpu/drm/arm/hdlcd_drv.h | 1 + + drivers/gpu/drm/arm/malidp_drv.c | 4 - + drivers/gpu/drm/armada/armada_drv.c | 4 +- + drivers/gpu/drm/armada/armada_overlay.c | 2 - + drivers/gpu/drm/armada/armada_plane.c | 29 - + drivers/gpu/drm/armada/armada_plane.h | 2 - + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 1 - + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 6 + + drivers/gpu/drm/ast/ast_main.c | 5 + + drivers/gpu/drm/ast/ast_mode.c | 54 +- + drivers/gpu/drm/ast/ast_post.c | 91 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 80 +- + drivers/gpu/drm/bochs/Kconfig | 11 - + drivers/gpu/drm/bochs/Makefile | 4 - + drivers/gpu/drm/bochs/bochs.h | 98 - + drivers/gpu/drm/bochs/bochs_drv.c | 205 -- + drivers/gpu/drm/bochs/bochs_hw.c | 323 -- + drivers/gpu/drm/bochs/bochs_kms.c | 178 - + drivers/gpu/drm/bochs/bochs_mm.c | 24 - + drivers/gpu/drm/bridge/Kconfig | 1 + + drivers/gpu/drm/bridge/adv7511/adv7533.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 36 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 4 +- + drivers/gpu/drm/bridge/cdns-dsi.c | 4 +- + drivers/gpu/drm/bridge/ite-it66121.c | 2 + + drivers/gpu/drm/bridge/lontium-lt8912b.c | 2 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 8 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 55 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 68 +- + drivers/gpu/drm/bridge/tc358768.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 200 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 760 ++-- + drivers/gpu/drm/drm_aperture.c | 21 +- + drivers/gpu/drm/drm_atomic.c | 4 +- + drivers/gpu/drm/drm_atomic_helper.c | 20 +- + drivers/gpu/drm/drm_atomic_uapi.c | 6 +- + drivers/gpu/drm/drm_auth.c | 96 +- + drivers/gpu/drm/drm_bridge.c | 12 +- + drivers/gpu/drm/drm_bufs.c | 2 +- + drivers/gpu/drm/drm_cache.c | 2 +- + drivers/gpu/drm/drm_connector.c | 5 +- + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_damage_helper.c | 58 +- + drivers/gpu/drm/drm_debugfs.c | 3 +- + drivers/gpu/drm/drm_debugfs_crc.c | 8 +- + drivers/gpu/drm/drm_dp_aux_bus.c | 323 ++ + drivers/gpu/drm/drm_dp_helper.c | 470 ++- + drivers/gpu/drm/drm_dp_mst_topology.c | 10 +- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_dsc.c | 2 +- + drivers/gpu/drm/drm_edid.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_file.c | 7 +- + drivers/gpu/drm/drm_format_helper.c | 2 +- + drivers/gpu/drm/drm_framebuffer.c | 24 +- + drivers/gpu/drm/drm_gem.c | 38 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 97 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 199 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 6 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 11 +- + drivers/gpu/drm/drm_hdcp.c | 2 +- + drivers/gpu/drm/drm_ioctl.c | 4 +- + drivers/gpu/drm/drm_irq.c | 104 +- + drivers/gpu/drm/drm_lease.c | 263 +- + drivers/gpu/drm/drm_legacy_misc.c | 3 +- + drivers/gpu/drm/drm_mipi_dbi.c | 75 +- + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/drm_mode_object.c | 2 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_of.c | 6 +- + drivers/gpu/drm/drm_plane.c | 106 +- + drivers/gpu/drm/drm_plane_helper.c | 2 +- + drivers/gpu/drm/drm_prime.c | 4 +- + drivers/gpu/drm/drm_probe_helper.c | 2 +- + drivers/gpu/drm/drm_property.c | 2 +- + drivers/gpu/drm/drm_scdc_helper.c | 2 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 51 +- + drivers/gpu/drm/drm_syncobj.c | 8 +- + drivers/gpu/drm/drm_vblank.c | 27 +- + drivers/gpu/drm/drm_vma_manager.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 3 +- + drivers/gpu/drm/exynos/exynos_dp.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 - + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 8 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 78 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 6 +- + drivers/gpu/drm/gma500/power.c | 1 + + drivers/gpu/drm/gma500/psb_drv.c | 8 +- + drivers/gpu/drm/gma500/psb_drv.h | 5 - + drivers/gpu/drm/gma500/psb_irq.c | 26 +- + drivers/gpu/drm/gma500/psb_irq.h | 4 +- + drivers/gpu/drm/gud/gud_drv.c | 61 +- + drivers/gpu/drm/gud/gud_internal.h | 2 + + drivers/gpu/drm/gud/gud_pipe.c | 86 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 3 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 15 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 9 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 - + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 4 +- + drivers/gpu/drm/i810/i810_dma.c | 3 +- + drivers/gpu/drm/i915/Kconfig.debug | 6 + + drivers/gpu/drm/i915/Makefile | 15 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 46 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 19 + + drivers/gpu/drm/i915/display/intel_acpi.h | 3 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 3 +- + drivers/gpu/drm/i915/display/intel_audio.c | 4 +- + drivers/gpu/drm/i915/display/intel_bios.c | 8 +- + drivers/gpu/drm/i915/display/intel_bw.c | 178 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 107 +- + drivers/gpu/drm/i915/display/intel_color.c | 5 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 106 +- + drivers/gpu/drm/i915/display/intel_crt.c | 3 + + drivers/gpu/drm/i915/display/intel_crtc.c | 10 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 12 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 630 ++-- + drivers/gpu/drm/i915/display/intel_ddi.h | 4 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 2475 +++++++------ + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 70 +- + drivers/gpu/drm/i915/display/intel_display.c | 375 +- + drivers/gpu/drm/i915/display/intel_display.h | 1 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 118 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 568 ++- + drivers/gpu/drm/i915/display/intel_display_power.h | 15 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 34 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 232 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 23 +- + drivers/gpu/drm/i915/display/intel_dp.c | 65 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 1 - + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 329 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 43 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 12 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 631 +--- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 219 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 96 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 25 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 53 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 3 + + drivers/gpu/drm/i915/display/intel_psr.c | 265 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 34 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 4 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 862 +++++ + drivers/gpu/drm/i915/display/intel_snps_phy.h | 35 + + drivers/gpu/drm/i915/display/intel_sprite.c | 2 +- + drivers/gpu/drm/i915/display/intel_tc.c | 34 +- + drivers/gpu/drm/i915/display/intel_tc.h | 2 + + drivers/gpu/drm/i915/display/intel_tv.c | 13 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 2 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 5 +- + drivers/gpu/drm/i915/display/intel_vga.c | 12 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 49 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 28 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 13 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 355 -- + drivers/gpu/drm/i915/gem/i915_gem_client_blt.h | 21 - + drivers/gpu/drm/i915/gem/i915_gem_context.c | 2920 +++++++--------- + drivers/gpu/drm/i915/gem/i915_gem_context.h | 6 + + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 196 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 188 +- + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 58 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 486 +-- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 160 +- + drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 107 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 350 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 69 +- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 461 --- + drivers/gpu/drm/i915/gem/i915_gem_object_blt.h | 39 - + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 255 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 54 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_region.c | 23 +- + drivers/gpu/drm/i915/gem/i915_gem_region.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 965 +++++ + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 49 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 117 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 23 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 4 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 114 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 127 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 190 +- + .../gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 243 ++ + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 164 +- + .../drm/i915/gem/selftests/i915_gem_object_blt.c | 597 ---- + drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c | 3 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 67 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.h | 4 +- + drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 10 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 17 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 68 + + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 44 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.h | 16 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 7 + + drivers/gpu/drm/i915/gt/intel_context.c | 88 +- + drivers/gpu/drm/i915/gt/intel_context.h | 56 +- + drivers/gpu/drm/i915/gt/intel_context_param.c | 63 - + drivers/gpu/drm/i915/gt/intel_context_param.h | 6 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 64 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 87 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 420 ++- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 74 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.h | 4 + + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 93 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 6 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 604 ++-- + .../gpu/drm/i915/gt/intel_execlists_submission.h | 12 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 2 + + drivers/gpu/drm/i915/gt/intel_gt.c | 197 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 10 + + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 13 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 11 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 21 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.h | 9 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 37 + + drivers/gpu/drm/i915/gt/intel_gtt.c | 20 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 18 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 117 +- + drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 3 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 688 ++++ + drivers/gpu/drm/i915/gt/intel_migrate.h | 65 + + drivers/gpu/drm/i915/gt/intel_migrate_types.h | 15 + + drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 49 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 7 +- + drivers/gpu/drm/i915/gt/intel_renderstate.h | 1 + + drivers/gpu/drm/i915/gt/intel_reset.c | 56 +- + drivers/gpu/drm/i915/gt/intel_ring.h | 1 + + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 70 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 209 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 10 + + drivers/gpu/drm/i915/gt/intel_sseu.c | 126 +- + drivers/gpu/drm/i915/gt/intel_sseu.h | 10 +- + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 8 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 498 +-- + drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 1 + + drivers/gpu/drm/i915/gt/mock_engine.c | 51 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 10 + + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 22 + + .../gpu/drm/i915/gt/selftest_engine_heartbeat.h | 2 + + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 307 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 330 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 6 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 669 ++++ + drivers/gpu/drm/i915/gt/selftest_mocs.c | 52 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_slpc.c | 311 ++ + drivers/gpu/drm/i915/gt/selftest_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 162 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 129 +- + .../gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 235 ++ + .../drm/i915/gt/uc/abi/guc_communication_ctb_abi.h | 127 +- + .../i915/gt/uc/abi/guc_communication_mmio_abi.h | 65 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_messages_abi.h | 213 ++ + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 206 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 119 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 487 ++- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 4 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 703 ++-- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 36 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 47 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 167 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 29 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.h | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 80 + + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.h | 31 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 626 ++++ + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 42 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 29 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2895 +++++++++++++-- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 18 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 126 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.h | 15 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 27 +- + drivers/gpu/drm/i915/gvt/gtt.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 7 +- + drivers/gpu/drm/i915/i915_active.c | 37 +- + drivers/gpu/drm/i915/i915_active.h | 3 + + drivers/gpu/drm/i915/i915_buddy.c | 421 +++ + drivers/gpu/drm/i915/i915_buddy.h | 135 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 67 +- + drivers/gpu/drm/i915/i915_debugfs.c | 8 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 32 + + drivers/gpu/drm/i915/i915_drv.c | 19 +- + drivers/gpu/drm/i915/i915_drv.h | 270 +- + drivers/gpu/drm/i915/i915_gem.c | 63 +- + drivers/gpu/drm/i915/i915_gem.h | 12 - + drivers/gpu/drm/i915/i915_gem_evict.c | 1 + + drivers/gpu/drm/i915/i915_gem_ww.c | 63 + + drivers/gpu/drm/i915/i915_gem_ww.h | 50 + + drivers/gpu/drm/i915/i915_getparam.c | 7 +- + drivers/gpu/drm/i915/i915_globals.c | 160 - + drivers/gpu/drm/i915/i915_globals.h | 37 - + drivers/gpu/drm/i915/i915_gpu_error.c | 27 +- + drivers/gpu/drm/i915/i915_irq.c | 178 +- + drivers/gpu/drm/i915/i915_module.c | 113 + + drivers/gpu/drm/i915/i915_pci.c | 209 +- + drivers/gpu/drm/i915/i915_pci.h | 8 + + drivers/gpu/drm/i915/i915_perf.c | 58 +- + drivers/gpu/drm/i915/i915_perf.h | 2 +- + drivers/gpu/drm/i915/i915_pmu.c | 6 +- + drivers/gpu/drm/i915/i915_pmu.h | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 450 +-- + drivers/gpu/drm/i915/i915_request.c | 299 +- + drivers/gpu/drm/i915/i915_request.h | 38 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 80 + + drivers/gpu/drm/i915/i915_scatterlist.h | 5 + + drivers/gpu/drm/i915/i915_scheduler.c | 220 +- + drivers/gpu/drm/i915/i915_scheduler.h | 54 +- + drivers/gpu/drm/i915/i915_scheduler_types.h | 111 + + drivers/gpu/drm/i915/i915_sw_fence_work.c | 5 +- + drivers/gpu/drm/i915/i915_sw_fence_work.h | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 83 +- + drivers/gpu/drm/i915/i915_trace.h | 201 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 258 ++ + drivers/gpu/drm/i915/i915_ttm_buddy_manager.h | 56 + + drivers/gpu/drm/i915/i915_vma.c | 34 +- + drivers/gpu/drm/i915/i915_vma.h | 3 + + drivers/gpu/drm/i915/intel_device_info.c | 34 +- + drivers/gpu/drm/i915/intel_device_info.h | 20 +- + drivers/gpu/drm/i915/intel_dram.c | 42 +- + drivers/gpu/drm/i915/intel_memory_region.c | 63 +- + drivers/gpu/drm/i915/intel_memory_region.h | 30 +- + drivers/gpu/drm/i915/intel_pch.c | 8 +- + drivers/gpu/drm/i915/intel_pch.h | 2 + + drivers/gpu/drm/i915/intel_pm.c | 304 +- + drivers/gpu/drm/i915/intel_region_ttm.c | 150 +- + drivers/gpu/drm/i915/intel_region_ttm.h | 23 +- + drivers/gpu/drm/i915/intel_sideband.c | 13 +- + drivers/gpu/drm/i915/intel_sideband.h | 2 +- + drivers/gpu/drm/i915/intel_step.c | 149 +- + drivers/gpu/drm/i915/intel_step.h | 33 +- + drivers/gpu/drm/i915/intel_uncore.c | 424 ++- + drivers/gpu/drm/i915/intel_uncore.h | 20 +- + drivers/gpu/drm/i915/intel_wopcm.c | 10 +- + drivers/gpu/drm/i915/selftests/i915_buddy.c | 787 +++++ + .../gpu/drm/i915/selftests/i915_live_selftests.h | 5 +- + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 2 +- + .../gpu/drm/i915/selftests/i915_perf_selftests.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 4 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_live_test.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +- + drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 257 +- + .../drm/i915/selftests/intel_scheduler_helpers.c | 88 + + .../drm/i915/selftests/intel_scheduler_helpers.h | 33 + + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 1 - + drivers/gpu/drm/i915/selftests/mock_region.c | 29 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 8 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 1 - + drivers/gpu/drm/imx/imx-drm-core.c | 11 - + drivers/gpu/drm/imx/imx-ldb.c | 4 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 1 - + drivers/gpu/drm/imx/parallel-display.c | 5 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 41 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 1 - + drivers/gpu/drm/kmb/kmb_drv.c | 26 +- + drivers/gpu/drm/kmb/kmb_dsi.c | 1 - + drivers/gpu/drm/lima/lima_sched.c | 3 +- + drivers/gpu/drm/mcde/mcde_display.c | 1 - + drivers/gpu/drm/mcde/mcde_dsi.c | 11 +- + drivers/gpu/drm/mediatek/Makefile | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_aal.c | 167 + + drivers/gpu/drm/mediatek/mtk_disp_drv.h | 9 + + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 6 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 173 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 42 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 65 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 44 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 3 - + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 - + drivers/gpu/drm/mediatek/mtk_dsi.c | 4 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 5 +- + drivers/gpu/drm/meson/meson_drv.c | 12 +- + drivers/gpu/drm/meson/meson_overlay.c | 1 - + drivers/gpu/drm/meson/meson_plane.c | 1 - + drivers/gpu/drm/mga/mga_dma.c | 2 +- + drivers/gpu/drm/mga/mga_drv.h | 1 - + drivers/gpu/drm/mgag200/Makefile | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 64 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 77 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 797 +---- + drivers/gpu/drm/mgag200/mgag200_pll.c | 992 ++++++ + drivers/gpu/drm/mgag200/mgag200_reg.h | 9 +- + drivers/gpu/drm/msm/Kconfig | 7 +- + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 35 +- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 7 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 24 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 1 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 137 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 34 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 40 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 43 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 5 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 102 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 10 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 85 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.h | 1 - + drivers/gpu/drm/msm/dp/dp_aux.c | 3 + + drivers/gpu/drm/msm/dp/dp_catalog.c | 8 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 139 +- + drivers/gpu/drm/msm/dp/dp_display.c | 77 +- + drivers/gpu/drm/msm/dp/dp_link.c | 50 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 9 +- + drivers/gpu/drm/msm/dp/dp_power.c | 3 + + drivers/gpu/drm/msm/dsi/dsi.c | 15 +- + drivers/gpu/drm/msm/dsi/dsi.h | 18 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 74 + + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 33 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 3 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 169 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 146 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 83 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 5 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 2 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 8 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 190 +- + drivers/gpu/drm/msm/msm_drv.c | 158 +- + drivers/gpu/drm/msm/msm_drv.h | 18 +- + drivers/gpu/drm/msm/msm_fbdev.c | 14 +- + drivers/gpu/drm/msm/msm_fence.c | 53 +- + drivers/gpu/drm/msm/msm_fence.h | 44 +- + drivers/gpu/drm/msm/msm_gem.c | 134 +- + drivers/gpu/drm/msm/msm_gem.h | 50 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 11 - + drivers/gpu/drm/msm/msm_gem_submit.c | 350 +- + drivers/gpu/drm/msm/msm_gpu.c | 220 +- + drivers/gpu/drm/msm/msm_gpu.h | 139 +- + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 203 ++ + drivers/gpu/drm/msm/msm_kms.h | 5 +- + drivers/gpu/drm/msm/msm_rd.c | 6 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 69 +- + drivers/gpu/drm/msm/msm_ringbuffer.h | 12 + + drivers/gpu/drm/msm/msm_submitqueue.c | 53 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 84 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.h | 3 + + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 74 +- + drivers/gpu/drm/mxsfb/mxsfb_regs.h | 9 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 34 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 166 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 9 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 1 + + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 8 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 6 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 + + drivers/gpu/drm/omapdrm/omap_irq.c | 13 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 3 + + drivers/gpu/drm/panel/Kconfig | 54 + + drivers/gpu/drm/panel/Makefile | 5 + + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 2 +- + drivers/gpu/drm/panel/panel-dsi-cm.c | 2 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 2 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 792 +++++ + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 289 ++ + drivers/gpu/drm/panel/panel-khadas-ts050.c | 2 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 2 +- + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 2 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 2 +- + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 366 ++ + drivers/gpu/drm/panel/panel-samsung-db7430.c | 347 ++ + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 2 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 83 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 41 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.h | 33 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 357 +- + drivers/gpu/drm/panel/panel-sony-acx424akp.c | 82 +- + drivers/gpu/drm/panel/panel-widechips-ws2401.c | 441 +++ + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 3 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 142 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 99 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 91 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 20 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 695 ++-- + drivers/gpu/drm/panfrost/panfrost_job.h | 8 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 203 +- + drivers/gpu/drm/panfrost/panfrost_mmu.h | 5 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 3 - + drivers/gpu/drm/pl111/pl111_display.c | 2 - + drivers/gpu/drm/pl111/pl111_drv.c | 1 - + drivers/gpu/drm/qxl/qxl_drv.c | 4 +- + drivers/gpu/drm/qxl/qxl_drv.h | 3 - + drivers/gpu/drm/qxl/qxl_irq.c | 9 +- + drivers/gpu/drm/qxl/qxl_prime.c | 6 - + drivers/gpu/drm/r128/r128_cce.c | 3 +- + drivers/gpu/drm/radeon/atombios.h | 4 +- + drivers/gpu/drm/radeon/evergreen.c | 8 +- + drivers/gpu/drm/radeon/r100.c | 9 + + drivers/gpu/drm/radeon/r300_reg.h | 2 +- + drivers/gpu/drm/radeon/radeon_device.c | 13 +- + drivers/gpu/drm/radeon/radeon_drv.c | 6 +- + drivers/gpu/drm/radeon/radeon_fb.c | 7 +- + drivers/gpu/drm/radeon/radeon_fence.c | 4 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 60 +- + drivers/gpu/drm/radeon/radeon_kms.h | 4 - + drivers/gpu/drm/radeon/radeon_vm.c | 2 +- + drivers/gpu/drm/radeon/rs600.c | 8 +- + drivers/gpu/drm/radeon/rv770.c | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 26 +- + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 1 + + drivers/gpu/drm/rcar-du/rcar_lvds.c | 126 +- + drivers/gpu/drm/rockchip/Kconfig | 2 + + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 349 ++ + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - + drivers/gpu/drm/rockchip/rockchip_lvds.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 5 +- + drivers/gpu/drm/scheduler/sched_main.c | 21 +- + drivers/gpu/drm/selftests/test-drm_damage_helper.c | 287 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 14 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.h | 1 + + drivers/gpu/drm/sti/sti_compositor.c | 2 - + drivers/gpu/drm/sti/sti_dvo.c | 4 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 17 +- + drivers/gpu/drm/stm/ltdc.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 1 - + drivers/gpu/drm/sun4i/sun4i_lvds.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 1 - + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 1 - + drivers/gpu/drm/tegra/drm.c | 9 +- + drivers/gpu/drm/tegra/rgb.c | 5 +- + drivers/gpu/drm/tidss/tidss_drv.c | 15 +- + drivers/gpu/drm/tidss/tidss_drv.h | 2 + + drivers/gpu/drm/tidss/tidss_irq.c | 30 +- + drivers/gpu/drm/tidss/tidss_irq.h | 4 +- + drivers/gpu/drm/tidss/tidss_kms.c | 4 +- + drivers/gpu/drm/tidss/tidss_plane.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 51 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 3 + + drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 +- + drivers/gpu/drm/tiny/Kconfig | 17 +- + drivers/gpu/drm/tiny/Makefile | 1 + + drivers/gpu/drm/tiny/bochs.c | 733 ++++ + drivers/gpu/drm/tiny/cirrus.c | 6 +- + drivers/gpu/drm/tiny/gm12u320.c | 23 +- + drivers/gpu/drm/tiny/hx8357d.c | 1 - + drivers/gpu/drm/tiny/ili9225.c | 1 - + drivers/gpu/drm/tiny/ili9341.c | 1 - + drivers/gpu/drm/tiny/ili9486.c | 1 - + drivers/gpu/drm/tiny/mi0283qt.c | 1 - + drivers/gpu/drm/tiny/repaper.c | 19 +- + drivers/gpu/drm/tiny/simpledrm.c | 4 +- + drivers/gpu/drm/tiny/st7586.c | 19 +- + drivers/gpu/drm/tiny/st7735r.c | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 66 +- + drivers/gpu/drm/tve200/tve200_display.c | 1 - + drivers/gpu/drm/udl/udl_modeset.c | 33 +- + drivers/gpu/drm/v3d/Makefile | 1 + + drivers/gpu/drm/v3d/v3d_drv.c | 8 + + drivers/gpu/drm/v3d/v3d_drv.h | 63 + + drivers/gpu/drm/v3d/v3d_gem.c | 31 + + drivers/gpu/drm/v3d/v3d_perfmon.c | 213 ++ + drivers/gpu/drm/v3d/v3d_regs.h | 2 + + drivers/gpu/drm/v3d/v3d_sched.c | 26 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 3 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 1 - + drivers/gpu/drm/vboxvideo/vbox_irq.c | 16 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 5 +- + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/vc4_drv.c | 6 +- + drivers/gpu/drm/vc4/vc4_drv.h | 8 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 4 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 450 +-- + drivers/gpu/drm/vc4/vc4_hdmi.h | 5 +- + drivers/gpu/drm/vc4/vc4_irq.c | 48 +- + drivers/gpu/drm/vc4/vc4_kms.c | 1 - + drivers/gpu/drm/vc4/vc4_regs.h | 30 + + drivers/gpu/drm/vc4/vc4_v3d.c | 17 +- + drivers/gpu/drm/via/via_mm.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 4 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 64 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 2 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 7 +- + drivers/gpu/drm/vkms/vkms_composer.c | 28 +- + drivers/gpu/drm/vkms/vkms_drv.c | 32 +- + drivers/gpu/drm/vkms/vkms_drv.h | 13 +- + drivers/gpu/drm/vkms/vkms_plane.c | 57 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 28 +- + drivers/gpu/drm/vmwgfx/Kconfig | 8 + + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + .../gpu/drm/vmwgfx/device_include/includeCheck.h | 3 - + .../gpu/drm/vmwgfx/device_include/svga3d_caps.h | 111 - + drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h | 3680 ++++++++------------ + .../gpu/drm/vmwgfx/device_include/svga3d_devcaps.h | 793 ++--- + drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h | 3503 +++++++++---------- + .../gpu/drm/vmwgfx/device_include/svga3d_limits.h | 101 +- + drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h | 15 +- + .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 3132 ++++++++--------- + .../gpu/drm/vmwgfx/device_include/svga3d_types.h | 3020 +++++++--------- + .../gpu/drm/vmwgfx/device_include/svga_escape.h | 68 +- + .../gpu/drm/vmwgfx/device_include/svga_overlay.h | 203 +- + drivers/gpu/drm/vmwgfx/device_include/svga_reg.h | 2847 ++++----------- + drivers/gpu/drm/vmwgfx/device_include/svga_types.h | 51 - + .../gpu/drm/vmwgfx/device_include/vm_basic_types.h | 130 +- + .../drm/vmwgfx/device_include/vmware_pack_begin.h | 2 - + .../drm/vmwgfx/device_include/vmware_pack_end.h | 2 - + drivers/gpu/drm/vmwgfx/ttm_memory.c | 2 + + drivers/gpu/drm/vmwgfx/vmw_surface_cache.h | 539 +++ + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c | 142 + + drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.h | 50 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 457 +-- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 50 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 111 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mksstat.h | 144 + + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 45 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 579 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 - + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 84 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 35 - + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 4 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 1 - + drivers/gpu/drm/xlnx/Kconfig | 2 + + drivers/gpu/drm/xlnx/zynqmp_disp.c | 320 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 22 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 - + drivers/gpu/drm/zte/zx_drm_drv.c | 6 - + drivers/gpu/vga/vgaarb.c | 67 +- + drivers/hid/hid-core.c | 4 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 4 +- + drivers/hv/vmbus_drv.c | 5 +- + drivers/hwtracing/intel_th/core.c | 4 +- + drivers/i2c/i2c-core-base.c | 5 +- + drivers/i3c/master.c | 4 +- + drivers/input/gameport/gameport.c | 3 +- + drivers/input/serio/serio.c | 3 +- + drivers/ipack/ipack.c | 4 +- + drivers/macintosh/macio_asic.c | 4 +- + drivers/mcb/mcb-core.c | 4 +- + drivers/media/pci/bt8xx/bttv-gpio.c | 3 +- + drivers/memstick/core/memstick.c | 3 +- + drivers/mfd/mcp-core.c | 3 +- + drivers/misc/mei/bus.c | 4 +- + drivers/misc/tifm_core.c | 3 +- + drivers/mmc/core/bus.c | 4 +- + drivers/mmc/core/sdio_bus.c | 4 +- + drivers/net/netdevsim/bus.c | 3 +- + drivers/ntb/core.c | 4 +- + drivers/ntb/ntb_transport.c | 4 +- + drivers/nubus/bus.c | 6 +- + drivers/nvdimm/bus.c | 3 +- + drivers/pci/endpoint/pci-epf-core.c | 7 +- + drivers/pci/pci-driver.c | 3 +- + drivers/pcmcia/ds.c | 4 +- + drivers/platform/surface/aggregator/bus.c | 4 +- + drivers/platform/x86/wmi.c | 4 +- + drivers/pnp/driver.c | 3 +- + drivers/rapidio/rio-driver.c | 4 +- + drivers/rpmsg/rpmsg_core.c | 7 +- + drivers/s390/block/scm_drv.c | 4 +- + drivers/s390/cio/ccwgroup.c | 6 +- + drivers/s390/cio/chsc_sch.c | 3 +- + drivers/s390/cio/css.c | 7 +- + drivers/s390/cio/css.h | 2 +- + drivers/s390/cio/device.c | 9 +- + drivers/s390/cio/eadm_sch.c | 4 +- + drivers/s390/cio/scm.c | 5 +- + drivers/s390/cio/vfio_ccw_drv.c | 3 +- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/scsi/scsi_debug.c | 3 +- + drivers/sh/superhyway/superhyway.c | 8 +- + drivers/siox/siox-core.c | 4 +- + drivers/slimbus/core.c | 4 +- + drivers/soc/qcom/apr.c | 4 +- + drivers/spi/spi.c | 4 +- + drivers/spmi/spmi.c | 3 +- + drivers/ssb/main.c | 4 +- + drivers/staging/fieldbus/anybuss/host.c | 4 +- + drivers/staging/greybus/gbphy.c | 4 +- + drivers/target/loopback/tcm_loop.c | 5 +- + drivers/thunderbolt/domain.c | 4 +- + drivers/tty/serdev/core.c | 4 +- + drivers/usb/common/ulpi.c | 4 +- + drivers/usb/serial/bus.c | 4 +- + drivers/usb/typec/bus.c | 4 +- + drivers/vdpa/vdpa.c | 4 +- + drivers/vfio/mdev/mdev_driver.c | 4 +- + drivers/vfio/pci/vfio_pci.c | 11 +- + drivers/video/fbdev/arcfb.c | 2 +- + drivers/video/fbdev/asiliantfb.c | 3 + + drivers/video/fbdev/core/fbmem.c | 6 +- + drivers/video/fbdev/ep93xx-fb.c | 4 +- + drivers/video/fbdev/kyro/fbdev.c | 8 + + drivers/video/fbdev/neofb.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/apply.c | 4 +- + drivers/video/fbdev/riva/fbdev.c | 3 + + drivers/video/fbdev/ssd1307fb.c | 151 +- + drivers/virtio/virtio.c | 3 +- + drivers/vlynq/vlynq.c | 4 +- + drivers/vme/vme.c | 4 +- + drivers/xen/xenbus/xenbus.h | 2 +- + drivers/xen/xenbus/xenbus_probe.c | 4 +- + drivers/zorro/zorro-driver.c | 3 +- + include/drm/amd_asic_type.h | 17 +- + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/drm_aperture.h | 14 +- + include/drm/drm_auth.h | 68 +- + include/drm/drm_bridge.h | 26 +- + include/drm/drm_connector.h | 10 + + include/drm/drm_damage_helper.h | 18 - + include/drm/drm_device.h | 18 +- + include/drm/drm_dp_aux_bus.h | 57 + + include/drm/drm_dp_helper.h | 175 +- + include/drm/drm_drv.h | 44 +- + include/drm/drm_edid.h | 2 +- + include/drm/drm_file.h | 22 +- + include/drm/drm_fourcc.h | 13 +- + include/drm/drm_framebuffer.h | 8 +- + include/drm/drm_gem.h | 2 - + include/drm/drm_gem_atomic_helper.h | 17 +- + include/drm/drm_gem_framebuffer_helper.h | 13 + + include/drm/drm_gem_vram_helper.h | 16 +- + include/drm/drm_legacy.h | 3 + + include/drm/drm_mipi_dbi.h | 7 +- + include/drm/drm_mipi_dsi.h | 13 +- + include/drm/drm_modeset_helper_vtables.h | 7 +- + include/drm/drm_panel.h | 8 +- + include/drm/drm_plane.h | 39 +- + include/drm/drm_print.h | 2 +- + include/drm/drm_property.h | 9 +- + include/drm/drm_rect.h | 3 + + include/drm/drm_simple_kms_helper.h | 34 +- + include/drm/drm_vma_manager.h | 2 +- + include/drm/gpu_scheduler.h | 37 +- + include/drm/ttm/ttm_placement.h | 7 +- + include/dt-bindings/phy/phy.h | 2 + + include/linux/device/bus.h | 2 +- + include/linux/dma-buf.h | 170 +- + include/linux/dma-fence-chain.h | 52 +- + include/linux/fb.h | 3 +- + include/linux/lockdep.h | 41 +- + include/linux/pci-epf.h | 2 +- + {arch/x86/include/asm => include/linux}/sysfb.h | 32 +- + include/linux/vgaarb.h | 118 +- + include/uapi/drm/drm.h | 14 +- + include/uapi/drm/drm_fourcc.h | 109 +- + include/uapi/drm/drm_mode.h | 92 +- + include/uapi/drm/i915_drm.h | 498 ++- + include/uapi/drm/msm_drm.h | 14 +- + include/uapi/drm/v3d_drm.h | 136 + + include/uapi/drm/vmwgfx_drm.h | 41 + + include/uapi/linux/dma-buf.h | 50 +- + include/uapi/linux/kfd_ioctl.h | 16 +- + sound/ac97/bus.c | 6 +- + sound/aoa/soundbus/core.c | 4 +- + 1086 files changed, 57010 insertions(+), 34310 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers + create mode 100644 Documentation/devicetree/bindings/display/dp-aux-bus.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,ej030na.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,lms380kf01.yaml + create mode 100644 Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml + delete mode 100644 Documentation/devicetree/bindings/display/ssd1307fb.txt + create mode 100644 Documentation/gpu/rfc/i915_parallel_execbuf.h + create mode 100644 Documentation/gpu/rfc/i915_scheduler.rst + create mode 100644 drivers/dma-buf/dma-buf-sysfs-stats.c + create mode 100644 drivers/dma-buf/dma-buf-sysfs-stats.h + rename {arch/x86/kernel => drivers/firmware/efi}/sysfb_efi.c (83%) + rename {arch/x86/kernel => drivers/firmware}/sysfb.c (75%) + rename {arch/x86/kernel => drivers/firmware}/sysfb_simplefb.c (81%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c + rename drivers/gpu/drm/amd/amdgpu/{dce_virtual.h => psp_v11_0_8.h} (85%) + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_8_offset.h + create mode 100644 drivers/gpu/drm/amd/include/cyan_skillfish_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c + rename include/drm/drm_irq.h => drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.h (64%) + delete mode 100644 drivers/gpu/drm/bochs/Kconfig + delete mode 100644 drivers/gpu/drm/bochs/Makefile + delete mode 100644 drivers/gpu/drm/bochs/bochs.h + delete mode 100644 drivers/gpu/drm/bochs/bochs_drv.c + delete mode 100644 drivers/gpu/drm/bochs/bochs_hw.c + delete mode 100644 drivers/gpu/drm/bochs/bochs_kms.c + delete mode 100644 drivers/gpu/drm/bochs/bochs_mm.c + create mode 100644 drivers/gpu/drm/drm_dp_aux_bus.c + create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy.c + create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy.h + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.c + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.h + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.c + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_ttm.h + create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c + delete mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c + delete mode 100644 drivers/gpu/drm/i915/gt/intel_context_param.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate_types.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_migrate.c + create mode 100644 drivers/gpu/drm/i915/gt/selftest_slpc.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_rc.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h + create mode 100644 drivers/gpu/drm/i915/i915_buddy.c + create mode 100644 drivers/gpu/drm/i915/i915_buddy.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.h + delete mode 100644 drivers/gpu/drm/i915/i915_globals.c + delete mode 100644 drivers/gpu/drm/i915/i915_globals.h + create mode 100644 drivers/gpu/drm/i915/i915_module.c + create mode 100644 drivers/gpu/drm/i915/i915_pci.h + create mode 100644 drivers/gpu/drm/i915/i915_ttm_buddy_manager.c + create mode 100644 drivers/gpu/drm/i915/i915_ttm_buddy_manager.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_aal.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_pll.c + create mode 100644 drivers/gpu/drm/msm/msm_gpu_devfreq.c + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9341.c + create mode 100644 drivers/gpu/drm/panel/panel-innolux-ej030na.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-atna33xc20.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-db7430.c + create mode 100644 drivers/gpu/drm/panel/panel-widechips-ws2401.c + create mode 100644 drivers/gpu/drm/tiny/bochs.c + create mode 100644 drivers/gpu/drm/v3d/v3d_perfmon.c + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/includeCheck.h + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga3d_caps.h + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/svga_types.h + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/vmware_pack_begin.h + delete mode 100644 drivers/gpu/drm/vmwgfx/device_include/vmware_pack_end.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmw_surface_cache.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_mksstat.h + create mode 100644 include/drm/drm_dp_aux_bus.h + rename {arch/x86/include/asm => include/linux}/sysfb.h (70%) +Merging drm-misc/for-linux-next (d03a493f6782 drm/mgag200: Fix uninitialized variable delta) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + Documentation/gpu/drm-mm.rst | 2 +- + drivers/gpu/drm/mgag200/mgag200_pll.c | 1 + + drivers/gpu/drm/ttm/ttm_tt.c | 1 - + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + include/drm/ttm/ttm_tt.h | 3 ++- + 5 files changed, 5 insertions(+), 4 deletions(-) +Merging amdgpu/drm-next (06a631a08050 drm/radeon: Add HD-audio component notifier support (v2)) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/Kconfig | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 31 ++ + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 31 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 86 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 432 ++++++++++++--------- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 111 ++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 59 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 18 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 3 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- + drivers/gpu/drm/amd/amdgpu/ta_xgmi_if.h | 3 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 18 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 21 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 124 ++++-- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 112 +++--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 23 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 12 +- + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 23 ++ + drivers/gpu/drm/amd/display/dc/core/dc.c | 68 +++- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 106 +++-- + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 3 + + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 192 ++++++++- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 11 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 14 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 90 +++-- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 12 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 96 +---- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 12 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 21 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 18 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 5 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 8 + + .../amd/display/modules/hdcp/hdcp1_transition.c | 8 +- + .../amd/display/modules/hdcp/hdcp2_transition.c | 4 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 74 ++++ + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 72 ---- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 56 +-- + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 1 + + .../amd/include/asic_reg/thm/thm_11_0_2_offset.h | 6 + + .../amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h | 3 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 56 +-- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 8 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 25 +- + drivers/gpu/drm/amd/pm/inc/hwmgr.h | 6 +- + drivers/gpu/drm/amd/pm/inc/smu_types.h | 3 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 11 +- + drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h | 2 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 22 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 46 +-- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 21 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.h | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 7 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 59 +-- + .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c | 18 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.h | 4 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 14 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 80 ++-- + .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c | 30 +- + .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.h | 4 +- + drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 19 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 86 ++-- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 194 +++++++-- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 89 +++-- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 67 ++-- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 102 ++++- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 50 +-- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.h | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 20 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 44 ++- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 102 +++-- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 14 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 6 +- + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_audio.c | 95 +++++ + drivers/gpu/drm/radeon/radeon_fb.c | 1 + + drivers/usb/host/xhci-pci.c | 3 + + 123 files changed, 2403 insertions(+), 1324 deletions(-) +Merging drm-intel/for-linux-next (c00e14cd4d3f drm/i915/adl_p: Also disable underrun recovery with MSO) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_dp_link_training.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 28 +++++----- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 58 +++++++++++++++++++- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 7 +++ + drivers/gpu/drm/i915/display/intel_display.c | 3 ++ + .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 9 +--- + drivers/gpu/drm/i915/display/intel_fbc.c | 10 +--- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 3 +- + drivers/gpu/drm/i915/display/intel_psr.c | 8 +-- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 61 ++++++---------------- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 3 +- + drivers/video/fbdev/efifb.c | 21 +++++--- + 12 files changed, 123 insertions(+), 90 deletions(-) +Merging drm-tegra/drm/tegra/for-next (fed028939417 gpu: host1x: debug: Dump DMASTART and DMAEND register) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/drm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/Kconfig | 1 + + drivers/gpu/drm/tegra/Makefile | 3 + + drivers/gpu/drm/tegra/dc.c | 358 ++++++++++++++++- + drivers/gpu/drm/tegra/dc.h | 17 + + drivers/gpu/drm/tegra/drm.c | 98 +++-- + drivers/gpu/drm/tegra/drm.h | 12 + + drivers/gpu/drm/tegra/firewall.c | 254 ++++++++++++ + drivers/gpu/drm/tegra/gem.c | 13 + + drivers/gpu/drm/tegra/gem.h | 2 + + drivers/gpu/drm/tegra/plane.c | 117 ++++++ + drivers/gpu/drm/tegra/plane.h | 16 + + drivers/gpu/drm/tegra/submit.c | 625 +++++++++++++++++++++++++++++ + drivers/gpu/drm/tegra/submit.h | 21 + + drivers/gpu/drm/tegra/uapi.c | 338 ++++++++++++++++ + drivers/gpu/drm/tegra/uapi.h | 58 +++ + drivers/gpu/drm/tegra/vic.c | 112 +++--- + drivers/gpu/host1x/Makefile | 1 + + drivers/gpu/host1x/cdma.c | 58 ++- + drivers/gpu/host1x/fence.c | 168 ++++++++ + drivers/gpu/host1x/fence.h | 13 + + drivers/gpu/host1x/hw/channel_hw.c | 87 +++- + drivers/gpu/host1x/hw/debug_hw.c | 32 +- + drivers/gpu/host1x/hw/debug_hw_1x01.c | 8 +- + drivers/gpu/host1x/hw/debug_hw_1x06.c | 16 +- + drivers/gpu/host1x/hw/hw_host1x02_uclass.h | 12 + + drivers/gpu/host1x/hw/hw_host1x04_uclass.h | 12 + + drivers/gpu/host1x/hw/hw_host1x05_uclass.h | 12 + + drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 12 + + drivers/gpu/host1x/hw/hw_host1x07_uclass.h | 12 + + drivers/gpu/host1x/intr.c | 9 + + drivers/gpu/host1x/intr.h | 2 + + drivers/gpu/host1x/job.c | 98 +++-- + drivers/gpu/host1x/job.h | 16 + + drivers/gpu/host1x/syncpt.c | 2 + + drivers/gpu/host1x/syncpt.h | 12 + + include/linux/host1x.h | 27 +- + include/uapi/drm/tegra_drm.h | 425 ++++++++++++++++++-- + 37 files changed, 2882 insertions(+), 197 deletions(-) + create mode 100644 drivers/gpu/drm/tegra/firewall.c + create mode 100644 drivers/gpu/drm/tegra/submit.c + create mode 100644 drivers/gpu/drm/tegra/submit.h + create mode 100644 drivers/gpu/drm/tegra/uapi.c + create mode 100644 drivers/gpu/drm/tegra/uapi.h + create mode 100644 drivers/gpu/host1x/fence.c + create mode 100644 drivers/gpu/host1x/fence.h +Merging drm-msm/msm-next (cb0927ab80d2 drm/msi/mdp4: populate priv->kms in mdp4_kms_init) +$ git merge drm-msm/msm-next +Already up to date. +Merging imx-drm/imx-drm/next (59e4e762a17d gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/ipu-v3/ipu-cpmem.c | 30 +++++++++++++++--------------- + drivers/gpu/ipu-v3/ipu-image-convert.c | 9 +++------ + 2 files changed, 18 insertions(+), 21 deletions(-) +Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 14 ++----------- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 --- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 18 +++++------------ + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 ------------ + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 ++++++ + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 31 +++++++++++++++++++++++++++++ + 6 files changed, 44 insertions(+), 41 deletions(-) +$ git am -3 ../patches/0001-drm-i915-use-linux-stddef.h-due-to-isystem-trim-fixu.patch +Applying: drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/gt/intel_gt_requests.h +$ git add -A . +$ git commit -v -a --amend +[master 7fbac99e8338] Merge remote-tracking branch 'etnaviv/etnaviv/next' + Date: Fri Aug 20 11:55:42 2021 +1000 +Merging regmap/for-next (cc15156265f0 Merge remote-tracking branch 'regmap/for-5.15' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 2 +- + drivers/base/regmap/regmap-mmio.c | 2 +- + drivers/base/regmap/regmap.c | 14 +++++++------- + include/linux/regmap.h | 5 +++-- + 4 files changed, 12 insertions(+), 11 deletions(-) +Merging sound/for-next (d2d837563743 ALSA: hda/analog - Sink ad198x_shutup() and shuffle CONFIG_PM guards) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging Documentation/sound/kernel-api/writing-an-alsa-driver.rst +Merge made by the 'recursive' strategy. + Documentation/sound/alsa-configuration.rst | 26 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 33 + + include/sound/compress_driver.h | 2 - + include/sound/core.h | 6 + + include/sound/emu10k1.h | 6 +- + include/sound/emu8000.h | 3 - + include/sound/hda_codec.h | 1 - + include/sound/hdaudio_ext.h | 2 +- + include/sound/memalloc.h | 10 +- + include/sound/pcm.h | 47 +- + include/sound/pxa2xx-lib.h | 13 +- + include/uapi/sound/asound.h | 1 + + sound/arm/pxa2xx-ac97.c | 18 +- + sound/arm/pxa2xx-pcm-lib.c | 90 +- + sound/core/compress_offload.c | 69 +- + sound/core/control_led.c | 2 +- + sound/core/init.c | 105 +- + sound/core/isadma.c | 38 + + sound/core/memalloc.c | 177 ++- + sound/core/memalloc_local.h | 2 +- + sound/core/pcm_memory.c | 67 +- + sound/core/pcm_native.c | 18 +- + sound/core/seq/seq_dummy.c | 8 +- + sound/core/sgbuf.c | 30 +- + sound/drivers/Kconfig | 2 +- + sound/drivers/aloop.c | 26 +- + sound/drivers/dummy.c | 24 +- + sound/drivers/mpu401/mpu401.c | 34 +- + sound/drivers/mtpav.c | 30 +- + sound/drivers/pcsp/pcsp.c | 49 +- + sound/drivers/pcsp/pcsp_input.c | 14 +- + sound/drivers/pcsp/pcsp_input.h | 1 - + sound/drivers/serial-u16550.c | 57 +- + sound/drivers/virmidi.c | 21 +- + sound/drivers/vx/vx_core.c | 12 +- + sound/isa/ad1816a/ad1816a.c | 41 +- + sound/isa/ad1816a/ad1816a_lib.c | 49 +- + sound/isa/ad1848/ad1848.c | 19 +- + sound/isa/adlib.c | 28 +- + sound/isa/als100.c | 41 +- + sound/isa/azt2320.c | 49 +- + sound/isa/cmi8328.c | 31 +- + sound/isa/cmi8330.c | 27 +- + sound/isa/cs423x/cs4231.c | 21 +- + sound/isa/cs423x/cs4236.c | 52 +- + sound/isa/cs423x/cs4236_lib.c | 2 - + sound/isa/es1688/es1688.c | 33 +- + sound/isa/es18xx.c | 112 +- + sound/isa/galaxy/galaxy.c | 82 +- + sound/isa/gus/gus_main.c | 44 +- + sound/isa/gus/gusclassic.c | 28 +- + sound/isa/gus/gusextreme.c | 39 +- + sound/isa/gus/gusmax.c | 65 +- + sound/isa/gus/interwave.c | 53 +- + sound/isa/msnd/msnd.c | 8 +- + sound/isa/msnd/msnd_pinnacle.c | 119 +- + sound/isa/opl3sa2.c | 60 +- + sound/isa/opti9xx/miro.c | 76 +- + sound/isa/opti9xx/opti92x-ad1848.c | 77 +- + sound/isa/sb/emu8000.c | 48 +- + sound/isa/sb/jazz16.c | 39 +- + sound/isa/sb/sb16.c | 42 +- + sound/isa/sb/sb8.c | 48 +- + sound/isa/sb/sb_common.c | 64 +- + sound/isa/sc6000.c | 84 +- + sound/isa/sscape.c | 92 +- + sound/isa/wavefront/wavefront.c | 46 +- + sound/isa/wss/wss_lib.c | 67 +- + sound/parisc/harmony.c | 14 - + sound/pci/ad1889.c | 144 +-- + sound/pci/ali5451/ali5451.c | 90 +- + sound/pci/als300.c | 80 +- + sound/pci/als4000.c | 59 +- + sound/pci/atiixp.c | 92 +- + sound/pci/atiixp_modem.c | 92 +- + sound/pci/au88x0/au88x0.c | 134 +- + sound/pci/aw2/aw2-alsa.c | 102 +- + sound/pci/azt3328.c | 124 +- + sound/pci/bt87x.c | 98 +- + sound/pci/ca0106/ca0106.h | 3 +- + sound/pci/ca0106/ca0106_main.c | 114 +- + sound/pci/cmipci.c | 104 +- + sound/pci/cs4281.c | 114 +- + sound/pci/cs46xx/cs46xx.c | 51 +- + sound/pci/cs46xx/cs46xx.h | 4 +- + sound/pci/cs46xx/cs46xx_lib.c | 141 +-- + sound/pci/cs5530.c | 86 +- + sound/pci/cs5535audio/cs5535audio.c | 94 +- + sound/pci/cs5535audio/cs5535audio_olpc.c | 7 +- + sound/pci/echoaudio/echoaudio.c | 168 +-- + sound/pci/echoaudio/echoaudio.h | 2 +- + sound/pci/emu10k1/emu10k1.c | 53 +- + sound/pci/emu10k1/emu10k1_main.c | 102 +- + sound/pci/emu10k1/emu10k1x.c | 128 +- + sound/pci/emu10k1/p16v.c | 22 +- + sound/pci/ens1370.c | 115 +- + sound/pci/es1938.c | 97 +- + sound/pci/es1968.c | 112 +- + sound/pci/fm801.c | 103 +- + sound/pci/hda/Kconfig | 10 + + sound/pci/hda/Makefile | 2 + + sound/pci/hda/hda_bind.c | 8 +- + sound/pci/hda/hda_codec.c | 14 + + sound/pci/hda/hda_controller.c | 13 +- + sound/pci/hda/hda_controller.h | 3 - + sound/pci/hda/hda_generic.c | 19 - + sound/pci/hda/hda_generic.h | 1 - + sound/pci/hda/hda_intel.c | 52 +- + sound/pci/hda/hda_local.h | 2 + + sound/pci/hda/patch_analog.c | 11 +- + sound/pci/hda/patch_ca0132.c | 8 +- + sound/pci/hda/patch_cirrus.c | 1074 ---------------- + sound/pci/hda/patch_conexant.c | 15 +- + sound/pci/hda/patch_cs8409-tables.c | 560 +++++++++ + sound/pci/hda/patch_cs8409.c | 1279 ++++++++++++++++++++ + sound/pci/hda/patch_cs8409.h | 369 ++++++ + sound/pci/hda/patch_hdmi.c | 7 + + sound/pci/hda/patch_realtek.c | 13 - + sound/pci/hda/patch_sigmatel.c | 23 +- + sound/pci/ice1712/ice1712.c | 133 +- + sound/pci/ice1712/ice1724.c | 167 +-- + sound/pci/intel8x0.c | 144 +-- + sound/pci/intel8x0m.c | 139 +-- + sound/pci/korg1212/korg1212.c | 211 +--- + sound/pci/lola/lola.c | 127 +- + sound/pci/lola/lola.h | 5 +- + sound/pci/lola/lola_pcm.c | 20 +- + sound/pci/lx6464es/lx6464es.c | 112 +- + sound/pci/maestro3.c | 106 +- + sound/pci/nm256/nm256.c | 131 +- + sound/pci/oxygen/oxygen.c | 1 - + sound/pci/oxygen/oxygen.h | 1 - + sound/pci/oxygen/oxygen_lib.c | 66 +- + sound/pci/oxygen/se6x.c | 1 - + sound/pci/oxygen/virtuoso.c | 1 - + sound/pci/pcxhr/pcxhr.c | 47 +- + sound/pci/riptide/riptide.c | 89 +- + sound/pci/rme32.c | 49 +- + sound/pci/rme96.c | 57 +- + sound/pci/rme9652/hdsp.c | 95 +- + sound/pci/rme9652/hdspm.c | 64 +- + sound/pci/rme9652/rme9652.c | 91 +- + sound/pci/sis7019.c | 87 +- + sound/pci/sonicvibes.c | 117 +- + sound/pci/trident/trident.c | 39 +- + sound/pci/trident/trident.h | 7 +- + sound/pci/trident/trident_main.c | 90 +- + sound/pci/trident/trident_memory.c | 8 +- + sound/pci/via82xx.c | 116 +- + sound/pci/via82xx_modem.c | 88 +- + sound/pci/vx222/vx222.c | 69 +- + sound/pci/ymfpci/ymfpci.c | 66 +- + sound/pci/ymfpci/ymfpci.h | 8 +- + sound/pci/ymfpci/ymfpci_main.c | 149 +-- + sound/pcmcia/vx/vxpocket.c | 22 - + sound/soc/bcm/bcm63xx-pcm-whistler.c | 82 +- + sound/soc/fsl/fsl_asrc_dma.c | 47 +- + sound/soc/fsl/fsl_dma.c | 50 +- + sound/soc/fsl/imx-pcm-fiq.c | 75 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 89 +- + sound/soc/fsl/mpc5200_dma.c | 63 +- + sound/soc/pxa/pxa-ssp.c | 3 - + sound/soc/pxa/pxa2xx-ac97.c | 3 - + sound/soc/pxa/pxa2xx-i2s.c | 3 - + sound/soc/pxa/pxa2xx-pcm.c | 3 - + sound/soc/qcom/lpass-platform.c | 60 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 63 +- + sound/soc/soc-compress.c | 1 - + sound/soc/sprd/sprd-pcm-dma.c | 67 +- + sound/soc/tegra/tegra210_admaif.c | 6 - + sound/soc/tegra/tegra_pcm.c | 93 +- + sound/soc/tegra/tegra_pcm.h | 7 - + sound/usb/card.c | 42 +- + sound/usb/clock.c | 15 +- + sound/usb/endpoint.c | 14 +- + sound/usb/format.c | 6 +- + sound/usb/implicit.c | 6 +- + sound/usb/mixer.c | 10 +- + sound/usb/mixer.h | 3 +- + sound/usb/mixer_maps.c | 22 - + sound/usb/mixer_quirks.c | 265 +++- + sound/usb/quirks-table.h | 70 +- + sound/usb/quirks.c | 359 +++--- + sound/usb/quirks.h | 5 +- + sound/usb/stream.c | 4 +- + sound/usb/usbaudio.h | 65 +- + sound/x86/intel_hdmi_audio.c | 90 +- + sound/x86/intel_hdmi_audio.h | 1 - + 188 files changed, 5153 insertions(+), 8124 deletions(-) + create mode 100644 sound/pci/hda/patch_cs8409-tables.c + create mode 100644 sound/pci/hda/patch_cs8409.c + create mode 100644 sound/pci/hda/patch_cs8409.h +Merging sound-asoc/for-next (dc392f00eb58 Merge remote-tracking branch 'asoc/for-5.15' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../bindings/sound/davinci-mcasp-audio.txt | 1 + + .../devicetree/bindings/sound/realtek,rt1015p.yaml | 4 +- + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 118 +++ + drivers/soundwire/intel.c | 74 -- + drivers/soundwire/intel_init.c | 14 +- + include/linux/platform_data/davinci_asp.h | 1 + + include/linux/soundwire/sdw_intel.h | 87 ++ + include/sound/sof.h | 1 + + sound/soc/amd/Kconfig | 9 + + sound/soc/amd/Makefile | 1 + + sound/soc/amd/acp-da7219-max98357a.c | 12 +- + sound/soc/amd/acp-pcm-dma.c | 20 +- + sound/soc/amd/acp3x-rt5682-max9836.c | 14 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 10 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 8 - + sound/soc/amd/renoir/acp3x-rn.c | 7 +- + sound/soc/amd/vangogh/Makefile | 9 + + sound/soc/amd/vangogh/acp5x-i2s.c | 427 ++++++++ + sound/soc/amd/vangogh/acp5x-pcm-dma.c | 517 ++++++++++ + sound/soc/amd/vangogh/acp5x.h | 193 ++++ + sound/soc/amd/vangogh/pci-acp5x.c | 326 ++++++ + sound/soc/amd/vangogh/vg_chip_offset_byte.h | 337 ++++++ + sound/soc/atmel/Kconfig | 1 - + sound/soc/atmel/mchp-spdifrx.c | 6 +- + sound/soc/atmel/mchp-spdiftx.c | 2 +- + sound/soc/atmel/tse850-pcm5142.c | 2 +- + sound/soc/bcm/cygnus-pcm.c | 2 +- + sound/soc/codecs/Kconfig | 19 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad193x.c | 30 +- + sound/soc/codecs/ad193x.h | 4 + + sound/soc/codecs/cs42l42.c | 28 +- + sound/soc/codecs/cx20442.c | 8 +- + sound/soc/codecs/lpass-rx-macro.c | 65 +- + sound/soc/codecs/max98090.c | 4 +- + sound/soc/codecs/max98390.c | 26 +- + sound/soc/codecs/max98390.h | 1 + + sound/soc/codecs/mt6359-accdet.c | 25 +- + sound/soc/codecs/rt1015.c | 39 +- + sound/soc/codecs/rt1015.h | 2 - + sound/soc/codecs/rt1015p.c | 2 + + sound/soc/codecs/rt5514.c | 2 +- + sound/soc/codecs/rt5640.c | 19 +- + sound/soc/codecs/rt5682-i2c.c | 15 +- + sound/soc/codecs/rt5682.c | 44 + + sound/soc/codecs/sdw-mockup.c | 310 ++++++ + sound/soc/codecs/tlv320aic32x4.c | 10 +- + sound/soc/codecs/wcd938x.c | 854 +++++++++++++++- + sound/soc/codecs/wcd938x.h | 1 - + sound/soc/codecs/wm_adsp.c | 7 +- + sound/soc/fsl/fsl_rpmsg.c | 20 +- + sound/soc/fsl/fsl_xcvr.c | 4 +- + sound/soc/generic/simple-card-utils.c | 4 +- + sound/soc/intel/atom/sst/sst_ipc.c | 2 +- + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/bytcht_es8316.c | 31 +- + sound/soc/intel/boards/bytcr_rt5640.c | 178 +++- + sound/soc/intel/boards/bytcr_rt5651.c | 63 +- + sound/soc/intel/boards/sof_cs42l42.c | 361 +++++-- + sound/soc/intel/boards/sof_maxim_common.c | 17 +- + sound/soc/intel/boards/sof_maxim_common.h | 4 +- + sound/soc/intel/boards/sof_pcm512x.c | 13 +- + sound/soc/intel/boards/sof_rt5682.c | 66 +- + sound/soc/intel/boards/sof_sdw.c | 105 +- + sound/soc/intel/boards/sof_sdw_common.h | 64 +- + sound/soc/intel/boards/sof_sdw_max98373.c | 7 +- + sound/soc/intel/boards/sof_sdw_rt1308.c | 3 +- + sound/soc/intel/boards/sof_sdw_rt1316.c | 3 +- + sound/soc/intel/boards/sof_sdw_rt5682.c | 3 +- + sound/soc/intel/boards/sof_sdw_rt700.c | 3 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 51 +- + sound/soc/intel/boards/sof_sdw_rt711_sdca.c | 52 +- + sound/soc/intel/boards/sof_sdw_rt715.c | 3 +- + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 3 +- + sound/soc/intel/common/Makefile | 3 +- + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 15 + + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 8 + + .../intel/common/soc-acpi-intel-sdw-mockup-match.c | 166 +++ + .../intel/common/soc-acpi-intel-sdw-mockup-match.h | 17 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 38 + + sound/soc/intel/skylake/skl-pcm.c | 8 - + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 43 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 27 +- + sound/soc/qcom/apq8016_sbc.c | 17 + + sound/soc/qcom/qdsp6/q6adm.c | 2 +- + sound/soc/qcom/qdsp6/q6asm.c | 2 +- + sound/soc/samsung/aries_wm8994.c | 2 +- + sound/soc/samsung/arndale.c | 4 +- + sound/soc/samsung/h1940_uda1380.c | 2 +- + sound/soc/samsung/littlemill.c | 2 +- + sound/soc/samsung/midas_wm1811.c | 2 +- + sound/soc/samsung/neo1973_wm8753.c | 4 +- + sound/soc/samsung/rx1950_uda1380.c | 2 +- + sound/soc/samsung/smartq_wm8987.c | 2 +- + sound/soc/samsung/smdk_wm8580.c | 2 +- + sound/soc/samsung/smdk_wm8994.c | 2 +- + sound/soc/samsung/smdk_wm8994pcm.c | 2 +- + sound/soc/samsung/tm2_wm5110.c | 6 +- + sound/soc/samsung/tobermory.c | 2 +- + sound/soc/sh/Kconfig | 6 + + sound/soc/sh/Makefile | 4 + + sound/soc/sh/rcar/dma.c | 2 +- + sound/soc/sh/rcar/ssi.c | 6 +- + sound/soc/sh/rz-ssi.c | 1074 ++++++++++++++++++++ + sound/soc/soc-ac97.c | 14 +- + sound/soc/soc-component.c | 4 +- + sound/soc/soc-core.c | 36 +- + sound/soc/soc-dai.c | 18 +- + sound/soc/soc-dapm.c | 65 +- + sound/soc/soc-generic-dmaengine-pcm.c | 9 +- + sound/soc/soc-jack.c | 15 +- + sound/soc/soc-ops.c | 21 +- + sound/soc/soc-pcm.c | 22 +- + sound/soc/soc-topology.c | 23 +- + sound/soc/sof/intel/Kconfig | 10 - + sound/soc/sof/intel/cnl.c | 6 + + sound/soc/sof/intel/hda-pcm.c | 16 +- + sound/soc/sof/intel/hda-stream.c | 11 +- + sound/soc/sof/intel/hda.c | 39 +- + sound/soc/sof/intel/hda.h | 8 +- + sound/soc/sof/intel/icl.c | 3 + + sound/soc/sof/intel/shim.h | 3 + + sound/soc/sof/intel/tgl.c | 12 + + sound/soc/sof/sof-audio.c | 42 +- + sound/soc/sof/sof-pci-dev.c | 9 + + sound/soc/tegra/tegra30_ahub.c | 6 +- + sound/soc/tegra/tegra30_i2s.c | 8 +- + sound/soc/ti/Kconfig | 1 + + sound/soc/ti/davinci-mcasp.c | 176 +++- + sound/soc/ti/j721e-evm.c | 30 +- + sound/soc/ti/omap-abe-twl6040.c | 5 - + sound/soc/uniphier/aio-cpu.c | 4 +- + 132 files changed, 5951 insertions(+), 918 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml + create mode 100644 sound/soc/amd/vangogh/Makefile + create mode 100644 sound/soc/amd/vangogh/acp5x-i2s.c + create mode 100644 sound/soc/amd/vangogh/acp5x-pcm-dma.c + create mode 100644 sound/soc/amd/vangogh/acp5x.h + create mode 100644 sound/soc/amd/vangogh/pci-acp5x.c + create mode 100644 sound/soc/amd/vangogh/vg_chip_offset_byte.h + create mode 100644 sound/soc/codecs/sdw-mockup.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-sdw-mockup-match.h + create mode 100644 sound/soc/sh/rz-ssi.c +Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) +$ git merge modules/modules-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + scripts/module.lds.S | 1 + + 2 files changed, 2 insertions(+) +Merging input/next (76ba1900cb67 dt-bindings: power: reset: qcom-pon: Convert qcom PON binding to yaml) +$ git merge input/next +Removing drivers/input/misc/ixp4xx-beeper.c +Removing Documentation/devicetree/bindings/power/reset/qcom,pon.txt +Removing Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt +Merge made by the 'recursive' strategy. + .../bindings/input/qcom,pm8941-pwrkey.txt | 55 ------- + .../bindings/input/qcom,pm8941-pwrkey.yaml | 51 ++++++ + .../devicetree/bindings/power/reset/qcom,pon.txt | 49 ------ + .../devicetree/bindings/power/reset/qcom,pon.yaml | 80 +++++++++ + .../bindings/power/reset/reboot-mode.yaml | 2 +- + drivers/input/misc/Kconfig | 12 -- + drivers/input/misc/Makefile | 1 - + drivers/input/misc/ixp4xx-beeper.c | 183 --------------------- + drivers/input/serio/parkbd.c | 14 +- + 9 files changed, 133 insertions(+), 314 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt + create mode 100644 Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.yaml + delete mode 100644 drivers/input/misc/ixp4xx-beeper.c +Merging block/for-next (39916d4054e7 Merge branch 'for-5.15/io_uring' into for-next) +$ git merge block/for-next +Auto-merging net/sunrpc/xprtsock.c +Removing include/uapi/linux/lightnvm.h +Removing include/linux/lightnvm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cpuhotplug.h +Removing include/linux/cmdline-parser.h +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/bio.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/namei.c +Auto-merging fs/internal.h +Auto-merging fs/f2fs/sysfs.c +Removing drivers/nvme/host/lightnvm.c +Removing drivers/lightnvm/pblk.h +Removing drivers/lightnvm/pblk-write.c +Removing drivers/lightnvm/pblk-trace.h +Removing drivers/lightnvm/pblk-sysfs.c +Removing drivers/lightnvm/pblk-rl.c +Removing drivers/lightnvm/pblk-recovery.c +Removing drivers/lightnvm/pblk-read.c +Removing drivers/lightnvm/pblk-rb.c +Removing drivers/lightnvm/pblk-map.c +Removing drivers/lightnvm/pblk-init.c +Removing drivers/lightnvm/pblk-gc.c +Removing drivers/lightnvm/pblk-core.c +Removing drivers/lightnvm/pblk-cache.c +Removing drivers/lightnvm/core.c +Removing drivers/lightnvm/Makefile +Removing drivers/lightnvm/Kconfig +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/block/nbd.c +Auto-merging block/mq-deadline.c +CONFLICT (modify/delete): block/mq-deadline-cgroup.c deleted in HEAD and modified in block/for-next. Version block/for-next of block/mq-deadline-cgroup.c left in tree. +Removing block/cmdline-parser.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-iocost.c +Auto-merging block/blk-cgroup.c +Auto-merging block/bio.c +Auto-merging block/Makefile +Auto-merging MAINTAINERS +Removing Documentation/driver-api/lightnvm-pblk.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f block/mq-deadline-cgroup.c +rm 'block/mq-deadline-cgroup.c' +$ git commit --no-edit -v -a +[master 161e6f40a4d3] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block | 12 + + Documentation/ABI/testing/sysfs-block-device | 43 +- + Documentation/driver-api/index.rst | 1 - + Documentation/driver-api/lightnvm-pblk.rst | 21 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 9 - + arch/m68k/configs/stmark2_defconfig | 1 - + arch/mips/include/asm/mach-rc32434/rb.h | 2 - + arch/um/drivers/ubd_kern.c | 3 +- + block/Kconfig | 14 +- + block/Makefile | 2 +- + block/bfq-iosched.c | 17 +- + block/bfq-iosched.h | 4 +- + block/bfq-wf2q.c | 6 +- + block/bio-integrity.c | 21 +- + block/bio.c | 200 +- + block/blk-cgroup.c | 139 +- + block/blk-core.c | 20 +- + block/blk-iocost.c | 23 +- + block/blk-iolatency.c | 38 +- + block/blk-map.c | 2 +- + block/blk-merge.c | 20 +- + block/blk-mq-sysfs.c | 55 - + block/blk-mq.c | 2 +- + block/blk-settings.c | 34 +- + block/blk-sysfs.c | 29 +- + block/blk-throttle.c | 32 + + block/blk-wbt.c | 10 +- + block/blk.h | 20 +- + block/bounce.c | 39 +- + block/cmdline-parser.c | 255 --- + block/disk-events.c | 62 +- + block/elevator.c | 7 +- + block/genhd.c | 160 +- + block/holder.c | 167 ++ + block/ioctl.c | 16 +- + block/ioprio.c | 9 +- + block/mq-deadline.c | 2 + + block/partitions/Kconfig | 1 - + block/partitions/acorn.c | 4 +- + block/partitions/aix.c | 20 +- + block/partitions/amiga.c | 7 +- + block/partitions/atari.c | 4 +- + block/partitions/check.h | 2 +- + block/partitions/cmdline.c | 273 ++- + block/partitions/core.c | 73 +- + block/partitions/efi.c | 36 +- + block/partitions/ibm.c | 4 +- + block/partitions/ldm.c | 18 +- + block/partitions/mac.c | 2 +- + block/partitions/msdos.c | 6 +- + block/partitions/sgi.c | 5 +- + block/partitions/sun.c | 5 +- + block/t10-pi.c | 16 +- + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/ata/libahci.c | 1 + + drivers/ata/libata-core.c | 272 +-- + drivers/ata/libata-sata.c | 62 +- + drivers/ata/libata-scsi.c | 60 +- + drivers/ata/sata_dwc_460ex.c | 12 +- + drivers/block/brd.c | 3 - + drivers/block/drbd/drbd_nl.c | 2 +- + drivers/block/drbd/drbd_req.c | 5 +- + drivers/block/loop.c | 13 +- + drivers/block/nbd.c | 181 +- + drivers/block/null_blk/main.c | 4 - + drivers/block/pktcdvd.c | 8 +- + drivers/block/ps3disk.c | 18 +- + drivers/block/ps3vram.c | 2 +- + drivers/block/rbd.c | 18 +- + drivers/block/rnbd/rnbd-clt-sysfs.c | 33 +- + drivers/block/rnbd/rnbd-clt.c | 2 +- + drivers/block/rnbd/rnbd-srv-sysfs.c | 14 +- + drivers/block/sx8.c | 2 +- + drivers/block/virtio_blk.c | 7 +- + drivers/block/xen-blkfront.c | 1 - + drivers/lightnvm/Kconfig | 44 - + drivers/lightnvm/Makefile | 11 - + drivers/lightnvm/core.c | 1440 ------------- + drivers/lightnvm/pblk-cache.c | 137 -- + drivers/lightnvm/pblk-core.c | 2151 -------------------- + drivers/lightnvm/pblk-gc.c | 726 ------- + drivers/lightnvm/pblk-init.c | 1324 ------------ + drivers/lightnvm/pblk-map.c | 210 -- + drivers/lightnvm/pblk-rb.c | 858 -------- + drivers/lightnvm/pblk-read.c | 474 ----- + drivers/lightnvm/pblk-recovery.c | 874 -------- + drivers/lightnvm/pblk-rl.c | 254 --- + drivers/lightnvm/pblk-sysfs.c | 728 ------- + drivers/lightnvm/pblk-trace.h | 145 -- + drivers/lightnvm/pblk-write.c | 665 ------ + drivers/lightnvm/pblk.h | 1358 ------------ + drivers/md/Kconfig | 4 +- + drivers/md/bcache/Kconfig | 1 + + drivers/md/bcache/btree.c | 2 +- + drivers/md/bcache/super.c | 26 +- + drivers/md/bcache/util.h | 2 - + drivers/md/dm-ebs-target.c | 2 +- + drivers/md/dm-integrity.c | 4 +- + drivers/md/dm-ioctl.c | 4 - + drivers/md/dm-rq.c | 1 - + drivers/md/dm-table.c | 2 +- + drivers/md/dm-writecache.c | 5 +- + drivers/md/dm.c | 32 +- + drivers/md/md.h | 4 +- + drivers/mmc/core/block.c | 143 +- + drivers/nvme/host/Kconfig | 4 +- + drivers/nvme/host/Makefile | 1 - + drivers/nvme/host/core.c | 39 +- + drivers/nvme/host/fabrics.c | 1 - + drivers/nvme/host/ioctl.c | 4 +- + drivers/nvme/host/lightnvm.c | 1274 ------------ + drivers/nvme/host/multipath.c | 2 +- + drivers/nvme/host/nvme.h | 79 +- + drivers/nvme/host/pci.c | 187 +- + drivers/nvme/host/rdma.c | 8 +- + drivers/nvme/host/tcp.c | 44 +- + drivers/nvme/host/trace.c | 18 +- + drivers/nvme/target/Kconfig | 2 - + drivers/nvme/target/core.c | 1 + + drivers/nvme/target/fabrics-cmd.c | 38 +- + drivers/nvme/target/loop.c | 4 +- + drivers/nvme/target/trace.c | 18 +- + drivers/nvme/target/zns.c | 5 +- + drivers/s390/block/dasd_diag.c | 2 +- + drivers/s390/block/dasd_eckd.c | 14 +- + drivers/s390/block/dasd_fba.c | 4 +- + drivers/s390/block/dcssblk.c | 3 +- + drivers/scsi/sd.c | 2 +- + fs/block_dev.c | 259 +-- + fs/exec.c | 8 +- + fs/f2fs/sysfs.c | 2 +- + fs/fat/fatent.c | 1 + + fs/internal.h | 8 +- + fs/io-wq.c | 79 +- + fs/io-wq.h | 2 +- + fs/io_uring.c | 1500 ++++++++------ + fs/namei.c | 239 ++- + fs/nilfs2/super.c | 2 +- + fs/squashfs/block.c | 7 +- + fs/squashfs/lz4_wrapper.c | 2 +- + fs/squashfs/lzo_wrapper.c | 2 +- + fs/squashfs/xz_wrapper.c | 2 +- + fs/squashfs/zlib_wrapper.c | 2 +- + fs/squashfs/zstd_wrapper.c | 2 +- + fs/super.c | 2 +- + fs/xfs/xfs_buf.c | 2 +- + include/linux/backing-dev.h | 2 +- + include/linux/bio.h | 55 +- + include/linux/blk-cgroup.h | 4 +- + include/linux/blk-mq.h | 6 + + include/linux/blk_types.h | 5 +- + include/linux/blkdev.h | 28 +- + include/linux/bvec.h | 64 +- + include/linux/cmdline-parser.h | 46 - + include/linux/cpuhotplug.h | 1 + + include/linux/device-mapper.h | 1 - + include/linux/fs.h | 3 + + include/linux/genhd.h | 32 +- + include/linux/io_uring.h | 11 +- + include/linux/ioprio.h | 44 +- + include/linux/libata.h | 5 + + include/linux/lightnvm.h | 697 ------- + include/linux/moduleparam.h | 2 + + include/linux/writeback.h | 5 - + include/uapi/linux/fs.h | 1 + + include/uapi/linux/io_uring.h | 4 + + include/uapi/linux/ioprio.h | 52 + + include/uapi/linux/lightnvm.h | 224 -- + kernel/exit.c | 2 +- + kernel/params.c | 18 + + mm/backing-dev.c | 3 + + mm/page-writeback.c | 2 - + net/sunrpc/xprtsock.c | 18 - + 175 files changed, 3179 insertions(+), 16359 deletions(-) + delete mode 100644 Documentation/driver-api/lightnvm-pblk.rst + delete mode 100644 block/cmdline-parser.c + create mode 100644 block/holder.c + delete mode 100644 drivers/lightnvm/Kconfig + delete mode 100644 drivers/lightnvm/Makefile + delete mode 100644 drivers/lightnvm/core.c + delete mode 100644 drivers/lightnvm/pblk-cache.c + delete mode 100644 drivers/lightnvm/pblk-core.c + delete mode 100644 drivers/lightnvm/pblk-gc.c + delete mode 100644 drivers/lightnvm/pblk-init.c + delete mode 100644 drivers/lightnvm/pblk-map.c + delete mode 100644 drivers/lightnvm/pblk-rb.c + delete mode 100644 drivers/lightnvm/pblk-read.c + delete mode 100644 drivers/lightnvm/pblk-recovery.c + delete mode 100644 drivers/lightnvm/pblk-rl.c + delete mode 100644 drivers/lightnvm/pblk-sysfs.c + delete mode 100644 drivers/lightnvm/pblk-trace.h + delete mode 100644 drivers/lightnvm/pblk-write.c + delete mode 100644 drivers/lightnvm/pblk.h + delete mode 100644 drivers/nvme/host/lightnvm.c + delete mode 100644 include/linux/cmdline-parser.h + delete mode 100644 include/linux/lightnvm.h + create mode 100644 include/uapi/linux/ioprio.h + delete mode 100644 include/uapi/linux/lightnvm.h +Merging device-mapper/for-next (528b16bfc3ae dm crypt: Avoid percpu_counter spinlock contention in crypt_page_alloc()) +$ git merge device-mapper/for-next +Auto-merging include/linux/device-mapper.h +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-ebs-target.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/device-mapper/dm-ima.rst | 306 +++++++++ + Documentation/admin-guide/device-mapper/index.rst | 1 + + .../admin-guide/device-mapper/writecache.rst | 16 +- + drivers/md/Makefile | 4 + + drivers/md/dm-cache-target.c | 24 + + drivers/md/dm-clone-target.c | 5 + + drivers/md/dm-core.h | 5 + + drivers/md/dm-crypt.c | 34 +- + drivers/md/dm-delay.c | 4 + + drivers/md/dm-dust.c | 4 + + drivers/md/dm-ebs-target.c | 3 + + drivers/md/dm-era-target.c | 4 + + drivers/md/dm-flakey.c | 4 + + drivers/md/dm-ima.c | 705 +++++++++++++++++++++ + drivers/md/dm-ima.h | 68 ++ + drivers/md/dm-integrity.c | 25 + + drivers/md/dm-ioctl.c | 24 +- + drivers/md/dm-linear.c | 10 +- + drivers/md/dm-log-userspace-base.c | 3 + + drivers/md/dm-log-writes.c | 4 + + drivers/md/dm-log.c | 10 + + drivers/md/dm-mpath.c | 28 + + drivers/md/dm-ps-historical-service-time.c | 3 + + drivers/md/dm-ps-io-affinity.c | 3 + + drivers/md/dm-ps-queue-length.c | 3 + + drivers/md/dm-ps-round-robin.c | 4 + + drivers/md/dm-ps-service-time.c | 3 + + drivers/md/dm-raid.c | 39 ++ + drivers/md/dm-raid1.c | 17 + + drivers/md/dm-snap-persistent.c | 4 + + drivers/md/dm-snap-transient.c | 4 + + drivers/md/dm-snap.c | 13 + + drivers/md/dm-stripe.c | 15 + + drivers/md/dm-switch.c | 4 + + drivers/md/dm-thin.c | 8 + + drivers/md/dm-unstripe.c | 4 + + drivers/md/dm-verity-target.c | 41 ++ + drivers/md/dm-writecache.c | 467 ++++++++------ + drivers/md/dm-zoned-target.c | 3 + + drivers/md/dm.c | 3 + + include/linux/device-mapper.h | 6 +- + include/uapi/linux/dm-ioctl.h | 6 + + security/integrity/ima/ima_main.c | 1 + + 43 files changed, 1751 insertions(+), 191 deletions(-) + create mode 100644 Documentation/admin-guide/device-mapper/dm-ima.rst + create mode 100644 drivers/md/dm-ima.c + create mode 100644 drivers/md/dm-ima.h +Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (7d6fab2c3ea8 mmc: renesas_sdhi: Refactor renesas_sdhi_probe()) +$ git merge mmc/next +Removing include/linux/platform_data/mmc-esdhc-imx.h +Auto-merging drivers/mmc/core/block.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + + drivers/memstick/core/ms_block.c | 2 +- + drivers/mmc/core/block.c | 74 +++++------ + drivers/mmc/core/core.c | 13 +- + drivers/mmc/core/crypto.c | 15 +-- + drivers/mmc/core/host.c | 13 +- + drivers/mmc/core/host.h | 6 + + drivers/mmc/core/mmc_ops.c | 5 +- + drivers/mmc/core/mmc_ops.h | 1 + + drivers/mmc/core/sdio_cis.c | 22 +++- + drivers/mmc/host/cqhci-crypto.h | 7 +- + drivers/mmc/host/dw_mmc.c | 74 +++++++++++ + drivers/mmc/host/dw_mmc.h | 7 ++ + drivers/mmc/host/mmc_spi.c | 15 +-- + drivers/mmc/host/mmci.c | 3 + + drivers/mmc/host/moxart-mmc.c | 1 + + drivers/mmc/host/renesas_sdhi.h | 9 +- + drivers/mmc/host/renesas_sdhi_core.c | 90 +------------- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 135 +++++++++++++++++++-- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 7 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 36 ++++-- + drivers/mmc/host/sdhci-esdhc-imx.c | 33 ++++- + drivers/mmc/host/sdhci-msm.c | 3 + + drivers/mmc/host/sdhci-of-arasan.c | 51 ++++++-- + drivers/mmc/host/sdhci.c | 17 +-- + drivers/mmc/host/sdhci.h | 1 + + drivers/mmc/host/sh_mmcif.c | 4 +- + drivers/mmc/host/usdhi6rol0.c | 4 +- + include/linux/mmc/core.h | 3 +- + include/linux/platform_data/mmc-esdhc-imx.h | 42 ------- + 30 files changed, 439 insertions(+), 255 deletions(-) + delete mode 100644 include/linux/platform_data/mmc-esdhc-imx.h +Merging mfd/for-mfd-next (be722576fd63 dt-bindings: mfd: Add Broadcom CRU) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mfd/tps65086.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/axp20x.txt | 3 +- + .../devicetree/bindings/mfd/brcm,cru.yaml | 86 +++ + .../devicetree/bindings/mfd/qcom,pm8008.yaml | 13 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 3 + + .../devicetree/bindings/mfd/ti,tps65086.yaml | 124 ++++ + Documentation/devicetree/bindings/mfd/tps65086.txt | 54 -- + MAINTAINERS | 1 - + drivers/clk/ux500/u8500_of_clk.c | 3 +- + drivers/cpuidle/cpuidle-ux500.c | 2 +- + drivers/mfd/Kconfig | 28 + + drivers/mfd/Makefile | 5 + + drivers/mfd/ab8500-core.c | 2 +- + drivers/mfd/axp20x.c | 16 +- + .../{dbx500-prcmu-regs.h => db8500-prcmu-regs.h} | 0 + drivers/mfd/db8500-prcmu.c | 25 +- + drivers/mfd/intel-lpss-acpi.c | 18 + + drivers/mfd/intel-m10-bmc.c | 12 +- + drivers/mfd/lpc_ich.c | 1 + + drivers/mfd/mt6360-core.c | 8 +- + drivers/mfd/rsmu.h | 16 + + drivers/mfd/rsmu_core.c | 88 +++ + drivers/mfd/rsmu_i2c.c | 203 ++++++ + drivers/mfd/rsmu_spi.c | 273 ++++++++ + drivers/mfd/simple-mfd-i2c.c | 41 +- + drivers/mfd/simple-mfd-i2c.h | 32 + + drivers/mfd/stmpe.c | 4 +- + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/ti_am335x_tscadc.c | 5 +- + drivers/mfd/tps65086.c | 22 +- + drivers/mfd/tqmx86.c | 48 +- + drivers/mfd/wm8994-irq.c | 2 +- + include/linux/mfd/dbx500-prcmu.h | 3 +- + include/linux/mfd/idt82p33_reg.h | 112 ++++ + include/linux/mfd/idt8a340_reg.h | 729 +++++++++++++++++++++ + include/linux/mfd/rsmu.h | 36 + + 35 files changed, 1903 insertions(+), 117 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/brcm,cru.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,tps65086.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt + rename drivers/mfd/{dbx500-prcmu-regs.h => db8500-prcmu-regs.h} (100%) + create mode 100644 drivers/mfd/rsmu.h + create mode 100644 drivers/mfd/rsmu_core.c + create mode 100644 drivers/mfd/rsmu_i2c.c + create mode 100644 drivers/mfd/rsmu_spi.c + create mode 100644 drivers/mfd/simple-mfd-i2c.h + create mode 100644 include/linux/mfd/idt82p33_reg.h + create mode 100644 include/linux/mfd/idt8a340_reg.h + create mode 100644 include/linux/mfd/rsmu.h +Merging backlight/for-backlight-next (79fad92f2e59 backlight: pwm_bl: Improve bootloader/kernel device handover) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/ktd253-backlight.c | 75 ++++++++++++++++++++++-------- + drivers/video/backlight/pwm_bl.c | 54 ++++++++++----------- + 2 files changed, 83 insertions(+), 46 deletions(-) +Merging battery/for-next (eaa2c490514d power: supply: max17042_battery: log SOC threshold using debug log level) +$ git merge battery/for-next +Auto-merging drivers/power/supply/ab8500_fg.c +Auto-merging drivers/power/supply/ab8500_chargalg.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/battery.yaml | 14 + + .../bindings/power/supply/maxim,max17042.yaml | 3 + + .../bindings/power/supply/mt6360_charger.yaml | 48 ++ + .../power/supply/summit,smb347-charger.yaml | 30 + + .../supply/x-powers,axp20x-ac-power-supply.yaml | 11 +- + .../x-powers,axp20x-battery-power-supply.yaml | 12 +- + .../supply/x-powers,axp20x-usb-power-supply.yaml | 14 +- + drivers/iio/adc/rn5t618-adc.c | 23 + + drivers/power/reset/Kconfig | 6 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/linkstation-poweroff.c | 77 +- + drivers/power/reset/tps65086-restart.c | 98 +++ + drivers/power/supply/Kconfig | 26 +- + drivers/power/supply/Makefile | 4 +- + drivers/power/supply/ab8500-bm.h | 219 +----- + drivers/power/supply/ab8500_bmdata.c | 34 +- + drivers/power/supply/ab8500_btemp.c | 22 +- + .../{abx500_chargalg.c => ab8500_chargalg.c} | 601 +++++++------- + drivers/power/supply/ab8500_charger.c | 4 +- + drivers/power/supply/ab8500_fg.c | 20 +- + drivers/power/supply/axp288_charger.c | 11 +- + drivers/power/supply/axp288_fuel_gauge.c | 489 +++++------- + drivers/power/supply/bq24735-charger.c | 27 +- + drivers/power/supply/cros_peripheral_charger.c | 386 +++++++++ + drivers/power/supply/cw2015_battery.c | 4 +- + drivers/power/supply/max17042_battery.c | 61 +- + drivers/power/supply/mt6360_charger.c | 867 +++++++++++++++++++++ + drivers/power/supply/power_supply_core.c | 20 + + drivers/power/supply/qcom_smbb.c | 5 +- + drivers/power/supply/rn5t618_power.c | 38 + + drivers/power/supply/sbs-battery.c | 16 +- + drivers/power/supply/sc27xx_fuel_gauge.c | 4 +- + drivers/power/supply/smb347-charger.c | 271 ++++++- + include/dt-bindings/power/summit,smb347-charger.h | 4 + + include/linux/linear_range.h | 2 + + include/linux/platform_data/cros_ec_commands.h | 67 ++ + include/linux/power/max17042_battery.h | 12 +- + include/linux/power_supply.h | 1 + + lib/linear_ranges.c | 31 + + 39 files changed, 2646 insertions(+), 937 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml + create mode 100644 drivers/power/reset/tps65086-restart.c + rename drivers/power/supply/{abx500_chargalg.c => ab8500_chargalg.c} (74%) + create mode 100644 drivers/power/supply/cros_peripheral_charger.c + create mode 100644 drivers/power/supply/mt6360_charger.c +Merging regulator/for-next (aa9f92097dcc Merge remote-tracking branch 'regulator/for-5.15' into regulator-next) +$ git merge regulator/for-next +Removing Documentation/devicetree/bindings/regulator/uniphier-regulator.txt +Merge made by the 'recursive' strategy. + .../regulator/richtek,rtq2134-regulator.yaml | 106 ++++++ + .../regulator/richtek,rtq6752-regulator.yaml | 76 +++++ + .../regulator/socionext,uniphier-regulator.yaml | 85 +++++ + .../bindings/regulator/uniphier-regulator.txt | 58 ---- + drivers/regulator/Kconfig | 24 +- + drivers/regulator/Makefile | 2 + + drivers/regulator/bd718x7-regulator.c | 369 ++++++++++++++------ + drivers/regulator/da9063-regulator.c | 132 +++++++- + drivers/regulator/dbx500-prcmu.c | 4 +- + drivers/regulator/devres.c | 69 +--- + drivers/regulator/fixed.c | 5 +- + drivers/regulator/hi6421v600-regulator.c | 30 +- + drivers/regulator/mt6358-regulator.c | 87 +++-- + drivers/regulator/mt6359-regulator.c | 19 +- + drivers/regulator/mt6397-regulator.c | 15 +- + drivers/regulator/rt5033-regulator.c | 21 +- + drivers/regulator/rt6245-regulator.c | 2 +- + drivers/regulator/rtq2134-regulator.c | 373 +++++++++++++++++++++ + drivers/regulator/rtq6752-regulator.c | 289 ++++++++++++++++ + drivers/regulator/sy7636a-regulator.c | 41 ++- + drivers/regulator/sy8824x.c | 16 +- + drivers/regulator/sy8827n.c | 14 + + drivers/regulator/tps65910-regulator.c | 10 +- + include/linux/mfd/rt5033-private.h | 4 +- + include/linux/regulator/consumer.h | 15 - + include/linux/regulator/driver.h | 9 +- + include/linux/regulator/machine.h | 2 +- + 27 files changed, 1504 insertions(+), 373 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rtq2134-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rtq6752-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/uniphier-regulator.txt + create mode 100644 drivers/regulator/rtq2134-regulator.c + create mode 100644 drivers/regulator/rtq6752-regulator.c +Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) +$ git merge security/next-testing +Already up to date. +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) +$ git merge 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 (d07eeeb87459 Merge branch 'restrict-digest-alg-v8' into next-integrity) +$ git merge integrity/next-integrity +Auto-merging security/integrity/ima/ima_main.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 15 ++- + include/linux/ima.h | 23 +++- + security/integrity/ima/Kconfig | 1 - + security/integrity/ima/ima.h | 24 ++-- + security/integrity/ima/ima_api.c | 6 +- + security/integrity/ima/ima_appraise.c | 75 +++++++++++- + security/integrity/ima/ima_asymmetric_keys.c | 2 +- + security/integrity/ima/ima_init.c | 3 +- + security/integrity/ima/ima_main.c | 89 ++++++++++---- + security/integrity/ima/ima_mok.c | 2 +- + security/integrity/ima/ima_policy.c | 174 ++++++++++++++++++++++++--- + security/integrity/ima/ima_queue_keys.c | 2 +- + security/selinux/ima.c | 6 +- + 13 files changed, 348 insertions(+), 74 deletions(-) +$ git am -3 ../patches/0001-dm-ima-fix-for-ima-Add-digest-and-digest_len-params-.patch +Applying: dm ima: fix for "ima: Add digest and digest_len params to the functions to measure a buffer" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/dm-ima.c +$ git add -A . +$ git commit -v -a --amend +[master f3b5ecee743e] Merge remote-tracking branch 'integrity/next-integrity' + Date: Fri Aug 20 13:17:38 2021 +1000 +Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) +$ git merge 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 de2b7d9f2ac9] Merge remote-tracking branch 'keys/keys-next' +$ git diff -M --stat --summary HEAD^.. +Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) +$ git merge safesetid/safesetid-next +Already up to date. +Merging selinux/next (893c47d1964f selinux: return early for possible NULL audit buffers) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 4 ++++ + security/selinux/ss/services.c | 2 ++ + 2 files changed, 6 insertions(+) +Merging smack/next (bfc3cac0c761 smack: mark 'smack_enabled' global variable as __initdata) +$ git merge smack/next +Merge made by the 'recursive' strategy. + security/smack/smack.h | 2 +- + security/smack/smack_access.c | 17 ++++++++--------- + security/smack/smack_lsm.c | 2 +- + 3 files changed, 10 insertions(+), 11 deletions(-) +Merging tomoyo/master (ff1176468d36 Linux 5.14-rc3) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (ada16d6b0f0a tpm: ibmvtpm: Avoid error message when process gets signal while waiting) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + certs/Kconfig | 26 ++++++++++++++++++++++++++ + certs/Makefile | 21 +++++++++++++++++++++ + crypto/asymmetric_keys/pkcs7_parser.c | 8 ++++++++ + drivers/char/tpm/Kconfig | 1 - + drivers/char/tpm/tpm_ibmvtpm.c | 26 +++++++++++++++----------- + drivers/char/tpm/tpm_ibmvtpm.h | 2 +- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 12 ++---------- + 7 files changed, 73 insertions(+), 23 deletions(-) +Merging watchdog/master (cf813c67d961 watchdog: iTCO_wdt: use dev_err() instead of pr_err()) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (cf1f65a86d45 Merge branches 'apple/dart', 'arm/smmu', 'iommu/fixes', 'x86/amd' and 'x86/vt-d' into next) +$ git merge iommu/next +Auto-merging include/linux/iommu.h +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/iommu/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-kernel-iommu_groups | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 29 +- + .../devicetree/bindings/iommu/apple,dart.yaml | 81 ++ + MAINTAINERS | 7 + + drivers/iommu/Kconfig | 69 +- + drivers/iommu/Makefile | 1 + + drivers/iommu/amd/amd_iommu_types.h | 6 - + drivers/iommu/amd/init.c | 12 +- + drivers/iommu/amd/io_pgtable.c | 3 - + drivers/iommu/amd/iommu.c | 151 +++- + drivers/iommu/amd/iommu_v2.c | 13 +- + drivers/iommu/apple-dart.c | 923 +++++++++++++++++++++ + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 121 +-- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 11 + + drivers/iommu/arm/arm-smmu/arm-smmu.c | 85 +- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 1 + + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 9 - + drivers/iommu/dma-iommu.c | 52 +- + drivers/iommu/exynos-iommu.c | 19 +- + drivers/iommu/intel/Kconfig | 19 +- + drivers/iommu/intel/dmar.c | 2 - + drivers/iommu/intel/iommu.c | 197 ++--- + drivers/iommu/intel/pasid.c | 28 +- + drivers/iommu/intel/pasid.h | 16 +- + drivers/iommu/intel/perf.c | 2 +- + drivers/iommu/intel/svm.c | 7 +- + drivers/iommu/io-pgtable-arm-v7s.c | 62 +- + drivers/iommu/io-pgtable-arm.c | 282 +++++-- + drivers/iommu/io-pgtable.c | 1 + + drivers/iommu/iommu.c | 198 +++-- + drivers/iommu/iova.c | 14 +- + drivers/iommu/ipmmu-vmsa.c | 28 +- + drivers/iommu/mtk_iommu.c | 13 +- + drivers/iommu/mtk_iommu_v1.c | 1 - + drivers/iommu/rockchip-iommu.c | 12 +- + drivers/iommu/sprd-iommu.c | 7 - + drivers/iommu/sun50i-iommu.c | 13 +- + drivers/iommu/virtio-iommu.c | 8 - + include/linux/dma-iommu.h | 6 + + include/linux/intel-iommu.h | 6 +- + include/linux/intel-svm.h | 5 + + include/linux/io-pgtable.h | 20 +- + include/linux/iommu.h | 106 ++- + 43 files changed, 2042 insertions(+), 610 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/apple,dart.yaml + create mode 100644 drivers/iommu/apple-dart.c +Merging audit/next (d97e99386ad0 audit: add header protection to kernel/audit.h) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.h | 5 +++++ + 1 file changed, 5 insertions(+) +Merging devicetree/for-next (ec6c6c9c1386 dt-bindings: eeprom-93xx46: Convert to json schema) +$ git merge devicetree/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/timer/energymicro,efm32-timer.txt +Removing Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.txt +Removing Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.txt +Removing Documentation/devicetree/bindings/pci/kirin-pcie.txt +Removing Documentation/devicetree/bindings/pci/faraday,ftpci100.txt +Removing Documentation/devicetree/bindings/pci/designware-pcie.txt +Removing Documentation/devicetree/bindings/nvmem/uniphier-efuse.txt +Removing Documentation/devicetree/bindings/net/micrel-ks8851.txt +Removing Documentation/devicetree/bindings/misc/eeprom-93xx46.txt +Removing Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt +Removing Documentation/devicetree/bindings/memory-controllers/synopsys.txt +Removing Documentation/devicetree/bindings/memory-controllers/mvebu-sdram-controller.txt +Removing Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt +Removing Documentation/devicetree/bindings/memory-controllers/ath79-ddr-controller.txt +Removing Documentation/devicetree/bindings/interrupt-controller/samsung,exynos4210-combiner.txt +Removing Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.txt +Auto-merging Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml +Removing Documentation/devicetree/bindings/fpga/xlnx,zynqmp-pcap-fpga.txt +Auto-merging Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +Removing Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt +Removing Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt +Removing Documentation/devicetree/bindings/ata/exynos-sata.txt +CONFLICT (modify/delete): Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt left in tree. +Removing Documentation/devicetree/bindings/arm/gemini.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt +rm 'Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt' +$ git commit --no-edit -v -a +[master 398b1d6d1081] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/gemini.txt | 108 ------------- + Documentation/devicetree/bindings/arm/gemini.yaml | 95 +++++++++++ + .../bindings/arm/mediatek/mediatek,mmsys.txt | 32 ---- + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 58 +++++++ + .../devicetree/bindings/ata/exynos-sata.txt | 30 ---- + .../bindings/auxdisplay/arm,versatile-lcd.yaml | 44 ++++++ + .../devicetree/bindings/auxdisplay/arm-charlcd.txt | 18 --- + .../bindings/auxdisplay/img,ascii-lcd.yaml | 55 +++++++ + .../bindings/auxdisplay/img-ascii-lcd.txt | 17 -- + .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 2 - + .../bindings/display/bridge/ti,sn65dsi83.yaml | 6 +- + .../devicetree/bindings/display/fsl,lcdif.yaml | 1 + + .../bindings/display/msm/dsi-controller-main.yaml | 6 +- + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 1 - + .../bindings/fpga/xlnx,zynqmp-pcap-fpga.txt | 25 --- + .../bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml | 36 +++++ + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 1 + + .../devicetree/bindings/i2c/brcm,iproc-i2c.txt | 46 ------ + .../devicetree/bindings/i2c/brcm,iproc-i2c.yaml | 71 +++++++++ + .../samsung,exynos4210-combiner.txt | 50 ------ + .../samsung,exynos4210-combiner.yaml | 96 ++++++++++++ + .../interrupt-controller/ti,pruss-intc.yaml | 4 +- + .../devicetree/bindings/media/atmel,isc.yaml | 3 +- + .../devicetree/bindings/media/microchip,xisc.yaml | 2 +- + .../bindings/media/nxp,imx7-mipi-csi2.yaml | 2 - + .../devicetree/bindings/media/renesas,drif.yaml | 3 +- + .../memory-controllers/ath79-ddr-controller.txt | 35 ----- + .../bindings/memory-controllers/brcm,dpfe-cpu.txt | 27 ---- + .../bindings/memory-controllers/brcm,dpfe-cpu.yaml | 48 ++++++ + .../marvell,mvebu-sdram-controller.yaml | 31 ++++ + .../memory-controllers/mvebu-sdram-controller.txt | 21 --- + .../qca,ath79-ddr-controller.yaml | 61 ++++++++ + .../memory-controllers/renesas,rpc-if.yaml | 17 +- + .../memory-controllers/synopsys,ddrc-ecc.yaml | 73 +++++++++ + .../bindings/memory-controllers/synopsys.txt | 32 ---- + .../memory-controllers/ti,da8xx-ddrctl.yaml | 35 +++++ + .../memory-controllers/ti-da8xx-ddrctl.txt | 20 --- + .../devicetree/bindings/misc/eeprom-93xx46.txt | 29 ---- + .../devicetree/bindings/misc/eeprom-93xx46.yaml | 70 +++++++++ + Documentation/devicetree/bindings/mtd/gpmc-nor.txt | 4 +- + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 1 - + .../bindings/net/intel,ixp4xx-ethernet.yaml | 2 - + .../devicetree/bindings/net/micrel,ks8851.yaml | 96 ++++++++++++ + .../devicetree/bindings/net/micrel-ks8851.txt | 18 --- + .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 4 +- + .../bindings/net/nfc/samsung,s3fwrn5.yaml | 3 - + .../devicetree/bindings/net/qca,ar71xx.yaml | 25 +-- + .../devicetree/bindings/net/renesas,etheravb.yaml | 57 +++++-- + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 2 +- + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 95 +++++++++++ + .../devicetree/bindings/nvmem/uniphier-efuse.txt | 49 ------ + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 4 +- + .../devicetree/bindings/pci/axis,artpec6-pcie.txt | 2 +- + .../devicetree/bindings/pci/designware-pcie.txt | 77 --------- + .../devicetree/bindings/pci/faraday,ftpci100.txt | 135 ---------------- + .../devicetree/bindings/pci/faraday,ftpci100.yaml | 174 +++++++++++++++++++++ + .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 2 +- + .../bindings/pci/hisilicon,kirin-pcie.yaml | 167 ++++++++++++++++++++ + .../bindings/pci/hisilicon-histb-pcie.txt | 2 +- + .../devicetree/bindings/pci/intel-gw-pcie.yaml | 36 +---- + .../devicetree/bindings/pci/kirin-pcie.txt | 50 ------ + .../devicetree/bindings/pci/layerscape-pci.txt | 2 +- + .../bindings/pci/nvidia,tegra194-pcie.txt | 5 +- + .../devicetree/bindings/pci/pci-armada8k.txt | 2 +- + Documentation/devicetree/bindings/pci/pcie-al.txt | 2 +- + .../devicetree/bindings/pci/qcom,pcie.txt | 14 +- + .../bindings/pci/samsung,exynos-pcie.yaml | 4 +- + .../devicetree/bindings/pci/sifive,fu740-pcie.yaml | 4 +- + .../devicetree/bindings/pci/snps,dw-pcie-ep.yaml | 90 +++++++++++ + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 102 ++++++++++++ + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 4 +- + Documentation/devicetree/bindings/pci/ti-pci.txt | 4 +- + .../bindings/pci/toshiba,visconti-pcie.yaml | 110 +++++++++++++ + .../devicetree/bindings/pci/uniphier-pcie.txt | 2 +- + .../bindings/phy/hisilicon,phy-hi3670-pcie.yaml | 82 ++++++++++ + .../bindings/power/reset/xlnx,zynqmp-power.txt | 61 -------- + .../bindings/power/reset/xlnx,zynqmp-power.yaml | 83 ++++++++++ + .../regulator/richtek,rt6245-regulator.yaml | 1 - + .../regulator/vqmmc-ipq4019-regulator.yaml | 1 - + .../bindings/reset/hisilicon,hi3660-reset.yaml | 1 - + .../devicetree/bindings/reset/intel,rcu-gw.yaml | 1 - + .../devicetree/bindings/riscv/sifive-l2-cache.yaml | 8 +- + Documentation/devicetree/bindings/rng/mtk-rng.yaml | 1 + + .../bindings/rng/samsung,exynos5250-trng.txt | 17 -- + .../bindings/rng/samsung,exynos5250-trng.yaml | 44 ++++++ + .../bindings/rtc/microcrystal,rv3032.yaml | 1 - + .../bindings/soc/litex/litex,soc-controller.yaml | 1 - + .../devicetree/bindings/sound/st,stm32-sai.yaml | 2 - + .../bindings/sound/ti,j721e-cpb-audio.yaml | 2 - + .../bindings/sound/ti,j721e-cpb-ivi-audio.yaml | 2 - + .../bindings/timer/energymicro,efm32-timer.txt | 23 --- + .../devicetree/bindings/vendor-prefixes.yaml | 10 ++ + MAINTAINERS | 14 +- + drivers/of/base.c | 4 +- + drivers/of/fdt.c | 43 ++--- + drivers/of/kexec.c | 40 ++--- + drivers/of/property.c | 10 ++ + include/linux/of_fdt.h | 3 - + 98 files changed, 2000 insertions(+), 1116 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/gemini.txt + create mode 100644 Documentation/devicetree/bindings/arm/gemini.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/exynos-sata.txt + create mode 100644 Documentation/devicetree/bindings/auxdisplay/arm,versatile-lcd.yaml + delete mode 100644 Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt + create mode 100644 Documentation/devicetree/bindings/auxdisplay/img,ascii-lcd.yaml + delete mode 100644 Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt + delete mode 100644 Documentation/devicetree/bindings/fpga/xlnx,zynqmp-pcap-fpga.txt + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.txt + create mode 100644 Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/samsung,exynos4210-combiner.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/samsung,exynos4210-combiner.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ath79-ddr-controller.txt + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/marvell,mvebu-sdram-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-sdram-controller.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/qca,ath79-ddr-controller.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/synopsys,ddrc-ecc.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/synopsys.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ti,da8xx-ddrctl.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ti-da8xx-ddrctl.txt + delete mode 100644 Documentation/devicetree/bindings/misc/eeprom-93xx46.txt + create mode 100644 Documentation/devicetree/bindings/misc/eeprom-93xx46.yaml + create mode 100644 Documentation/devicetree/bindings/net/micrel,ks8851.yaml + delete mode 100644 Documentation/devicetree/bindings/net/micrel-ks8851.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/socionext,uniphier-efuse.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/uniphier-efuse.txt + delete mode 100644 Documentation/devicetree/bindings/pci/designware-pcie.txt + delete mode 100644 Documentation/devicetree/bindings/pci/faraday,ftpci100.txt + create mode 100644 Documentation/devicetree/bindings/pci/faraday,ftpci100.yaml + create mode 100644 Documentation/devicetree/bindings/pci/hisilicon,kirin-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/kirin-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/phy/hisilicon,phy-hi3670-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.yaml + delete mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.txt + create mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos5250-trng.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/energymicro,efm32-timer.txt +$ git am -3 ../patches/0001-dt-bindings-arm-mediatek-mmsys-fixup-for-conversion-.patch +Applying: dt-bindings: arm: mediatek: mmsys: fixup for conversion to yaml +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +$ git add -A . +$ git commit -v -a --amend +[master d6f51cf671ef] Merge remote-tracking branch 'devicetree/for-next' + Date: Fri Aug 20 13:30:57 2021 +1000 +Merging mailbox/mailbox-for-next (4f197188da66 MAINTAINERS: add entry for polarfire soc mailbox) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (5d14499b5016 Merge remote-tracking branch 'spi/for-5.15' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi.c +Auto-merging drivers/spi/spi-imx.c +Removing Documentation/devicetree/bindings/spi/omap-spi.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/fsi/ibm,fsi2spi.yaml | 1 - + Documentation/devicetree/bindings/spi/omap-spi.txt | 48 -- + .../devicetree/bindings/spi/omap-spi.yaml | 117 ++++ + .../devicetree/bindings/spi/rockchip-sfc.yaml | 91 +++ + .../devicetree/bindings/spi/spi-mt65xx.txt | 1 + + drivers/spi/Kconfig | 12 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-bcm2835aux.c | 4 +- + drivers/spi/spi-ep93xx.c | 4 +- + drivers/spi/spi-fsi.c | 125 +--- + drivers/spi/spi-fsl-dspi.c | 1 + + drivers/spi/spi-geni-qcom.c | 6 - + drivers/spi/spi-imx.c | 21 +- + drivers/spi/spi-mt65xx.c | 159 +++-- + drivers/spi/spi-mxic.c | 44 +- + drivers/spi/spi-pic32.c | 1 + + drivers/spi/spi-pxa2xx.c | 35 +- + drivers/spi/spi-rockchip-sfc.c | 694 +++++++++++++++++++++ + drivers/spi/spi-stm32.c | 122 ++-- + drivers/spi/spi-tegra114.c | 8 +- + drivers/spi/spi-tegra20-slink.c | 77 +-- + drivers/spi/spi.c | 6 +- + include/linux/platform_data/spi-mt65xx.h | 1 + + include/linux/spi/spi.h | 26 +- + 24 files changed, 1203 insertions(+), 402 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/spi/omap-spi.txt + create mode 100644 Documentation/devicetree/bindings/spi/omap-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/rockchip-sfc.yaml + create mode 100644 drivers/spi/spi-rockchip-sfc.c +Merging tip/auto-latest (a27fdfde0570 Merge branch 'locking/core') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Removing kernel/locking/mutex-debug.h +Auto-merging include/uapi/linux/prctl.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/cpuhotplug.h +Auto-merging include/asm-generic/bitops/non-atomic.h +CONFLICT (content): Merge conflict in include/asm-generic/bitops/non-atomic.h +Removing include/asm-generic/atomic-long.h +Auto-merging block/blk-mq.c +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'include/asm-generic/bitops/non-atomic.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ecbc85817445] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../testing/sysfs-bus-event_source-devices-uncore | 13 + + Documentation/admin-guide/hw-vuln/index.rst | 1 + + Documentation/admin-guide/hw-vuln/l1d_flush.rst | 69 ++ + Documentation/admin-guide/kernel-parameters.txt | 19 +- + Documentation/atomic_t.txt | 94 ++ + Documentation/userspace-api/spec_ctrl.rst | 8 + + Documentation/x86/x86_64/boot-options.rst | 11 +- + arch/Kconfig | 3 + + arch/s390/pci/pci_irq.c | 4 - + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 53 +- + arch/x86/events/core.c | 4 +- + arch/x86/events/intel/core.c | 8 +- + arch/x86/events/intel/pt.c | 4 +- + arch/x86/events/intel/uncore.c | 45 +- + arch/x86/events/intel/uncore.h | 4 + + arch/x86/events/intel/uncore_discovery.c | 42 +- + arch/x86/events/intel/uncore_discovery.h | 21 + + arch/x86/events/intel/uncore_snbep.c | 585 +++++++++- + arch/x86/include/asm/i8259.h | 2 + + arch/x86/include/asm/nospec-branch.h | 2 + + arch/x86/include/asm/pc-conf-reg.h | 33 + + arch/x86/include/asm/processor-cyrix.h | 8 +- + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/thread_info.h | 6 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/kernel/acpi/boot.c | 12 +- + arch/x86/kernel/apic/apic.c | 9 +- + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/cpu/bugs.c | 70 ++ + arch/x86/kernel/cpu/mce/inject.c | 8 +- + arch/x86/kernel/cpu/microcode/core.c | 18 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 8 +- + arch/x86/kernel/cpu/resctrl/core.c | 276 ++--- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 163 ++- + arch/x86/kernel/cpu/resctrl/internal.h | 231 ++-- + arch/x86/kernel/cpu/resctrl/monitor.c | 44 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 12 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 461 ++++---- + arch/x86/kernel/i8259.c | 8 +- + arch/x86/kernel/mpparse.c | 3 +- + arch/x86/kernel/reboot.c | 3 +- + arch/x86/kernel/smpboot.c | 10 +- + arch/x86/kvm/i8259.c | 20 +- + arch/x86/kvm/irq.h | 2 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/pc-conf-reg.c | 13 + + arch/x86/mm/mmio-mod.c | 4 +- + arch/x86/mm/tlb.c | 107 +- + arch/x86/pci/irq.c | 279 ++++- + arch/x86/power/cpu.c | 31 +- + block/blk-mq.c | 2 +- + drivers/pci/msi.c | 183 ++-- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 4 +- + fs/timerfd.c | 16 + + include/asm-generic/atomic-long.h | 1014 ----------------- + include/asm-generic/bitops/atomic.h | 32 +- + include/asm-generic/bitops/lock.h | 39 +- + include/asm-generic/bitops/non-atomic.h | 39 +- + include/linux/atomic.h | 7 +- + include/linux/{ => atomic}/atomic-arch-fallback.h | 0 + .../atomic}/atomic-instrumented.h | 586 +++++++++- + include/linux/atomic/atomic-long.h | 1014 +++++++++++++++++ + include/linux/cpuhotplug.h | 2 +- + include/linux/debug_locks.h | 3 +- + include/linux/hrtimer.h | 8 +- + include/linux/interrupt.h | 8 +- + include/linux/local_lock_internal.h | 86 +- + include/linux/msi.h | 10 +- + include/linux/mutex.h | 92 +- + include/linux/pci_ids.h | 2 + + include/linux/posix-timers.h | 11 +- + include/linux/preempt.h | 4 + + include/linux/rbtree.h | 31 +- + include/linux/rbtree_types.h | 34 + + include/linux/resctrl.h | 184 ++++ + include/linux/rtmutex.h | 63 +- + include/linux/rwbase_rt.h | 39 + + include/linux/rwlock_rt.h | 140 +++ + include/linux/rwlock_types.h | 53 +- + include/linux/rwsem.h | 78 +- + include/linux/sched.h | 129 ++- + include/linux/sched/signal.h | 6 + + include/linux/sched/sysctl.h | 18 - + include/linux/sched/wake_q.h | 7 +- + include/linux/spinlock.h | 15 +- + include/linux/spinlock_api_smp.h | 3 + + include/linux/spinlock_rt.h | 159 +++ + include/linux/spinlock_types.h | 89 +- + include/linux/spinlock_types_raw.h | 73 ++ + include/linux/static_call.h | 33 + + include/linux/wait.h | 2 +- + include/linux/ww_mutex.h | 50 +- + include/uapi/linux/prctl.h | 1 + + kernel/Kconfig.locks | 2 +- + kernel/cpu.c | 84 +- + kernel/events/hw_breakpoint.c | 4 +- + kernel/futex.c | 556 +++++++--- + kernel/irq/affinity.c | 8 +- + kernel/irq/generic-chip.c | 17 +- + kernel/irq/ipi.c | 32 +- + kernel/irq/irqdesc.c | 2 +- + kernel/irq/manage.c | 19 +- + kernel/irq/matrix.c | 3 +- + kernel/irq/msi.c | 19 +- + kernel/irq/pm.c | 2 +- + kernel/irq/proc.c | 2 +- + kernel/irq/timings.c | 2 + + kernel/locking/Makefile | 3 +- + kernel/locking/mutex-debug.c | 5 +- + kernel/locking/mutex-debug.h | 29 - + kernel/locking/mutex.c | 541 ++-------- + kernel/locking/mutex.h | 48 +- + kernel/locking/rtmutex.c | 1134 +++++++++----------- + kernel/locking/rtmutex_api.c | 590 ++++++++++ + kernel/locking/rtmutex_common.h | 122 ++- + kernel/locking/rwbase_rt.c | 263 +++++ + kernel/locking/rwsem.c | 115 +- + kernel/locking/spinlock.c | 7 + + kernel/locking/spinlock_debug.c | 5 + + kernel/locking/spinlock_rt.c | 263 +++++ + kernel/locking/ww_mutex.h | 569 ++++++++++ + kernel/locking/ww_rt_mutex.c | 76 ++ + kernel/rcu/tree_plugin.h | 6 +- + kernel/sched/core.c | 166 ++- + kernel/sched/deadline.c | 8 +- + kernel/sched/debug.c | 7 + + kernel/sched/fair.c | 14 +- + kernel/sched/sched.h | 17 + + kernel/signal.c | 15 + + kernel/smp.c | 14 +- + kernel/smpboot.c | 8 +- + kernel/softirq.c | 2 +- + kernel/time/clocksource.c | 6 +- + kernel/time/hrtimer.c | 340 ++++-- + kernel/time/posix-cpu-timers.c | 90 +- + kernel/time/posix-timers.c | 2 +- + kernel/time/tick-common.c | 7 + + kernel/time/tick-internal.h | 12 + + kernel/time/timekeeping.c | 36 +- + lib/Kconfig.debug | 11 +- + lib/debugobjects.c | 7 +- + lib/test_lockup.c | 8 +- + scripts/atomic/check-atomics.sh | 6 +- + scripts/atomic/fallbacks/acquire | 4 +- + scripts/atomic/fallbacks/add_negative | 6 +- + scripts/atomic/fallbacks/add_unless | 6 +- + scripts/atomic/fallbacks/andnot | 4 +- + scripts/atomic/fallbacks/dec | 4 +- + scripts/atomic/fallbacks/dec_and_test | 6 +- + scripts/atomic/fallbacks/dec_if_positive | 6 +- + scripts/atomic/fallbacks/dec_unless_positive | 6 +- + scripts/atomic/fallbacks/fence | 4 +- + scripts/atomic/fallbacks/fetch_add_unless | 8 +- + scripts/atomic/fallbacks/inc | 4 +- + scripts/atomic/fallbacks/inc_and_test | 6 +- + scripts/atomic/fallbacks/inc_not_zero | 6 +- + scripts/atomic/fallbacks/inc_unless_negative | 6 +- + scripts/atomic/fallbacks/read_acquire | 2 +- + scripts/atomic/fallbacks/release | 4 +- + scripts/atomic/fallbacks/set_release | 2 +- + scripts/atomic/fallbacks/sub_and_test | 6 +- + scripts/atomic/fallbacks/try_cmpxchg | 4 +- + scripts/atomic/gen-atomic-fallback.sh | 68 +- + scripts/atomic/gen-atomic-instrumented.sh | 11 +- + scripts/atomic/gen-atomic-long.sh | 10 +- + scripts/atomic/gen-atomics.sh | 6 +- + 168 files changed, 8740 insertions(+), 3963 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore + create mode 100644 Documentation/admin-guide/hw-vuln/l1d_flush.rst + create mode 100644 arch/x86/include/asm/pc-conf-reg.h + create mode 100644 arch/x86/lib/pc-conf-reg.c + delete mode 100644 include/asm-generic/atomic-long.h + rename include/linux/{ => atomic}/atomic-arch-fallback.h (100%) + rename include/{asm-generic => linux/atomic}/atomic-instrumented.h (68%) + create mode 100644 include/linux/atomic/atomic-long.h + create mode 100644 include/linux/rbtree_types.h + create mode 100644 include/linux/rwbase_rt.h + create mode 100644 include/linux/rwlock_rt.h + create mode 100644 include/linux/spinlock_rt.h + create mode 100644 include/linux/spinlock_types_raw.h + delete mode 100644 kernel/locking/mutex-debug.h + create mode 100644 kernel/locking/rtmutex_api.c + create mode 100644 kernel/locking/rwbase_rt.c + create mode 100644 kernel/locking/spinlock_rt.c + create mode 100644 kernel/locking/ww_mutex.h + create mode 100644 kernel/locking/ww_rt_mutex.c +Merging clockevents/timers/drivers/next (631c7c0df0ef dt-bindings: timer: Add ABIs for new Ingenic SoCs) +$ git merge clockevents/timers/drivers/next +Removing Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt +Merge made by the 'recursive' strategy. + .../bindings/timer/rockchip,rk-timer.txt | 27 --------- + .../bindings/timer/rockchip,rk-timer.yaml | 64 ++++++++++++++++++++++ + drivers/clocksource/exynos_mct.c | 16 +++++- + drivers/clocksource/ingenic-sysost.c | 13 +++-- + drivers/clocksource/sh_cmt.c | 30 ++++++---- + drivers/clocksource/timer-fttmr010.c | 61 +++++++++++++-------- + drivers/clocksource/timer-mediatek.c | 8 ++- + include/dt-bindings/clock/ingenic,sysost.h | 19 +++++++ + 8 files changed, 166 insertions(+), 72 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml +Merging edac/edac-for-next (7d07deb3b838 EDAC/altera: Skip defining unused structures for specific configs) +$ git merge edac/edac-for-next +Merge made by the 'recursive' strategy. + drivers/edac/altera_edac.c | 44 ++++++++++++++++++++++++++------------------ + drivers/edac/amd64_edac.c | 21 ++++++++------------- + drivers/edac/edac_mc.c | 1 + + drivers/edac/mce_amd.c | 3 +++ + include/linux/edac.h | 3 +++ + 5 files changed, 41 insertions(+), 31 deletions(-) +Merging irqchip/irq/irqchip-next (cf39e60c83f1 Merge branch irq/generic_handle_domain_irq into irq/irqchip-next) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging drivers/mfd/db8500-prcmu.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +Auto-merging drivers/gpio/gpio-tqmx86.c +Auto-merging drivers/gpio/gpio-mpc8xxx.c +Auto-merging drivers/edac/altera_edac.c +Auto-merging arch/arm/common/sa1111.c +Merge made by the 'recursive' strategy. + Documentation/core-api/irq/irq-domain.rst | 28 +- + .../bindings/gpio/rockchip,gpio-bank.yaml | 5 +- + arch/arc/kernel/mcip.c | 2 +- + arch/arm/common/sa1111.c | 12 +- + arch/arm/mach-pxa/pxa_cplds_irqs.c | 6 +- + arch/arm/mach-s3c/irq-s3c24xx.c | 5 +- + arch/mips/ath25/ar2315.c | 14 +- + arch/mips/ath25/ar5312.c | 13 +- + arch/mips/lantiq/irq.c | 2 +- + arch/mips/pci/pci-ar2315.c | 8 +- + arch/mips/pci/pci-rt3883.c | 5 +- + arch/mips/ralink/irq.c | 2 +- + arch/mips/sgi-ip27/ip27-irq.c | 16 +- + arch/mips/sgi-ip30/ip30-irq.c | 8 +- + arch/nios2/kernel/irq.c | 4 +- + arch/sh/boards/mach-se/7343/irq.c | 2 +- + arch/sh/boards/mach-se/7722/irq.c | 2 +- + arch/sh/boards/mach-x3proto/gpio.c | 2 +- + arch/xtensa/kernel/irq.c | 4 +- + drivers/edac/altera_edac.c | 7 +- + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-104-dio-48e.c | 4 +- + drivers/gpio/gpio-104-idi-48.c | 4 +- + drivers/gpio/gpio-104-idio-16.c | 2 +- + drivers/gpio/gpio-altera.c | 11 +- + drivers/gpio/gpio-aspeed-sgpio.c | 9 +- + drivers/gpio/gpio-aspeed.c | 9 +- + drivers/gpio/gpio-ath79.c | 7 +- + drivers/gpio/gpio-bcm-kona.c | 6 +- + drivers/gpio/gpio-brcmstb.c | 5 +- + drivers/gpio/gpio-cadence.c | 2 +- + drivers/gpio/gpio-davinci.c | 3 +- + drivers/gpio/gpio-dln2.c | 22 +- + drivers/gpio/gpio-em.c | 2 +- + drivers/gpio/gpio-ep93xx.c | 8 +- + drivers/gpio/gpio-ftgpio010.c | 3 +- + drivers/gpio/gpio-hisi.c | 4 +- + drivers/gpio/gpio-hlwd.c | 7 +- + drivers/gpio/gpio-merrifield.c | 8 +- + drivers/gpio/gpio-mpc8xxx.c | 2 +- + drivers/gpio/gpio-mt7621.c | 4 +- + drivers/gpio/gpio-mxc.c | 2 +- + drivers/gpio/gpio-mxs.c | 2 +- + drivers/gpio/gpio-omap.c | 3 +- + drivers/gpio/gpio-pci-idio-16.c | 2 +- + drivers/gpio/gpio-pcie-idio-24.c | 3 +- + drivers/gpio/gpio-pl061.c | 4 +- + drivers/gpio/gpio-pxa.c | 9 +- + drivers/gpio/gpio-rcar.c | 4 +- + drivers/gpio/gpio-rda.c | 8 +- + drivers/gpio/gpio-realtek-otto.c | 7 +- + drivers/gpio/gpio-rockchip.c | 771 +++++++++++++++++ + drivers/gpio/gpio-sch.c | 2 +- + drivers/gpio/gpio-sodaville.c | 2 +- + drivers/gpio/gpio-sprd.c | 12 +- + drivers/gpio/gpio-tb10x.c | 2 +- + drivers/gpio/gpio-tegra.c | 9 +- + drivers/gpio/gpio-tegra186.c | 9 +- + drivers/gpio/gpio-tqmx86.c | 10 +- + drivers/gpio/gpio-vf610.c | 2 +- + drivers/gpio/gpio-ws16c48.c | 4 +- + drivers/gpio/gpio-xgs-iproc.c | 2 +- + drivers/gpio/gpio-xilinx.c | 2 +- + drivers/gpio/gpio-xlp.c | 3 +- + drivers/gpio/gpio-zynq.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 15 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 3 +- + drivers/gpu/ipu-v3/ipu-common.c | 11 +- + drivers/irqchip/irq-alpine-msi.c | 6 +- + drivers/irqchip/irq-gic-v2m.c | 5 +- + drivers/irqchip/irq-gic-v3-its.c | 6 +- + drivers/irqchip/irq-gic-v3-mbi.c | 5 +- + drivers/irqchip/irq-gic-v3.c | 61 +- + drivers/irqchip/irq-loongson-pch-pic.c | 19 +- + drivers/irqchip/irq-ls-scfg-msi.c | 5 +- + drivers/irqchip/irq-mtk-sysirq.c | 1 + + drivers/irqchip/irq-mvebu-gicp.c | 4 +- + drivers/irqchip/irq-mvebu-odmi.c | 5 +- + drivers/irqchip/irq-partition-percpu.c | 3 +- + drivers/mfd/db8500-prcmu.c | 2 +- + drivers/mfd/fsl-imx25-tsadc.c | 4 +- + drivers/mfd/ioc3.c | 10 +- + drivers/mfd/qcom-pm8xxx.c | 10 +- + drivers/pinctrl/actions/pinctrl-owl.c | 5 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 3 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 3 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 7 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 5 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 8 +- + drivers/pinctrl/mediatek/mtk-eint.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 2 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 6 +- + drivers/pinctrl/pinctrl-at91.c | 6 +- + drivers/pinctrl/pinctrl-equilibrium.c | 2 +- + drivers/pinctrl/pinctrl-ingenic.c | 2 +- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 2 +- + drivers/pinctrl/pinctrl-ocelot.c | 3 +- + drivers/pinctrl/pinctrl-oxnas.c | 2 +- + drivers/pinctrl/pinctrl-pic32.c | 2 +- + drivers/pinctrl/pinctrl-pistachio.c | 2 +- + drivers/pinctrl/pinctrl-rockchip.c | 909 +-------------------- + drivers/pinctrl/pinctrl-rockchip.h | 287 +++++++ + drivers/pinctrl/pinctrl-single.c | 4 +- + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 4 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 15 +- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 25 +- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 17 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 3 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 8 +- + 114 files changed, 1410 insertions(+), 1272 deletions(-) + create mode 100644 drivers/gpio/gpio-rockchip.c + create mode 100644 drivers/pinctrl/pinctrl-rockchip.h +Merging ftrace/for-next (db396be6ddc4 MAINTAINERS: Add an entry for os noise/latency) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace.c +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/um/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/openrisc/Kconfig +Auto-merging arch/nios2/Kconfig +Auto-merging arch/nds32/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/hexagon/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Recorded preimage for 'MAINTAINERS' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'MAINTAINERS'. +[master 0fad45760cde] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/trace/boottime-trace.rst | 85 +++++- + Documentation/trace/histogram.rst | 92 ++++++- + MAINTAINERS | 14 + + arch/Kconfig | 3 + + arch/arc/Kconfig | 4 +- + arch/arm/Kconfig | 5 +- + arch/arm64/Kconfig | 4 +- + arch/csky/Kconfig | 4 +- + arch/hexagon/Kconfig | 4 +- + arch/microblaze/Kconfig | 1 + + arch/microblaze/Kconfig.debug | 5 - + arch/mips/Kconfig | 1 + + arch/mips/Kconfig.debug | 4 - + arch/nds32/Kconfig | 4 +- + arch/nios2/Kconfig | 3 - + arch/openrisc/Kconfig | 4 +- + arch/parisc/Kconfig | 1 + + arch/parisc/Kconfig.debug | 3 - + arch/powerpc/Kconfig | 5 +- + arch/riscv/Kconfig | 4 +- + arch/s390/Kconfig | 1 + + arch/s390/Kconfig.debug | 3 - + arch/sh/Kconfig | 1 + + arch/sh/Kconfig.debug | 3 - + arch/sparc/Kconfig | 1 + + arch/sparc/Kconfig.debug | 4 - + arch/um/Kconfig | 5 +- + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 3 - + arch/xtensa/Kconfig | 4 +- + include/linux/tracepoint.h | 2 +- + kernel/trace/Kconfig | 6 +- + kernel/trace/trace.c | 1 + + kernel/trace/trace_boot.c | 302 ++++++++++++++++++++- + kernel/trace/trace_events_hist.c | 143 ++++++++-- + kernel/tracepoint.c | 4 +- + tools/bootconfig/scripts/bconf2ftrace.sh | 101 +++++++ + tools/bootconfig/scripts/ftrace2bconf.sh | 24 +- + tools/bootconfig/scripts/xbc.sh | 4 +- + .../ktest/examples/bootconfigs/boottrace.bconf | 20 +- + .../ktest/examples/bootconfigs/verify-boottrace.sh | 2 +- + 41 files changed, 753 insertions(+), 132 deletions(-) +Merging rcu/rcu/next (213605c149ff kcsan: selftest: Cleanup and add missing __init) +$ git merge rcu/rcu/next +Auto-merging kernel/time/tick-internal.h +CONFLICT (content): Merge conflict in kernel/time/tick-internal.h +Auto-merging kernel/time/clocksource.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcu/tree_plugin.h +Removing kernel/kcsan/atomic.h +Resolved 'kernel/time/tick-internal.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f7ac6b92da8e] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 98 +- + .../RCU/Design/Requirements/Requirements.rst | 8 +- + Documentation/RCU/checklist.rst | 24 +- + Documentation/RCU/rcu_dereference.rst | 6 +- + Documentation/RCU/stallwarn.rst | 41 +- + Documentation/dev-tools/kcsan.rst | 12 + + .../litmus-tests/locking/DCL-broken.litmus | 55 + + .../litmus-tests/locking/DCL-fixed.litmus | 56 + + .../litmus-tests/locking/RM-broken.litmus | 42 + + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 + + arch/sh/configs/sdk7786_defconfig | 1 - + arch/xtensa/configs/nommu_kc705_defconfig | 1 - + include/linux/kcsan-checks.h | 3 + + include/linux/rculist.h | 35 +- + include/linux/rcupdate.h | 4 +- + include/linux/rcupdate_trace.h | 5 +- + include/linux/rcutiny.h | 3 - + include/linux/srcutiny.h | 8 +- + include/linux/torture.h | 8 + + kernel/kcsan/atomic.h | 23 - + kernel/kcsan/core.c | 152 +- + kernel/kcsan/kcsan.h | 8 +- + kernel/kcsan/kcsan_test.c | 94 +- + kernel/kcsan/permissive.h | 94 ++ + kernel/kcsan/report.c | 77 +- + kernel/kcsan/selftest.c | 72 +- + kernel/locking/locktorture.c | 39 +- + kernel/rcu/rcuscale.c | 14 +- + kernel/rcu/rcutorture.c | 45 +- + kernel/rcu/refscale.c | 42 +- + kernel/rcu/srcutiny.c | 2 +- + kernel/rcu/tasks.h | 88 +- + kernel/rcu/tree.c | 139 +- + kernel/rcu/tree_exp.h | 1 - + kernel/rcu/tree_nocb.h | 1496 +++++++++++++++++++ + kernel/rcu/tree_plugin.h | 1506 +------------------- + kernel/rcu/tree_stall.h | 111 +- + kernel/rcu/update.c | 8 +- + kernel/scftorture.c | 113 +- + kernel/sched/core.c | 11 + + kernel/time/clocksource-wdtest.c | 10 +- + kernel/time/clocksource.c | 31 +- + kernel/time/jiffies.c | 21 +- + kernel/time/tick-internal.h | 20 + + kernel/torture.c | 6 +- + lib/Kconfig.kcsan | 42 +- + tools/include/nolibc/nolibc.h | 15 +- + .../memory-model/Documentation/access-marking.txt | 151 +- + 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 | 33 + + tools/testing/selftests/rcutorture/bin/jitter.sh | 10 +- + .../selftests/rcutorture/bin/kcsan-collapse.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 4 +- + .../selftests/rcutorture/bin/kvm-assign-cpus.sh | 106 ++ + .../rcutorture/bin/kvm-get-cpus-script.sh | 88 ++ + .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-scf.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 5 +- + .../selftests/rcutorture/bin/kvm-remote-noreap.sh | 30 + + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 21 +- + .../rcutorture/bin/kvm-test-1-run-batch.sh | 24 + + .../rcutorture/bin/kvm-test-1-run-qemu.sh | 49 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 41 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 48 +- + .../selftests/rcutorture/configs/rcu/RUDE01 | 2 +- + .../selftests/rcutorture/configs/rcu/TASKS01 | 2 +- + .../selftests/rcutorture/configs/rcu/TASKS03 | 2 +- + 84 files changed, 3935 insertions(+), 2229 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 + delete mode 100644 kernel/kcsan/atomic.h + create mode 100644 kernel/kcsan/permissive.h + create mode 100644 kernel/rcu/tree_nocb.h + 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 + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-assign-cpus.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-get-cpus-script.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-remote-noreap.sh +Merging kvm/next (5a4bfabcc865 KVM: SVM: Add 5-level page table support for SVM) +$ git merge kvm/next +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/nested.c +Auto-merging arch/x86/kvm/hyperv.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 36 +- + Documentation/virt/kvm/locking.rst | 6 + + arch/arm64/kvm/guest.c | 4 - + arch/mips/kvm/mips.c | 4 - + arch/powerpc/include/asm/kvm_host.h | 1 - + arch/powerpc/kvm/book3s.c | 5 - + arch/powerpc/kvm/book3s_64_vio.c | 2 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 18 +- + arch/powerpc/kvm/booke.c | 5 - + arch/s390/kvm/kvm-s390.c | 8 +- + arch/x86/include/asm/kvm-x86-ops.h | 1 - + arch/x86/include/asm/kvm_host.h | 78 ++-- + arch/x86/include/uapi/asm/kvm.h | 1 + + arch/x86/kvm/debugfs.c | 113 +++++ + arch/x86/kvm/hyperv.c | 32 +- + arch/x86/kvm/i8254.c | 3 +- + arch/x86/kvm/ioapic.h | 4 - + arch/x86/kvm/lapic.c | 26 +- + arch/x86/kvm/mmu.h | 25 + + arch/x86/kvm/mmu/mmu.c | 507 +++++++++++++-------- + arch/x86/kvm/mmu/mmu_audit.c | 4 +- + arch/x86/kvm/mmu/mmu_internal.h | 8 +- + arch/x86/kvm/mmu/mmutrace.h | 6 + + arch/x86/kvm/mmu/page_track.c | 1 + + arch/x86/kvm/mmu/paging_tmpl.h | 6 +- + arch/x86/kvm/mmu/tdp_mmu.c | 139 ++++-- + arch/x86/kvm/mmu/tdp_mmu.h | 29 +- + arch/x86/kvm/pmu.c | 5 +- + arch/x86/kvm/pmu.h | 2 +- + arch/x86/kvm/svm/avic.c | 49 +- + arch/x86/kvm/svm/nested.c | 5 - + arch/x86/kvm/svm/sev.c | 3 +- + arch/x86/kvm/svm/svm.c | 97 ++-- + arch/x86/kvm/svm/svm.h | 8 - + arch/x86/kvm/svm/svm_ops.h | 2 +- + arch/x86/kvm/vmx/evmcs.c | 1 - + arch/x86/kvm/vmx/evmcs.h | 4 - + arch/x86/kvm/vmx/nested.c | 56 +-- + arch/x86/kvm/vmx/pmu_intel.c | 4 +- + arch/x86/kvm/vmx/vmcs.h | 2 + + arch/x86/kvm/vmx/vmcs12.c | 1 - + arch/x86/kvm/vmx/vmcs12.h | 4 - + arch/x86/kvm/vmx/vmx.c | 330 +++++++------- + arch/x86/kvm/vmx/vmx.h | 38 +- + arch/x86/kvm/vmx/vmx_ops.h | 4 +- + arch/x86/kvm/x86.c | 185 +++++--- + arch/x86/kvm/x86.h | 2 + + arch/x86/kvm/xen.c | 23 +- + arch/x86/kvm/xen.h | 5 + + include/linux/kvm_host.h | 232 ++++++++-- + include/linux/kvm_types.h | 6 + + include/uapi/linux/kvm.h | 11 +- + .../selftests/kvm/access_tracking_perf_test.c | 4 +- + tools/testing/selftests/kvm/demand_paging_test.c | 3 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 77 +++- + .../testing/selftests/kvm/include/perf_test_util.h | 2 +- + .../testing/selftests/kvm/kvm_binary_stats_test.c | 12 + + tools/testing/selftests/kvm/lib/perf_test_util.c | 22 +- + .../kvm/memslot_modification_stress_test.c | 3 +- + tools/testing/selftests/kvm/x86_64/debug_regs.c | 24 +- + virt/kvm/binary_stats.c | 2 - + virt/kvm/kvm_main.c | 180 ++++++-- + 63 files changed, 1586 insertions(+), 896 deletions(-) +Merging kvm-arm/next (f2267b87ecd5 Merge branch kvm-arm64/misc-5.15 into kvmarm-master/next) +$ git merge kvm-arm/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/linux/kvm_host.h +Auto-merging arch/arm64/kvm/hyp/nvhe/mem_protect.c +Auto-merging arch/arm64/kvm/guest.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/include/asm/sysreg.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/cpufeature.h +Resolved 'arch/arm64/include/asm/sysreg.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dd65ec6dea01] Merge remote-tracking branch 'kvm-arm/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/include/asm/cpufeature.h | 14 +- + arch/arm64/include/asm/kvm_asm.h | 5 +- + arch/arm64/include/asm/kvm_host.h | 4 +- + arch/arm64/include/asm/kvm_pgtable.h | 168 ++++++++++---- + arch/arm64/include/asm/sysreg.h | 10 + + arch/arm64/kernel/vmlinux.lds.S | 4 +- + arch/arm64/kvm/Kconfig | 10 + + arch/arm64/kvm/arm.c | 158 +++++-------- + arch/arm64/kvm/guest.c | 5 +- + arch/arm64/kvm/handle_exit.c | 23 +- + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 33 ++- + arch/arm64/kvm/hyp/include/nvhe/mm.h | 3 +- + arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 25 +++ + arch/arm64/kvm/hyp/nvhe/host.S | 21 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 20 +- + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 225 ++++++++++++++++--- + arch/arm64/kvm/hyp/nvhe/mm.c | 22 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 82 ++++++- + arch/arm64/kvm/hyp/pgtable.c | 247 +++++++++++---------- + arch/arm64/kvm/mmu.c | 74 +++++- + arch/arm64/kvm/perf.c | 2 +- + arch/arm64/kvm/pmu-emul.c | 14 +- + arch/arm64/kvm/psci.c | 15 +- + arch/arm64/kvm/reset.c | 43 ++-- + arch/arm64/kvm/sys_regs.c | 70 +++++- + arch/arm64/kvm/vgic/vgic-mmio-v2.c | 4 +- + arch/arm64/kvm/vgic/vgic.c | 1 - + include/linux/entry-kvm.h | 6 +- + include/linux/kvm_host.h | 1 - + include/linux/page-flags.h | 37 --- + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + .../selftests/kvm/aarch64/psci_cpu_on_test.c | 121 ++++++++++ + .../selftests/kvm/include/aarch64/processor.h | 3 + + virt/kvm/kvm_main.c | 19 +- + 35 files changed, 1023 insertions(+), 468 deletions(-) + create mode 100644 tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c +Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (1f703d2cf204 KVM: s390: allow facility 192 (vector-packed-decimal-enhancement facility 2)) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (88ca2521bd5b xen/events: Fix race in set_evtchn_to_irq) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) +$ git merge percpu/for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (bdb0a6548d22 workqueue: Remove unused WORK_NO_COLOR) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 15 ++-- + kernel/workqueue.c | 186 ++++++++++++++++++++++++++------------------ + kernel/workqueue_internal.h | 3 +- + 3 files changed, 116 insertions(+), 88 deletions(-) +Merging drivers-x86/for-next (c58259bc83a2 asus-wmi: Add support for platform_profile) +$ git merge drivers-x86/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/dell-smbios-wmi | 2 +- + Documentation/ABI/testing/sysfs-bus-thunderbolt | 2 +- + .../ABI/testing/sysfs-class-firmware-attributes | 19 +- + Documentation/ABI/testing/sysfs-driver-intc_sar | 54 +++ + .../ABI/testing/sysfs-platform-dell-smbios | 2 +- + .../testing/sysfs-platform-intel-wmi-thunderbolt | 2 +- + Documentation/ABI/testing/sysfs-power | 2 +- + Documentation/admin-guide/laptops/lg-laptop.rst | 4 +- + MAINTAINERS | 13 +- + drivers/i2c/i2c-core-acpi.c | 32 ++ + drivers/platform/surface/aggregator/Makefile | 15 +- + drivers/platform/surface/surface3_power.c | 8 +- + drivers/platform/x86/Kconfig | 60 +-- + drivers/platform/x86/Makefile | 7 +- + drivers/platform/x86/acer-wmi.c | 179 +++++++++ + drivers/platform/x86/asus-wmi.c | 419 ++++++++++++++++++++- + drivers/platform/x86/dell/Kconfig | 2 +- + drivers/platform/x86/dell/dcdbas.c | 4 +- + drivers/platform/x86/dell/dell-smbios-smm.c | 31 -- + drivers/platform/x86/dell/dell-smo8800.c | 74 +--- + drivers/platform/x86/dual_accel_detect.h | 26 +- + drivers/platform/x86/i2c-multi-instantiate.c | 27 +- + drivers/platform/x86/ideapad-laptop.c | 10 + + drivers/platform/x86/intel/Kconfig | 2 + + drivers/platform/x86/intel/Makefile | 2 + + drivers/platform/x86/intel/int1092/Kconfig | 14 + + drivers/platform/x86/intel/int1092/Makefile | 1 + + drivers/platform/x86/intel/int1092/intel_sar.c | 316 ++++++++++++++++ + drivers/platform/x86/intel/int1092/intel_sar.h | 86 +++++ + drivers/platform/x86/intel/int33fe/Makefile | 2 +- + .../x86/intel/int33fe/intel_cht_int33fe_common.c | 29 +- + drivers/platform/x86/intel/int3472/Makefile | 2 +- + drivers/platform/x86/intel/pmt/Kconfig | 40 ++ + drivers/platform/x86/intel/pmt/Makefile | 12 + + .../x86/{intel_pmt_class.c => intel/pmt/class.c} | 2 +- + .../x86/{intel_pmt_class.h => intel/pmt/class.h} | 0 + .../{intel_pmt_crashlog.c => intel/pmt/crashlog.c} | 2 +- + .../pmt/telemetry.c} | 10 +- + drivers/platform/x86/intel_pmc_core.c | 65 +++- + drivers/platform/x86/intel_pmc_core.h | 2 + + .../x86/intel_speed_select_if/isst_if_common.c | 3 +- + drivers/platform/x86/lg-laptop.c | 107 +++++- + drivers/platform/x86/meraki-mx100.c | 230 +++++++++++ + drivers/platform/x86/think-lmi.c | 80 ++++ + drivers/platform/x86/think-lmi.h | 1 + + drivers/thermal/intel/Kconfig | 9 + + drivers/thermal/intel/Makefile | 1 + + .../{platform/x86 => thermal/intel}/intel_menlow.c | 0 + include/linux/i2c.h | 5 + + include/linux/platform_data/x86/asus-wmi.h | 7 + + 50 files changed, 1733 insertions(+), 291 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intc_sar + create mode 100644 drivers/platform/x86/intel/int1092/Kconfig + create mode 100644 drivers/platform/x86/intel/int1092/Makefile + create mode 100644 drivers/platform/x86/intel/int1092/intel_sar.c + create mode 100644 drivers/platform/x86/intel/int1092/intel_sar.h + create mode 100644 drivers/platform/x86/intel/pmt/Kconfig + create mode 100644 drivers/platform/x86/intel/pmt/Makefile + rename drivers/platform/x86/{intel_pmt_class.c => intel/pmt/class.c} (99%) + rename drivers/platform/x86/{intel_pmt_class.h => intel/pmt/class.h} (100%) + rename drivers/platform/x86/{intel_pmt_crashlog.c => intel/pmt/crashlog.c} (99%) + rename drivers/platform/x86/{intel_pmt_telemetry.c => intel/pmt/telemetry.c} (93%) + create mode 100644 drivers/platform/x86/meraki-mx100.c + rename drivers/{platform/x86 => thermal/intel}/intel_menlow.c (100%) +$ git reset --hard HEAD^ +HEAD is now at 89e73c4a6ac6 Merge remote-tracking branch 'workqueues/for-next' +Merging next-20210819 version of drivers-x86 +$ git merge -m next-20210819/drivers-x86 2010319b3c438ba428e9a5c54998c5b05631cf78 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/dell-smbios-wmi | 2 +- + Documentation/ABI/testing/sysfs-bus-thunderbolt | 2 +- + .../ABI/testing/sysfs-class-firmware-attributes | 8 +- + .../ABI/testing/sysfs-platform-dell-smbios | 2 +- + .../testing/sysfs-platform-intel-wmi-thunderbolt | 2 +- + Documentation/ABI/testing/sysfs-power | 2 +- + MAINTAINERS | 6 +- + drivers/i2c/i2c-core-acpi.c | 32 +++ + drivers/platform/surface/aggregator/Makefile | 15 +- + drivers/platform/surface/surface3_power.c | 8 +- + drivers/platform/x86/Kconfig | 59 +---- + drivers/platform/x86/Makefile | 7 +- + drivers/platform/x86/acer-wmi.c | 179 +++++++++++++ + drivers/platform/x86/asus-wmi.c | 289 +++++++++++++++++++++ + drivers/platform/x86/dell/Kconfig | 2 +- + drivers/platform/x86/dell/dcdbas.c | 4 +- + drivers/platform/x86/dell/dell-smbios-smm.c | 31 --- + drivers/platform/x86/dell/dell-smo8800.c | 74 ++---- + drivers/platform/x86/dual_accel_detect.h | 26 +- + drivers/platform/x86/i2c-multi-instantiate.c | 27 +- + drivers/platform/x86/intel/Kconfig | 1 + + drivers/platform/x86/intel/Makefile | 1 + + drivers/platform/x86/intel/int33fe/Makefile | 2 +- + .../x86/intel/int33fe/intel_cht_int33fe_common.c | 29 +-- + drivers/platform/x86/intel/int3472/Makefile | 2 +- + drivers/platform/x86/intel/pmt/Kconfig | 40 +++ + drivers/platform/x86/intel/pmt/Makefile | 12 + + .../x86/{intel_pmt_class.c => intel/pmt/class.c} | 2 +- + .../x86/{intel_pmt_class.h => intel/pmt/class.h} | 0 + .../{intel_pmt_crashlog.c => intel/pmt/crashlog.c} | 2 +- + .../pmt/telemetry.c} | 2 +- + .../x86/intel_speed_select_if/isst_if_common.c | 3 +- + drivers/platform/x86/meraki-mx100.c | 230 ++++++++++++++++ + drivers/thermal/intel/Kconfig | 9 + + drivers/thermal/intel/Makefile | 1 + + .../{platform/x86 => thermal/intel}/intel_menlow.c | 0 + include/linux/i2c.h | 5 + + include/linux/platform_data/x86/asus-wmi.h | 7 + + 38 files changed, 873 insertions(+), 252 deletions(-) + create mode 100644 drivers/platform/x86/intel/pmt/Kconfig + create mode 100644 drivers/platform/x86/intel/pmt/Makefile + rename drivers/platform/x86/{intel_pmt_class.c => intel/pmt/class.c} (99%) + rename drivers/platform/x86/{intel_pmt_class.h => intel/pmt/class.h} (100%) + rename drivers/platform/x86/{intel_pmt_crashlog.c => intel/pmt/crashlog.c} (99%) + rename drivers/platform/x86/{intel_pmt_telemetry.c => intel/pmt/telemetry.c} (99%) + create mode 100644 drivers/platform/x86/meraki-mx100.c + rename drivers/{platform/x86 => thermal/intel}/intel_menlow.c (100%) +Merging chrome-platform/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (3d3d65bd2764 leds: pwm: add support for default-state device property) +$ git merge leds/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/leds/Kconfig | 57 -------------------------------- + drivers/leds/Makefile | 6 ---- + drivers/leds/blink/leds-lgm-sso.c | 39 +++++++++++----------- + drivers/leds/flash/Kconfig | 53 +++++++++++++++++++++++++++++ + drivers/leds/flash/Makefile | 6 ++++ + drivers/leds/{ => flash}/leds-aat1290.c | 0 + drivers/leds/{ => flash}/leds-as3645a.c | 0 + drivers/leds/{ => flash}/leds-ktd2692.c | 0 + drivers/leds/{ => flash}/leds-lm3601x.c | 0 + drivers/leds/{ => flash}/leds-max77693.c | 0 + drivers/leds/flash/leds-rt8515.c | 4 ++- + drivers/leds/{ => flash}/leds-sgm3140.c | 0 + drivers/leds/led-class-flash.c | 6 ++-- + drivers/leds/led-core.c | 15 +++++++++ + drivers/leds/leds-el15203000.c | 3 +- + drivers/leds/leds-gpio.c | 12 ++----- + drivers/leds/leds-is31fl32xx.c | 1 + + drivers/leds/leds-lm3692x.c | 3 +- + drivers/leds/leds-lm3697.c | 16 +++++---- + drivers/leds/leds-lt3593.c | 5 ++- + drivers/leds/leds-pwm.c | 49 +++++++++++++++++++++++---- + drivers/leds/leds.h | 1 + + drivers/leds/trigger/ledtrig-audio.c | 37 ++++++++++++++++----- + include/linux/leds.h | 12 +++++-- + 25 files changed, 199 insertions(+), 128 deletions(-) + rename drivers/leds/{ => flash}/leds-aat1290.c (100%) + rename drivers/leds/{ => flash}/leds-as3645a.c (100%) + rename drivers/leds/{ => flash}/leds-ktd2692.c (100%) + rename drivers/leds/{ => flash}/leds-lm3601x.c (100%) + rename drivers/leds/{ => flash}/leds-max77693.c (100%) + rename drivers/leds/{ => flash}/leds-sgm3140.c (100%) +Merging ipmi/for-next (bf064c7bec3b char: ipmi: use DEVICE_ATTR helper macro) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_si_intf.c | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) +Merging driver-core/driver-core-next (bd1e336aa853 driver core: platform: Remove platform_device_add_properties()) +$ git merge driver-core/driver-core-next +Auto-merging drivers/pci/pci-sysfs.c +CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c +Recorded preimage for 'drivers/pci/pci-sysfs.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/pci/pci-sysfs.c'. +[master c62b97d7a1e2] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-tegra/board-paz00.c | 2 +- + drivers/base/bus.c | 6 +- + drivers/base/cacheinfo.c | 1 + + drivers/base/cpu.c | 4 +- + drivers/base/dd.c | 16 ++- + drivers/base/firmware_loader/main.c | 20 ++-- + drivers/base/map.c | 12 +- + drivers/base/node.c | 71 ++++++----- + drivers/base/platform.c | 20 +--- + drivers/base/power/wakeup.c | 2 +- + drivers/base/topology.c | 115 ++++++++++-------- + drivers/net/ethernet/8390/mac8390.c | 3 +- + drivers/net/ethernet/natsemi/macsonic.c | 4 +- + drivers/nubus/bus.c | 2 +- + drivers/pci/pci-sysfs.c | 6 +- + drivers/sh/superhyway/superhyway.c | 2 +- + drivers/zorro/zorro-driver.c | 13 +- + fs/debugfs/file.c | 8 +- + fs/kernfs/dir.c | 153 +++++++++++++----------- + fs/kernfs/file.c | 4 +- + fs/kernfs/inode.c | 26 ++-- + fs/kernfs/kernfs-internal.h | 24 +++- + fs/kernfs/mount.c | 12 +- + fs/kernfs/symlink.c | 4 +- + fs/sysfs/file.c | 4 +- + fs/sysfs/group.c | 2 +- + include/linux/bitmap.h | 6 + + include/linux/cpumask.h | 38 ++++++ + include/linux/kernfs.h | 7 +- + include/linux/nubus.h | 2 +- + include/linux/platform_device.h | 2 - + include/linux/sysfs.h | 2 +- + include/linux/zorro.h | 1 - + lib/bitmap.c | 121 +++++++++++++++++++ + lib/test_bitmap.c | 150 +++++++++++++++++++++++ + tools/testing/selftests/firmware/fw_namespace.c | 3 +- + 36 files changed, 618 insertions(+), 250 deletions(-) +Merging usb/usb-next (e4788edc730a USB: EHCI: Add alias for Broadcom INSNREG) +$ git merge usb/usb-next +Auto-merging drivers/usb/typec/tcpm/tcpm.c +Auto-merging drivers/usb/host/xhci-pci.c +Removing drivers/usb/host/ehci-pmcmsp.c +Auto-merging drivers/of/base.c +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging arch/arm64/boot/dts/qcom/sc7280-idp.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sc7280-idp.dts +Resolved 'arch/arm64/boot/dts/qcom/sc7280-idp.dts' using previous resolution. +Resolved 'arch/arm64/boot/dts/qcom/sc7280.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a496a7b8417b] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 10 + + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 10 + + .../bindings/connector/usb-connector.yaml | 4 + + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 1 + + .../devicetree/bindings/usb/generic-ehci.yaml | 6 + + .../devicetree/bindings/usb/generic-ohci.yaml | 6 + + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 47 +- + .../devicetree/bindings/usb/mediatek,musb.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/renesas,usbhs.yaml | 26 +- + .../devicetree/bindings/usb/snps,dwc3.yaml | 15 +- + Documentation/usb/gadget-testing.rst | 64 +- + drivers/of/base.c | 1 + + drivers/usb/Kconfig | 2 +- + drivers/usb/Makefile | 1 - + drivers/usb/cdns3/cdnsp-mem.c | 2 +- + drivers/usb/common/common.c | 20 + + drivers/usb/dwc2/core.h | 2 + + drivers/usb/dwc2/gadget.c | 51 +- + drivers/usb/dwc3/core.c | 24 + + drivers/usb/dwc3/core.h | 21 +- + drivers/usb/dwc3/drd.c | 8 +- + drivers/usb/dwc3/dwc3-meson-g12a.c | 2 + + drivers/usb/dwc3/dwc3-qcom.c | 28 +- + drivers/usb/dwc3/ep0.c | 2 + + drivers/usb/dwc3/gadget.c | 234 ++++++- + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/composite.c | 8 +- + drivers/usb/gadget/configfs.c | 12 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/function/f_ncm.c | 50 +- + drivers/usb/gadget/function/f_uac1.c | 674 ++++++++++++++++++++- + drivers/usb/gadget/function/f_uac2.c | 652 ++++++++++++++++++-- + drivers/usb/gadget/function/f_uvc.c | 1 + + drivers/usb/gadget/function/u_audio.c | 369 ++++++++++- + drivers/usb/gadget/function/u_audio.h | 22 + + drivers/usb/gadget/function/u_ether.c | 5 +- + drivers/usb/gadget/function/u_uac1.h | 20 + + drivers/usb/gadget/function/u_uac2.h | 23 +- + drivers/usb/gadget/function/uvc.h | 15 +- + drivers/usb/gadget/function/uvc_queue.c | 28 +- + drivers/usb/gadget/function/uvc_queue.h | 7 +- + drivers/usb/gadget/function/uvc_video.c | 155 ++++- + drivers/usb/gadget/function/uvc_video.h | 2 + + drivers/usb/gadget/legacy/Kconfig | 1 + + drivers/usb/gadget/legacy/inode.c | 4 +- + drivers/usb/gadget/udc/at91_udc.c | 4 +- + drivers/usb/gadget/udc/bdc/bdc_cmd.c | 1 - + drivers/usb/gadget/udc/core.c | 19 + + drivers/usb/gadget/udc/mv_u3d_core.c | 19 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 17 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 4 + + drivers/usb/gadget/udc/tegra-xudc.c | 4 +- + drivers/usb/host/Kconfig | 9 - + drivers/usb/host/ehci-brcm.c | 11 +- + drivers/usb/host/ehci-hcd.c | 5 - + drivers/usb/host/ehci-mv.c | 23 +- + drivers/usb/host/ehci-pmcmsp.c | 328 ---------- + drivers/usb/host/fotg210-hcd.c | 48 +- + drivers/usb/host/fotg210.h | 5 - + drivers/usb/host/ohci-spear.c | 2 +- + drivers/usb/host/ohci-tmio.c | 3 + + drivers/usb/host/xhci-mtk-sch.c | 160 ++--- + drivers/usb/host/xhci-mtk.h | 15 +- + drivers/usb/host/xhci-pci-renesas.c | 7 +- + drivers/usb/host/xhci-pci.c | 2 - + drivers/usb/host/xhci-pci.h | 3 - + drivers/usb/isp1760/isp1760-hcd.c | 23 +- + drivers/usb/misc/adutux.c | 5 +- + drivers/usb/misc/brcmstb-usb-pinmap.c | 2 + + drivers/usb/mtu3/mtu3.h | 8 + + drivers/usb/mtu3/mtu3_core.c | 119 +++- + drivers/usb/mtu3/mtu3_dr.c | 26 +- + drivers/usb/mtu3/mtu3_dr.h | 30 +- + drivers/usb/mtu3/mtu3_gadget.c | 11 +- + drivers/usb/mtu3/mtu3_host.c | 106 +++- + drivers/usb/mtu3/mtu3_plat.c | 166 ++++- + drivers/usb/phy/phy-fsl-usb.c | 2 + + drivers/usb/phy/phy-isp1301-omap.c | 2 +- + drivers/usb/phy/phy-tahvo.c | 4 +- + drivers/usb/phy/phy-twl6030-usb.c | 5 + + drivers/usb/typec/tcpm/tcpm.c | 87 ++- + include/linux/of.h | 5 + + include/linux/usb/audio-v2.h | 14 + + include/linux/usb/ehci_def.h | 33 +- + include/linux/usb/gadget.h | 6 +- + include/linux/usb/otg.h | 1 + + 88 files changed, 3152 insertions(+), 836 deletions(-) + delete mode 100644 drivers/usb/host/ehci-pmcmsp.c +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (4e9340bb551a USB: serial: cp210x: determine fw version for CP2105 and CP2108) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 77 +++++++++++++++++----------------------- + drivers/usb/serial/io_edgeport.c | 33 ----------------- + 2 files changed, 32 insertions(+), 78 deletions(-) +Merging usb-chipidea-next/for-usb-next (956df1bb0ab8 usb: chipidea: host: fix port index underflow and UBSAN complains) +$ git merge usb-chipidea-next/for-usb-next +Auto-merging drivers/usb/cdns3/cdnsp-gadget.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/host.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) +Merging tty/tty-next (88c1d2478ec8 tty: serial: fsl_lpuart: check dma_tx_in_progress in tx dma callback) +$ git merge tty/tty-next +Auto-merging drivers/tty/synclink_gt.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serdev/core.c +Auto-merging drivers/net/usb/hso.c +Auto-merging drivers/char/pcmcia/synclink_cs.c +Auto-merging arch/xtensa/platforms/iss/console.c +Removing Documentation/devicetree/bindings/serial/cdns,uart.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/serial/8250.yaml | 6 + + .../devicetree/bindings/serial/8250_omap.yaml | 1 + + .../devicetree/bindings/serial/cdns,uart.txt | 27 -- + .../devicetree/bindings/serial/cdns,uart.yaml | 66 +++++ + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + arch/alpha/kernel/srmcons.c | 8 +- + arch/m68k/emu/nfcon.c | 30 +-- + arch/parisc/kernel/pdc_cons.c | 34 +-- + arch/um/drivers/line.c | 13 +- + arch/xtensa/platforms/iss/console.c | 45 ++-- + drivers/char/pcmcia/synclink_cs.c | 4 +- + drivers/char/ttyprintk.c | 4 +- + drivers/ipack/devices/ipoctal.c | 13 +- + drivers/isdn/capi/capi.c | 14 +- + drivers/misc/bcm-vk/bcm_vk_tty.c | 8 +- + drivers/mmc/core/sdio_uart.c | 12 +- + drivers/net/usb/hso.c | 12 +- + drivers/platform/surface/aggregator/core.c | 9 +- + drivers/s390/char/con3215.c | 11 +- + drivers/s390/char/sclp_tty.c | 15 +- + drivers/s390/char/sclp_vt220.c | 9 +- + drivers/s390/char/tty3270.c | 4 +- + drivers/staging/fwserial/fwserial.c | 8 +- + drivers/staging/gdm724x/gdm_tty.c | 13 +- + drivers/staging/greybus/uart.c | 4 +- + drivers/tty/amiserial.c | 278 ++++++++------------- + drivers/tty/ehv_bytechan.c | 34 +-- + drivers/tty/goldfish.c | 18 +- + drivers/tty/hvc/hvc_console.c | 10 +- + drivers/tty/hvc/hvc_xen.c | 17 +- + drivers/tty/hvc/hvcs.c | 12 +- + drivers/tty/hvc/hvsi.c | 55 ++-- + drivers/tty/ipwireless/tty.c | 12 +- + drivers/tty/mips_ejtag_fdc.c | 2 +- + drivers/tty/moxa.c | 4 +- + drivers/tty/mxser.c | 12 +- + drivers/tty/n_gsm.c | 13 +- + drivers/tty/nozomi.c | 12 +- + drivers/tty/serdev/core.c | 36 ++- + drivers/tty/serial/8250/8250_bcm7271.c | 2 +- + drivers/tty/serial/8250/8250_exar.c | 36 ++- + drivers/tty/serial/8250/8250_lpss.c | 10 + + drivers/tty/serial/8250/8250_omap.c | 27 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/tty/serial/8250/8250_pnp.c | 2 + + drivers/tty/serial/8250/8250_port.c | 3 +- + drivers/tty/serial/8250/Kconfig | 10 +- + drivers/tty/serial/Kconfig | 4 +- + drivers/tty/serial/amba-pl011.c | 163 +++++++++++- + drivers/tty/serial/fsl_lpuart.c | 4 + + drivers/tty/serial/jsm/jsm_neo.c | 2 + + drivers/tty/serial/jsm/jsm_tty.c | 3 + + drivers/tty/serial/kgdb_nmi.c | 11 +- + drivers/tty/serial/max310x.c | 15 +- + drivers/tty/serial/omap-serial.c | 75 +----- + drivers/tty/serial/samsung_tty.c | 95 +++++-- + drivers/tty/serial/serial_core.c | 20 +- + drivers/tty/serial/sh-sci.c | 7 +- + drivers/tty/serial/stm32-usart.c | 11 +- + drivers/tty/serial/uartlite.c | 61 ++++- + drivers/tty/synclink_gt.c | 12 +- + drivers/tty/sysrq.c | 4 +- + drivers/tty/tty_io.c | 13 - + drivers/tty/ttynull.c | 4 +- + drivers/tty/vcc.c | 4 +- + drivers/tty/vt/keyboard.c | 62 ++--- + drivers/tty/vt/vt.c | 27 +- + drivers/usb/class/cdc-acm.c | 14 +- + drivers/usb/gadget/function/u_serial.c | 36 +-- + drivers/usb/host/xhci-dbgtty.c | 4 +- + drivers/usb/serial/usb-serial.c | 13 +- + include/linux/serdev.h | 14 ++ + include/linux/serial_s3c.h | 9 + + include/linux/tty.h | 275 +------------------- + include/linux/tty_buffer.h | 59 +++++ + include/linux/tty_driver.h | 39 +-- + include/linux/tty_flip.h | 8 +- + include/linux/tty_ldisc.h | 17 ++ + include/linux/tty_port.h | 208 +++++++++++++++ + include/linux/vt_kern.h | 30 +-- + include/uapi/linux/serial_reg.h | 1 + + net/bluetooth/rfcomm/tty.c | 12 +- + 82 files changed, 1328 insertions(+), 986 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/cdns,uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/cdns,uart.yaml + create mode 100644 include/linux/tty_buffer.h + create mode 100644 include/linux/tty_port.h +Merging char-misc/char-misc-next (b2159182dd49 lkdtm: remove IDE_CORE_CP crashpoint) +$ git merge char-misc/char-misc-next +Auto-merging include/linux/mhi.h +Auto-merging drivers/misc/pci_endpoint_test.c +Auto-merging drivers/misc/mei/bus.c +Auto-merging drivers/fpga/dfl.c +Auto-merging drivers/bus/mhi/pci_generic.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Removing Documentation/devicetree/bindings/misc/ge-achc.txt +Removing Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ge-achc | 15 + + Documentation/admin-guide/binderfs.rst | 13 + + .../firmware/xilinx/xlnx,zynqmp-firmware.txt | 44 -- + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 89 +++ + .../devicetree/bindings/fpga/xlnx,versal-fpga.yaml | 33 + + Documentation/devicetree/bindings/misc/ge-achc.txt | 26 - + .../devicetree/bindings/misc/ge-achc.yaml | 65 ++ + .../devicetree/bindings/nvmem/nintendo-otp.yaml | 44 ++ + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 3 + + Documentation/driver-api/fpga/fpga-bridge.rst | 10 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 12 +- + Documentation/driver-api/fpga/fpga-programming.rst | 8 +- + Documentation/driver-api/fpga/fpga-region.rst | 20 +- + Documentation/fault-injection/provoke-crashes.rst | 3 +- + Documentation/fpga/dfl.rst | 4 +- + Documentation/trace/coresight/coresight-config.rst | 244 ++++++ + Documentation/trace/coresight/coresight.rst | 15 + + arch/arm/boot/dts/imx53-ppd.dts | 23 +- + drivers/accessibility/speakup/i18n.c | 14 +- + drivers/accessibility/speakup/speakup_soft.c | 15 +- + drivers/android/binder.c | 4 +- + drivers/android/binderfs.c | 39 + + drivers/bus/fsl-mc/fsl-mc-bus.c | 134 +++- + drivers/bus/mhi/core/boot.c | 17 +- + drivers/bus/mhi/core/init.c | 93 ++- + drivers/bus/mhi/core/internal.h | 20 - + drivers/bus/mhi/core/main.c | 8 +- + drivers/bus/mhi/core/pm.c | 34 +- + drivers/bus/mhi/pci_generic.c | 38 + + drivers/char/Kconfig | 4 +- + drivers/dio/dio.c | 2 +- + drivers/firmware/raspberrypi.c | 10 +- + drivers/firmware/xilinx/zynqmp.c | 23 +- + drivers/fpga/Kconfig | 11 +- + drivers/fpga/Makefile | 1 + + drivers/fpga/altera-cvp.c | 2 +- + drivers/fpga/altera-freeze-bridge.c | 2 + + drivers/fpga/dfl-fme-mgr.c | 6 - + drivers/fpga/dfl-fme-pr.c | 2 +- + drivers/fpga/dfl-n3000-nios.c | 2 +- + drivers/fpga/dfl-pci.c | 5 + + drivers/fpga/dfl.c | 27 +- + drivers/fpga/dfl.h | 3 +- + drivers/fpga/fpga-bridge.c | 8 +- + drivers/fpga/fpga-mgr.c | 111 ++- + drivers/fpga/stratix10-soc.c | 6 - + drivers/fpga/ts73xx-fpga.c | 6 - + drivers/fpga/versal-fpga.c | 83 ++ + drivers/fpga/xilinx-pr-decoupler.c | 2 + + drivers/fpga/xilinx-spi.c | 2 + + drivers/fpga/zynq-fpga.c | 6 +- + drivers/fpga/zynqmp-fpga.c | 10 +- + drivers/hwtracing/coresight/Kconfig | 1 + + drivers/hwtracing/coresight/Makefile | 7 +- + drivers/hwtracing/coresight/coresight-cfg-afdo.c | 153 ++++ + .../hwtracing/coresight/coresight-cfg-preload.c | 31 + + .../hwtracing/coresight/coresight-cfg-preload.h | 13 + + drivers/hwtracing/coresight/coresight-config.c | 272 +++++++ + drivers/hwtracing/coresight/coresight-config.h | 253 ++++++ + drivers/hwtracing/coresight/coresight-core.c | 12 +- + drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 150 +++- + drivers/hwtracing/coresight/coresight-etm-perf.h | 12 +- + drivers/hwtracing/coresight/coresight-etm4x-cfg.c | 182 +++++ + drivers/hwtracing/coresight/coresight-etm4x-cfg.h | 30 + + drivers/hwtracing/coresight/coresight-etm4x-core.c | 38 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 3 + + .../coresight/coresight-syscfg-configfs.c | 396 ++++++++++ + .../coresight/coresight-syscfg-configfs.h | 45 ++ + drivers/hwtracing/coresight/coresight-syscfg.c | 847 +++++++++++++++++++++ + drivers/hwtracing/coresight/coresight-syscfg.h | 81 ++ + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/gehc-achc.c | 565 ++++++++++++++ + drivers/misc/lkdtm/bugs.c | 51 +- + drivers/misc/lkdtm/core.c | 8 +- + drivers/misc/lkdtm/fortify.c | 53 ++ + drivers/misc/lkdtm/heap.c | 9 +- + drivers/misc/lkdtm/lkdtm.h | 24 +- + drivers/misc/mei/bus.c | 18 +- + drivers/misc/mei/client.h | 2 +- + drivers/misc/mei/mei_dev.h | 2 +- + drivers/misc/pci_endpoint_test.c | 1 + + drivers/misc/pvpanic/pvpanic-pci.c | 2 + + drivers/misc/sgi-gru/grumain.c | 6 +- + drivers/misc/sgi-gru/grutables.h | 3 +- + drivers/misc/sgi-xp/xpc_uv.c | 8 +- + drivers/misc/sram.c | 103 ++- + drivers/misc/sram.h | 9 + + drivers/most/most_cdev.c | 8 +- + drivers/net/wireless/ath/ath11k/mhi.c | 1 + + drivers/nvmem/Kconfig | 11 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 7 +- + drivers/nvmem/nintendo-otp.c | 124 +++ + drivers/nvmem/qfprom.c | 31 +- + drivers/parport/parport_serial.c | 9 +- + drivers/pps/clients/pps_parport.c | 42 +- + drivers/spi/spi-altera-dfl.c | 21 +- + drivers/spi/spidev.c | 1 - + include/linux/coresight.h | 9 + + include/linux/dfl.h | 1 + + include/linux/firmware/xlnx-zynqmp.h | 10 + + include/linux/fpga/fpga-mgr.h | 2 +- + include/linux/mei_cl_bus.h | 9 +- + include/linux/mhi.h | 2 + + net/qrtr/mhi.c | 2 +- + samples/mei/mei-amt-version.c | 51 +- + scripts/spdxcheck-test.sh | 16 +- + .../selftests/filesystems/binderfs/binderfs_test.c | 17 + + tools/testing/selftests/lkdtm/config | 2 + + tools/testing/selftests/lkdtm/tests.txt | 3 + + 112 files changed, 4641 insertions(+), 568 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-ge-achc + delete mode 100644 Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.txt + create mode 100644 Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,versal-fpga.yaml + delete mode 100644 Documentation/devicetree/bindings/misc/ge-achc.txt + create mode 100644 Documentation/devicetree/bindings/misc/ge-achc.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/nintendo-otp.yaml + create mode 100644 Documentation/trace/coresight/coresight-config.rst + create mode 100644 drivers/fpga/versal-fpga.c + create mode 100644 drivers/hwtracing/coresight/coresight-cfg-afdo.c + create mode 100644 drivers/hwtracing/coresight/coresight-cfg-preload.c + create mode 100644 drivers/hwtracing/coresight/coresight-cfg-preload.h + create mode 100644 drivers/hwtracing/coresight/coresight-config.c + create mode 100644 drivers/hwtracing/coresight/coresight-config.h + create mode 100644 drivers/hwtracing/coresight/coresight-etm4x-cfg.c + create mode 100644 drivers/hwtracing/coresight/coresight-etm4x-cfg.h + create mode 100644 drivers/hwtracing/coresight/coresight-syscfg-configfs.c + create mode 100644 drivers/hwtracing/coresight/coresight-syscfg-configfs.h + create mode 100644 drivers/hwtracing/coresight/coresight-syscfg.c + create mode 100644 drivers/hwtracing/coresight/coresight-syscfg.h + create mode 100644 drivers/misc/gehc-achc.c + create mode 100644 drivers/nvmem/nintendo-otp.c +Merging extcon/extcon-next (07de34f5ce1e extcon: max3355: Drop unused include) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-max3355.c | 1 - + drivers/extcon/extcon-usb-gpio.c | 3 +-- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging phy-next/next (34633219b894 phy: qmp: Provide unique clock names for DP clocks) +$ git merge phy-next/next +Removing Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt +Auto-merging Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml +Removing Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt +Resolved 'Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 76b7ca2b24d5] Merge remote-tracking branch 'phy-next/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt | 20 - + .../bindings/phy/fsl,imx8mq-usb-phy.yaml | 53 + + ...keembay-usb.yaml => intel,keembay-phy-usb.yaml} | 2 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 30 +- + .../devicetree/bindings/phy/qcom,qmp-phy.yaml | 3 + + .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 1 + + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 15 + + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 1 + + .../bindings/phy/ti,phy-am654-serdes.txt | 82 - + .../bindings/phy/ti,phy-am654-serdes.yaml | 103 + + drivers/phy/amlogic/phy-meson8b-usb2.c | 8 +- + drivers/phy/cadence/phy-cadence-torrent.c | 3181 +++++++++++--------- + drivers/phy/mediatek/phy-mtk-hdmi.c | 7 +- + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 13 +- + drivers/phy/mediatek/phy-mtk-tphy.c | 224 +- + drivers/phy/mediatek/phy-mtk-ufs.c | 44 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 197 +- + drivers/phy/qualcomm/phy-qcom-usb-hs.c | 2 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 97 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 4 +- + drivers/phy/samsung/Makefile | 5 +- + .../{phy-exynos7-ufs.h => phy-exynos7-ufs.c} | 8 +- + drivers/phy/samsung/phy-exynosautov9-ufs.c | 67 + + drivers/phy/samsung/phy-samsung-ufs.c | 3 + + drivers/phy/samsung/phy-samsung-ufs.h | 13 +- + drivers/phy/tegra/xusb.c | 4 +- + drivers/phy/ti/phy-twl4030-usb.c | 15 + + drivers/phy/xilinx/phy-zynqmp.c | 3 + + 28 files changed, 2533 insertions(+), 1672 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml + rename Documentation/devicetree/bindings/phy/{intel,phy-keembay-usb.yaml => intel,keembay-phy-usb.yaml} (93%) + delete mode 100644 Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt + create mode 100644 Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.yaml + rename drivers/phy/samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c} (93%) + create mode 100644 drivers/phy/samsung/phy-exynosautov9-ufs.c +Merging soundwire/next (dd81e7c3f0bb soundwire: cadence: override PDI configurations to create loopback) +$ git merge soundwire/next +Auto-merging drivers/soundwire/intel.c +Merge made by the 'recursive' strategy. + drivers/soundwire/bus.c | 14 ++- + drivers/soundwire/cadence_master.c | 224 +++++++++++++++++++++++++++++++------ + drivers/soundwire/cadence_master.h | 7 ++ + drivers/soundwire/dmi-quirks.c | 36 +++--- + drivers/soundwire/intel.c | 14 +++ + drivers/soundwire/stream.c | 5 +- + include/linux/soundwire/sdw.h | 3 + + sound/soc/codecs/sdw-mockup.c | 2 + + 8 files changed, 250 insertions(+), 55 deletions(-) +Merging thunderbolt/next (42716425ad7e thunderbolt: Fix port linking by checking all adapters) +$ git merge thunderbolt/next +Auto-merging drivers/thunderbolt/switch.c +Merge made by the 'recursive' strategy. + drivers/thunderbolt/nhi.c | 46 ++++++++++++++++++++++++++++++++++++-------- + drivers/thunderbolt/switch.c | 28 ++++++++++++++++++--------- + include/linux/thunderbolt.h | 2 ++ + 3 files changed, 59 insertions(+), 17 deletions(-) +Merging vfio/next (eb24c1007e68 vfio: Remove struct vfio_device_ops open/release) +$ git merge vfio/next +Auto-merging drivers/vfio/pci/vfio_pci.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/vfio.rst | 4 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 8 +- + drivers/s390/cio/vfio_ccw_ops.c | 8 +- + drivers/s390/crypto/vfio_ap_ops.c | 8 +- + drivers/vfio/Kconfig | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 159 ++------ + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 6 +- + drivers/vfio/fsl-mc/vfio_fsl_mc_private.h | 7 - + drivers/vfio/mdev/mdev_core.c | 6 +- + drivers/vfio/mdev/vfio_mdev.c | 33 +- + drivers/vfio/pci/vfio_pci.c | 503 ++++++++++---------------- + drivers/vfio/pci/vfio_pci_igd.c | 10 +- + drivers/vfio/pci/vfio_pci_private.h | 9 +- + drivers/vfio/platform/vfio_platform_common.c | 86 ++--- + drivers/vfio/platform/vfio_platform_private.h | 1 - + drivers/vfio/vfio.c | 144 ++++++-- + include/linux/mdev.h | 9 +- + include/linux/vfio.h | 26 +- + samples/vfio-mdev/mbochs.c | 40 +- + samples/vfio-mdev/mdpy.c | 40 +- + samples/vfio-mdev/mtty.c | 40 +- + 21 files changed, 491 insertions(+), 658 deletions(-) +Merging staging/staging-next (093991aaadf0 staging: r8188eu: Remove empty rtw_mfree_xmit_priv_lock()) +$ git merge staging/staging-next +Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +Auto-merging drivers/staging/rtl8723bs/os_dep/os_intfs.c +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +Removing drivers/staging/rtl8723bs/hal/odm_RTL8723B.h +Removing drivers/staging/rtl8723bs/hal/odm_RTL8723B.c +Removing drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +Removing drivers/staging/rtl8188eu/os_dep/usb_intf.c +Removing drivers/staging/rtl8188eu/os_dep/recv_linux.c +Removing drivers/staging/rtl8188eu/os_dep/osdep_service.c +CONFLICT (modify/delete): drivers/staging/rtl8188eu/os_dep/os_intfs.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8188eu/os_dep/os_intfs.c left in tree. +Removing drivers/staging/rtl8188eu/os_dep/mon.c +Removing drivers/staging/rtl8188eu/os_dep/mlme_linux.c +CONFLICT (modify/delete): drivers/staging/rtl8188eu/os_dep/ioctl_linux.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8188eu/os_dep/ioctl_linux.c left in tree. +Removing drivers/staging/rtl8188eu/include/xmit_osdep.h +Removing drivers/staging/rtl8188eu/include/wifi.h +Removing drivers/staging/rtl8188eu/include/usb_ops_linux.h +Removing drivers/staging/rtl8188eu/include/rtw_sreset.h +Removing drivers/staging/rtl8188eu/include/rtw_recv.h +Removing drivers/staging/rtl8188eu/include/rtw_mlme.h +Removing drivers/staging/rtl8188eu/include/rtw_led.h +Removing drivers/staging/rtl8188eu/include/rtw_iol.h +Removing drivers/staging/rtl8188eu/include/rtw_ioctl_set.h +Removing drivers/staging/rtl8188eu/include/rtw_ht.h +Removing drivers/staging/rtl8188eu/include/rtw_event.h +Removing drivers/staging/rtl8188eu/include/rtw_efuse.h +Removing drivers/staging/rtl8188eu/include/rtw_cmd.h +Removing drivers/staging/rtl8188eu/include/rf.h +Removing drivers/staging/rtl8188eu/include/recv_osdep.h +Removing drivers/staging/rtl8188eu/include/pwrseqcmd.h +Removing drivers/staging/rtl8188eu/include/pwrseq.h +Removing drivers/staging/rtl8188eu/include/phydm_regdefine11n.h +Removing drivers/staging/rtl8188eu/include/phydm_reg.h +Removing drivers/staging/rtl8188eu/include/phy.h +Removing drivers/staging/rtl8188eu/include/osdep_service.h +CONFLICT (modify/delete): drivers/staging/rtl8188eu/include/osdep_intf.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8188eu/include/osdep_intf.h left in tree. +Removing drivers/staging/rtl8188eu/include/odm_types.h +Removing drivers/staging/rtl8188eu/include/odm_rtl8188e.h +Removing drivers/staging/rtl8188eu/include/mon.h +Removing drivers/staging/rtl8188eu/include/hal_intf.h +Removing drivers/staging/rtl8188eu/include/hal8188e_rate_adaptive.h +Removing drivers/staging/rtl8188eu/include/hal8188e_phy_reg.h +Removing drivers/staging/rtl8188eu/include/fw.h +Removing drivers/staging/rtl8188eu/include/drv_types.h +Removing drivers/staging/rtl8188eu/include/HalVerDef.h +Removing drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +Removing drivers/staging/rtl8188eu/hal/rtl8188eu_led.c +Removing drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +Removing drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +Removing drivers/staging/rtl8188eu/hal/rf_cfg.c +Removing drivers/staging/rtl8188eu/hal/rf.c +Removing drivers/staging/rtl8188eu/hal/pwrseqcmd.c +Removing drivers/staging/rtl8188eu/hal/pwrseq.c +Removing drivers/staging/rtl8188eu/hal/phy.c +Removing drivers/staging/rtl8188eu/hal/odm_rtl8188e.c +Removing drivers/staging/rtl8188eu/hal/odm_hwconfig.c +Removing drivers/staging/rtl8188eu/hal/odm.c +Removing drivers/staging/rtl8188eu/hal/mac_cfg.c +Removing drivers/staging/rtl8188eu/hal/hal_intf.c +Removing drivers/staging/rtl8188eu/hal/fw.c +Removing drivers/staging/rtl8188eu/core/rtw_sreset.c +Removing drivers/staging/rtl8188eu/core/rtw_security.c +Removing drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +Removing drivers/staging/rtl8188eu/core/rtw_led.c +Removing drivers/staging/rtl8188eu/core/rtw_iol.c +Removing drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +Removing drivers/staging/rtl8188eu/core/rtw_ieee80211.c +Removing drivers/staging/rtl8188eu/core/rtw_efuse.c +Removing drivers/staging/rtl8188eu/core/rtw_cmd.c +Removing drivers/staging/rtl8188eu/TODO +Removing drivers/staging/rtl8188eu/Makefile +Auto-merging drivers/staging/r8188eu/os_dep/rtw_android.c +CONFLICT (content): Merge conflict in drivers/staging/r8188eu/os_dep/rtw_android.c +Auto-merging drivers/staging/r8188eu/include/rtw_android.h +CONFLICT (content): Merge conflict in drivers/staging/r8188eu/include/rtw_android.h +Removing drivers/staging/hikey9xx/hi6421-spmi-pmic.c +Removing drivers/staging/hikey9xx/TODO +Removing drivers/staging/hikey9xx/Makefile +Removing drivers/staging/hikey9xx/Kconfig +Auto-merging drivers/misc/Makefile +Auto-merging drivers/misc/Kconfig +CONFLICT (content): Merge conflict in drivers/misc/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/iio/accel/bosch,bma180.yaml +Resolved 'drivers/misc/Kconfig' using previous resolution. +Resolved 'drivers/staging/r8188eu/include/rtw_android.h' using previous resolution. +Resolved 'drivers/staging/r8188eu/os_dep/rtw_android.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/rtl8188eu/include/osdep_intf.h drivers/staging/rtl8188eu/os_dep/ioctl_linux.c drivers/staging/rtl8188eu/os_dep/os_intfs.c +rm 'drivers/staging/rtl8188eu/include/osdep_intf.h' +rm 'drivers/staging/rtl8188eu/os_dep/ioctl_linux.c' +rm 'drivers/staging/rtl8188eu/os_dep/os_intfs.c' +$ git commit --no-edit -v -a +[master 7a307d605388] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-iio-chemical-sgp40 | 31 + + .../bindings/iio/accel/bosch,bma180.yaml | 61 - + .../bindings/iio/accel/bosch,bma255.yaml | 55 +- + .../devicetree/bindings/iio/adc/ingenic,adc.yaml | 19 + + .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 134 + + .../bindings/iio/adc/rockchip-saradc.yaml | 1 + + .../devicetree/bindings/iio/dac/adi,ad5064.yaml | 268 + + .../devicetree/bindings/iio/dac/adi,ad5360.yaml | 79 + + .../devicetree/bindings/iio/dac/adi,ad5380.yaml | 70 + + .../devicetree/bindings/iio/dac/adi,ad5421.yaml | 51 + + .../devicetree/bindings/iio/dac/adi,ad5449.yaml | 97 + + .../devicetree/bindings/iio/dac/adi,ad5504.yaml | 50 + + .../devicetree/bindings/iio/dac/adi,ad5624r.yaml | 47 + + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 75 + + .../devicetree/bindings/iio/dac/adi,ad5761.yaml | 60 + + .../devicetree/bindings/iio/dac/adi,ad5764.yaml | 62 + + .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 52 + + .../devicetree/bindings/iio/dac/adi,ad8801.yaml | 60 + + .../bindings/iio/dac/microchip,mcp4922.yaml | 46 + + .../bindings/mfd}/hisilicon,hi6421-spmi-pmic.yaml | 31 +- + .../devicetree/bindings/trivial-devices.yaml | 6 + + MAINTAINERS | 31 +- + drivers/counter/104-quad-8.c | 47 +- + drivers/counter/counter.c | 50 +- + drivers/counter/ftm-quaddec.c | 5 +- + drivers/counter/intel-qep.c | 7 +- + drivers/counter/interrupt-cnt.c | 11 +- + drivers/counter/microchip-tcb-capture.c | 16 +- + drivers/counter/stm32-lptimer-cnt.c | 18 +- + drivers/counter/stm32-timer-cnt.c | 10 +- + drivers/counter/ti-eqep.c | 37 +- + drivers/iio/accel/Kconfig | 5 +- + drivers/iio/accel/adxl345.h | 1 - + drivers/iio/accel/adxl345_core.c | 29 +- + drivers/iio/accel/adxl345_i2c.c | 6 - + drivers/iio/accel/adxl345_spi.c | 6 - + drivers/iio/accel/bma220_spi.c | 79 +- + drivers/iio/accel/bmc150-accel-core.c | 78 +- + drivers/iio/accel/bmc150-accel-i2c.c | 10 +- + drivers/iio/accel/bmc150-accel-spi.c | 10 +- + drivers/iio/accel/bmc150-accel.h | 20 +- + drivers/iio/accel/da280.c | 26 +- + drivers/iio/accel/da311.c | 26 +- + drivers/iio/accel/dmard10.c | 27 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 10 +- + drivers/iio/accel/st_accel.h | 4 - + drivers/iio/accel/st_accel_buffer.c | 16 +- + drivers/iio/accel/st_accel_core.c | 14 +- + drivers/iio/accel/st_accel_i2c.c | 3 +- + drivers/iio/accel/st_accel_spi.c | 2 +- + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ep93xx_adc.c | 6 +- + drivers/iio/adc/fsl-imx25-gcq.c | 17 +- + drivers/iio/adc/ingenic-adc.c | 102 +- + drivers/iio/adc/meson_saradc.c | 20 +- + drivers/iio/adc/rockchip_saradc.c | 69 +- + drivers/iio/adc/rzg2l_adc.c | 600 ++ + drivers/iio/chemical/Kconfig | 11 + + drivers/iio/chemical/Makefile | 1 + + drivers/iio/chemical/sgp40.c | 378 + + drivers/iio/common/st_sensors/st_sensors_buffer.c | 2 - + drivers/iio/common/st_sensors/st_sensors_core.c | 1 + + drivers/iio/common/st_sensors/st_sensors_core.h | 1 + + drivers/iio/common/st_sensors/st_sensors_i2c.c | 3 +- + drivers/iio/common/st_sensors/st_sensors_spi.c | 3 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 1 - + drivers/iio/dac/ad5624r_spi.c | 18 +- + drivers/iio/dac/max5821.c | 41 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 11 +- + drivers/iio/gyro/st_gyro.h | 4 - + drivers/iio/gyro/st_gyro_buffer.c | 16 +- + drivers/iio/gyro/st_gyro_core.c | 15 +- + drivers/iio/gyro/st_gyro_i2c.c | 2 +- + drivers/iio/gyro/st_gyro_spi.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 22 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 18 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 15 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 1 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 3 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 3 +- + drivers/iio/industrialio-buffer.c | 9 +- + drivers/iio/industrialio-core.c | 33 +- + drivers/iio/light/adjd_s311.c | 53 +- + drivers/iio/light/cm3323.c | 7 + + drivers/iio/light/hid-sensor-als.c | 11 +- + drivers/iio/light/hid-sensor-prox.c | 11 +- + drivers/iio/light/si1145.c | 1 - + drivers/iio/light/tcs3414.c | 48 +- + drivers/iio/magnetometer/st_magn.h | 12 - + drivers/iio/magnetometer/st_magn_buffer.c | 16 +- + drivers/iio/magnetometer/st_magn_core.c | 17 +- + drivers/iio/magnetometer/st_magn_i2c.c | 2 +- + drivers/iio/magnetometer/st_magn_spi.c | 2 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 11 +- + drivers/iio/potentiometer/Kconfig | 10 + + drivers/iio/potentiometer/Makefile | 1 + + drivers/iio/potentiometer/ad5110.c | 344 + + drivers/iio/potentiometer/max5481.c | 22 +- + drivers/iio/pressure/hid-sensor-press.c | 51 +- + drivers/iio/pressure/hp03.c | 36 +- + drivers/iio/pressure/st_pressure.h | 5 - + drivers/iio/pressure/st_pressure_buffer.c | 16 +- + drivers/iio/pressure/st_pressure_core.c | 16 +- + drivers/iio/pressure/st_pressure_i2c.c | 3 +- + drivers/iio/pressure/st_pressure_spi.c | 2 +- + drivers/iio/proximity/rfd77402.c | 83 +- + drivers/iio/proximity/sx9310.c | 48 +- + drivers/iio/proximity/vcnl3020.c | 351 +- + drivers/iio/temperature/ltc2983.c | 30 +- + drivers/iio/temperature/tmp006.c | 53 +- + drivers/mfd/Kconfig | 16 + + drivers/mfd/Makefile | 1 + + drivers/mfd/hi6421-spmi-pmic.c | 72 + + drivers/misc/Kconfig | 10 + + drivers/misc/Makefile | 1 + + drivers/misc/hi6421v600-irq.c | 307 + + drivers/staging/Kconfig | 4 +- + drivers/staging/Makefile | 3 +- + drivers/staging/board/board.c | 7 +- + drivers/staging/clocking-wizard/Kconfig | 2 +- + drivers/staging/fbtft/fbtft-core.c | 23 +- + drivers/staging/gdm724x/netlink_k.c | 4 +- + drivers/staging/hikey9xx/Kconfig | 19 - + drivers/staging/hikey9xx/Makefile | 3 - + drivers/staging/hikey9xx/TODO | 5 - + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 311 - + drivers/staging/ks7010/ks7010_sdio.c | 2 +- + drivers/staging/ks7010/ks_wlan_net.c | 10 +- + drivers/staging/most/video/video.c | 4 +- + drivers/staging/qlge/qlge_dbg.c | 4 +- + drivers/staging/{rtl8188eu => r8188eu}/Kconfig | 7 +- + drivers/staging/r8188eu/Makefile | 106 + + .../staging/{rtl8188eu => r8188eu}/core/rtw_ap.c | 847 +- + drivers/staging/r8188eu/core/rtw_br_ext.c | 717 ++ + drivers/staging/r8188eu/core/rtw_cmd.c | 2129 +++++ + drivers/staging/r8188eu/core/rtw_debug.c | 904 +++ + drivers/staging/r8188eu/core/rtw_efuse.c | 856 ++ + drivers/staging/r8188eu/core/rtw_ieee80211.c | 1539 ++++ + drivers/staging/r8188eu/core/rtw_io.c | 299 + + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 891 +++ + drivers/staging/r8188eu/core/rtw_iol.c | 192 + + drivers/staging/r8188eu/core/rtw_led.c | 1618 ++++ + .../staging/{rtl8188eu => r8188eu}/core/rtw_mlme.c | 1118 ++- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 8327 ++++++++++++++++++++ + drivers/staging/r8188eu/core/rtw_mp.c | 974 +++ + drivers/staging/r8188eu/core/rtw_mp_ioctl.c | 1170 +++ + drivers/staging/r8188eu/core/rtw_p2p.c | 1997 +++++ + .../{rtl8188eu => r8188eu}/core/rtw_pwrctrl.c | 354 +- + .../staging/{rtl8188eu => r8188eu}/core/rtw_recv.c | 901 ++- + .../staging/{rtl8188eu => r8188eu}/core/rtw_rf.c | 34 +- + drivers/staging/r8188eu/core/rtw_security.c | 1656 ++++ + drivers/staging/r8188eu/core/rtw_sreset.c | 62 + + .../{rtl8188eu => r8188eu}/core/rtw_sta_mgt.c | 271 +- + .../{rtl8188eu => r8188eu}/core/rtw_wlan_util.c | 940 ++- + .../staging/{rtl8188eu => r8188eu}/core/rtw_xmit.c | 848 +- + drivers/staging/r8188eu/hal/Hal8188EPwrSeq.c | 69 + + .../hal/Hal8188ERateAdaptive.c} | 148 +- + .../bb_cfg.c => r8188eu/hal/HalHWImg8188E_BB.c} | 473 +- + drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 213 + + drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 250 + + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 1264 +++ + drivers/staging/r8188eu/hal/HalPwrSeqCmd.c | 95 + + .../staging/{rtl8188eu => r8188eu}/hal/hal_com.c | 189 +- + drivers/staging/r8188eu/hal/hal_intf.c | 441 ++ + drivers/staging/r8188eu/hal/odm.c | 1968 +++++ + drivers/staging/r8188eu/hal/odm_HWConfig.c | 567 ++ + drivers/staging/r8188eu/hal/odm_RTL8188E.c | 344 + + drivers/staging/r8188eu/hal/odm_RegConfig8188E.c | 98 + + drivers/staging/r8188eu/hal/odm_debug.c | 6 + + drivers/staging/r8188eu/hal/odm_interface.c | 178 + + .../{rtl8188eu => r8188eu}/hal/rtl8188e_cmd.c | 423 +- + drivers/staging/r8188eu/hal/rtl8188e_dm.c | 238 + + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2304 ++++++ + drivers/staging/r8188eu/hal/rtl8188e_mp.c | 798 ++ + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 1105 +++ + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 550 ++ + .../{rtl8188eu => r8188eu}/hal/rtl8188e_rxdesc.c | 45 +- + drivers/staging/r8188eu/hal/rtl8188e_sreset.c | 64 + + .../{rtl8188eu => r8188eu}/hal/rtl8188e_xmit.c | 13 +- + drivers/staging/r8188eu/hal/rtl8188eu_led.c | 94 + + drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 120 + + .../{rtl8188eu => r8188eu}/hal/rtl8188eu_xmit.c | 207 +- + .../{rtl8188eu => r8188eu}/hal/usb_halinit.c | 1178 ++- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 640 ++ + .../include/Hal8188EPhyCfg.h} | 140 +- + drivers/staging/r8188eu/include/Hal8188EPhyReg.h | 1072 +++ + drivers/staging/r8188eu/include/Hal8188EPwrSeq.h | 155 + + .../staging/r8188eu/include/Hal8188ERateAdaptive.h | 64 + + drivers/staging/r8188eu/include/HalHWImg8188E_BB.h | 27 + + drivers/staging/r8188eu/include/HalHWImg8188E_FW.h | 16 + + .../staging/r8188eu/include/HalHWImg8188E_MAC.h | 13 + + drivers/staging/r8188eu/include/HalHWImg8188E_RF.h | 13 + + drivers/staging/r8188eu/include/HalPhyRf_8188e.h | 41 + + drivers/staging/r8188eu/include/HalPwrSeqCmd.h | 110 + + drivers/staging/r8188eu/include/HalVerDef.h | 149 + + .../{rtl8188eu => r8188eu}/include/basic_types.h | 101 +- + drivers/staging/r8188eu/include/cmd_osdep.h | 16 + + drivers/staging/r8188eu/include/drv_types.h | 323 + + drivers/staging/r8188eu/include/ethernet.h | 24 + + .../{rtl8188eu => r8188eu}/include/hal_com.h | 28 +- + drivers/staging/r8188eu/include/hal_intf.h | 411 + + .../{rtl8188eu => r8188eu}/include/ieee80211.h | 680 +- + drivers/staging/r8188eu/include/ieee80211_ext.h | 271 + + drivers/staging/r8188eu/include/if_ether.h | 94 + + drivers/staging/r8188eu/include/ioctl_cfg80211.h | 91 + + drivers/staging/r8188eu/include/ip.h | 109 + + .../{rtl8188eu => r8188eu}/include/mlme_osdep.h | 14 +- + drivers/staging/r8188eu/include/mp_custom_oid.h | 333 + + .../staging/{rtl8188eu => r8188eu}/include/odm.h | 214 +- + .../include/odm_HWConfig.h} | 37 +- + drivers/staging/r8188eu/include/odm_RTL8188E.h | 38 + + .../staging/r8188eu/include/odm_RegConfig8188E.h | 27 + + .../staging/r8188eu/include/odm_RegDefine11AC.h | 29 + + drivers/staging/r8188eu/include/odm_RegDefine11N.h | 143 + + drivers/staging/r8188eu/include/odm_interface.h | 147 + + .../{rtl8188eu => r8188eu}/include/odm_precomp.h | 45 +- + drivers/staging/r8188eu/include/odm_reg.h | 89 + + drivers/staging/r8188eu/include/odm_types.h | 45 + + drivers/staging/r8188eu/include/osdep_intf.h | 64 + + drivers/staging/r8188eu/include/osdep_service.h | 315 + + drivers/staging/r8188eu/include/recv_osdep.h | 37 + + .../{rtl8188eu => r8188eu}/include/rtl8188e_cmd.h | 48 +- + .../{rtl8188eu => r8188eu}/include/rtl8188e_dm.h | 21 +- + .../{rtl8188eu => r8188eu}/include/rtl8188e_hal.h | 223 +- + drivers/staging/r8188eu/include/rtl8188e_led.h | 18 + + .../{rtl8188eu => r8188eu}/include/rtl8188e_recv.h | 22 +- + drivers/staging/r8188eu/include/rtl8188e_rf.h | 19 + + .../{rtl8188eu => r8188eu}/include/rtl8188e_spec.h | 457 +- + drivers/staging/r8188eu/include/rtl8188e_sreset.h | 15 + + .../{rtl8188eu => r8188eu}/include/rtl8188e_xmit.h | 51 +- + .../{rtl8188eu => r8188eu}/include/rtw_android.h | 9 +- + .../{rtl8188eu => r8188eu}/include/rtw_ap.h | 22 +- + drivers/staging/r8188eu/include/rtw_br_ext.h | 49 + + drivers/staging/r8188eu/include/rtw_cmd.h | 975 +++ + drivers/staging/r8188eu/include/rtw_debug.h | 231 + + .../{rtl8188eu => r8188eu}/include/rtw_eeprom.h | 32 +- + drivers/staging/r8188eu/include/rtw_efuse.h | 134 + + drivers/staging/r8188eu/include/rtw_event.h | 97 + + drivers/staging/r8188eu/include/rtw_ht.h | 28 + + drivers/staging/r8188eu/include/rtw_io.h | 370 + + .../{rtl8188eu => r8188eu}/include/rtw_ioctl.h | 35 +- + drivers/staging/r8188eu/include/rtw_ioctl_rtl.h | 63 + + drivers/staging/r8188eu/include/rtw_ioctl_set.h | 33 + + drivers/staging/r8188eu/include/rtw_iol.h | 68 + + drivers/staging/r8188eu/include/rtw_led.h | 181 + + drivers/staging/r8188eu/include/rtw_mlme.h | 632 ++ + .../{rtl8188eu => r8188eu}/include/rtw_mlme_ext.h | 355 +- + drivers/staging/r8188eu/include/rtw_mp.h | 476 ++ + 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 | 119 + + .../{rtl8188eu => r8188eu}/include/rtw_pwrctrl.h | 75 +- + drivers/staging/r8188eu/include/rtw_recv.h | 411 + + .../{rtl8188eu => r8188eu}/include/rtw_rf.h | 37 +- + .../{rtl8188eu => r8188eu}/include/rtw_security.h | 168 +- + drivers/staging/r8188eu/include/rtw_sreset.h | 34 + + .../{rtl8188eu => r8188eu}/include/rtw_xmit.h | 63 +- + .../{rtl8188eu => r8188eu}/include/sta_info.h | 61 +- + drivers/staging/r8188eu/include/usb_ops.h | 76 + + drivers/staging/r8188eu/include/usb_ops_linux.h | 39 + + drivers/staging/r8188eu/include/usb_osintf.h | 29 + + drivers/staging/r8188eu/include/usb_vendor_req.h | 35 + + drivers/staging/r8188eu/include/wifi.h | 1029 +++ + .../{rtl8188eu => r8188eu}/include/wlan_bssdef.h | 149 +- + drivers/staging/r8188eu/include/xmit_osdep.h | 51 + + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 6663 ++++++++++++++++ + drivers/staging/r8188eu/os_dep/mlme_linux.c | 216 + + drivers/staging/r8188eu/os_dep/os_intfs.c | 1202 +++ + drivers/staging/r8188eu/os_dep/osdep_service.c | 343 + + drivers/staging/r8188eu/os_dep/recv_linux.c | 215 + + .../{rtl8188eu => r8188eu}/os_dep/rtw_android.c | 79 +- + drivers/staging/r8188eu/os_dep/usb_intf.c | 784 ++ + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 253 + + .../{rtl8188eu => r8188eu}/os_dep/xmit_linux.c | 132 +- + drivers/staging/rtl8188eu/Makefile | 56 - + drivers/staging/rtl8188eu/TODO | 14 - + drivers/staging/rtl8188eu/core/rtw_cmd.c | 1219 --- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 876 -- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 992 --- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 512 -- + drivers/staging/rtl8188eu/core/rtw_iol.c | 19 - + drivers/staging/rtl8188eu/core/rtw_led.c | 460 -- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 5172 ------------ + drivers/staging/rtl8188eu/core/rtw_security.c | 869 -- + drivers/staging/rtl8188eu/core/rtw_sreset.c | 21 - + drivers/staging/rtl8188eu/hal/fw.c | 202 - + drivers/staging/rtl8188eu/hal/hal_intf.c | 60 - + drivers/staging/rtl8188eu/hal/mac_cfg.c | 120 - + drivers/staging/rtl8188eu/hal/odm.c | 966 --- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 397 - + drivers/staging/rtl8188eu/hal/odm_rtl8188e.c | 335 - + drivers/staging/rtl8188eu/hal/phy.c | 1276 --- + drivers/staging/rtl8188eu/hal/pwrseq.c | 88 - + drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 80 - + drivers/staging/rtl8188eu/hal/rf.c | 289 - + drivers/staging/rtl8188eu/hal/rf_cfg.c | 247 - + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 217 - + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 523 -- + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 55 - + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 83 - + drivers/staging/rtl8188eu/include/HalVerDef.h | 37 - + drivers/staging/rtl8188eu/include/drv_types.h | 176 - + drivers/staging/rtl8188eu/include/fw.h | 44 - + .../staging/rtl8188eu/include/hal8188e_phy_reg.h | 201 - + .../rtl8188eu/include/hal8188e_rate_adaptive.h | 74 - + drivers/staging/rtl8188eu/include/hal_intf.h | 223 - + drivers/staging/rtl8188eu/include/mon.h | 28 - + drivers/staging/rtl8188eu/include/odm_rtl8188e.h | 39 - + drivers/staging/rtl8188eu/include/odm_types.h | 24 - + drivers/staging/rtl8188eu/include/osdep_intf.h | 37 - + drivers/staging/rtl8188eu/include/osdep_service.h | 81 - + drivers/staging/rtl8188eu/include/phy.h | 26 - + drivers/staging/rtl8188eu/include/phydm_reg.h | 22 - + .../staging/rtl8188eu/include/phydm_regdefine11n.h | 53 - + drivers/staging/rtl8188eu/include/pwrseq.h | 242 - + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 52 - + drivers/staging/rtl8188eu/include/recv_osdep.h | 26 - + drivers/staging/rtl8188eu/include/rf.h | 12 - + drivers/staging/rtl8188eu/include/rtw_cmd.h | 361 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 67 - + drivers/staging/rtl8188eu/include/rtw_event.h | 81 - + drivers/staging/rtl8188eu/include/rtw_ht.h | 26 - + drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 28 - + drivers/staging/rtl8188eu/include/rtw_iol.h | 14 - + drivers/staging/rtl8188eu/include/rtw_led.h | 98 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 355 - + drivers/staging/rtl8188eu/include/rtw_recv.h | 262 - + drivers/staging/rtl8188eu/include/rtw_sreset.h | 30 - + drivers/staging/rtl8188eu/include/usb_ops_linux.h | 26 - + drivers/staging/rtl8188eu/include/wifi.h | 355 - + drivers/staging/rtl8188eu/include/xmit_osdep.h | 32 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2777 ------- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 167 - + drivers/staging/rtl8188eu/os_dep/mon.c | 183 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 658 -- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 63 - + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 138 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 485 -- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 644 -- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 - + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 4 +- + drivers/staging/rtl8192e/rtllib_rx.c | 57 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 3 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 18 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 49 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8712/hal_init.c | 1 - + drivers/staging/rtl8712/os_intfs.c | 2 +- + drivers/staging/rtl8712/osdep_service.h | 2 +- + drivers/staging/rtl8712/wifi.h | 48 - + drivers/staging/rtl8723bs/Makefile | 1 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 135 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 54 +- + drivers/staging/rtl8723bs/core/rtw_debug.c | 19 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 154 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 13 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 37 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 263 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 297 +- + drivers/staging/rtl8723bs/core/rtw_rf.c | 1 - + drivers/staging/rtl8723bs/core/rtw_security.c | 36 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 147 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 464 -- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 1 - + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 414 - + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 1 - + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 8 - + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 17 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 86 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 67 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 191 +- + drivers/staging/rtl8723bs/hal/Mp_Precomp.h | 2 - + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 111 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 172 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 447 +- + drivers/staging/rtl8723bs/hal/hal_sdio.c | 1 - + drivers/staging/rtl8723bs/hal/odm.c | 56 +- + drivers/staging/rtl8723bs/hal/odm.h | 25 - + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 36 +- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.h | 2 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 5 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 343 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 29 +- + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 23 +- + drivers/staging/rtl8723bs/hal/odm_RTL8723B.c | 36 - + drivers/staging/rtl8723bs/hal/odm_RTL8723B.h | 14 - + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 7 +- + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h | 11 +- + drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h | 2 - + drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 - + drivers/staging/rtl8723bs/hal/odm_reg.h | 4 - + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 23 +- + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 12 - + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 84 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 52 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 21 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 3 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 1 - + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 - + drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h | 4 - + drivers/staging/rtl8723bs/include/HalVerDef.h | 18 - + drivers/staging/rtl8723bs/include/drv_types.h | 5 - + drivers/staging/rtl8723bs/include/hal_btcoex.h | 3 - + drivers/staging/rtl8723bs/include/hal_com.h | 35 +- + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 20 +- + drivers/staging/rtl8723bs/include/hal_com_reg.h | 19 - + drivers/staging/rtl8723bs/include/hal_data.h | 24 +- + drivers/staging/rtl8723bs/include/hal_pg.h | 8 +- + drivers/staging/rtl8723bs/include/hal_phy.h | 3 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 42 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 4 - + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 8 - + drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_rf.h | 10 - + drivers/staging/rtl8723bs/include/wifi.h | 8 - + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 92 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 173 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 209 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 30 +- + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 1 - + drivers/staging/rts5208/rtsx_scsi.c | 10 +- + drivers/staging/sm750fb/sm750.c | 52 +- + drivers/staging/sm750fb/sm750.h | 12 +- + drivers/staging/sm750fb/sm750_cursor.c | 4 +- + drivers/staging/sm750fb/sm750_hw.c | 62 +- + drivers/staging/vc04_services/Kconfig | 28 +- + drivers/staging/vc04_services/Makefile | 5 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 2 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 564 -- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 2330 ++---- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 82 + + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 1440 ++++ + drivers/staging/vt6655/baseband.c | 2 - + drivers/staging/vt6655/baseband.h | 2 - + drivers/staging/vt6655/card.c | 1 - + drivers/staging/vt6655/card.h | 2 - + drivers/staging/vt6655/channel.c | 2 - + drivers/staging/vt6655/channel.h | 1 - + drivers/staging/vt6655/device_cfg.h | 6 +- + drivers/staging/vt6655/device_main.c | 2 - + drivers/staging/vt6655/dpc.c | 2 - + drivers/staging/vt6655/dpc.h | 2 - + drivers/staging/vt6655/key.c | 2 - + drivers/staging/vt6655/key.h | 2 - + drivers/staging/vt6655/mac.c | 3 - + drivers/staging/vt6655/mac.h | 2 - + drivers/staging/vt6655/upc.h | 2 - + drivers/staging/vt6656/device.h | 2 - + drivers/staging/wlan-ng/prism2fw.c | 8 +- + drivers/staging/wlan-ng/prism2mib.c | 10 + + include/dt-bindings/iio/adc/ingenic,adc.h | 1 + + include/linux/counter.h | 32 +- + include/linux/mfd/hi6421-spmi-pmic.h | 5 - + 461 files changed, 70748 insertions(+), 34255 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-sgp40 + delete mode 100644 Documentation/devicetree/bindings/iio/accel/bosch,bma180.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5064.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5360.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5380.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5421.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5449.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5504.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5624r.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5761.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5764.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5791.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad8801.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/microchip,mcp4922.yaml + rename {drivers/staging/hikey9xx => Documentation/devicetree/bindings/mfd}/hisilicon,hi6421-spmi-pmic.yaml (87%) + create mode 100644 drivers/iio/adc/rzg2l_adc.c + create mode 100644 drivers/iio/chemical/sgp40.c + create mode 100644 drivers/iio/potentiometer/ad5110.c + create mode 100644 drivers/mfd/hi6421-spmi-pmic.c + create mode 100644 drivers/misc/hi6421v600-irq.c + delete mode 100644 drivers/staging/hikey9xx/Kconfig + delete mode 100644 drivers/staging/hikey9xx/Makefile + delete mode 100644 drivers/staging/hikey9xx/TODO + delete mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c + rename drivers/staging/{rtl8188eu => r8188eu}/Kconfig (63%) + create mode 100644 drivers/staging/r8188eu/Makefile + rename drivers/staging/{rtl8188eu => r8188eu}/core/rtw_ap.c (63%) + create mode 100644 drivers/staging/r8188eu/core/rtw_br_ext.c + create mode 100644 drivers/staging/r8188eu/core/rtw_cmd.c + create mode 100644 drivers/staging/r8188eu/core/rtw_debug.c + create mode 100644 drivers/staging/r8188eu/core/rtw_efuse.c + create mode 100644 drivers/staging/r8188eu/core/rtw_ieee80211.c + create mode 100644 drivers/staging/r8188eu/core/rtw_io.c + create mode 100644 drivers/staging/r8188eu/core/rtw_ioctl_set.c + create mode 100644 drivers/staging/r8188eu/core/rtw_iol.c + create mode 100644 drivers/staging/r8188eu/core/rtw_led.c + rename drivers/staging/{rtl8188eu => r8188eu}/core/rtw_mlme.c (61%) + create mode 100644 drivers/staging/r8188eu/core/rtw_mlme_ext.c + create mode 100644 drivers/staging/r8188eu/core/rtw_mp.c + create mode 100644 drivers/staging/r8188eu/core/rtw_mp_ioctl.c + create mode 100644 drivers/staging/r8188eu/core/rtw_p2p.c + rename drivers/staging/{rtl8188eu => r8188eu}/core/rtw_pwrctrl.c (57%) + rename drivers/staging/{rtl8188eu => r8188eu}/core/rtw_recv.c (64%) + rename drivers/staging/{rtl8188eu => r8188eu}/core/rtw_rf.c (70%) + create mode 100644 drivers/staging/r8188eu/core/rtw_security.c + create mode 100644 drivers/staging/r8188eu/core/rtw_sreset.c + rename drivers/staging/{rtl8188eu => r8188eu}/core/rtw_sta_mgt.c (60%) + rename drivers/staging/{rtl8188eu => r8188eu}/core/rtw_wlan_util.c (52%) + rename drivers/staging/{rtl8188eu => r8188eu}/core/rtw_xmit.c (65%) + create mode 100644 drivers/staging/r8188eu/hal/Hal8188EPwrSeq.c + rename drivers/staging/{rtl8188eu/hal/hal8188e_rate_adaptive.c => r8188eu/hal/Hal8188ERateAdaptive.c} (80%) + rename drivers/staging/{rtl8188eu/hal/bb_cfg.c => r8188eu/hal/HalHWImg8188E_BB.c} (56%) + create mode 100644 drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c + create mode 100644 drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c + create mode 100644 drivers/staging/r8188eu/hal/HalPhyRf_8188e.c + create mode 100644 drivers/staging/r8188eu/hal/HalPwrSeqCmd.c + rename drivers/staging/{rtl8188eu => r8188eu}/hal/hal_com.c (63%) + create mode 100644 drivers/staging/r8188eu/hal/hal_intf.c + create mode 100644 drivers/staging/r8188eu/hal/odm.c + create mode 100644 drivers/staging/r8188eu/hal/odm_HWConfig.c + create mode 100644 drivers/staging/r8188eu/hal/odm_RTL8188E.c + create mode 100644 drivers/staging/r8188eu/hal/odm_RegConfig8188E.c + create mode 100644 drivers/staging/r8188eu/hal/odm_debug.c + create mode 100644 drivers/staging/r8188eu/hal/odm_interface.c + rename drivers/staging/{rtl8188eu => r8188eu}/hal/rtl8188e_cmd.c (52%) + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_dm.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_hal_init.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_mp.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_phycfg.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_rf6052.c + rename drivers/staging/{rtl8188eu => r8188eu}/hal/rtl8188e_rxdesc.c (84%) + create mode 100644 drivers/staging/r8188eu/hal/rtl8188e_sreset.c + rename drivers/staging/{rtl8188eu => r8188eu}/hal/rtl8188e_xmit.c (55%) + create mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_led.c + create mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_recv.c + rename drivers/staging/{rtl8188eu => r8188eu}/hal/rtl8188eu_xmit.c (76%) + rename drivers/staging/{rtl8188eu => r8188eu}/hal/usb_halinit.c (53%) + create mode 100644 drivers/staging/r8188eu/hal/usb_ops_linux.c + rename drivers/staging/{rtl8188eu/include/hal8188e_phy_cfg.h => r8188eu/include/Hal8188EPhyCfg.h} (50%) + create mode 100644 drivers/staging/r8188eu/include/Hal8188EPhyReg.h + create mode 100644 drivers/staging/r8188eu/include/Hal8188EPwrSeq.h + create mode 100644 drivers/staging/r8188eu/include/Hal8188ERateAdaptive.h + create mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_BB.h + create mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_FW.h + create mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h + create mode 100644 drivers/staging/r8188eu/include/HalHWImg8188E_RF.h + create mode 100644 drivers/staging/r8188eu/include/HalPhyRf_8188e.h + create mode 100644 drivers/staging/r8188eu/include/HalPwrSeqCmd.h + create mode 100644 drivers/staging/r8188eu/include/HalVerDef.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/basic_types.h (53%) + create mode 100644 drivers/staging/r8188eu/include/cmd_osdep.h + create mode 100644 drivers/staging/r8188eu/include/drv_types.h + create mode 100644 drivers/staging/r8188eu/include/ethernet.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/hal_com.h (86%) + create mode 100644 drivers/staging/r8188eu/include/hal_intf.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/ieee80211.h (51%) + create mode 100644 drivers/staging/r8188eu/include/ieee80211_ext.h + create mode 100644 drivers/staging/r8188eu/include/if_ether.h + create mode 100644 drivers/staging/r8188eu/include/ioctl_cfg80211.h + create mode 100644 drivers/staging/r8188eu/include/ip.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/mlme_osdep.h (57%) + create mode 100644 drivers/staging/r8188eu/include/mp_custom_oid.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/odm.h (86%) + rename drivers/staging/{rtl8188eu/include/odm_hwconfig.h => r8188eu/include/odm_HWConfig.h} (69%) + create mode 100644 drivers/staging/r8188eu/include/odm_RTL8188E.h + create mode 100644 drivers/staging/r8188eu/include/odm_RegConfig8188E.h + create mode 100644 drivers/staging/r8188eu/include/odm_RegDefine11AC.h + create mode 100644 drivers/staging/r8188eu/include/odm_RegDefine11N.h + create mode 100644 drivers/staging/r8188eu/include/odm_interface.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/odm_precomp.h (59%) + create mode 100644 drivers/staging/r8188eu/include/odm_reg.h + create mode 100644 drivers/staging/r8188eu/include/odm_types.h + create mode 100644 drivers/staging/r8188eu/include/osdep_intf.h + create mode 100644 drivers/staging/r8188eu/include/osdep_service.h + create mode 100644 drivers/staging/r8188eu/include/recv_osdep.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtl8188e_cmd.h (59%) + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtl8188e_dm.h (58%) + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtl8188e_hal.h (57%) + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_led.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtl8188e_recv.h (56%) + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_rf.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtl8188e_spec.h (71%) + create mode 100644 drivers/staging/r8188eu/include/rtl8188e_sreset.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtl8188e_xmit.h (67%) + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtw_android.h (81%) + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtw_ap.h (73%) + create mode 100644 drivers/staging/r8188eu/include/rtw_br_ext.h + create mode 100644 drivers/staging/r8188eu/include/rtw_cmd.h + create mode 100644 drivers/staging/r8188eu/include/rtw_debug.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtw_eeprom.h (80%) + create mode 100644 drivers/staging/r8188eu/include/rtw_efuse.h + create mode 100644 drivers/staging/r8188eu/include/rtw_event.h + create mode 100644 drivers/staging/r8188eu/include/rtw_ht.h + create mode 100644 drivers/staging/r8188eu/include/rtw_io.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtw_ioctl.h (69%) + create mode 100644 drivers/staging/r8188eu/include/rtw_ioctl_rtl.h + create mode 100644 drivers/staging/r8188eu/include/rtw_ioctl_set.h + create mode 100644 drivers/staging/r8188eu/include/rtw_iol.h + create mode 100644 drivers/staging/r8188eu/include/rtw_led.h + create mode 100644 drivers/staging/r8188eu/include/rtw_mlme.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtw_mlme_ext.h (63%) + create mode 100644 drivers/staging/r8188eu/include/rtw_mp.h + create mode 100644 drivers/staging/r8188eu/include/rtw_mp_ioctl.h + create mode 100644 drivers/staging/r8188eu/include/rtw_mp_phy_regdef.h + create mode 100644 drivers/staging/r8188eu/include/rtw_p2p.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtw_pwrctrl.h (81%) + create mode 100644 drivers/staging/r8188eu/include/rtw_recv.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtw_rf.h (80%) + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtw_security.h (53%) + create mode 100644 drivers/staging/r8188eu/include/rtw_sreset.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/rtw_xmit.h (88%) + rename drivers/staging/{rtl8188eu => r8188eu}/include/sta_info.h (86%) + create mode 100644 drivers/staging/r8188eu/include/usb_ops.h + create mode 100644 drivers/staging/r8188eu/include/usb_ops_linux.h + create mode 100644 drivers/staging/r8188eu/include/usb_osintf.h + create mode 100644 drivers/staging/r8188eu/include/usb_vendor_req.h + create mode 100644 drivers/staging/r8188eu/include/wifi.h + rename drivers/staging/{rtl8188eu => r8188eu}/include/wlan_bssdef.h (65%) + create mode 100644 drivers/staging/r8188eu/include/xmit_osdep.h + create mode 100644 drivers/staging/r8188eu/os_dep/ioctl_linux.c + create mode 100644 drivers/staging/r8188eu/os_dep/mlme_linux.c + create mode 100644 drivers/staging/r8188eu/os_dep/os_intfs.c + create mode 100644 drivers/staging/r8188eu/os_dep/osdep_service.c + create mode 100644 drivers/staging/r8188eu/os_dep/recv_linux.c + rename drivers/staging/{rtl8188eu => r8188eu}/os_dep/rtw_android.c (73%) + create mode 100644 drivers/staging/r8188eu/os_dep/usb_intf.c + create mode 100644 drivers/staging/r8188eu/os_dep/usb_ops_linux.c + rename drivers/staging/{rtl8188eu => r8188eu}/os_dep/xmit_linux.c (56%) + delete mode 100644 drivers/staging/rtl8188eu/Makefile + delete mode 100644 drivers/staging/rtl8188eu/TODO + delete mode 100644 drivers/staging/rtl8188eu/core/rtw_cmd.c + delete mode 100644 drivers/staging/rtl8188eu/core/rtw_efuse.c + delete mode 100644 drivers/staging/rtl8188eu/core/rtw_ieee80211.c + delete mode 100644 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c + delete mode 100644 drivers/staging/rtl8188eu/core/rtw_iol.c + delete mode 100644 drivers/staging/rtl8188eu/core/rtw_led.c + delete mode 100644 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c + delete mode 100644 drivers/staging/rtl8188eu/core/rtw_security.c + delete mode 100644 drivers/staging/rtl8188eu/core/rtw_sreset.c + delete mode 100644 drivers/staging/rtl8188eu/hal/fw.c + delete mode 100644 drivers/staging/rtl8188eu/hal/hal_intf.c + delete mode 100644 drivers/staging/rtl8188eu/hal/mac_cfg.c + delete mode 100644 drivers/staging/rtl8188eu/hal/odm.c + delete mode 100644 drivers/staging/rtl8188eu/hal/odm_hwconfig.c + delete mode 100644 drivers/staging/rtl8188eu/hal/odm_rtl8188e.c + delete mode 100644 drivers/staging/rtl8188eu/hal/phy.c + delete mode 100644 drivers/staging/rtl8188eu/hal/pwrseq.c + delete mode 100644 drivers/staging/rtl8188eu/hal/pwrseqcmd.c + delete mode 100644 drivers/staging/rtl8188eu/hal/rf.c + delete mode 100644 drivers/staging/rtl8188eu/hal/rf_cfg.c + delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_dm.c + delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c + delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188eu_led.c + delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c + delete mode 100644 drivers/staging/rtl8188eu/include/HalVerDef.h + delete mode 100644 drivers/staging/rtl8188eu/include/drv_types.h + delete mode 100644 drivers/staging/rtl8188eu/include/fw.h + delete mode 100644 drivers/staging/rtl8188eu/include/hal8188e_phy_reg.h + delete mode 100644 drivers/staging/rtl8188eu/include/hal8188e_rate_adaptive.h + delete mode 100644 drivers/staging/rtl8188eu/include/hal_intf.h + delete mode 100644 drivers/staging/rtl8188eu/include/mon.h + delete mode 100644 drivers/staging/rtl8188eu/include/odm_rtl8188e.h + delete mode 100644 drivers/staging/rtl8188eu/include/odm_types.h + delete mode 100644 drivers/staging/rtl8188eu/include/osdep_intf.h + delete mode 100644 drivers/staging/rtl8188eu/include/osdep_service.h + delete mode 100644 drivers/staging/rtl8188eu/include/phy.h + delete mode 100644 drivers/staging/rtl8188eu/include/phydm_reg.h + delete mode 100644 drivers/staging/rtl8188eu/include/phydm_regdefine11n.h + delete mode 100644 drivers/staging/rtl8188eu/include/pwrseq.h + delete mode 100644 drivers/staging/rtl8188eu/include/pwrseqcmd.h + delete mode 100644 drivers/staging/rtl8188eu/include/recv_osdep.h + delete mode 100644 drivers/staging/rtl8188eu/include/rf.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_cmd.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_efuse.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_event.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_ht.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_ioctl_set.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_iol.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_led.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_mlme.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_recv.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtw_sreset.h + delete mode 100644 drivers/staging/rtl8188eu/include/usb_ops_linux.h + delete mode 100644 drivers/staging/rtl8188eu/include/wifi.h + delete mode 100644 drivers/staging/rtl8188eu/include/xmit_osdep.h + delete mode 100644 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c + delete mode 100644 drivers/staging/rtl8188eu/os_dep/mlme_linux.c + delete mode 100644 drivers/staging/rtl8188eu/os_dep/mon.c + delete mode 100644 drivers/staging/rtl8188eu/os_dep/os_intfs.c + delete mode 100644 drivers/staging/rtl8188eu/os_dep/osdep_service.c + delete mode 100644 drivers/staging/rtl8188eu/os_dep/recv_linux.c + delete mode 100644 drivers/staging/rtl8188eu/os_dep/usb_intf.c + delete mode 100644 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_RTL8723B.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_RTL8723B.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c + create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c +Merging iio/togreg (d484c21bacfa iio: adc: Add driver for Renesas RZ/G2L A/D converter) +$ git merge iio/togreg +Already up to date. +Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge mux/for-next +Already up to date. +Merging icc/icc-next (8bf5d31c4f06 interconnect: qcom: osm-l3: Use driver-specific naming) +$ git merge icc/icc-next +Auto-merging drivers/interconnect/qcom/icc-rpmh.c +Auto-merging drivers/interconnect/core.c +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../bindings/interconnect/qcom,rpmh.yaml | 11 + + drivers/interconnect/core.c | 3 + + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-rpmh.c | 93 +++ + drivers/interconnect/qcom/icc-rpmh.h | 2 + + drivers/interconnect/qcom/osm-l3.c | 60 +- + drivers/interconnect/qcom/sc7180.c | 96 +--- + drivers/interconnect/qcom/sc7280.c | 96 +--- + drivers/interconnect/qcom/sc8180x.c | 626 +++++++++++++++++++++ + drivers/interconnect/qcom/sc8180x.h | 174 ++++++ + drivers/interconnect/qcom/sdm845.c | 99 +--- + drivers/interconnect/qcom/sdx55.c | 96 +--- + drivers/interconnect/qcom/sm8150.c | 96 +--- + drivers/interconnect/qcom/sm8250.c | 96 +--- + drivers/interconnect/qcom/sm8350.c | 97 +--- + include/dt-bindings/interconnect/qcom,sc8180x.h | 185 ++++++ + 18 files changed, 1159 insertions(+), 683 deletions(-) + create mode 100644 drivers/interconnect/qcom/sc8180x.c + create mode 100644 drivers/interconnect/qcom/sc8180x.h + create mode 100644 include/dt-bindings/interconnect/qcom,sc8180x.h +Merging dmaengine/next (9760383b22ed Merge tag 'v5.14-rc5' into next) +$ git merge dmaengine/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 9 + + Documentation/admin-guide/kernel-parameters.txt | 5 + + .../devicetree/bindings/dma/altr,msgdma.yaml | 4 +- + .../devicetree/bindings/dma/st,stm32-dma.yaml | 7 + + drivers/dma/Kconfig | 23 +- + drivers/dma/Makefile | 2 +- + drivers/dma/acpi-dma.c | 18 +- + drivers/dma/altera-msgdma.c | 37 +- + drivers/dma/at_xdmac.c | 8 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 56 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 4 + + drivers/dma/dw/idma32.c | 138 ++++- + drivers/dma/dw/internal.h | 16 + + drivers/dma/dw/of.c | 49 +- + drivers/dma/dw/pci.c | 6 +- + drivers/dma/dw/platform.c | 6 +- + drivers/dma/ep93xx_dma.c | 6 +- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 8 +- + drivers/dma/hisi_dma.c | 10 +- + drivers/dma/idxd/Makefile | 8 + + drivers/dma/idxd/bus.c | 91 ++++ + drivers/dma/idxd/cdev.c | 68 ++- + drivers/dma/idxd/compat.c | 107 ++++ + drivers/dma/idxd/device.c | 311 +++++++++-- + drivers/dma/idxd/dma.c | 86 ++- + drivers/dma/idxd/idxd.h | 167 +++++- + drivers/dma/idxd/init.c | 148 ++++-- + drivers/dma/idxd/irq.c | 182 +------ + drivers/dma/idxd/registers.h | 6 + + drivers/dma/idxd/submit.c | 32 +- + drivers/dma/idxd/sysfs.c | 591 +++++---------------- + drivers/dma/ppc4xx/adma.c | 12 +- + drivers/dma/sh/usb-dmac.c | 2 +- + drivers/dma/sprd-dma.c | 1 + + drivers/dma/stm32-dma.c | 8 +- + drivers/dma/tegra210-adma.c | 7 +- + drivers/dma/xilinx/xilinx_dma.c | 15 +- + drivers/dma/xilinx/zynqmp_dma.c | 3 +- + include/linux/platform_data/dma-dw.h | 21 +- + include/uapi/linux/idxd.h | 23 + + 40 files changed, 1423 insertions(+), 878 deletions(-) + create mode 100644 drivers/dma/idxd/bus.c + create mode 100644 drivers/dma/idxd/compat.c +Merging cgroup/for-next (c5b6c8a56ef3 Merge branch 'for-5.15' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 11 +++ + kernel/cgroup/cgroup-v1.c | 8 +- + kernel/cgroup/cgroup.c | 1 - + kernel/cgroup/cpuset.c | 157 ++++++++++++++++++++------------ + 4 files changed, 119 insertions(+), 58 deletions(-) +Merging scsi/for-next (52e22d4d4e37 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging include/linux/blkdev.h +Auto-merging drivers/target/loopback/tcm_loop.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/base/core.c +Auto-merging drivers/ata/libata-scsi.c +Removing block/scsi_ioctl.c +Auto-merging block/blk-mq.c +Auto-merging block/Makefile +Auto-merging block/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 236 ++ + block/Kconfig | 26 +- + block/Makefile | 3 +- + block/blk-mq.c | 2 - + block/bsg-lib.c | 90 +- + block/bsg.c | 463 +--- + block/scsi_ioctl.c | 890 ------- + drivers/ata/libata-eh.c | 5 +- + drivers/ata/libata-scsi.c | 10 +- + drivers/ata/pata_falcon.c | 4 +- + drivers/base/core.c | 2 + + drivers/block/Kconfig | 3 +- + drivers/block/paride/Kconfig | 1 - + drivers/cdrom/cdrom.c | 78 +- + drivers/infiniband/ulp/iser/iser_memory.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 9 +- + drivers/s390/scsi/zfcp_fsf.c | 6 +- + drivers/scsi/53c700.c | 2 +- + drivers/scsi/BusLogic.c | 8 +- + drivers/scsi/Kconfig | 18 +- + drivers/scsi/Makefile | 3 +- + drivers/scsi/NCR5380.c | 6 +- + drivers/scsi/aacraid/aachba.c | 3 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/advansys.c | 4 +- + drivers/scsi/aha1542.c | 6 +- + drivers/scsi/be2iscsi/be_mgmt.c | 84 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/ch.c | 73 +- + drivers/scsi/csiostor/csio_scsi.c | 6 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/dpt_i2o.c | 4 +- + drivers/scsi/elx/efct/efct_lio.c | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 51 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- + drivers/scsi/hpsa.c | 6 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/ips.c | 2 +- + drivers/scsi/isci/request.c | 4 +- + drivers/scsi/libsas/Kconfig | 1 - + drivers/scsi/libsas/Makefile | 2 +- + drivers/scsi/libsas/sas_ata.c | 6 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_expander.c | 2 +- + drivers/scsi/libsas/sas_host_smp.c | 2 +- + drivers/scsi/libsas/sas_init.c | 2 +- + drivers/scsi/libsas/sas_phy.c | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 8 +- + drivers/scsi/lpfc/lpfc.h | 1 - + drivers/scsi/lpfc/lpfc_attr.c | 21 +- + drivers/scsi/lpfc/lpfc_crtn.h | 2 + + drivers/scsi/lpfc/lpfc_ct.c | 10 +- + drivers/scsi/lpfc/lpfc_disc.h | 9 +- + drivers/scsi/lpfc/lpfc_els.c | 128 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 198 +- + drivers/scsi/lpfc/lpfc_hw.h | 3 +- + drivers/scsi/lpfc/lpfc_hw4.h | 26 +- + drivers/scsi/lpfc/lpfc_ids.h | 4 +- + drivers/scsi/lpfc/lpfc_init.c | 93 +- + drivers/scsi/lpfc/lpfc_mbox.c | 5 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 43 +- + drivers/scsi/lpfc/lpfc_nvme.c | 10 +- + drivers/scsi/lpfc/lpfc_nvme.h | 6 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 11 +- + drivers/scsi/lpfc/lpfc_scsi.c | 147 +- + drivers/scsi/lpfc/lpfc_scsi.h | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 194 +- + drivers/scsi/lpfc/lpfc_sli4.h | 4 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 10 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 63 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 317 ++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 40 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 37 + + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 24 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 119 +- + drivers/scsi/mvumi.c | 2 +- + drivers/scsi/myrb.c | 11 +- + drivers/scsi/myrs.c | 11 +- + drivers/scsi/ncr53c8xx.c | 4 +- + drivers/scsi/pcmcia/fdomain_cs.c | 4 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/qedf/qedf_io.c | 8 +- + drivers/scsi/qedi/qedi_fw.c | 23 +- + drivers/scsi/qedi/qedi_iscsi.c | 36 +- + drivers/scsi/qedi/qedi_iscsi.h | 1 + + drivers/scsi/qla1280.c | 5 +- + drivers/scsi/qla2xxx/Makefile | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 30 + + drivers/scsi/qla2xxx/qla_bsg.c | 90 +- + drivers/scsi/qla2xxx/qla_bsg.h | 3 + + drivers/scsi/qla2xxx/qla_dbg.c | 3 +- + drivers/scsi/qla2xxx/qla_dbg.h | 1 + + drivers/scsi/qla2xxx/qla_def.h | 206 +- + drivers/scsi/qla2xxx/qla_edif.c | 3409 ++++++++++++++++++++++++ + drivers/scsi/qla2xxx/qla_edif.h | 128 + + drivers/scsi/qla2xxx/qla_edif_bsg.h | 220 ++ + drivers/scsi/qla2xxx/qla_fw.h | 12 +- + drivers/scsi/qla2xxx/qla_gbl.h | 50 +- + drivers/scsi/qla2xxx/qla_gs.c | 10 +- + drivers/scsi/qla2xxx/qla_init.c | 213 +- + drivers/scsi/qla2xxx/qla_iocb.c | 146 +- + drivers/scsi/qla2xxx/qla_isr.c | 347 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 33 +- + drivers/scsi/qla2xxx/qla_mid.c | 49 +- + drivers/scsi/qla2xxx/qla_nvme.c | 49 +- + drivers/scsi/qla2xxx/qla_nx.c | 2 - + drivers/scsi/qla2xxx/qla_os.c | 133 +- + drivers/scsi/qla2xxx/qla_sup.c | 1 - + drivers/scsi/qla2xxx/qla_target.c | 145 +- + drivers/scsi/qla2xxx/qla_target.h | 19 +- + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/qla4xxx/ql4_init.c | 4 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 4 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 30 +- + drivers/scsi/qla4xxx/ql4_nx.c | 10 +- + drivers/scsi/qla4xxx/ql4_os.c | 14 +- + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/scsi.c | 2 +- + drivers/scsi/scsi_bsg.c | 106 + + drivers/scsi/scsi_common.c | 9 + + drivers/scsi/scsi_debug.c | 125 +- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/scsi_error.c | 16 +- + drivers/scsi/scsi_ioctl.c | 851 +++++- + drivers/scsi/scsi_lib.c | 36 +- + drivers/scsi/scsi_logging.c | 18 +- + drivers/scsi/scsi_priv.h | 3 + + drivers/scsi/scsi_scan.c | 5 + + drivers/scsi/scsi_sysfs.c | 24 +- + drivers/scsi/scsi_transport_fc.c | 2 +- + drivers/scsi/scsi_transport_spi.c | 2 +- + drivers/scsi/sd.c | 121 +- + drivers/scsi/sd_zbc.c | 10 +- + drivers/scsi/sg.c | 33 +- + drivers/scsi/smartpqi/Kconfig | 8 +- + drivers/scsi/smartpqi/smartpqi.h | 6 +- + drivers/scsi/smartpqi/smartpqi_init.c | 68 +- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 4 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 4 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 4 +- + drivers/scsi/snic/snic_scsi.c | 12 +- + drivers/scsi/sr.c | 143 +- + drivers/scsi/st.c | 72 +- + drivers/scsi/stex.c | 6 +- + drivers/scsi/storvsc_drv.c | 4 +- + drivers/scsi/sun3_scsi.c | 5 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- + drivers/scsi/ufs/Kconfig | 16 + + drivers/scsi/ufs/Makefile | 2 + + drivers/scsi/ufs/cdns-pltfrm.c | 7 +- + drivers/scsi/ufs/tc-dwc-g210-pci.c | 32 +- + drivers/scsi/ufs/tc-dwc-g210-pltfrm.c | 7 +- + drivers/scsi/ufs/ufs-exynos.c | 7 +- + drivers/scsi/ufs/ufs-fault-injection.c | 70 + + drivers/scsi/ufs/ufs-fault-injection.h | 24 + + drivers/scsi/ufs/ufs-hisi.c | 7 +- + drivers/scsi/ufs/ufs-mediatek.c | 7 +- + drivers/scsi/ufs/ufs-qcom.c | 7 +- + drivers/scsi/ufs/ufs-sysfs.c | 25 +- + drivers/scsi/ufs/ufs.h | 54 +- + drivers/scsi/ufs/ufs_quirks.h | 6 + + drivers/scsi/ufs/ufshcd-pci.c | 48 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 47 - + drivers/scsi/ufs/ufshcd-pltfrm.h | 18 - + drivers/scsi/ufs/ufshcd.c | 612 +++-- + drivers/scsi/ufs/ufshcd.h | 107 +- + drivers/scsi/ufs/ufshci.h | 1 - + drivers/scsi/ufs/ufshpb.c | 2933 ++++++++++++++++++++ + drivers/scsi/ufs/ufshpb.h | 323 +++ + drivers/scsi/virtio_scsi.c | 4 +- + drivers/scsi/xen-scsifront.c | 2 +- + drivers/target/Kconfig | 2 +- + drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 2 +- + drivers/target/loopback/tcm_loop.c | 8 +- + drivers/target/sbp/sbp_target.c | 4 +- + drivers/target/target_core_alua.c | 94 +- + drivers/target/target_core_iblock.c | 2 +- + drivers/target/target_core_transport.c | 33 +- + drivers/target/target_core_user.c | 150 +- + drivers/usb/storage/transport.c | 2 +- + fs/nfsd/Kconfig | 2 +- + include/linux/blkdev.h | 33 +- + include/linux/bsg-lib.h | 1 + + include/linux/bsg.h | 38 +- + include/linux/cdrom.h | 6 +- + include/scsi/scsi_cmnd.h | 38 +- + include/scsi/scsi_device.h | 22 +- + include/scsi/scsi_devinfo.h | 6 +- + include/scsi/scsi_ioctl.h | 9 +- + include/scsi/scsi_request.h | 2 - + include/target/target_core_base.h | 8 +- + include/uapi/linux/target_core_user.h | 2 + + 198 files changed, 12214 insertions(+), 3495 deletions(-) + delete mode 100644 block/scsi_ioctl.c + create mode 100644 drivers/scsi/qla2xxx/qla_edif.c + create mode 100644 drivers/scsi/qla2xxx/qla_edif.h + create mode 100644 drivers/scsi/qla2xxx/qla_edif_bsg.h + create mode 100644 drivers/scsi/scsi_bsg.c + create mode 100644 drivers/scsi/ufs/ufs-fault-injection.c + create mode 100644 drivers/scsi/ufs/ufs-fault-injection.h + create mode 100644 drivers/scsi/ufs/ufshpb.c + create mode 100644 drivers/scsi/ufs/ufshpb.h +Merging scsi-mkp/for-next (848ade90ba9c scsi: sd: Do not exit sd_spinup_disk() quietly) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/sd.c +Merge made by the 'recursive' strategy. + drivers/scsi/fnic/fnic_scsi.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 13 +++++++++---- + drivers/scsi/ibmvscsi/ibmvfc.h | 1 + + drivers/scsi/qedf/qedf_main.c | 10 +++++----- + drivers/scsi/qedi/qedi_main.c | 14 +++++++------- + drivers/scsi/scsi_lib.c | 1 - + drivers/scsi/sd.c | 4 +++- + drivers/scsi/smartpqi/smartpqi.h | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 4 ++-- + drivers/scsi/wd719x.c | 8 +++++--- + drivers/target/target_core_pscsi.c | 18 +++++++++--------- + drivers/target/target_core_transport.c | 15 ++++++++++++--- + drivers/target/target_core_xcopy.c | 26 +++++++++++++++----------- + include/scsi/scsi_cmnd.h | 1 - + include/target/target_core_backend.h | 1 + + include/target/target_core_base.h | 2 ++ + 16 files changed, 73 insertions(+), 49 deletions(-) +Merging vhost/linux-next (879753c816db vdpa/mlx5: Fix queue type selection logic) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (c93ca5f21d93 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 1 + + drivers/remoteproc/qcom_q6v5_pas.c | 1 + + drivers/remoteproc/qcom_wcnss.c | 49 +++------ + drivers/remoteproc/qcom_wcnss.h | 4 +- + drivers/remoteproc/qcom_wcnss_iris.c | 120 +++++++++++++-------- + drivers/remoteproc/remoteproc_core.c | 4 +- + drivers/remoteproc/remoteproc_elf_helpers.h | 2 +- + include/linux/remoteproc.h | 5 +- + 8 files changed, 96 insertions(+), 90 deletions(-) +Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (d0ef631d40ba gpio: mlxbf2: Use DEFINE_RES_MEM_NAMED() helper macro) +$ git merge gpio-brgl/gpio/for-next +Removing include/linux/platform_data/gpio-dwapb.h +Auto-merging include/linux/of.h +Auto-merging drivers/gpio/gpio-tegra186.c +Auto-merging drivers/gpio/gpio-rcar.c +Auto-merging drivers/gpio/gpio-mt7621.c +Auto-merging drivers/gpio/gpio-brcmstb.c +Auto-merging drivers/gpio/gpio-aspeed-sgpio.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/driver-api/gpio/consumer.rst | 10 +- + Documentation/driver-api/gpio/driver.rst | 11 +- + MAINTAINERS | 2 +- + drivers/gpio/gpio-aspeed-sgpio.c | 178 ++++++++++++++++++----------- + drivers/gpio/gpio-brcmstb.c | 45 +------- + drivers/gpio/gpio-dwapb.c | 56 +++++---- + drivers/gpio/gpio-ml-ioh.c | 49 ++------ + drivers/gpio/gpio-mlxbf2.c | 43 +++---- + drivers/gpio/gpio-mt7621.c | 1 + + drivers/gpio/gpio-rcar.c | 4 +- + drivers/gpio/gpio-tegra186.c | 30 ++++- + drivers/gpio/gpiolib-devres.c | 2 +- + drivers/gpio/gpiolib-of.c | 16 +-- + drivers/gpio/gpiolib.c | 32 +++++- + drivers/mfd/intel_quark_i2c_gpio.c | 71 ++++++------ + include/linux/gpio/consumer.h | 14 +-- + include/linux/gpio/driver.h | 4 + + include/linux/of.h | 2 +- + include/linux/of_gpio.h | 15 +-- + include/linux/platform_data/gpio-dwapb.h | 25 ---- + 20 files changed, 302 insertions(+), 308 deletions(-) + delete mode 100644 include/linux/platform_data/gpio-dwapb.h +Merging gpio-intel/for-next (5111c2b6b019 gpio: dwapb: Get rid of legacy platform data) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (04853352952b Merge tag 'samsung-pinctrl-5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/qcom/Kconfig +Auto-merging drivers/pinctrl/pinctrl-single.c +Auto-merging drivers/pinctrl/pinctrl-ingenic.c +Auto-merging drivers/pinctrl/bcm/pinctrl-bcm2835.c +Auto-merging drivers/pinctrl/Kconfig +Auto-merging arch/arm64/boot/dts/mediatek/mt8183.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.txt +Removing Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt +Removing Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt +Removing Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt +Removing Documentation/devicetree/bindings/pinctrl/pinctrl-mt6797.txt +Removing Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml | 79 + + .../bindings/pinctrl/ingenic,pinctrl.yaml | 10 +- + .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 135 ++ + .../pinctrl/marvell,armada-37xx-pinctrl.txt | 8 +- + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 206 +++ + .../bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 173 ++ + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 373 +++++ + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 228 +++ + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 156 -- + .../devicetree/bindings/pinctrl/pinctrl-mt6797.txt | 83 - + .../devicetree/bindings/pinctrl/pinctrl-mt7622.txt | 490 ------ + .../devicetree/bindings/pinctrl/pinctrl-mt8183.txt | 132 -- + .../bindings/pinctrl/pinctrl-mt8195.yaml | 5 +- + .../bindings/pinctrl/qcom,mdm9607-pinctrl.yaml | 133 ++ + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 288 ---- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 239 +++ + .../bindings/pinctrl/qcom,sm6115-pinctrl.yaml | 179 ++ + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 155 ++ + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 1 + + .../bindings/pinctrl/xlnx,zynq-pinctrl.txt | 105 -- + .../bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 214 +++ + MAINTAINERS | 17 +- + arch/arm/boot/dts/mt8135.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 +- + drivers/pinctrl/Kconfig | 19 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 4 +- + drivers/pinctrl/aspeed/pinmux-aspeed.c | 3 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 3 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8mn.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8ulp.c | 278 ++++ + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 - + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 16 +- + drivers/pinctrl/pinctrl-ingenic.c | 545 +++++- + drivers/pinctrl/pinctrl-keembay.c | 1731 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-single.c | 21 +- + drivers/pinctrl/pinctrl-stmfx.c | 6 +- + drivers/pinctrl/pinctrl-zynq.c | 2 + + drivers/pinctrl/pinctrl-zynqmp.c | 10 - + drivers/pinctrl/qcom/Kconfig | 17 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-mdm9607.c | 1087 ++++++++++++ + drivers/pinctrl/qcom/pinctrl-sm6115.c | 923 +++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 37 +- + drivers/pinctrl/renesas/Kconfig | 11 + + drivers/pinctrl/renesas/Makefile | 1 + + drivers/pinctrl/renesas/core.c | 29 +- + drivers/pinctrl/renesas/pfc-r8a77995.c | 320 +++- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 1175 +++++++++++++ + drivers/pinctrl/renesas/pinctrl.c | 16 +- + drivers/pinctrl/renesas/sh_pfc.h | 7 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 116 ++ + drivers/pinctrl/samsung/pinctrl-exynos.h | 29 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 4 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/stm32/Kconfig | 6 + + drivers/pinctrl/stm32/Makefile | 1 + + drivers/pinctrl/stm32/pinctrl-stm32mp135.c | 1679 +++++++++++++++++++ + .../dt-bindings/pinctrl}/mt8135-pinfunc.h | 0 + .../dt-bindings/pinctrl}/mt8183-pinfunc.h | 0 + include/dt-bindings/pinctrl/pinctrl-zynq.h | 17 + + include/dt-bindings/pinctrl/rzg2l-pinctrl.h | 23 + + 67 files changed, 10130 insertions(+), 1439 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/intel,pinctrl-keembay.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt6797-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt6797.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,mdm9607-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm6115-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.yaml + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8ulp.c + create mode 100644 drivers/pinctrl/pinctrl-keembay.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-mdm9607.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm6115.c + create mode 100644 drivers/pinctrl/renesas/pinctrl-rzg2l.c + create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32mp135.c + rename {arch/arm/boot/dts => include/dt-bindings/pinctrl}/mt8135-pinfunc.h (100%) + rename {arch/arm64/boot/dts/mediatek => include/dt-bindings/pinctrl}/mt8183-pinfunc.h (100%) + create mode 100644 include/dt-bindings/pinctrl/pinctrl-zynq.h + create mode 100644 include/dt-bindings/pinctrl/rzg2l-pinctrl.h +Merging pinctrl-intel/for-next (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (c4c4637eb57f pinctrl: renesas: Add RZ/G2L pin and gpio controller driver) +$ git merge pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (cdd3d945dcec pinctrl: samsung: Add Exynos850 SoC specific data) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (7954f76161ea pwm: ab8500: Fix register offset calculation to not depend on probe order) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/pwm-ab8500.c | 17 ++++++-- + drivers/pwm/pwm-atmel.c | 102 ++++++++++++++++++++++++++++++++++++----------- + 2 files changed, 93 insertions(+), 26 deletions(-) +Merging userns/for-next (534471c614f8 Merge of ucount-fixes-for-5.14, and siginfo-si_trapno-for-v5.15 for testing in linux-next) +$ git merge userns/for-next +Auto-merging kernel/signal.c +Auto-merging include/linux/sched/signal.h +Auto-merging arch/sparc/kernel/process_64.c +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/arm/kernel/signal.c +Auto-merging arch/alpha/kernel/traps.c +Auto-merging arch/alpha/kernel/osf_sys.c +Merge made by the 'recursive' strategy. + arch/alpha/include/uapi/asm/siginfo.h | 2 -- + arch/alpha/kernel/osf_sys.c | 2 +- + arch/alpha/kernel/signal.c | 4 +-- + arch/alpha/kernel/traps.c | 26 +++++++-------- + arch/alpha/mm/fault.c | 4 +-- + arch/arm/kernel/signal.c | 39 ++++++++++++++++++++++ + arch/arm64/kernel/signal.c | 39 ++++++++++++++++++++++ + arch/arm64/kernel/signal32.c | 39 ++++++++++++++++++++++ + arch/mips/include/uapi/asm/siginfo.h | 2 -- + arch/sparc/include/uapi/asm/siginfo.h | 3 -- + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/signal32.c | 37 +++++++++++++++++++++ + arch/sparc/kernel/signal_64.c | 36 ++++++++++++++++++++ + arch/sparc/kernel/sys_sparc_32.c | 2 +- + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/sparc/kernel/traps_32.c | 22 ++++++------- + arch/sparc/kernel/traps_64.c | 44 +++++++++++-------------- + arch/sparc/kernel/unaligned_32.c | 2 +- + arch/sparc/mm/fault_32.c | 2 +- + arch/sparc/mm/fault_64.c | 2 +- + arch/x86/kernel/signal_compat.c | 6 ++++ + fs/signalfd.c | 4 +-- + include/linux/sched/signal.h | 11 ++----- + include/linux/signal.h | 2 +- + include/uapi/asm-generic/siginfo.h | 5 +++ + kernel/signal.c | 62 +++++++++++++++++++++++++---------- + 26 files changed, 305 insertions(+), 96 deletions(-) +Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) +$ git merge ktest/for-next +Already up to date. +Merging kselftest/next (2734d6c1b1a0 Linux 5.14-rc2) +$ git merge kselftest/next +Already up to date. +Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + kernel/livepatch/transition.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (8158da6a33f2 dt-bindings: rtc: add Epson RX-8025 and RX-8035) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-cmos.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/trivial-rtc.yaml | 3 + + drivers/rtc/Kconfig | 9 ++ + drivers/rtc/Makefile | 2 + + drivers/rtc/lib.c | 107 +++++++++++++++------ + drivers/rtc/lib_test.c | 81 ++++++++++++++++ + drivers/rtc/rtc-cmos.c | 8 +- + drivers/rtc/rtc-rx8025.c | 46 ++++++++- + drivers/rtc/rtc-s5m.c | 48 ++++----- + drivers/rtc/rtc-tps65910.c | 2 +- + 9 files changed, 242 insertions(+), 64 deletions(-) + create mode 100644 drivers/rtc/lib_test.c +Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up to date. +Merge made by the 'recursive' strategy. +Merging at24/at24/for-next (658ae44345c1 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05) +$ git merge 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 (28293b6c68cd ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/ntb/test/ntb_msi_test.c | 4 +++- + drivers/ntb/test/ntb_perf.c | 1 + + drivers/ntb/test/ntb_pingpong.c | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (b4d8a58f8dcf seccomp: Fix setting loaded filter count during TSYNC) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (b88972649fa0 lib/test_stackinit: Add assigned initializers) +$ git merge kspp/for-next/kspp +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 5 + + lib/test_stackinit.c | 252 +++++++++++++++++++++++++++++++++------------ + security/Kconfig.hardening | 71 +++++++++---- + 3 files changed, 241 insertions(+), 87 deletions(-) +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) +$ git merge 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 fsi/next +Already up to date. +Merging slimbus/for-next (e5c578adcdd9 slimbus: ngd: reset dma setup during runtime pm) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (80c3356bea4e nvmem: nintendo-otp: Add new driver for the Wii and Wii U OTP) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. +Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) +$ git merge xarray/main +Already up to date. +Merging hyperv/hyperv-next (7aff79e297ee Drivers: hv: Enable Hyper-V code to be built on ARM64) +$ git merge hyperv/hyperv-next +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 + + arch/arm64/Kbuild | 1 + + arch/arm64/hyperv/Makefile | 2 + + arch/arm64/hyperv/hv_core.c | 181 +++++++++++++++++++++++++++++ + arch/arm64/hyperv/mshyperv.c | 87 ++++++++++++++ + arch/arm64/include/asm/hyperv-tlfs.h | 69 +++++++++++ + arch/arm64/include/asm/mshyperv.h | 54 +++++++++ + arch/arm64/kernel/efi.c | 1 + + arch/x86/hyperv/hv_init.c | 165 +++++++++----------------- + arch/x86/include/asm/hyperv-tlfs.h | 9 ++ + arch/x86/include/asm/mshyperv.h | 4 - + arch/x86/kernel/cpu/mshyperv.c | 38 +++--- + drivers/clocksource/hyperv_timer.c | 3 - + drivers/hv/Kconfig | 7 +- + drivers/hv/hv_common.c | 219 +++++++++++++++++++++++++++++++++++ + drivers/hv/hv_util.c | 5 - + include/asm-generic/mshyperv.h | 13 +++ + include/clocksource/hyperv_timer.h | 11 +- + include/linux/hyperv.h | 16 --- + 19 files changed, 723 insertions(+), 165 deletions(-) + create mode 100644 arch/arm64/hyperv/Makefile + create mode 100644 arch/arm64/hyperv/hv_core.c + create mode 100644 arch/arm64/hyperv/mshyperv.c + create mode 100644 arch/arm64/include/asm/hyperv-tlfs.h + create mode 100644 arch/arm64/include/asm/mshyperv.h +Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + .../bindings/auxdisplay/hit,hd44780.yaml | 31 +++++++++++++++++++++- + drivers/auxdisplay/cfag12864b.c | 2 +- + drivers/auxdisplay/charlcd.c | 4 +-- + drivers/auxdisplay/hd44780.c | 2 +- + drivers/auxdisplay/ks0108.c | 18 +++---------- + 5 files changed, 36 insertions(+), 21 deletions(-) +Merging kgdb/kgdb/for-next (e868f0a3c4b9 kdb: Rename members of struct kdbtab_t) +$ git merge kgdb/kgdb/for-next +Auto-merging kernel/debug/kdb/kdb_support.c +Merge made by the 'recursive' strategy. + include/linux/kdb.h | 27 +- + kernel/debug/kdb/kdb_bp.c | 72 ++--- + kernel/debug/kdb/kdb_debugger.c | 1 - + kernel/debug/kdb/kdb_main.c | 626 ++++++++++++++++++---------------------- + kernel/debug/kdb/kdb_private.h | 18 -- + kernel/debug/kdb/kdb_support.c | 329 ++------------------- + kernel/trace/trace_kdb.c | 12 +- + samples/kdb/kdb_hello.c | 20 +- + 8 files changed, 385 insertions(+), 720 deletions(-) +Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (4f45f3404960 spi: spi-altera-dfl: support n5010 feature revision) +$ git merge fpga/for-next +Already up to date. +Merging kunit/test (e73f0f0ee754 Linux 5.14-rc1) +$ git merge kunit/test +Already up to date. +Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (acd8e8407b8f kunit: Print test statistics on failure) +$ git merge kunit-next/kunit +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kunit/kunit-tool.rst | 9 +- + Documentation/dev-tools/kunit/running_tips.rst | 10 ++ + fs/fat/.kunitconfig | 5 + + fs/fat/Kconfig | 14 +- + fs/fat/Makefile | 2 + + fs/fat/fat_test.c | 196 +++++++++++++++++++++++++ + fs/fat/misc.c | 3 + + lib/kunit/test.c | 109 ++++++++++++++ + lib/ubsan.c | 3 + + tools/testing/kunit/kunit.py | 36 +++-- + tools/testing/kunit/kunit_parser.py | 6 +- + tools/testing/kunit/kunit_tool_test.py | 29 +++- + 12 files changed, 398 insertions(+), 24 deletions(-) + create mode 100644 fs/fat/.kunitconfig + create mode 100644 fs/fat/fat_test.c +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 trivial/for-next +Already up to date. +Merging mhi/mhi-next (813272ed5238 Merge 5.14-rc5 into char-misc-next) +$ git merge mhi/mhi-next +Already up to date. +Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering) +$ git merge memblock/for-next +Merge made by the 'recursive' strategy. + mm/memblock.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) +$ git merge counters/counters +Already up to date. +Merging rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust) +$ git merge rust/rust-next +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.build +Auto-merging samples/Kconfig +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/kallsyms.c +Auto-merging init/Kconfig +Auto-merging include/linux/spinlock.h +Auto-merging include/linux/kallsyms.h +CONFLICT (content): Merge conflict in include/linux/kallsyms.h +Auto-merging arch/riscv/Makefile +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging MAINTAINERS +Resolved 'Makefile' using previous resolution. +Resolved 'include/linux/kallsyms.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 29c015fe3b55] Merge remote-tracking branch 'rust/rust-next' +$ 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 | 174 +- + arch/arm/rust/target.json | 28 + + arch/arm64/rust/target.json | 35 + + arch/powerpc/rust/target.json | 30 + + arch/riscv/Makefile | 1 + + arch/riscv/rust/rv32ima.json | 37 + + arch/riscv/rust/rv32imac.json | 37 + + arch/riscv/rust/rv64ima.json | 37 + + arch/riscv/rust/rv64imac.json | 37 + + arch/x86/rust/target.json | 37 + + include/linux/kallsyms.h | 2 +- + include/linux/spinlock.h | 17 +- + init/Kconfig | 28 + + kernel/kallsyms.c | 7 + + kernel/livepatch/core.c | 4 +- + kernel/printk/printk.c | 5 +- + lib/Kconfig.debug | 144 ++ + lib/vsprintf.c | 12 + + rust/.gitignore | 6 + + rust/Makefile | 316 +++ + rust/alloc/README.md | 32 + + rust/alloc/alloc.rs | 425 ++++ + rust/alloc/borrow.rs | 493 ++++ + rust/alloc/boxed.rs | 1728 ++++++++++++++ + rust/alloc/collections/mod.rs | 116 + + rust/alloc/fmt.rs | 587 +++++ + rust/alloc/lib.rs | 197 ++ + rust/alloc/macros.rs | 128 ++ + rust/alloc/prelude/mod.rs | 17 + + rust/alloc/prelude/v1.rs | 16 + + rust/alloc/raw_vec.rs | 612 +++++ + rust/alloc/rc.rs | 2539 +++++++++++++++++++++ + rust/alloc/slice.rs | 1271 +++++++++++ + rust/alloc/str.rs | 614 +++++ + rust/alloc/string.rs | 2847 +++++++++++++++++++++++ + rust/alloc/sync.rs | 2631 ++++++++++++++++++++++ + rust/alloc/vec/drain.rs | 157 ++ + rust/alloc/vec/drain_filter.rs | 145 ++ + rust/alloc/vec/into_iter.rs | 296 +++ + rust/alloc/vec/is_zero.rs | 106 + + rust/alloc/vec/mod.rs | 3255 +++++++++++++++++++++++++++ + rust/alloc/vec/partial_eq.rs | 49 + + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 170 ++ + rust/bindgen_parameters | 13 + + rust/build_error.rs | 33 + + rust/compiler_builtins.rs | 146 ++ + rust/exports.c | 16 + + rust/helpers.c | 235 ++ + rust/kernel/allocator.rs | 63 + + rust/kernel/bindings.rs | 28 + + rust/kernel/bindings_helper.h | 24 + + rust/kernel/buffer.rs | 39 + + rust/kernel/build_assert.rs | 80 + + rust/kernel/c_types.rs | 119 + + rust/kernel/chrdev.rs | 212 ++ + rust/kernel/error.rs | 272 +++ + rust/kernel/file.rs | 130 ++ + rust/kernel/file_operations.rs | 698 ++++++ + rust/kernel/io_buffer.rs | 153 ++ + rust/kernel/iov_iter.rs | 95 + + rust/kernel/lib.rs | 220 ++ + rust/kernel/linked_list.rs | 245 ++ + rust/kernel/miscdev.rs | 113 + + rust/kernel/module_param.rs | 497 ++++ + rust/kernel/of.rs | 101 + + rust/kernel/pages.rs | 176 ++ + rust/kernel/platdev.rs | 166 ++ + rust/kernel/prelude.rs | 28 + + rust/kernel/print.rs | 412 ++++ + rust/kernel/random.rs | 50 + + rust/kernel/raw_list.rs | 361 +++ + rust/kernel/rbtree.rs | 570 +++++ + rust/kernel/security.rs | 79 + + rust/kernel/static_assert.rs | 39 + + rust/kernel/str.rs | 259 +++ + rust/kernel/sync/arc.rs | 227 ++ + rust/kernel/sync/condvar.rs | 136 ++ + rust/kernel/sync/guard.rs | 82 + + rust/kernel/sync/locked_by.rs | 112 + + rust/kernel/sync/mod.rs | 84 + + rust/kernel/sync/mutex.rs | 101 + + rust/kernel/sync/spinlock.rs | 109 + + rust/kernel/sysctl.rs | 198 ++ + rust/kernel/task.rs | 193 ++ + rust/kernel/traits.rs | 26 + + rust/kernel/types.rs | 249 ++ + rust/kernel/user_ptr.rs | 191 ++ + rust/macros/lib.rs | 127 ++ + rust/macros/module.rs | 754 +++++++ + samples/Kconfig | 2 + + samples/Makefile | 1 + + samples/rust/Kconfig | 113 + + samples/rust/Makefile | 12 + + samples/rust/rust_chrdev.rs | 51 + + samples/rust/rust_minimal.rs | 38 + + samples/rust/rust_miscdev.rs | 150 ++ + samples/rust/rust_module_parameters.rs | 72 + + samples/rust/rust_print.rs | 57 + + samples/rust/rust_random.rs | 61 + + samples/rust/rust_semaphore.rs | 177 ++ + samples/rust/rust_semaphore_c.c | 212 ++ + samples/rust/rust_stack_probing.rs | 40 + + samples/rust/rust_sync.rs | 81 + + scripts/Makefile.build | 22 + + scripts/Makefile.lib | 12 + + scripts/generate_rust_analyzer.py | 143 ++ + scripts/kallsyms.c | 33 +- + scripts/kconfig/confdata.c | 67 +- + scripts/rust-version.sh | 31 + + tools/include/linux/kallsyms.h | 2 +- + tools/include/linux/lockdep.h | 2 +- + tools/lib/perf/include/perf/event.h | 2 +- + tools/lib/symbol/kallsyms.h | 2 +- + 129 files changed, 29604 insertions(+), 26 deletions(-) + create mode 100644 .rustfmt.toml + create mode 100644 Documentation/rust/arch-support.rst + create mode 100644 Documentation/rust/assets/favicon-16x16.png + create mode 100644 Documentation/rust/assets/favicon-32x32.png + create mode 100644 Documentation/rust/assets/rust-logo.png + create mode 100644 Documentation/rust/coding.rst + create mode 100644 Documentation/rust/docs.rst + create mode 100644 Documentation/rust/index.rst + create mode 100644 Documentation/rust/quick-start.rst + create mode 100644 arch/arm/rust/target.json + create mode 100644 arch/arm64/rust/target.json + create mode 100644 arch/powerpc/rust/target.json + create mode 100644 arch/riscv/rust/rv32ima.json + create mode 100644 arch/riscv/rust/rv32imac.json + create mode 100644 arch/riscv/rust/rv64ima.json + create mode 100644 arch/riscv/rust/rv64imac.json + create mode 100644 arch/x86/rust/target.json + create mode 100644 rust/.gitignore + create mode 100644 rust/Makefile + create mode 100644 rust/alloc/README.md + create mode 100644 rust/alloc/alloc.rs + create mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/alloc/boxed.rs + create mode 100644 rust/alloc/collections/mod.rs + create mode 100644 rust/alloc/fmt.rs + create mode 100644 rust/alloc/lib.rs + create mode 100644 rust/alloc/macros.rs + create mode 100644 rust/alloc/prelude/mod.rs + create mode 100644 rust/alloc/prelude/v1.rs + create mode 100644 rust/alloc/raw_vec.rs + create mode 100644 rust/alloc/rc.rs + create mode 100644 rust/alloc/slice.rs + create mode 100644 rust/alloc/str.rs + create mode 100644 rust/alloc/string.rs + create mode 100644 rust/alloc/sync.rs + create mode 100644 rust/alloc/vec/drain.rs + create mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/into_iter.rs + create mode 100644 rust/alloc/vec/is_zero.rs + create mode 100644 rust/alloc/vec/mod.rs + create mode 100644 rust/alloc/vec/partial_eq.rs + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/bindgen_parameters + create mode 100644 rust/build_error.rs + create mode 100644 rust/compiler_builtins.rs + create mode 100644 rust/exports.c + create mode 100644 rust/helpers.c + create mode 100644 rust/kernel/allocator.rs + create mode 100644 rust/kernel/bindings.rs + create mode 100644 rust/kernel/bindings_helper.h + create mode 100644 rust/kernel/buffer.rs + create mode 100644 rust/kernel/build_assert.rs + create mode 100644 rust/kernel/c_types.rs + create mode 100644 rust/kernel/chrdev.rs + create mode 100644 rust/kernel/error.rs + create mode 100644 rust/kernel/file.rs + create mode 100644 rust/kernel/file_operations.rs + create mode 100644 rust/kernel/io_buffer.rs + create mode 100644 rust/kernel/iov_iter.rs + create mode 100644 rust/kernel/lib.rs + create mode 100644 rust/kernel/linked_list.rs + create mode 100644 rust/kernel/miscdev.rs + create mode 100644 rust/kernel/module_param.rs + create mode 100644 rust/kernel/of.rs + create mode 100644 rust/kernel/pages.rs + create mode 100644 rust/kernel/platdev.rs + create mode 100644 rust/kernel/prelude.rs + create mode 100644 rust/kernel/print.rs + create mode 100644 rust/kernel/random.rs + create mode 100644 rust/kernel/raw_list.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100644 rust/kernel/security.rs + create mode 100644 rust/kernel/static_assert.rs + create mode 100644 rust/kernel/str.rs + create mode 100644 rust/kernel/sync/arc.rs + create mode 100644 rust/kernel/sync/condvar.rs + create mode 100644 rust/kernel/sync/guard.rs + create mode 100644 rust/kernel/sync/locked_by.rs + create mode 100644 rust/kernel/sync/mod.rs + create mode 100644 rust/kernel/sync/mutex.rs + create mode 100644 rust/kernel/sync/spinlock.rs + create mode 100644 rust/kernel/sysctl.rs + create mode 100644 rust/kernel/task.rs + create mode 100644 rust/kernel/traits.rs + create mode 100644 rust/kernel/types.rs + create mode 100644 rust/kernel/user_ptr.rs + create mode 100644 rust/macros/lib.rs + create mode 100644 rust/macros/module.rs + create mode 100644 samples/rust/Kconfig + create mode 100644 samples/rust/Makefile + create mode 100644 samples/rust/rust_chrdev.rs + create mode 100644 samples/rust/rust_minimal.rs + create mode 100644 samples/rust/rust_miscdev.rs + create mode 100644 samples/rust/rust_module_parameters.rs + create mode 100644 samples/rust/rust_print.rs + create mode 100644 samples/rust/rust_random.rs + create mode 100644 samples/rust/rust_semaphore.rs + create mode 100644 samples/rust/rust_semaphore_c.c + create mode 100644 samples/rust/rust_stack_probing.rs + create mode 100644 samples/rust/rust_sync.rs + create mode 100755 scripts/generate_rust_analyzer.py + create mode 100755 scripts/rust-version.sh +$ git am -3 ../patches/0001-fixup-for-rust-integration-with-Makefile.clang-creat.patch +Applying: fixup for rust integration with Makefile.clang creation +error: sha1 information is lacking or useless (Makefile). +error: could not build fake ancestor +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 fixup for rust integration with Makefile.clang creation +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git reset HEAD^ +Unstaged changes after reset: +M Makefile +M scripts/Makefile.clang +$ git add -A . +$ git commit -v -a --amend +[master ae0785699e2b] Merge remote-tracking branch 'rust/rust-next' + Date: Fri Aug 20 17:02:42 2021 +1000 +Merging cxl/next (ceeb0da0a032 cxl/mem: Adjust ram/pmem range to represent DPA ranges) +$ git merge cxl/next +Auto-merging drivers/cxl/core/bus.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/cxl/memory-devices.rst | 8 +- + drivers/cxl/Makefile | 4 +- + drivers/cxl/core/Makefile | 8 + + drivers/cxl/{core.c => core/bus.c} | 464 ++---------------------- + drivers/cxl/core/core.h | 20 + + drivers/cxl/core/memdev.c | 246 +++++++++++++ + drivers/cxl/core/pmem.c | 204 +++++++++++ + drivers/cxl/core/regs.c | 236 ++++++++++++ + drivers/cxl/cxl.h | 1 - + drivers/cxl/{mem.h => cxlmem.h} | 35 +- + drivers/cxl/pci.c | 433 ++++++++-------------- + drivers/cxl/pci.h | 1 + + drivers/cxl/pmem.c | 2 +- + 13 files changed, 945 insertions(+), 717 deletions(-) + create mode 100644 drivers/cxl/core/Makefile + rename drivers/cxl/{core.c => core/bus.c} (58%) + create mode 100644 drivers/cxl/core/core.h + create mode 100644 drivers/cxl/core/memdev.c + create mode 100644 drivers/cxl/core/pmem.c + create mode 100644 drivers/cxl/core/regs.c + rename drivers/cxl/{mem.h => cxlmem.h} (71%) +Merging folio/for-next (1a90e9dae32c mm/writeback: Add folio_write_one) +$ git merge folio/for-next +Auto-merging mm/util.c +CONFLICT (content): Merge conflict in mm/util.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page-writeback.c +Auto-merging mm/migrate.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/linux/writeback.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/netfs.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/io_uring.c +Auto-merging fs/afs/write.c +Resolved 'mm/filemap.c' using previous resolution. +Resolved 'mm/rmap.c' using previous resolution. +Resolved 'mm/util.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 165b836a69b3] Merge remote-tracking branch 'folio/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/cachetlb.rst | 6 + + Documentation/core-api/mm-api.rst | 5 + + Documentation/filesystems/netfs_library.rst | 2 + + arch/arc/include/asm/cacheflush.h | 1 + + arch/arm/include/asm/cacheflush.h | 1 + + arch/mips/include/asm/cacheflush.h | 2 + + arch/nds32/include/asm/cacheflush.h | 1 + + arch/nios2/include/asm/cacheflush.h | 3 +- + arch/parisc/include/asm/cacheflush.h | 3 +- + arch/sh/include/asm/cacheflush.h | 3 +- + arch/xtensa/include/asm/cacheflush.h | 3 +- + fs/afs/write.c | 9 +- + fs/cachefiles/rdwr.c | 16 +- + fs/io_uring.c | 2 +- + fs/jfs/jfs_metapage.c | 1 + + include/asm-generic/cacheflush.h | 6 + + include/linux/backing-dev.h | 6 +- + include/linux/flex_proportions.h | 9 +- + include/linux/gfp.h | 22 +- + include/linux/highmem-internal.h | 11 + + include/linux/highmem.h | 37 ++ + include/linux/huge_mm.h | 15 - + include/linux/ksm.h | 4 +- + include/linux/memcontrol.h | 231 ++++++----- + include/linux/migrate.h | 4 + + include/linux/mm.h | 239 +++++++++--- + include/linux/mm_inline.h | 103 +++-- + include/linux/mm_types.h | 77 ++++ + include/linux/mmdebug.h | 20 + + include/linux/netfs.h | 77 ++-- + include/linux/page-flags.h | 267 +++++++++---- + include/linux/page_idle.h | 99 +++-- + include/linux/page_owner.h | 8 +- + include/linux/page_ref.h | 158 +++++++- + include/linux/pagemap.h | 585 ++++++++++++++++++---------- + include/linux/rmap.h | 10 +- + include/linux/swap.h | 17 +- + include/linux/vmstat.h | 113 +++++- + include/linux/writeback.h | 9 +- + include/trace/events/pagemap.h | 46 ++- + include/trace/events/writeback.h | 28 +- + kernel/bpf/verifier.c | 2 +- + kernel/events/uprobes.c | 3 +- + lib/flex_proportions.c | 28 +- + mm/Makefile | 2 +- + mm/compaction.c | 4 +- + mm/filemap.c | 567 +++++++++++++-------------- + mm/folio-compat.c | 142 +++++++ + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 2 +- + mm/internal.h | 36 +- + mm/khugepaged.c | 8 +- + mm/ksm.c | 34 +- + mm/memcontrol.c | 358 +++++++++-------- + mm/memory-failure.c | 2 +- + mm/memory.c | 20 +- + mm/mempolicy.c | 10 + + mm/memremap.c | 2 +- + mm/migrate.c | 189 +++++---- + mm/mlock.c | 3 +- + mm/page-writeback.c | 477 +++++++++++++---------- + mm/page_alloc.c | 14 +- + mm/page_io.c | 4 +- + mm/page_owner.c | 10 +- + mm/rmap.c | 14 +- + mm/shmem.c | 7 +- + mm/swap.c | 197 +++++----- + mm/swap_state.c | 2 +- + mm/swapfile.c | 8 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 111 +++--- + mm/vmscan.c | 8 +- + mm/workingset.c | 52 +-- + 73 files changed, 2896 insertions(+), 1688 deletions(-) + create mode 100644 mm/folio-compat.c +Merging akpm-current/current (2832d098abfd ipc: replace costly bailout check in sysvipc_find_ipc()) +$ git merge --no-ff akpm-current/current +Auto-merging tools/testing/selftests/kvm/dirty_log_perf_test.c +Removing tools/include/asm-generic/bitops/find.h +Auto-merging mm/workingset.c +Auto-merging mm/vmscan.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/truncate.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap_state.c +Auto-merging mm/swap.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_owner.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page-writeback.c +CONFLICT (content): Merge conflict in mm/page-writeback.c +Auto-merging mm/migrate.c +Auto-merging mm/memremap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/memblock.c +Auto-merging mm/madvise.c +Auto-merging mm/ksm.c +Auto-merging mm/khugepaged.c +Auto-merging mm/kfence/report.c +Auto-merging mm/kasan/kasan.h +Auto-merging mm/kasan/hw_tags.c +Auto-merging mm/internal.h +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/compaction.c +Auto-merging mm/backing-dev.c +Auto-merging mm/Makefile +Auto-merging lib/vsprintf.c +Auto-merging lib/test_kasan.c +Auto-merging lib/test_bitmap.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/time/posix-timers.c +Auto-merging kernel/time/clocksource.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/sys.c +Auto-merging kernel/signal.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging kernel/cpu.c +Auto-merging init/main.c +Auto-merging include/linux/writeback.h +Auto-merging include/linux/units.h +CONFLICT (content): Merge conflict in include/linux/units.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page_idle.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/memcontrol.h +CONFLICT (content): Merge conflict in include/linux/memcontrol.h +Auto-merging include/linux/highmem.h +Auto-merging include/linux/highmem-internal.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/bitops.h +Auto-merging include/linux/bitmap.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/internal.h +Auto-merging fs/inode.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/fcntl.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/exec.c +Auto-merging fs/buffer.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/pci/controller/dwc/pci-dra7xx.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/mtd/nand/raw/intel-nand-controller.c +Auto-merging drivers/mmc/host/renesas_sdhi_core.c +Auto-merging drivers/mmc/host/mmc_spi.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/block/rnbd/rnbd-clt.c +Auto-merging drivers/base/node.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-map.c +Auto-merging arch/x86/kernel/apic/vector.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sh/include/asm/cacheflush.h +Auto-merging arch/s390/mm/init.c +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c +Auto-merging arch/powerpc/mm/book3s64/radix_tlb.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/include/asm/cacheflush.h +Auto-merging arch/nds32/include/asm/cacheflush.h +Auto-merging arch/mips/include/asm/cacheflush.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mach-rpc/ecard.c +Auto-merging arch/arm/include/asm/cacheflush.h +Auto-merging arch/arc/include/asm/bitops.h +Auto-merging arch/arc/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/core-api/cachetlb.rst +Resolved 'include/linux/memcontrol.h' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Resolved 'include/linux/units.h' using previous resolution. +Resolved 'mm/memcontrol.c' using previous resolution. +Resolved 'mm/page-writeback.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 477fbcc7353f] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-mm-numa | 24 + + Documentation/admin-guide/mm/damon/index.rst | 15 + + Documentation/admin-guide/mm/damon/start.rst | 114 +++ + Documentation/admin-guide/mm/damon/usage.rst | 112 +++ + Documentation/admin-guide/mm/index.rst | 1 + + Documentation/admin-guide/mm/memory-hotplug.rst | 800 ++++++++++-------- + .../admin-guide/mm/numa_memory_policy.rst | 15 +- + Documentation/admin-guide/sysctl/vm.rst | 3 +- + Documentation/core-api/cachetlb.rst | 86 +- + Documentation/dev-tools/kasan.rst | 13 +- + Documentation/dev-tools/kfence.rst | 98 ++- + .../translations/zh_CN/core-api/cachetlb.rst | 9 - + Documentation/vm/damon/api.rst | 20 + + Documentation/vm/damon/design.rst | 166 ++++ + Documentation/vm/damon/faq.rst | 51 ++ + Documentation/vm/damon/index.rst | 30 + + Documentation/vm/hwpoison.rst | 1 - + Documentation/vm/index.rst | 1 + + MAINTAINERS | 17 +- + arch/Kconfig | 30 +- + arch/alpha/include/asm/agp.h | 4 +- + arch/alpha/include/asm/bitops.h | 2 - + arch/alpha/kernel/pci-sysfs.c | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 2 + + arch/arc/Kconfig | 1 - + arch/arc/include/asm/bitops.h | 1 - + arch/arc/kernel/traps.c | 5 - + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/include/asm/bitops.h | 1 - + arch/arm/include/asm/cacheflush.h | 4 +- + arch/arm/kernel/setup.c | 20 +- + arch/arm/kernel/traps.c | 5 - + arch/arm/mach-rpc/ecard.c | 2 +- + arch/arm/mm/flush.c | 33 - + arch/arm/mm/nommu.c | 6 - + arch/arm/tools/syscall.tbl | 2 + + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/bitops.h | 1 - + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/kvm/hyp/reserved_mem.c | 9 +- + arch/arm64/mm/init.c | 36 +- + arch/arm64/mm/mmu.c | 3 +- + arch/csky/abiv1/cacheflush.c | 11 - + arch/csky/abiv1/inc/abi/cacheflush.h | 4 +- + arch/csky/include/asm/bitops.h | 1 - + arch/csky/kernel/probes/kprobes.c | 3 +- + arch/h8300/include/asm/bitops.h | 1 - + arch/h8300/kernel/traps.c | 4 - + arch/hexagon/include/asm/bitops.h | 1 - + arch/hexagon/kernel/traps.c | 4 - + arch/ia64/include/asm/bitops.h | 2 - + arch/ia64/kernel/acpi.c | 2 +- + arch/ia64/kernel/syscalls/syscall.tbl | 2 + + arch/ia64/mm/init.c | 3 +- + arch/m68k/include/asm/bitops.h | 2 - + arch/m68k/kernel/syscalls/syscall.tbl | 2 + + arch/microblaze/include/asm/page.h | 3 +- + arch/microblaze/include/asm/pgtable.h | 2 - + arch/microblaze/kernel/syscalls/syscall.tbl | 2 + + arch/microblaze/mm/init.c | 12 - + arch/microblaze/mm/pgtable.c | 17 +- + arch/mips/Kconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 1 - + arch/mips/configs/pic32mzda_defconfig | 1 - + arch/mips/configs/rt305x_defconfig | 1 - + arch/mips/configs/xway_defconfig | 1 - + arch/mips/include/asm/bitops.h | 1 - + arch/mips/include/asm/cacheflush.h | 8 +- + arch/mips/kernel/setup.c | 14 +- + arch/mips/kernel/syscalls/syscall_n32.tbl | 2 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 2 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 2 + + arch/nds32/include/asm/cacheflush.h | 3 +- + arch/nds32/kernel/traps.c | 5 - + arch/nds32/mm/cacheflush.c | 9 - + arch/nios2/kernel/traps.c | 5 - + arch/openrisc/include/asm/bitops.h | 1 - + arch/openrisc/kernel/traps.c | 5 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + arch/parisc/include/asm/bitops.h | 2 - + arch/parisc/include/asm/cacheflush.h | 8 +- + arch/parisc/kernel/cache.c | 3 +- + arch/parisc/kernel/syscalls/syscall.tbl | 2 + + arch/parisc/kernel/traps.c | 4 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/bitops.h | 2 - + arch/powerpc/include/asm/cputhreads.h | 2 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 2 + + arch/powerpc/kernel/traps.c | 5 - + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + arch/powerpc/mm/mem.c | 3 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 13 +- + arch/riscv/include/asm/bitops.h | 1 - + arch/riscv/kernel/traps.c | 5 - + arch/riscv/mm/init.c | 44 +- + arch/s390/Kconfig | 1 - + arch/s390/include/asm/bitops.h | 1 - + arch/s390/kernel/setup.c | 10 +- + arch/s390/kernel/syscalls/syscall.tbl | 2 + + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/mm/fault.c | 2 +- + arch/s390/mm/init.c | 3 +- + arch/sh/include/asm/bitops.h | 1 - + arch/sh/include/asm/cacheflush.h | 8 +- + arch/sh/kernel/syscalls/syscall.tbl | 2 + + arch/sh/mm/init.c | 3 +- + arch/sparc/include/asm/bitops_32.h | 1 - + arch/sparc/include/asm/bitops_64.h | 2 - + arch/sparc/kernel/syscalls/syscall.tbl | 2 + + arch/um/kernel/trap.c | 4 - + arch/x86/Kconfig | 1 - + arch/x86/configs/i386_defconfig | 1 - + arch/x86/configs/x86_64_defconfig | 1 - + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/bitops.h | 2 - + arch/x86/kernel/aperture_64.c | 5 +- + arch/x86/kernel/apic/vector.c | 4 +- + arch/x86/kernel/ldt.c | 6 +- + arch/x86/mm/init.c | 23 +- + arch/x86/mm/init_32.c | 3 +- + arch/x86/mm/init_64.c | 3 +- + arch/x86/mm/numa.c | 5 +- + arch/x86/mm/numa_emulation.c | 5 +- + arch/x86/realmode/init.c | 2 +- + arch/x86/um/Kconfig | 1 - + arch/xtensa/include/asm/bitops.h | 1 - + arch/xtensa/kernel/syscalls/syscall.tbl | 2 + + block/blk-map.c | 2 +- + block/blk-mq.c | 2 +- + drivers/acpi/acpi_memhotplug.c | 46 +- + drivers/acpi/tables.c | 5 +- + drivers/base/arch_numa.c | 5 +- + drivers/base/memory.c | 229 ++++- + drivers/base/node.c | 2 - + drivers/block/rnbd/rnbd-clt.c | 2 +- + drivers/dax/kmem.c | 43 +- + drivers/devfreq/devfreq.c | 2 +- + drivers/dma/ti/edma.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +- + drivers/hwmon/ltc2992.c | 3 +- + drivers/hwmon/mr75203.c | 2 +- + drivers/iio/adc/ad7124.c | 2 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 3 +- + drivers/iio/light/as73211.c | 3 +- + drivers/infiniband/hw/irdma/hw.c | 16 +- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/i2c/ov02a10.c | 2 +- + drivers/media/mc/mc-devnode.c | 2 +- + drivers/mmc/host/jz4740_mmc.c | 4 - + drivers/mmc/host/mmc_spi.c | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 2 +- + drivers/net/virtio_net.c | 2 +- + drivers/of/of_reserved_mem.c | 12 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/phy/st/phy-stm32-usbphyc.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/thermal/devfreq_cooling.c | 2 +- + drivers/tty/n_tty.c | 2 +- + drivers/virt/acrn/ioreq.c | 3 +- + drivers/virtio/virtio_mem.c | 26 +- + fs/buffer.c | 56 +- + fs/coredump.c | 15 +- + fs/drop_caches.c | 3 +- + fs/eventpoll.c | 18 +- + fs/exec.c | 12 +- + fs/f2fs/segment.c | 8 +- + fs/fcntl.c | 3 +- + fs/fs-writeback.c | 28 +- + fs/fs_context.c | 4 +- + fs/hfsplus/catalog.c | 16 +- + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_raw.h | 12 +- + fs/hfsplus/xattr.c | 18 +- + fs/inode.c | 48 +- + fs/internal.h | 1 - + fs/locks.c | 6 +- + fs/namei.c | 8 +- + fs/namespace.c | 7 +- + fs/nilfs2/sysfs.c | 26 +- + 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 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/namei.c | 49 +- + fs/ocfs2/namei.h | 2 + + fs/ocfs2/quota_global.c | 1 - + fs/ocfs2/quota_local.c | 2 + + fs/ocfs2/refcounttree.c | 15 +- + fs/ocfs2/xattr.c | 12 +- + fs/ocfs2/xattr.h | 1 + + fs/pipe.c | 2 +- + fs/proc/array.c | 18 +- + fs/proc/base.c | 5 +- + fs/proc/fd.c | 23 +- + fs/proc/kcore.c | 73 ++ + fs/proc/page.c | 40 +- + fs/ramfs/inode.c | 4 + + fs/select.c | 4 +- + fs/userfaultfd.c | 116 ++- + include/asm-generic/bitops.h | 1 - + include/asm-generic/bitops/le.h | 64 -- + include/linux/backing-dev-defs.h | 2 + + include/linux/backing-dev.h | 19 + + include/linux/bitmap.h | 34 +- + include/linux/bitops.h | 34 - + include/linux/compaction.h | 2 + + include/linux/cpumask.h | 46 +- + include/linux/damon.h | 268 ++++++ + include/linux/find.h | 372 +++++++++ + include/linux/fs.h | 1 + + include/linux/highmem-internal.h | 27 +- + include/linux/highmem.h | 33 +- + include/linux/kfence.h | 7 +- + include/linux/memblock.h | 2 - + include/linux/memcontrol.h | 132 +-- + include/linux/memory.h | 57 +- + include/linux/memory_hotplug.h | 34 +- + include/linux/mempolicy.h | 21 +- + include/linux/memremap.h | 6 + + include/linux/migrate.h | 14 +- + include/linux/mm.h | 17 +- + include/linux/mm_types.h | 2 + + include/linux/mm_types_task.h | 5 + + include/linux/mmzone.h | 23 +- + include/linux/once.h | 2 +- + include/linux/page-flags.h | 17 +- + include/linux/page_ext.h | 2 +- + include/linux/page_idle.h | 6 +- + include/linux/pagemap.h | 61 +- + include/linux/rmap.h | 8 +- + include/linux/sched.h | 8 + + include/linux/sched/mm.h | 31 +- + include/linux/sched/user.h | 3 +- + include/linux/shmem_fs.h | 25 +- + include/linux/slub_def.h | 6 + + include/linux/swap.h | 28 +- + include/linux/syscalls.h | 1 + + include/linux/threads.h | 2 +- + include/linux/units.h | 10 +- + include/linux/userfaultfd_k.h | 8 +- + include/linux/vm_event_item.h | 2 + + include/linux/vmpressure.h | 2 +- + include/linux/writeback.h | 4 +- + include/trace/events/damon.h | 43 + + include/trace/events/migrate.h | 3 +- + include/trace/events/mmflags.h | 6 +- + include/trace/events/page_ref.h | 4 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/mempolicy.h | 1 + + init/initramfs.c | 2 + + init/main.c | 28 +- + init/noinitramfs.c | 2 + + ipc/msg.c | 2 +- + ipc/namespace.c | 2 +- + ipc/sem.c | 9 +- + ipc/shm.c | 2 +- + ipc/util.c | 16 +- + kernel/acct.c | 2 +- + kernel/cgroup/namespace.c | 2 +- + kernel/cpu.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 51 ++ + kernel/hung_task.c | 44 + + kernel/kthread.c | 21 +- + kernel/nsproxy.c | 2 +- + kernel/pid_namespace.c | 5 +- + kernel/sched/core.c | 35 +- + kernel/sched/sched.h | 4 +- + kernel/signal.c | 2 +- + kernel/sys.c | 7 - + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 10 +- + kernel/time/clocksource.c | 4 +- + kernel/time/namespace.c | 4 +- + kernel/time/posix-timers.c | 4 +- + kernel/user.c | 25 + + kernel/user_namespace.c | 2 +- + lib/Kconfig | 3 - + lib/Kconfig.debug | 15 +- + lib/dump_stack.c | 3 +- + lib/find_bit.c | 21 + + lib/find_bit_benchmark.c | 21 + + lib/genalloc.c | 2 +- + lib/iov_iter.c | 8 +- + lib/math/Kconfig | 2 +- + lib/math/rational.c | 3 + + lib/scatterlist.c | 5 +- + lib/string.c | 130 ++- + lib/test_bitmap.c | 37 + + lib/test_kasan.c | 80 +- + lib/test_kasan_module.c | 20 +- + lib/test_printf.c | 2 +- + lib/test_sort.c | 40 +- + lib/test_vmalloc.c | 5 +- + lib/vsprintf.c | 26 +- + mm/Kconfig | 17 +- + mm/Makefile | 1 + + mm/backing-dev.c | 11 + + mm/bootmem_info.c | 4 +- + mm/compaction.c | 87 +- + mm/damon/Kconfig | 68 ++ + mm/damon/Makefile | 5 + + mm/damon/core-test.h | 253 ++++++ + mm/damon/core.c | 720 ++++++++++++++++ + mm/damon/dbgfs-test.h | 126 +++ + mm/damon/dbgfs.c | 623 ++++++++++++++ + mm/damon/vaddr-test.h | 329 ++++++++ + mm/damon/vaddr.c | 614 ++++++++++++++ + mm/debug_vm_pgtable.c | 918 +++++++++++++-------- + mm/filemap.c | 24 +- + mm/gup.c | 109 ++- + mm/highmem.c | 2 +- + mm/huge_memory.c | 32 +- + mm/hugetlb.c | 186 ++++- + mm/hwpoison-inject.c | 2 +- + mm/internal.h | 9 + + mm/kasan/hw_tags.c | 43 - + mm/kasan/kasan.h | 1 - + mm/kasan/report.c | 29 +- + mm/kfence/core.c | 3 + + mm/kfence/kfence.h | 2 + + mm/kfence/report.c | 19 +- + mm/khugepaged.c | 2 +- + mm/kmemleak.c | 2 +- + mm/ksm.c | 8 +- + mm/madvise.c | 1 + + mm/memblock.c | 22 +- + mm/memcontrol.c | 210 +++-- + mm/memory-failure.c | 54 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 372 ++++++++- + mm/mempolicy.c | 189 ++++- + mm/memremap.c | 25 +- + mm/migrate.c | 315 ++++++- + mm/mmap.c | 7 +- + mm/mremap.c | 52 +- + mm/oom_kill.c | 77 +- + mm/page-writeback.c | 122 ++- + mm/page_alloc.c | 114 ++- + mm/page_ext.c | 12 +- + mm/page_idle.c | 10 - + mm/page_isolation.c | 7 +- + mm/page_owner.c | 14 +- + mm/percpu.c | 36 +- + mm/rmap.c | 20 +- + mm/shmem.c | 285 +++---- + mm/slab_common.c | 2 + + mm/slub.c | 837 ++++++++++++------- + mm/sparse.c | 46 +- + mm/swap.c | 22 - + mm/swap_state.c | 7 - + mm/swapfile.c | 8 +- + mm/truncate.c | 47 +- + mm/userfaultfd.c | 15 +- + mm/vmalloc.c | 79 +- + mm/vmpressure.c | 10 +- + mm/vmscan.c | 247 +++++- + mm/vmstat.c | 73 +- + mm/workingset.c | 10 + + mm/zsmalloc.c | 10 +- + net/ncsi/ncsi-manage.c | 4 +- + scripts/checkpatch.pl | 11 +- + security/tomoyo/domain.c | 13 +- + tools/include/asm-generic/bitops.h | 1 - + tools/include/asm-generic/bitops/find.h | 145 ---- + tools/include/linux/bitmap.h | 11 +- + .../bitops => tools/include/linux}/find.h | 54 +- + tools/lib/find_bit.c | 20 + + tools/perf/bench/find-bit-bench.c | 2 +- + tools/perf/builtin-c2c.c | 6 +- + tools/perf/builtin-record.c | 2 +- + tools/perf/tests/bitmap.c | 2 +- + tools/perf/tests/mem2node.c | 2 +- + tools/perf/util/affinity.c | 4 +- + tools/perf/util/header.c | 4 +- + tools/perf/util/metricgroup.c | 2 +- + tools/perf/util/mmap.c | 4 +- + tools/testing/scatterlist/linux/mm.h | 1 - + tools/testing/selftests/damon/Makefile | 7 + + tools/testing/selftests/damon/_chk_dependency.sh | 28 + + tools/testing/selftests/damon/debugfs_attrs.sh | 75 ++ + tools/testing/selftests/kvm/dirty_log_perf_test.c | 2 +- + tools/testing/selftests/kvm/dirty_log_test.c | 4 +- + .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 2 +- + tools/testing/selftests/memfd/memfd_test.c | 2 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/Makefile | 3 + + tools/testing/selftests/vm/ksm_tests.c | 662 +++++++++++++++ + tools/testing/selftests/vm/run_vmtests.sh | 96 +++ + tools/testing/selftests/vm/userfaultfd.c | 13 + + 401 files changed, 10761 insertions(+), 3524 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-numa + create mode 100644 Documentation/admin-guide/mm/damon/index.rst + create mode 100644 Documentation/admin-guide/mm/damon/start.rst + create mode 100644 Documentation/admin-guide/mm/damon/usage.rst + create mode 100644 Documentation/vm/damon/api.rst + create mode 100644 Documentation/vm/damon/design.rst + create mode 100644 Documentation/vm/damon/faq.rst + create mode 100644 Documentation/vm/damon/index.rst + create mode 100644 include/linux/damon.h + create mode 100644 include/linux/find.h + create mode 100644 include/trace/events/damon.h + create mode 100644 mm/damon/Kconfig + create mode 100644 mm/damon/Makefile + create mode 100644 mm/damon/core-test.h + create mode 100644 mm/damon/core.c + create mode 100644 mm/damon/dbgfs-test.h + create mode 100644 mm/damon/dbgfs.c + create mode 100644 mm/damon/vaddr-test.h + create mode 100644 mm/damon/vaddr.c + delete mode 100644 tools/include/asm-generic/bitops/find.h + rename {include/asm-generic/bitops => tools/include/linux}/find.h (83%) + create mode 100644 tools/testing/selftests/damon/Makefile + create mode 100644 tools/testing/selftests/damon/_chk_dependency.sh + create mode 100644 tools/testing/selftests/damon/debugfs_attrs.sh + create mode 100644 tools/testing/selftests/vm/ksm_tests.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/16)
Rebasing (2/16)
Rebasing (3/16)
Rebasing (4/16)
Rebasing (5/16)
Rebasing (6/16)
Rebasing (7/16)
Rebasing (8/16)
Rebasing (9/16)
Rebasing (10/16)
Rebasing (11/16)
Rebasing (12/16)
Rebasing (13/16)
Rebasing (14/16)
Rebasing (15/16)
Rebasing (16/16)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + cebda7fe5451...652afd45cf13 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (652afd45cf13 arch: remove compat_alloc_user_space) +$ git merge --no-ff akpm/master +Removing arch/arm64/lib/copy_in_user.S +Merge made by the 'recursive' strategy. + Makefile | 6 + + arch/arm64/include/asm/compat.h | 5 - + arch/arm64/include/asm/uaccess.h | 11 -- + arch/arm64/include/asm/unistd32.h | 10 +- + arch/arm64/lib/Makefile | 2 +- + arch/arm64/lib/copy_in_user.S | 77 ------------ + arch/mips/cavium-octeon/octeon-memcpy.S | 2 - + arch/mips/include/asm/compat.h | 8 -- + arch/mips/include/asm/uaccess.h | 26 ---- + arch/mips/kernel/syscalls/syscall_n32.tbl | 10 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 10 +- + arch/mips/lib/memcpy.S | 11 -- + arch/parisc/include/asm/compat.h | 6 - + arch/parisc/include/asm/uaccess.h | 2 - + arch/parisc/kernel/syscalls/syscall.tbl | 8 +- + arch/parisc/lib/memcpy.c | 9 -- + arch/powerpc/include/asm/compat.h | 16 --- + arch/powerpc/kernel/syscalls/syscall.tbl | 10 +- + arch/s390/include/asm/compat.h | 10 -- + arch/s390/include/asm/uaccess.h | 3 - + arch/s390/kernel/syscalls/syscall.tbl | 10 +- + arch/s390/lib/uaccess.c | 63 ---------- + arch/sparc/include/asm/compat.h | 19 --- + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/signal32.c | 12 +- + arch/sparc/kernel/signal_64.c | 8 +- + arch/sparc/kernel/syscalls/syscall.tbl | 10 +- + arch/x86/entry/syscalls/syscall_32.tbl | 4 +- + arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + arch/x86/include/asm/compat.h | 13 -- + arch/x86/include/asm/uaccess_64.h | 7 -- + drivers/of/kexec.c | 1 + + include/linux/compat.h | 39 ++---- + include/linux/compiler_attributes.h | 6 + + include/linux/gfp.h | 2 + + include/linux/mm.h | 34 ------ + include/linux/percpu.h | 3 + + include/linux/slab.h | 118 +++++++++++++----- + include/linux/uaccess.h | 10 -- + include/uapi/asm-generic/unistd.h | 10 +- + kernel/compat.c | 21 ---- + kernel/kexec.c | 103 ++++++---------- + kernel/sys_ni.c | 5 - + mm/mempolicy.c | 197 +++++++----------------------- + mm/migrate.c | 50 ++++---- + mm/workingset.c | 2 +- + scripts/check_extable.sh | 2 +- + scripts/checkpatch.pl | 3 +- + 48 files changed, 283 insertions(+), 715 deletions(-) + delete mode 100644 arch/arm64/lib/copy_in_user.S diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..63b03ec8de41 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20210820 |