diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-08-18 14:53:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-08-18 14:53:19 +1000 |
| commit | 83c52faab7b150eb4ffe88e9d874e53aa2fc5b02 (patch) | |
| tree | 34a0bb1fa9f0c916352e283412e521a87e19c155 | |
| parent | c9467412a10938a685af9561566d709af6a9f18c (diff) | |
| download | linux-next-20200818.tar.gz linux-next-20200818.tar.xz | |
Add linux-next specific files for 20200818next-20200818
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 329 | ||||
| -rw-r--r-- | Next/Trees | 331 | ||||
| -rw-r--r-- | Next/merge.log | 4364 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5025 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..96779373636e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,329 @@ +Name SHA1 +---- ---- +origin 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +fixes 73c7adb54169250aa31935d2de57ff58388028ec +kbuild-current 06a81c1c7db9bd5de0bd38cd5acc44bb22b99150 +arc-current 97363c07f02346696e1d816098b1209fd2c1111e +arm-current 5c6360ee4a0e7f62de34341ad5d3c936f49b391d +arm64-fixes 6a7389f0312f01bb6641d37b395548a2922a057c +arm-soc-fixes fe1d899f4212a08dad98accb47cd335b58cc9085 +uniphier-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +drivers-memory-fixes 7ff3a2a626f7161c94fb58a0058dbdaedaa9d166 +m68k-current 382f429bb559fe991b1ece2e5e58c812e28b3ad8 +powerpc-fixes 388692e943a58f28aac0fe83e75f5994da9ff8a1 +s390-fixes b97bf44f99155e57088e16974afb1f2d7b5287aa +sparc 0a95a6d1a4cd6e10e70f8a6c93dc2ecd02e7d6ab +fscrypt-current 2b4eae95c7361e0a147b838715c8baa1380a428f +net bf2bcd6f1a8822ea45465f86d705951725883ee8 +bpf cf28f3bbfca097d956f9021cb710dfad56adcc62 +ipsec 4eb2e13415757a2bce5bb0d580d22bbeef1f5346 +netfilter b3b2854dcf704c1db05d897072f98e8b79398af1 +ipvs 7c7ab580db49cc7befe5f4b91bb1920cd6b07575 +wireless-drivers 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +mac80211 b3b2854dcf704c1db05d897072f98e8b79398af1 +rdma-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +sound-current d8d0db7bb358ef65d60726a61bfcd08eccff0bc0 +sound-asoc-fixes e4135d350a2d33b9a0364d606839e4f68e0e3e91 +regmap-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +regulator-fixes 79d0a6620a76351574e197b96474b999947b56b6 +spi-fixes e5c9b1cfe42c4a63f72be19349384e418bdbc351 +pci-current 7c2308f79fc81ba0bf24ccd2429fb483a91bcd51 +driver-core.current 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +tty.current 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +usb.current 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +usb-gadget-fixes 8778eb0927ddcd3f431805c37b78fa56481aeed9 +usb-serial-fixes 47ec5303d73ea344e84f46660fff693c57641386 +usb-chipidea-fixes 2d79b3360dcc0a842398e2231d5cffb2c5d60cac +phy 04db2304a9495b98b8976c9a8cc5f9845be35ba8 +staging.current 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +char-misc.current 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +soundwire-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +thunderbolt-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +input-current 9e8238020c5beba64e7ffafbb7ea0fb02fe68270 +crypto-current 21dfbcd1f5cbff9cf2f9e7e43475aed8d072b0dd +ide 6800cd8cbc6e35989f8d1aa20fac58031231b90f +vfio-fixes aae7a75a821a793ed6b8ad502a5890fb8e8f172d +kselftest-fixes 3c01655ac82eb6d1cc2cfe9507031f1b5e0a6df1 +modules-fixes 57baec7b1b0459ef885e816d8c28a9d9a62bb8de +dmaengine-fixes 5b2aa9f918f6837ae943557f8cec02c34fcf80e7 +backlight-fixes 219d54332a09e8d8741c1e1982f5eae56099de85 +mtd-fixes f7e6b19bc76471ba03725fe58e0c218a3d6266c3 +mfd-fixes 603d9299da32955d49995738541f750f2ae74839 +v4l-dvb-fixes 0d6db85131e014c128e57649793aff5aa96e065f +reset-fixes b460e0a9e2404450a0cc4c5e6476483d6cda1b26 +mips-fixes 433c1ca0d441ee0b88fdd83c84ee6d6d43080dcd +at91-fixes 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +omap-fixes d1db7b80a6c8c5f81db0e80664d29b374750e2c6 +kvm-fixes 06a81c1c7db9bd5de0bd38cd5acc44bb22b99150 +kvms390-fixes 774911290c589e98e3638e73b24b0a4d4530e97c +hwmon-fixes 51fb91ed5a6fa855a74731610cd5435d83d6e17f +nvdimm-fixes 543094e19c82b5d171e139d09a1a3ea0a7361117 +btrfs-fixes c9f8e44ec4a513fa4fa8cb068e0cc746751ef665 +vfs-fixes bb1a773d5b6bf018bf84fdb3fbba01d3ef54e2c9 +dma-mapping-fixes 7dc6fd0f3b8404542718039f5de19fe56e474578 +i3c-fixes 6fbc7275c7a9ba97877050335f290341a1fd8dbf +drivers-x86-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +samsung-krzk-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pinctrl-samsung-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +devicetree-fixes 5f0b06da5cde3f0a613308b89f0afea678559fdf +scsi-fixes 3f0dcfbcd2e162fc0a11c1f59b7acd42ee45f126 +drm-fixes 887c909dd5d557c203a233ebbe238c18438a680a +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +mmc-fixes ebd4050c6144b38098d8eed34df461e5e3fa82a9 +rtc-fixes 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gnss-fixes 48778464bb7d346b47157d21ffde2af6b2d39110 +hyperv-fixes b9d8cf2eb3ceecdee3434b87763492aee9e28845 +soc-fsl-fixes fe8fe7723a3a824790bda681b40efd767e2251a7 +risc-v-fixes 76d4467a97bd8c4bb01e810a5129c8f96d7dcbf8 +pidfd-fixes 7665a47f70b3f64bf09c233cc7df73fde9e506f1 +fpga-fixes 8614afd689df59d9ce019439389be20bd788a897 +spdx 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gpio-intel-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +pinctrl-intel-fixes bcf876870b95592b52519ed4aafcf9d95999bc9c +erofs-fixes 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes c63d2dd7e134ebddce4745c51f9572b3f0d92b26 +ubifs-fixes f37e99aca03f63aa3f2bd13ceaf769455d12c4b0 +memblock-fixes bd05220c7be3356046861c317d9c287ca50445ba +drm-misc-fixes 77ef38574beb3e0b414db48e9c0f04633df68ba6 +kspp-gustavo 48778464bb7d346b47157d21ffde2af6b2d39110 +kbuild 514bad879fdbd17d3bc2ceaac4012bae026bfbf0 +compiler-attributes 98d54f81e36ba3bf92172791eba5ca5bd813989b +dma-mapping d7e673ec2c8e0ea39c4c70fc490d67d7fbda869d +asm-generic 060dc911501f6ee222569304f50962172a52b1d6 +arc def9d2780727cec3313ed3522d0123158d87224d +arm 4dffbda6a996813bc2760f021e1edf669cf84805 +arm64 3df14264ad9930733a8166e5bd0eccc1727564bb +arm-perf 55fdc1f44cd6bb1d61c9ca946d8f7cd67ea0bf36 +arm-soc e7e7df91deea4dc3bded9941957d8d033c9ab771 +amlogic c943b84fab78170fcdf60d960ea8d82d2cedbdbb +aspeed 2c887638a5fa1ac5e2491ae911f50d554b604985 +at91 ec539e70d882af33660bcab178a59b1251588a22 +drivers-memory ea0c0ad6b6eb36726088991d97a55b99cae456d0 +imx-mxs 3c1a41dab7b84a9fdedcb75afbbe2a30660a7595 +keystone 50c950e2c8b6c11fc7bb2f23856bd541f1b55a16 +mediatek 647a84d1e4dcc43369a968d6d2215de17b1c30d0 +mvebu 29bd9d8c2ac147964552b1bbfaf2b43fe53fd10c +omap a5b4d0a1b174b2675d7740b92a84e23e5dfe8148 +qcom 0854ab24c098532d7c14aaf1ecbeb5e04b12982b +raspberrypi 25c6f3960764b266a609281341f889a06d045039 +realtek 486f29df69413411a205d3101bae0427a892bee4 +renesas 923afaacb49deba2efb93f30a5f855099b6f6948 +reset 2983e2385ff6addd31de6f5b27f1ad0bec26aab6 +rockchip 088d74f511583cafbfc6ae37dc21fefe22f1fd05 +samsung-krzk 552233163db86e72768b85b766de35aa54d009fb +scmi bcf876870b95592b52519ed4aafcf9d95999bc9c +sunxi 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +tegra 8617339892a65cae34b9db786b037d6219ed3d7e +ti-k3 1e3d655fe7b48c2341d63f981774742e21744f53 +uniphier 4f8fb65af5299d138f57e6d62f88d2d5964d40eb +clk 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +clk-samsung 3d77e6a8804abcc0504c904bd6e5cdf3a5cf8162 +csky bdcd93ef9afb42a6051e472fa62c693b1f9edbd8 +h8300 9d48776fc609e434736e5cb114830d7e0b843739 +ia64 1a9d3c34c593f7ce3c6673e9e015b3253330eab2 +m68k 382f429bb559fe991b1ece2e5e58c812e28b3ad8 +m68knommu 89d77da0166df84afecd179e3bf87470350518fe +microblaze b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +mips 07989ee3abad9ffba5560f7434cfb02a5f74033e +nds32 0a2e478902c75be12b3e384cfe80b731e659f863 +nios2 6b57fa4d374bb8c005dee396c56598c14b9c01a6 +openrisc 55b2662ec665cc8b592809a011fe807b05370ab8 +parisc-hd bcf876870b95592b52519ed4aafcf9d95999bc9c +powerpc 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +fsl a76bea0287ce13d28494b19649d80d8ee5e7b757 +soc-fsl e9e4ef9116b12951eaee3f8447ba9bbb40ab3620 +risc-v a407942f182563918bbd6e4094086f95326a6846 +s390 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +sh 0c64a0dce51faa9c706fdf1f957d6f19878f4b81 +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml f6e8c474390be2e6f5bd0b8966e19958214609ff +xtensa a0fc1436f1f4f84e93144480bf30e0c958d135b6 +fscrypt 55e32c54bbd5741cad462c9ee00c453c72fa74b9 +afs 8409f67b6437c4b327ee95a71081b9c7bfee0b00 +btrfs cd37cdd68ef189c107f5cc4491c20f110e54559f +ceph 02e37571f9e79022498fd0525c073b07e9d9ac69 +cifs 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +configfs 059ccbfff8a826c0e7bfe5d69a55e1179672d8f8 +ecryptfs 8b614cb8f1dcac8ca77cf4dd85f46ef3055f8238 +erofs cfcedfe21820f425ddb40a75ad660e21249fdb91 +exfat 34d41dbe54551c06c86c00fd8883fc1b47605010 +ext3 de575ac602ab510d595869edf06431591e1d32a6 +ext4 0f9be45c08148d3c9686671acaf08579b49ba2f0 +f2fs 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +fsverity f3db0bed458314a835ccef5ccb130270c5b2cf04 +fuse 9e9e23bd2d363adfe9bf52e91ef238f9b4cbebf5 +jfs 7aba5dcc234635b44b2781dbc268048cfba388ad +nfs 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +nfs-anna 65caafd0d2145d1dd02072c4ced540624daeab40 +nfsd b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +cel 34b09af4f54e6485e28f138ccad159611a240cc1 +orangefs e848643b524be9c10826c2cf36eebb74eef643d2 +overlayfs 4518dfcf761e3c44632855abcf433236cf7ab6c6 +ubifs 798b7347e4f29553db4b996393caf12f5b233daf +v9fs 2ed0b7578170c3bab10cde09d4440897b305e40c +xfs 96cf2a2c75567ff56195fe3126d497a2e7e4379f +zonefs 2f4b7462d2fab380ba53f633948880552abb0b32 +iomap 60263d5889e6dc5987dc51b801be4955ff2e4aa7 +djw-vfs e4f9ba20d3b8c2b86ec71f326882e1a3c4e47953 +file-locks c0842fbc1b18c7a044e6ff3e8fa78bfa822c7d1a +vfs bcf876870b95592b52519ed4aafcf9d95999bc9c +printk 4f910e5876674f0f557d5ecdc72874a23e07f82f +pci 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pstore 137c6236aeec43c45c8f3b2e54b1dee50fd2010e +hid b14f43e0cbc8126197c5af1db42450fe1ff5ce6d +i2c 8cd60a71c849d5fb1d6484c2ef9cb39eef16c457 +i3c b4203ce0556348dcfe29f897d1dbe65102874d89 +dmi a3d13a0a23ea20a83d7148279a0ab68cc9a5962c +hwmon-staging 4f31c8c48312dad01ce36a3eb993709bed6651b4 +jc_docs 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +v4l-dvb f45882cfb152f5d3a421fd58f177f227e44843b9 +v4l-dvb-next 0d6db85131e014c128e57649793aff5aa96e065f +fbdev 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f +pm 395313eda1534576fc2440ea8907fb8ff9097485 +cpufreq-arm f259eab3ea0e7ed73db91f6358274dd3a9a27d79 +cpupower 94bd8ea151dadb5f10f25f03133edb350757cb15 +devfreq d6efb3ac3e6c19ab722b28bdb9252bae0b9676b6 +opp 06a8a059e88bd73ee81a4ad19e97c04766f84def +thermal c569e805c7bcebdd069e5c97ce5f8543f6d02433 +thermal-rzhang 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c +thermal-soc 6c375eccded41df8033ed55a1b785531b304fc67 +ieee1394 67f8e65e4fc19e24993e8780f41279eeffbd0610 +dlm fa601a9ebd49eac6581f9b448ef5e49ecf944301 +swiotlb 4cdfb27ba80d29aa04bc340b2e4b59e9ae74004c +rdma 23fcc7dee2c6aba1060558683988263851e74bab +net-next 7fca4dee610dffbe119714231cac0d59496bc193 +bpf-next bfdd5aaa54b0a44d9df550fe4c9db7e1470a11b8 +ipsec-next da7955405fb25c11a541234b32d06d9c09f81be6 +mlx5-next 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +netfilter-next 7fca4dee610dffbe119714231cac0d59496bc193 +ipvs-next bfdd5aaa54b0a44d9df550fe4c9db7e1470a11b8 +wireless-drivers-next 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +bluetooth 3b799254cf6f481460719023d7a18f46651e5e7f +mac80211-next 7fca4dee610dffbe119714231cac0d59496bc193 +gfs2 e28c02b94f9e039beeb5c75198caf6e17b66c520 +mtd 6a1380271b75e0d9a961e192e56b733fedf7a23a +nand da151e3458c825fa9d57c2db6e37748166e4d129 +spi-nor e93a977367b2aefff3c1fb426bbdfc6e2980815f +crypto 3cbfe80737c18ac6e635421ab676716a393d3074 +drm 62975d27d647a40c58d3b96c29b911fc4f33c310 +amdgpu ed6b26c2fb7f8167fb466efc7b91c0ff9bfd6dc9 +drm-intel 3a3d26153c81402b8ef4cfd7c201c97cda05c6c9 +drm-tegra 4fba6d22ca9ad28b8871d763b35a4da2e1ca272e +drm-misc 62975d27d647a40c58d3b96c29b911fc4f33c310 +drm-msm 20925fe84463ef87a01b0b536768c39544eae89b +mali-dp f634c6a8028789b05a9277a3d51303829ae29547 +imx-drm b93080622eb37e6e8b5aa2010709a5d0d561c695 +etnaviv c5d5a32ead1e3a61a07a1e59eb52a53e4a6b2a7f +regmap 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +sound d8d0db7bb358ef65d60726a61bfcd08eccff0bc0 +sound-asoc 01006be3554f315a1e1dc29a9d20bb791b86f2b4 +modules 262e6ae7081df304fc625cf368d5c2cbba2bb991 +input d862a3068ea593dc904ef524d8548467755ce36f +block 86cfccb66937dd6cbf26ed619958b9e587e6a115 +device-mapper a9cb9f4148ef6bb8fabbdaa85c42b2171fbd5a0d +pcmcia 46d0797906633d82bd50ef26780ee39fac5d27d6 +mmc 7f4bc2e8687ecea52177aac30fb153cc076f7022 +mfd e15d7f2b81d2e7d93115d46fa931b366c1cdebc2 +backlight 7eb99a39ef767644bbfd2b3f12f139d13e3ee8b3 +battery 46cbd0b05799e8234b719d18f3a4b27679c4c92e +regulator f10c1d395994acddf52070f5dd3ce17165cf91e3 +security ddcf4ecd547eeda553aa95c80647694718ab3613 +apparmor e37986097ba63c94b1af9d5ad5486d120a809f72 +integrity 3db0d0c276a752af39beb5ca7424cb659aa005bb +keys b6f61c31464940513ef4eccb3a030a405b4256d6 +safesetid 0476c865ded6180f9b3b68325b9bb5aa7f3babdb +selinux 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +smack 42a2df3e829f3c5562090391b33714b2e2e5ad4a +tomoyo 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +tpmdd 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +watchdog d5b29c2c5ba2bd5bbdb5b744659984185d17d079 +iommu e46b3c0d011eab9933c183d5b47569db8e377281 +vfio ccd59dce1a21f473518bf273bdf5b182bab955b3 +audit 265c32072b0ce4156f40527a969d335d03681b30 +devicetree f516fb704d02fff292cb79a6ad85c56529f7c8cf +mailbox 884996986347dbe3b735cfa9bc041dd98a533796 +spi 67d263acd44f597cf12ee88220133cc8c08c44a1 +tip d8211042f91d87737619154f17d94b73598422d8 +clockevents 9fba22584e54340365c611987c451e384bc4a96f +edac 6816f862e5248e606e5e7f62f569515161f24a61 +irqchip 7828a3ef8646fb2e69ed45616c8453a037ca7867 +ftrace 38ce2a9e33db61a3041840310077072d6210ead4 +rcu 71e05e558a5fd9c1001f4781298470fb4cd0ec0f +kvm e792415c5d3e0eb52527cce228a72e4392f8cae2 +kvm-arm 16314874b12b451bd5a1df86bcb69745eb487502 +kvm-ppc 81ab595ddd3c3036806b460526e1fbc5b271ff33 +kvms390 23a60f834406c8e3805328b630d09d5546b460c1 +xen-tip 585c6ed738a5ed2a6fd7662fa1d82f25acfa85de +percpu 4fa640dc52302b5e62b01b05c755b055549633ae +workqueues 10cdb15759540f03d056e2f73fe26377ed7dcfda +drivers-x86 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +chrome-platform 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +hsi bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9 +leds 242b81170fb8a4a9d84ae183a8e0b1aaf2554d89 +ipmi fc80c51fd4b23ec007e88d4c688f2cac1b8648e7 +driver-core 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +usb 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +usb-gadget f5e46aa4a124bfac34a770c4cfe5023de99380d4 +usb-serial 47ec5303d73ea344e84f46660fff693c57641386 +usb-chipidea-next d6f93d21001e4388a25b0b922e02e64bc6004d2f +phy-next 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +tty 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +char-misc 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +extcon b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +soundwire 9b3b4b3f2f2af863d2f6dd65afd295a5a673afa2 +thunderbolt 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +staging 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +mux 05f19f7f8944b6a269b2ac152bceaa322138be6b +icc 12a400b016ab955be8e4c569346fa18aaceed9d7 +dmaengine e8ee6c8cb61b676f1a2d6b942329e98224bd8ee9 +cgroup 936f2a70f2077f64fab1dcb3eca71879e82ecd3f +scsi 747eab70283e4621a549b370ad0cc78876ec4292 +scsi-mkp 7e0e8be3a1fd1399373224e22d77487e63566704 +vhost 8a7c3213db068135e816a6a517157de6443290d6 +rpmsg ca69dba7f13a293f83b08f003cd935c6abfee249 +gpio 22cc422070d9a9a399f8a70b89f1b852945444cb +gpio-brgl 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +gpio-intel 4941b8dedb3f33dcca5c6aef919ea518ff8947ce +pinctrl fc80c51fd4b23ec007e88d4c688f2cac1b8648e7 +pinctrl-intel b4f2fcb534875e2e57c96a0358267f2109d68004 +pinctrl-samsung 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +pwm 6ced5ff0be8e94871ba846dfbddf69d21363f3d7 +userns 7fce69dff8db30cb93aace0bbebda09972027af7 +ktest ff131efff141fc679cccde28bc265f4c79cbe329 +random ab9a7e27044b87ff2be47b8f8e095400e7fccc44 +kselftest 850d0cc64c8e2e0895acf735ac0a53c78b80dbe5 +y2038 c4e71212a245017d2ab05f322f7722f0b87a55da +livepatching bf14b015bf516fc769a47ea56303e014c76a7ce1 +coresight ff1304be0a05e9e77f9480e9a68375fb078c006f +rtc 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +nvdimm 03b68d5d7d4b7551ca445dfb84cb05786d70ae90 +at24 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 +ntb b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +seccomp 16b89f695313d91c99bdaf6898f28a51d0af1b17 +kspp 55dde35fdb7f3646f9aa534f56a2599e2aef6b31 +gnss 48778464bb7d346b47157d21ffde2af6b2d39110 +fsi 4ca8b73f16f0a9ea773a706fe4a3fd91e667aab9 +slimbus b3a9e3b9622ae10064826dccb4f7a52bd88c7407 +nvmem a24ef5be460b771424db6674f8d3f5d025415821 +xarray 27586ca786a729cda6c807621a1494900a56e7bc +hyperv 95c20aa048974ebb6da2e60af8902b5995750030 +auxdisplay 46d4a403a04c0ba46641452367b6a04bcf918a06 +kgdb 2c308ef41351372a5c23a1047d71db3015ed7a9c +pidfd da83d0cb92373b4424c60ff97edd941e300a1e7a +hmm 7d17e83abec1be3355260b3e4812044c65c32907 +fpga 3359f5f44cb557de6253b3137edafa1bfd7405b7 +kunit 48778464bb7d346b47157d21ffde2af6b2d39110 +generic-ioremap 4bdc0d676a643140bdf17dbf7eafedee3d496a3c +cfi 11399346ac39a26ade2a90303d38ad318163c665 +kunit-next d43c7fb05765152d4d4a39a8ef957c4ea14d8847 +trivial c1a371cf80fbc06280cc0064ca99a39d0428ded3 +zx2c4 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e +mhi d0dc371b39a71aea55160970455d8a37bbf40fb6 +notifications 841a0dfa511364fa9a8d67512e0643669f1f03e3 +fsinfo 13917414b9cc1d35a06c7d78dcb5b3f302fbb2f6 +memblock 762d4d1a174c2b2f1181ef284769e4cba7d2b11c +init 38b082236e77d403fed23ac2d30d570598744ec3 +akpm-current 8d7fe396c9e5b0422464202de3e722faa198c0ef +akpm f0b863ac0f643ae15e8463e773fdcb33c9dd6c3c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..209172136ec6 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,331 @@ +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#master +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 +uniphier-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git#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#ci-for-usb-stable +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 +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 +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.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 +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#master +drivers-x86-fixes git git://git.infradead.org/linux-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#pinctrl-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-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 +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 +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux-at91.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 +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git 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 +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 +uniphier git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +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 +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#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 +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/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#features +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 +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +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.linux-nfs.org/projects/cel/cel-2.6.git#cel-next +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 +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +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 +thermal-rzhang git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#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#master +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 +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +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 +amdgpu git git://people.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-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +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.infradead.org/users/jjs/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 +vfio git git://github.com/awilliam/linux-vfio.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#linux-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.infradead.org/linux-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#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#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 +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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +icc git git://git.linaro.org/people/georgi.djakov/linux.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-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 +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +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 +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/linux-dax.git#xarray +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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#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 +generic-ioremap git git://git.infradead.org/users/hch/ioremap.git#for-next +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 +zx2c4 git git://git.kernel.org/pub/scm/linux/kernel/git/zx2c4/linux.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +notifications git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#notifications-pipe-core +fsinfo git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fsinfo-core +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 +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..085016932a76 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4364 @@ +$ date -R +Tue, 18 Aug 2020 08:53:19 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 9123e3a74ec7 Linux 5.9-rc1 +Merging origin/master (9123e3a74ec7 Linux 5.9-rc1) +$ git merge origin/master +Already up to date. +Merging fixes/master (73c7adb54169 device_cgroup: Fix RCU list debugging warning) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + security/device_cgroup.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging kbuild-current/fixes (06a81c1c7db9 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (97363c07f023 ARC: show_regs: fix r12 printing and simplify) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/hsdk.dts | 2 ++ + arch/arc/include/asm/pgalloc.h | 4 +-- + arch/arc/kernel/perf_event.c | 14 +++----- + arch/arc/kernel/troubleshoot.c | 77 ++++++++++++++++-------------------------- + 4 files changed, 38 insertions(+), 59 deletions(-) +Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI calls due to p4d typo in create_mapping_late()) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (6a7389f0312f MAINTAINERS: Include drivers subdirs for ARM PMU PROFILING AND DEBUGGING entry) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (fe1d899f4212 ARM: dts: keystone-k2g-evm: fix rgmii phy-mode for ksz9031 phy) +$ git merge arm-soc-fixes/arm/fixes +Already up to date. +Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2) +$ git merge uniphier-fixes/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (7ff3a2a626f7 memory: jz4780_nemc: Fix an error pointer vs NULL check in probe()) +$ git merge drivers-memory-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/memory/jz4780-nemc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging m68k-current/for-linus (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (388692e943a5 powerpc/kernel: Cleanup machine check function declarations) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/cputable.h | 5 ++++ + arch/powerpc/include/asm/mce.h | 7 +++++ + arch/powerpc/include/asm/perf_event.h | 3 ++ + arch/powerpc/include/asm/perf_event_server.h | 5 ++++ + arch/powerpc/include/uapi/asm/perf_regs.h | 20 ++++++++++++- + arch/powerpc/kernel/cputable.c | 22 ++++++++++++-- + arch/powerpc/kernel/dt_cpu_ftrs.c | 4 --- + arch/powerpc/kernel/setup-common.c | 1 + + arch/powerpc/perf/core-book3s.c | 1 + + arch/powerpc/perf/perf_regs.c | 44 ++++++++++++++++++++++++++-- + arch/powerpc/perf/power10-pmu.c | 6 ++++ + arch/powerpc/perf/power9-pmu.c | 6 ++++ + 12 files changed, 113 insertions(+), 11 deletions(-) +Merging s390-fixes/fixes (b97bf44f9915 s390/pci: fix PF/VF linking on hot plug) +$ git merge s390-fixes/fixes +Merge made by the 'recursive' strategy. + arch/s390/kernel/ptrace.c | 7 +++-- + arch/s390/kernel/runtime_instr.c | 2 +- + arch/s390/pci/pci.c | 22 +++++++++++----- + arch/s390/pci/pci_bus.c | 52 ++++++++++++++++++++++---------------- + arch/s390/pci/pci_bus.h | 13 ++++++++++ + arch/s390/pci/pci_event.c | 7 +++-- + drivers/pci/hotplug/s390_pci_hpc.c | 12 ++++----- + drivers/s390/cio/css.c | 5 ++++ + 8 files changed, 79 insertions(+), 41 deletions(-) +Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) +$ git merge sparc/master +Auto-merging arch/sparc/kernel/signal_32.c +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/boot/piggyback.c | 4 ++++ + arch/sparc/include/asm/backoff.h | 2 +- + arch/sparc/include/asm/pgtsrmmu.h | 2 +- + arch/sparc/kernel/auxio_64.c | 1 - + arch/sparc/kernel/central.c | 2 +- + arch/sparc/kernel/kgdb_32.c | 2 +- + arch/sparc/kernel/kgdb_64.c | 2 +- + arch/sparc/kernel/pci.c | 3 +-- + arch/sparc/kernel/pcr.c | 2 +- + arch/sparc/kernel/prom_32.c | 2 +- + arch/sparc/kernel/signal32.c | 4 ++-- + arch/sparc/kernel/signal_32.c | 4 ++-- + arch/sparc/kernel/signal_64.c | 4 ++-- + arch/sparc/kernel/viohs.c | 6 ++---- + arch/sparc/lib/memset.S | 1 + + arch/sparc/math-emu/math_32.c | 8 ++++---- + arch/sparc/mm/srmmu.c | 18 +++++++++--------- + 18 files changed, 35 insertions(+), 34 deletions(-) +Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (bf2bcd6f1a88 otx2_common: Use devm_kcalloc() in otx2_config_npa()) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/bpf/index.rst | 7 ++ + Documentation/networking/bonding.rst | 18 ---- + drivers/net/bonding/bond_3ad.c | 15 +-- + drivers/net/bonding/bond_alb.c | 4 +- + drivers/net/bonding/bond_main.c | 28 +++++- + drivers/net/ethernet/3com/3c574_cs.c | 6 +- + drivers/net/ethernet/8390/axnet_cs.c | 1 + + drivers/net/ethernet/freescale/fec_main.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 35 +++++-- + drivers/net/ethernet/intel/i40e/i40e_main.c | 3 + + drivers/net/ethernet/intel/igc/igc_main.c | 5 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 2 - + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 4 +- + drivers/net/ethernet/sfc/ef100_rx.c | 5 + + drivers/net/ethernet/sfc/ef100_rx.h | 1 + + drivers/net/ethernet/sfc/efx.h | 8 ++ + drivers/net/ethernet/sfc/net_driver.h | 2 + + drivers/net/ethernet/sfc/rx_common.c | 3 +- + drivers/net/fddi/skfp/cfm.c | 17 +--- + drivers/net/fddi/skfp/fplustm.c | 4 - + drivers/net/fddi/skfp/hwmtm.c | 4 - + drivers/net/fddi/skfp/smt.c | 7 +- + drivers/net/ipvlan/ipvlan_main.c | 27 +++++- + drivers/net/wan/dlci.c | 3 +- + drivers/net/wan/hdlc.c | 1 + + drivers/net/wan/hdlc_x25.c | 17 +++- + include/linux/netfilter_ipv6.h | 18 ---- + include/linux/phylink.h | 3 +- + kernel/bpf/stackmap.c | 24 +++-- + net/bridge/netfilter/ebtables.c | 4 + + net/bridge/netfilter/nf_conntrack_bridge.c | 8 +- + net/can/j1939/socket.c | 14 +++ + net/can/j1939/transport.c | 104 +++++++++++++++++---- + net/core/dev.c | 8 +- + net/core/devlink.c | 2 +- + net/core/filter.c | 75 ++++++++++++--- + net/core/skbuff.c | 4 +- + net/ipv6/netfilter.c | 3 - + net/mptcp/protocol.c | 14 ++- + net/netfilter/nf_tables_api.c | 6 +- + net/netfilter/nft_compat.c | 37 +++----- + net/netfilter/nft_exthdr.c | 4 +- + net/qrtr/qrtr.c | 20 ++-- + net/tipc/Kconfig | 1 + + net/tipc/netlink_compat.c | 12 ++- + tools/bpf/bpftool/btf_dumper.c | 2 +- + tools/bpf/bpftool/gen.c | 22 ++++- + tools/bpf/bpftool/link.c | 4 +- + tools/bpf/bpftool/main.h | 10 +- + tools/bpf/bpftool/prog.c | 16 ++-- + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/btf.c | 83 +++++++++++++++- + tools/lib/bpf/btf.h | 2 + + tools/lib/bpf/btf_dump.c | 39 +++++++- + tools/lib/bpf/libbpf.c | 32 ++++--- + tools/lib/bpf/libbpf.map | 2 + + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 8 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 27 ++++-- + .../testing/selftests/bpf/prog_tests/core_extern.c | 4 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 20 ++-- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 6 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 2 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 6 +- + tools/testing/selftests/bpf/prog_tests/mmap.c | 19 ++-- + .../selftests/bpf/prog_tests/prog_run_xattr.c | 2 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 1 + + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 2 +- + tools/testing/selftests/bpf/prog_tests/varlen.c | 8 +- + .../testing/selftests/bpf/progs/core_reloc_types.h | 69 +++++++------- + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 41 ++++++++ + tools/testing/selftests/bpf/progs/test_varlen.c | 6 +- + tools/testing/selftests/bpf/test_btf.c | 8 +- + tools/testing/selftests/bpf/test_progs.h | 5 + + tools/testing/selftests/net/icmp_redirect.sh | 2 + + tools/testing/selftests/netfilter/nft_flowtable.sh | 73 +++++++++------ + 76 files changed, 768 insertions(+), 349 deletions(-) +Merging bpf/master (cf28f3bbfca0 bpf: Use get_file_rcu() instead of get_file() for task_file iterator) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/task_iter.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging ipsec/master (4eb2e1341575 espintcp: restore IP CB before handing the packet to xfrm) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/ip_vti.c | 2 ++ + net/xfrm/espintcp.c | 6 +++++- + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging netfilter/master (b3b2854dcf70 mptcp: sendmsg: reset iter on error redux) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (9123e3a74ec7 Linux 5.9-rc1) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (b3b2854dcf70 mptcp: sendmsg: reset iter on error redux) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (bcf876870b95 Linux 5.8) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (d8d0db7bb358 ALSA: usb-audio: ignore broken processing/extension unit) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/isa/sscape.c | 6 +++--- + sound/pci/hda/patch_realtek.c | 2 ++ + sound/usb/mixer.c | 8 +++++++- + sound/usb/quirks-table.h | 34 ++++++++++++++++++++++++++++++++-- + 4 files changed, 44 insertions(+), 6 deletions(-) +Merging sound-asoc-fixes/for-linus (e4135d350a2d Merge remote-tracking branch 'asoc/for-5.9' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 29 ++-- + sound/soc/codecs/msm8916-wcd-analog.c | 4 +- + sound/soc/codecs/wm8958-dsp2.c | 4 + + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8994.c | 60 ++++++-- + sound/soc/fsl/fsl-asoc-card.c | 154 +++++++++----------- + sound/soc/fsl/mpc5200_dma.c | 1 - + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 210 +++++++++++++-------------- + sound/soc/qcom/qdsp6/q6routing.c | 16 ++ + sound/soc/soc-component.c | 2 +- + sound/soc/tegra/tegra186_dspk.c | 4 +- + sound/soc/tegra/tegra210_admaif.c | 4 +- + sound/soc/tegra/tegra210_ahub.c | 4 +- + sound/soc/tegra/tegra210_dmic.c | 4 +- + sound/soc/tegra/tegra210_i2s.c | 4 +- + 17 files changed, 266 insertions(+), 243 deletions(-) +Merging regmap-fixes/for-linus (9123e3a74ec7 Linux 5.9-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (79d0a6620a76 Merge remote-tracking branch 'regulator/for-5.9' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 164 ++++++++++++++++++---------------- + drivers/regulator/cros-ec-regulator.c | 3 + + drivers/regulator/fixed.c | 2 +- + 3 files changed, 91 insertions(+), 78 deletions(-) +Merging spi-fixes/for-linus (e5c9b1cfe42c Merge remote-tracking branch 'spi/for-5.9' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 1 + + drivers/spi/Kconfig | 3 + + drivers/spi/spi-stm32.c | 100 +++++++++++++-------- + drivers/spi/spi.c | 21 ++++- + 4 files changed, 86 insertions(+), 39 deletions(-) +Merging pci-current/for-linus (7c2308f79fc8 PCI/P2PDMA: Fix build without DMA ops) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/p2pdma.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging driver-core.current/driver-core-linus (9123e3a74ec7 Linux 5.9-rc1) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (9123e3a74ec7 Linux 5.9-rc1) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (9123e3a74ec7 Linux 5.9-rc1) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (8778eb0927dd usb: gadget: function: fix missing spinlock in f_uac1_legacy) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (47ec5303d73e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/core.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (04db2304a949 phy: qualcomm: fix return value check in qcom_ipq806x_usb_phy_probe()) +$ git merge phy/fixes +Merge made by the 'recursive' strategy. + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging staging.current/staging-linus (9123e3a74ec7 Linux 5.9-rc1) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (9123e3a74ec7 Linux 5.9-rc1) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (9e8238020c5b Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (21dfbcd1f5cb crypto: algif_aead - fix uninitialized ctx->init) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) +$ git merge ide/master +Auto-merging drivers/ide/ide-acpi.c +Merge made by the 'recursive' strategy. + drivers/ide/Kconfig | 2 +- + drivers/ide/aec62xx.c | 3 +-- + drivers/ide/alim15x3.c | 3 +-- + drivers/ide/amd74xx.c | 3 +-- + drivers/ide/atiixp.c | 3 +-- + drivers/ide/cmd64x.c | 3 +-- + drivers/ide/cs5520.c | 3 +-- + drivers/ide/cs5530.c | 3 +-- + drivers/ide/cs5535.c | 3 +-- + drivers/ide/cs5536.c | 3 +-- + drivers/ide/cy82c693.c | 3 +-- + drivers/ide/delkin_cb.c | 32 ++++++-------------------------- + drivers/ide/hpt366.c | 5 ++--- + drivers/ide/ide-acpi.c | 5 +---- + drivers/ide/ide-pci-generic.c | 3 +-- + drivers/ide/it8172.c | 3 +-- + drivers/ide/it8213.c | 3 +-- + drivers/ide/it821x.c | 3 +-- + drivers/ide/jmicron.c | 3 +-- + drivers/ide/ns87415.c | 3 +-- + drivers/ide/opti621.c | 3 +-- + drivers/ide/pdc202xx_new.c | 3 +-- + drivers/ide/pdc202xx_old.c | 3 +-- + drivers/ide/piix.c | 3 +-- + drivers/ide/sc1200.c | 43 ++++++++++++++----------------------------- + drivers/ide/serverworks.c | 3 +-- + drivers/ide/setup-pci.c | 29 ++++++----------------------- + drivers/ide/siimage.c | 3 +-- + drivers/ide/sis5513.c | 3 +-- + drivers/ide/sl82c105.c | 3 +-- + drivers/ide/slc90e66.c | 3 +-- + drivers/ide/triflex.c | 24 ++++++++---------------- + drivers/ide/via82cxxx.c | 3 +-- + include/linux/ide.h | 8 +------- + 34 files changed, 65 insertions(+), 161 deletions(-) +Merging vfio-fixes/for-linus (aae7a75a821a vfio/type1: Add proper error unwind for vfio_iommu_replay()) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci_private.h | 2 + + drivers/vfio/pci/vfio_pci_rdwr.c | 120 ++++++++++++++++++++++++++++-------- + drivers/vfio/vfio_iommu_type1.c | 71 +++++++++++++++++++-- + 3 files changed, 164 insertions(+), 29 deletions(-) +Merging kselftest-fixes/fixes (3c01655ac82e kselftest: ksft_test_num return type should be unsigned) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (5b2aa9f918f6 dmaengine: of-dma: Fix of_dma_router_xlate's of_dma_xlate handling) +$ git merge dmaengine-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/dma/acpi-dma.c | 4 +++- + drivers/dma/idxd/device.c | 26 ++++++++++++++++++++++++++ + drivers/dma/idxd/irq.c | 12 ------------ + drivers/dma/of-dma.c | 8 ++++---- + 4 files changed, 33 insertions(+), 17 deletions(-) +Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (f7e6b19bc764 mtd: properly check all write ioctls for permissions) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it") +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (433c1ca0d441 MIPS: Loongson64: Do not override watch and ejtag feature) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h | 2 -- + 1 file changed, 2 deletions(-) +Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (d1db7b80a6c8 ARM: dts: logicpd-som-lv-baseboard: Fix missing video) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi | 29 ++++++------------------ + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 ++ + arch/arm/mach-omap2/omap-iommu.c | 2 +- + 3 files changed, 10 insertions(+), 23 deletions(-) +Merging kvm-fixes/master (06a81c1c7db9 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (51fb91ed5a6f hwmon: (pmbus/isl68137) remove READ_TEMPERATURE_1 telemetry for RAA228228) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/pmbus/isl68137.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (543094e19c82 nvdimm/region: always show the 'align' attribute) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (c9f8e44ec4a5 Merge branch 'misc-5.9' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (bb1a773d5b6b kill unused dump_fpu() instances) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (7dc6fd0f3b84 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (5f0b06da5cde dt-bindings: Remove more cases of 'allOf' containing a '$ref') +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (3f0dcfbcd2e1 scsi: core: Run queue in case of I/O resource contention failure) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (887c909dd5d5 Merge tag 'amd-drm-fixes-5.8-2020-07-30' of git://people.freedesktop.org/~agd5f/linux into drm-fixes) +$ 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 (bcf876870b95 Linux 5.8) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (ebd4050c6144 mmc: sdhci-of-aspeed: Fix clock divider calculation) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (b9d8cf2eb3ce x86/hyperv: Make hv_setup_sched_clock inline) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create) +$ git merge soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (76d4467a97bd riscv: Setup exception vector for nommu platform) +$ git merge risc-v-fixes/fixes +Already up to date. +Merging pidfd-fixes/fixes (7665a47f70b3 signal: fix typo in dequeue_synchronous_signal()) +$ git merge pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) +$ git merge fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (9123e3a74ec7 Linux 5.9-rc1) +$ git merge spdx/spdx-linus +Already up to date. +Merging gpio-intel-fixes/fixes (bcf876870b95 Linux 5.8) +$ git merge gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (bcf876870b95 Linux 5.8) +$ git merge pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3) +$ 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 (c63d2dd7e134 Documentation: kunit: Add some troubleshooting tips to the FAQ) +$ git merge kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (f37e99aca03f Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into master) +$ git merge ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (bd05220c7be3 arch/ia64: Restore arch-specific pgd_offset_k implementation) +$ git merge memblock-fixes/fixes +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/pgtable.h | 9 +++++++++ + include/linux/pgtable.h | 2 ++ + 2 files changed, 11 insertions(+) +Merging drm-misc-fixes/for-linux-next-fixes (77ef38574beb drm/modeset-lock: Take the modeset BKL for legacy drivers) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/virtio/virtgpu_object.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_ioctl.c +Auto-merging drivers/gpu/drm/drm_plane.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_helper.c | 7 ++++--- + drivers/gpu/drm/drm_color_mgmt.c | 2 +- + drivers/gpu/drm/drm_crtc.c | 4 +--- + drivers/gpu/drm/drm_dp_mst_topology.c | 4 ++-- + drivers/gpu/drm/drm_mode_object.c | 4 ++-- + drivers/gpu/drm/drm_plane.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 1 + + drivers/gpu/drm/virtio/virtgpu_object.c | 1 + + include/drm/drm_modeset_lock.h | 9 +++++++-- + 9 files changed, 20 insertions(+), 14 deletions(-) +Merging kspp-gustavo/for-next/kspp (02b894b985cb treewide: Use fallthrough pseudo-keyword) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging net/mptcp/protocol.c +Auto-merging net/core/filter.c +Auto-merging net/core/devlink.c +Auto-merging net/core/dev.c +Auto-merging net/can/j1939/transport.c +Auto-merging net/can/j1939/socket.c +Auto-merging drivers/vfio/vfio_iommu_type1.c +Auto-merging drivers/regulator/core.c +Auto-merging drivers/net/ethernet/8390/axnet_cs.c +Auto-merging drivers/net/ethernet/3com/3c574_cs.c +Auto-merging drivers/net/bonding/bond_main.c +Auto-merging drivers/net/bonding/bond_3ad.c +Auto-merging drivers/ide/sis5513.c +Auto-merging drivers/ide/hpt366.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/module.c | 2 +- + arch/alpha/kernel/signal.c | 2 +- + arch/alpha/kernel/traps.c | 4 +- + arch/arc/kernel/disasm.c | 2 +- + arch/arc/kernel/signal.c | 2 +- + arch/arc/kernel/unwind.c | 6 +- + arch/arm/kernel/hw_breakpoint.c | 10 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm/mach-ep93xx/crunch.c | 2 +- + arch/arm/mach-mmp/pm-mmp2.c | 8 +- + arch/arm/mach-mmp/pm-pxa910.c | 10 +- + arch/arm/mach-omap2/id.c | 8 -- + arch/arm/mach-omap2/omap_device.c | 2 +- + arch/arm/mach-orion5x/dns323-setup.c | 2 +- + arch/arm/mach-rpc/riscpc.c | 2 +- + arch/arm/mach-tegra/reset.c | 2 +- + arch/arm/mm/alignment.c | 4 +- + arch/arm/mm/proc-v7-bugs.c | 2 +- + arch/arm/plat-omap/dma.c | 6 +- + arch/arm/probes/decode.c | 2 +- + arch/arm/probes/kprobes/core.c | 2 +- + arch/arm64/kernel/acpi.c | 2 +- + arch/arm64/kernel/cpufeature.c | 2 +- + arch/arm64/kernel/cpuinfo.c | 2 +- + arch/arm64/kernel/hw_breakpoint.c | 6 +- + arch/arm64/kernel/module.c | 8 +- + arch/arm64/kernel/smp.c | 2 +- + arch/arm64/kvm/handle_exit.c | 2 +- + arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 60 +++++------ + arch/arm64/kvm/hyp/vgic-v3-sr.c | 16 +-- + arch/arm64/mm/context.c | 2 +- + arch/c6x/kernel/signal.c | 4 +- + arch/csky/kernel/signal.c | 2 +- + arch/h8300/kernel/signal.c | 2 +- + arch/hexagon/kernel/module.c | 2 +- + arch/hexagon/kernel/signal.c | 2 +- + arch/ia64/kernel/crash.c | 2 +- + arch/ia64/kernel/module.c | 2 +- + arch/ia64/kernel/perfmon.c | 2 +- + arch/ia64/kernel/signal.c | 2 +- + arch/ia64/kernel/unaligned.c | 6 +- + arch/ia64/kernel/unwind.c | 2 +- + arch/m68k/atari/atakeyb.c | 2 +- + arch/m68k/kernel/signal.c | 2 +- + arch/m68k/mac/config.c | 2 +- + arch/m68k/mac/via.c | 2 +- + arch/m68k/mm/fault.c | 2 +- + arch/microblaze/kernel/signal.c | 2 +- + arch/mips/include/asm/unroll.h | 64 ++++++------ + arch/nds32/kernel/fpu.c | 12 +-- + arch/nds32/kernel/signal.c | 4 +- + arch/openrisc/kernel/signal.c | 2 +- + arch/parisc/kernel/signal.c | 2 +- + arch/parisc/kernel/traps.c | 11 +- + arch/parisc/mm/fault.c | 4 +- + arch/powerpc/net/bpf_jit_comp.c | 2 +- + arch/powerpc/net/bpf_jit_comp64.c | 2 +- + arch/riscv/kernel/signal.c | 2 +- + arch/riscv/net/bpf_jit_comp32.c | 4 +- + arch/sh/drivers/platform_early.c | 2 +- + arch/sh/kernel/disassemble.c | 4 +- + arch/sh/kernel/kgdb.c | 2 +- + arch/sh/kernel/signal_32.c | 2 +- + arch/sparc/net/bpf_jit_comp_32.c | 2 +- + arch/um/kernel/signal.c | 2 +- + arch/x86/boot/cmdline.c | 4 +- + arch/x86/boot/compressed/kaslr.c | 2 +- + arch/x86/events/intel/core.c | 6 +- + arch/x86/events/intel/lbr.c | 2 +- + arch/x86/kernel/alternative.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 4 +- + arch/x86/kernel/apic/probe_32.c | 2 +- + arch/x86/kernel/cpu/cacheinfo.c | 2 +- + arch/x86/kernel/cpu/mce/inject.c | 2 +- + arch/x86/kernel/cpu/mce/intel.c | 2 +- + arch/x86/kernel/cpu/mtrr/cyrix.c | 2 +- + arch/x86/kernel/hw_breakpoint.c | 2 +- + arch/x86/kernel/kgdb.c | 4 +- + arch/x86/kernel/mpparse.c | 4 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/uprobes.c | 4 +- + arch/x86/kvm/emulate.c | 2 +- + arch/x86/kvm/hyperv.c | 2 +- + arch/x86/kvm/irq_comm.c | 2 +- + arch/x86/kvm/lapic.c | 6 +- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/svm/svm.c | 2 +- + arch/x86/kvm/vmx/vmx.c | 12 +-- + arch/x86/kvm/x86.c | 11 +- + arch/x86/lib/cmdline.c | 8 +- + arch/x86/lib/insn-eval.c | 6 +- + arch/x86/math-emu/errors.c | 2 +- + arch/x86/math-emu/fpu_trig.c | 2 +- + arch/x86/mm/ioremap.c | 2 +- + arch/xtensa/kernel/signal.c | 2 +- + block/badblocks.c | 2 +- + block/bfq-iosched.c | 4 +- + block/blk-wbt.c | 2 +- + block/ioprio.c | 2 +- + crypto/drbg.c | 2 +- + crypto/tcrypt.c | 114 ++++++++++----------- + drivers/accessibility/braille/braille_console.c | 2 +- + drivers/ata/ahci_brcm.c | 2 +- + drivers/ata/libahci_platform.c | 2 +- + drivers/ata/libata-core.c | 16 +-- + drivers/ata/libata-eh.c | 6 +- + drivers/ata/libata-scsi.c | 4 +- + drivers/ata/pata_atp867x.c | 4 +- + drivers/ata/pata_serverworks.c | 2 +- + drivers/ata/sata_mv.c | 12 +-- + drivers/ata/sata_promise.c | 8 +- + drivers/ata/sata_sx4.c | 2 +- + drivers/atm/firestream.c | 2 +- + drivers/atm/fore200e.c | 16 +-- + drivers/atm/he.c | 4 +- + drivers/atm/idt77105.c | 2 +- + drivers/atm/lanai.c | 2 +- + drivers/atm/zatm.c | 2 +- + drivers/auxdisplay/panel.c | 6 +- + drivers/base/firmware_loader/fallback.c | 4 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/ataflop.c | 2 +- + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_main.c | 2 +- + drivers/block/drbd/drbd_nl.c | 2 +- + drivers/block/drbd/drbd_receiver.c | 12 +-- + drivers/block/drbd/drbd_req.c | 4 +- + drivers/block/floppy.c | 4 +- + drivers/block/loop.c | 4 +- + drivers/block/paride/pd.c | 4 +- + drivers/block/pktcdvd.c | 2 +- + drivers/block/rbd.c | 8 +- + drivers/block/rsxx/core.c | 2 +- + drivers/block/skd_main.c | 2 +- + drivers/block/xen-blkback/blkback.c | 2 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/xen-blkfront.c | 5 +- + drivers/bus/ti-sysc.c | 2 +- + drivers/char/agp/ali-agp.c | 2 +- + drivers/char/ipmi/kcs_bmc.c | 2 +- + drivers/char/lp.c | 4 +- + drivers/char/mem.c | 2 +- + drivers/char/nvram.c | 2 +- + drivers/clocksource/timer-cadence-ttc.c | 4 +- + drivers/cpufreq/p4-clockmod.c | 2 +- + drivers/cpufreq/speedstep-lib.c | 2 +- + drivers/cpufreq/ti-cpufreq.c | 4 +- + drivers/crypto/axis/artpec6_crypto.c | 2 +- + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 4 +- + drivers/crypto/chelsio/chcr_ktls.c | 4 +- + drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c | 4 +- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 2 +- + drivers/crypto/qat/qat_common/qat_uclo.c | 6 +- + drivers/crypto/ux500/cryp/cryp.c | 12 +-- + drivers/dma/amba-pl08x.c | 10 +- + drivers/dma/fsldma.c | 2 +- + drivers/dma/imx-dma.c | 2 +- + drivers/dma/iop-adma.h | 12 +-- + drivers/dma/nbpfaxi.c | 2 +- + drivers/dma/pl330.c | 10 +- + drivers/dma/sh/shdma-base.c | 2 +- + drivers/edac/amd64_edac.c | 2 +- + drivers/edac/pnd2_edac.c | 2 +- + drivers/firewire/core-device.c | 2 +- + drivers/firewire/core-iso.c | 2 +- + drivers/firewire/core-topology.c | 2 +- + drivers/firewire/core-transaction.c | 4 +- + drivers/firewire/ohci.c | 4 +- + drivers/gpio/gpio-aspeed-sgpio.c | 6 +- + drivers/gpio/gpio-aspeed.c | 6 +- + drivers/gpio/gpio-ath79.c | 2 +- + drivers/gpio/gpio-eic-sprd.c | 4 +- + drivers/gpio/gpio-stmpe.c | 4 +- + drivers/gpio/gpiolib-acpi.c | 2 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- + drivers/gpu/drm/arm/malidp_hw.c | 6 +- + drivers/gpu/drm/ast/ast_main.c | 2 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 2 - + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 6 +- + drivers/gpu/drm/drm_bufs.c | 2 +- + drivers/gpu/drm/drm_dp_helper.c | 2 +- + drivers/gpu/drm/drm_modes.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 10 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 6 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 6 +- + drivers/gpu/drm/i915/display/intel_bios.c | 6 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 10 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 6 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 4 +- + drivers/gpu/drm/i915/display/intel_display.c | 20 ++-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 8 +- + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 12 +-- + drivers/gpu/drm/i915/display/intel_sprite.c | 22 ++-- + drivers/gpu/drm/i915/display/intel_tc.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 6 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_pmu.c | 2 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- + drivers/gpu/drm/meson/meson_osd_afbcd.c | 2 +- + drivers/gpu/drm/meson/meson_overlay.c | 4 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 2 +- + drivers/gpu/drm/radeon/ci_dpm.c | 4 +- + drivers/gpu/drm/radeon/r300.c | 4 +- + drivers/gpu/drm/radeon/r420.c | 2 +- + drivers/gpu/drm/radeon/r600_cs.c | 4 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + drivers/gpu/drm/radeon/si_dpm.c | 4 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 2 +- + drivers/gpu/drm/savage/savage_state.c | 10 +- + drivers/gpu/drm/sti/sti_hdmi.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +- + drivers/gpu/drm/tegra/dc.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- + drivers/gpu/drm/via/via_dmablit.c | 8 +- + drivers/gpu/drm/xen/xen_drm_front.c | 3 - + drivers/gpu/ipu-v3/ipu-dc.c | 2 +- + drivers/hid/hid-lg-g15.c | 2 +- + drivers/hid/hid-logitech-dj.c | 2 +- + drivers/hid/hid-microsoft.c | 3 - + drivers/hid/hid-rmi.c | 1 - + drivers/hid/hid-roccat-kone.c | 2 +- + drivers/hid/hid-uclogic-params.c | 2 +- + drivers/hid/hid-wiimote-core.c | 2 - + drivers/hid/usbhid/hiddev.c | 1 - + drivers/hid/wacom_wac.c | 32 +++--- + drivers/hsi/clients/ssi_protocol.c | 6 +- + drivers/hsi/controllers/omap_ssi_core.c | 2 +- + drivers/hv/hv_kvp.c | 2 +- + drivers/hwmon/adt7462.c | 8 +- + drivers/hwmon/emc1403.c | 4 +- + drivers/hwmon/f71882fg.c | 4 +- + drivers/hwmon/hwmon-vid.c | 4 +- + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/nct6775.c | 2 +- + drivers/hwmon/occ/common.c | 6 +- + drivers/hwmon/w83627hf.c | 2 +- + drivers/hwmon/w83781d.c | 2 +- + drivers/hwmon/w83795.c | 2 +- + drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 1 - + drivers/hwtracing/coresight/coresight-tmc.c | 2 - + drivers/hwtracing/intel_th/sth.c | 4 +- + drivers/i2c/busses/i2c-omap.c | 1 - + drivers/i2c/busses/i2c-opal.c | 2 +- + drivers/i3c/master/dw-i3c-master.c | 2 +- + drivers/ide/hpt366.c | 6 +- + drivers/ide/ide-cd.c | 4 +- + drivers/ide/ide-floppy.c | 2 +- + drivers/ide/ide-probe.c | 2 +- + drivers/ide/ide-taskfile.c | 12 +-- + drivers/ide/sis5513.c | 2 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/adc/ab8500-gpadc.c | 2 +- + drivers/iio/adc/cpcap-adc.c | 2 +- + drivers/iio/chemical/sps30.c | 2 +- + drivers/iio/dac/ad5592r-base.c | 2 - + drivers/iio/dac/dpot-dac.c | 2 +- + drivers/iio/health/max30102.c | 4 +- + drivers/iio/imu/adis.c | 6 +- + drivers/iio/industrialio-core.c | 4 +- + drivers/iio/light/si1145.c | 2 +- + drivers/iio/magnetometer/ak8974.c | 2 +- + drivers/infiniband/core/cm.c | 12 +-- + drivers/infiniband/core/cma.c | 3 +- + drivers/infiniband/core/rw.c | 1 - + drivers/infiniband/core/ucma.c | 4 +- + drivers/infiniband/core/uverbs_ioctl.c | 4 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 4 +- + drivers/infiniband/hw/cxgb4/qp.c | 2 +- + drivers/infiniband/hw/hfi1/pio_copy.c | 1 - + drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 5 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 3 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 22 ++-- + drivers/infiniband/hw/i40iw/i40iw_puda.c | 4 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 8 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 5 +- + drivers/infiniband/hw/mlx4/cq.c | 4 +- + drivers/infiniband/hw/mlx4/mcg.c | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 6 +- + drivers/infiniband/hw/mlx5/cq.c | 4 +- + drivers/infiniband/hw/mlx5/mad.c | 3 +- + drivers/infiniband/hw/mlx5/main.c | 2 +- + drivers/infiniband/hw/mlx5/qp.c | 4 +- + drivers/infiniband/hw/mthca/mthca_av.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- + drivers/infiniband/hw/qedr/verbs.c | 2 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 4 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 4 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 6 +- + drivers/infiniband/hw/qib/qib_mad.c | 12 +-- + drivers/infiniband/hw/qib/qib_rc.c | 18 ++-- + drivers/infiniband/hw/qib/qib_sdma.c | 2 +- + drivers/infiniband/hw/qib/qib_uc.c | 8 +- + drivers/infiniband/hw/qib/qib_verbs.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 2 +- + drivers/infiniband/sw/rdmavt/qp.c | 2 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 2 +- + drivers/infiniband/sw/rxe/rxe_task.c | 2 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- + drivers/infiniband/sw/siw/siw_cm.c | 2 - + drivers/infiniband/sw/siw/siw_qp_rx.c | 4 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 10 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 1 - + drivers/input/joystick/fsia6b.c | 4 +- + drivers/input/joystick/gamecon.c | 1 - + drivers/input/tablet/wacom_serial4.c | 2 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- + drivers/input/touchscreen/wm831x-ts.c | 2 +- + drivers/iommu/amd/init.c | 2 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 11 +- + drivers/iommu/intel/iommu.c | 1 - + drivers/iommu/virtio-iommu.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 4 +- + drivers/irqchip/irq-gic-v3.c | 8 +- + drivers/irqchip/irq-imx-gpcv2.c | 2 +- + drivers/irqchip/irq-mips-gic.c | 2 +- + drivers/irqchip/irq-vic.c | 2 +- + drivers/isdn/hardware/mISDN/avmfritz.c | 2 +- + drivers/isdn/hardware/mISDN/hfc_multi_8xx.h | 1 - + drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 2 +- + drivers/isdn/hardware/mISDN/isdnhdlc.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 8 +- + drivers/isdn/mISDN/stack.c | 2 +- + drivers/lightnvm/pblk-core.c | 2 +- + drivers/macintosh/adbhid.c | 2 +- + drivers/macintosh/smu.c | 2 +- + drivers/md/bcache/journal.c | 2 +- + drivers/md/bcache/util.c | 14 +-- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-mpath.c | 2 +- + drivers/md/dm.c | 2 +- + drivers/md/md-autodetect.c | 4 +- + drivers/md/md-bitmap.c | 2 +- + drivers/md/raid5.c | 4 +- + drivers/media/cec/core/cec-adap.c | 2 +- + drivers/media/cec/core/cec-pin.c | 6 +- + drivers/media/cec/usb/pulse8/pulse8-cec.c | 2 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 36 +++---- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 2 +- + drivers/media/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb-frontends/af9013.c | 2 +- + drivers/media/dvb-frontends/bcm3510.c | 2 +- + drivers/media/dvb-frontends/dib0090.c | 2 +- + drivers/media/dvb-frontends/dib3000mb.c | 2 +- + drivers/media/dvb-frontends/dib7000p.c | 2 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 103 ++++++++++--------- + drivers/media/dvb-frontends/drxd_hard.c | 12 +-- + drivers/media/dvb-frontends/drxk_hard.c | 24 ++--- + drivers/media/dvb-frontends/lg2160.c | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/mt352.c | 2 +- + drivers/media/dvb-frontends/mxl5xx.c | 2 +- + drivers/media/dvb-frontends/or51132.c | 2 +- + drivers/media/dvb-frontends/s5h1411.c | 2 +- + drivers/media/dvb-frontends/zl10353.c | 4 +- + drivers/media/i2c/adv7180.c | 2 +- + drivers/media/i2c/adv7511-v4l2.c | 4 +- + drivers/media/i2c/msp3400-kthreads.c | 2 +- + drivers/media/i2c/ov5640.c | 2 +- + drivers/media/i2c/ov6650.c | 4 +- + drivers/media/i2c/ov9640.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 2 +- + drivers/media/i2c/smiapp/smiapp-core.c | 6 +- + drivers/media/i2c/tda1997x.c | 10 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/pci/bt8xx/bttv-driver.c | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 4 +- + drivers/media/pci/cx88/cx88-cards.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 23 +++-- + drivers/media/pci/meye/meye.c | 2 +- + drivers/media/pci/saa7134/saa7134-cards.c | 4 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-i2c.c | 2 +- + drivers/media/pci/ttpci/av7110.c | 4 +- + drivers/media/pci/ttpci/av7110_hw.c | 2 +- + drivers/media/pci/ttpci/av7110_ipack.c | 2 +- + drivers/media/pci/ttpci/budget-av.c | 2 +- + drivers/media/pci/ttpci/budget.c | 4 +- + drivers/media/platform/coda/coda-bit.c | 4 +- + drivers/media/platform/coda/coda-common.c | 10 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 6 +- + drivers/media/platform/exynos4-is/fimc-reg.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 2 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/platform/pxa_camera.c | 6 +- + drivers/media/platform/qcom/venus/vdec.c | 2 +- + drivers/media/platform/renesas-ceu.c | 4 +- + drivers/media/platform/sh_vou.c | 4 +- + drivers/media/radio/radio-si476x.c | 3 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/radio/tea575x.c | 2 +- + drivers/media/rc/bpf-lirc.c | 2 +- + drivers/media/rc/iguanair.c | 2 +- + drivers/media/rc/ir-rc6-decoder.c | 2 +- + drivers/media/rc/ir-sony-decoder.c | 2 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 2 +- + drivers/media/test-drivers/vivid/vivid-vbi-gen.c | 2 +- + drivers/media/tuners/fc0011.c | 2 +- + drivers/media/tuners/tda18271-fe.c | 2 +- + drivers/media/tuners/xc5000.c | 2 +- + drivers/media/usb/b2c2/flexcop-usb.c | 2 +- + drivers/media/usb/cpia2/cpia2_core.c | 36 +++---- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/dvb-usb-v2/af9015.c | 2 +- + drivers/media/usb/dvb-usb-v2/gl861.c | 2 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 8 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-gpio.c | 4 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 6 +- + drivers/media/usb/em28xx/em28xx-audio.c | 8 +- + drivers/media/usb/go7007/go7007-driver.c | 2 +- + drivers/media/usb/gspca/mr97310a.c | 10 +- + drivers/media/usb/gspca/nw80x.c | 2 +- + drivers/media/usb/gspca/ov519.c | 6 +- + drivers/media/usb/gspca/sn9c20x.c | 2 +- + drivers/media/usb/gspca/sunplus.c | 4 +- + drivers/media/usb/gspca/xirlink_cit.c | 4 +- + drivers/media/usb/gspca/zc3xx.c | 4 +- + drivers/media/usb/pwc/pwc-v4l.c | 2 +- + drivers/media/usb/siano/smsusb.c | 2 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 8 +- + drivers/media/usb/uvc/uvc_video.c | 4 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 - + drivers/media/v4l2-core/videobuf-core.c | 2 +- + drivers/memory/omap-gpmc.c | 1 - + drivers/memstick/core/ms_block.c | 12 +-- + drivers/memstick/host/jmb38x_ms.c | 4 +- + drivers/memstick/host/tifm_ms.c | 4 +- + drivers/message/fusion/mptbase.c | 6 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/fusion/mptscsih.c | 4 +- + drivers/mfd/db8500-prcmu.c | 4 +- + drivers/mfd/iqs62x.c | 6 +- + drivers/mfd/mxs-lradc.c | 2 +- + drivers/mfd/omap-usb-host.c | 4 +- + drivers/mfd/rave-sp.c | 4 +- + drivers/mfd/syscon.c | 2 +- + drivers/misc/eeprom/at25.c | 10 +- + drivers/misc/mic/scif/scif_api.c | 4 +- + drivers/misc/mic/scif/scif_rma.c | 2 +- + drivers/misc/sgi-gru/grukservices.c | 4 +- + drivers/misc/sgi-xp/xpc_main.c | 4 +- + drivers/misc/sgi-xp/xpc_partition.c | 4 +- + drivers/misc/sgi-xp/xpc_uv.c | 2 +- + drivers/mmc/core/host.c | 2 +- + drivers/mmc/host/atmel-mci.c | 8 +- + drivers/mmc/host/davinci_mmc.c | 2 +- + drivers/mmc/host/dw_mmc-k3.c | 2 +- + drivers/mmc/host/dw_mmc.c | 6 +- + drivers/mmc/host/jz4740_mmc.c | 4 +- + drivers/mmc/host/meson-mx-sdio.c | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-s3c.c | 2 +- + drivers/mmc/host/sdhci-sprd.c | 2 +- + drivers/mmc/host/sdhci-xenon-phy.c | 2 +- + drivers/mmc/host/sdhci.c | 2 +- + drivers/mmc/host/tifm_sd.c | 2 +- + drivers/mmc/host/usdhi6rol0.c | 6 +- + drivers/mux/adgs1408.c | 2 +- + drivers/net/appletalk/cops.c | 2 +- + drivers/net/arcnet/arc-rimi.c | 6 +- + drivers/net/arcnet/com20020-isa.c | 12 +-- + drivers/net/arcnet/com90io.c | 4 +- + drivers/net/arcnet/com90xx.c | 6 +- + drivers/net/bonding/bond_3ad.c | 4 +- + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/can/at91_can.c | 4 +- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 2 +- + drivers/net/can/sja1000/sja1000_platform.c | 2 +- + drivers/net/can/slcan.c | 4 +- + drivers/net/can/spi/mcp251x.c | 2 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 4 +- + drivers/net/dsa/b53/b53_common.c | 2 +- + drivers/net/dsa/b53/b53_serdes.c | 2 +- + drivers/net/dsa/bcm_sf2.c | 2 +- + drivers/net/dsa/microchip/ksz9477.c | 2 +- + drivers/net/dsa/mt7530.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 4 +- + drivers/net/ethernet/3com/3c574_cs.c | 2 +- + drivers/net/ethernet/8390/axnet_cs.c | 2 +- + drivers/net/ethernet/8390/pcnet_cs.c | 2 +- + drivers/net/ethernet/alacritech/slicoss.c | 12 +-- + drivers/net/ethernet/alteon/acenic.c | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 6 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 14 +-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 14 +-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 16 +-- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 4 +- + drivers/net/ethernet/broadcom/cnic.c | 4 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 54 +++++----- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 6 +- + drivers/net/ethernet/brocade/bna/bna_enet.c | 2 +- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 2 +- + drivers/net/ethernet/cadence/macb_ptp.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 29 +++--- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 25 +++-- + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 6 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 4 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 4 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 1 - + drivers/net/ethernet/intel/igb/igb_main.c | 1 - + drivers/net/ethernet/marvell/mvneta.c | 4 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 4 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 6 +- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 18 ++-- + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 10 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 32 +++--- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 6 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 12 +-- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 2 +- + drivers/net/ethernet/mscc/ocelot.c | 2 +- + drivers/net/ethernet/natsemi/natsemi.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-config.c | 6 +- + drivers/net/ethernet/netronome/nfp/crypto/tls.c | 2 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 2 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 2 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_asm.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 4 +- + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 4 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 2 +- + drivers/net/ethernet/packetengines/yellowfin.c | 2 +- + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 10 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 4 +- + drivers/net/ethernet/rocker/rocker_main.c | 8 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 4 +- + drivers/net/ethernet/sfc/falcon/ethtool.c | 2 +- + drivers/net/ethernet/sfc/falcon/farch.c | 14 +-- + drivers/net/ethernet/sfc/farch.c | 14 +-- + drivers/net/ethernet/sfc/mcdi_filters.c | 2 +- + drivers/net/ethernet/sfc/mcdi_port_common.c | 2 +- + drivers/net/ethernet/sfc/rx.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 2 +- + drivers/net/ethernet/smsc/smc911x.c | 2 +- + drivers/net/ethernet/socionext/netsec.c | 4 +- + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 7 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 4 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/ti/cpsw-phy-sel.c | 4 +- + drivers/net/ethernet/ti/cpsw_priv.c | 4 +- + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 28 ++--- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/fddi/skfp/pcmplc.c | 4 +- + drivers/net/fjes/fjes_main.c | 2 +- + drivers/net/hamradio/baycom_epp.c | 2 +- + drivers/net/hamradio/mkiss.c | 5 +- + drivers/net/macvlan.c | 2 +- + drivers/net/mii.c | 2 +- + drivers/net/netdevsim/bus.c | 2 +- + drivers/net/netdevsim/fib.c | 6 +- + drivers/net/phy/adin.c | 4 +- + drivers/net/phy/dp83640.c | 8 +- + drivers/net/phy/fixed_phy.c | 4 +- + drivers/net/phy/phy.c | 4 +- + drivers/net/phy/phy_device.c | 2 +- + drivers/net/phy/phylink.c | 4 +- + drivers/net/phy/sfp-bus.c | 4 +- + drivers/net/phy/sfp.c | 12 +-- + drivers/net/plip/plip.c | 26 ++--- + drivers/net/tun.c | 6 +- + drivers/net/usb/aqc111.c | 6 +- + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/cdc-phonet.c | 2 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/pegasus.c | 4 +- + drivers/net/usb/r8152.c | 6 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/usbnet.c | 6 +- + drivers/net/veth.c | 8 +- + drivers/net/virtio_net.c | 6 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 +- + drivers/net/wan/lapbether.c | 2 +- + drivers/net/wan/sdla.c | 2 +- + drivers/net/wan/x25_asy.c | 2 +- + drivers/net/wimax/i2400m/control.c | 2 +- + drivers/net/wimax/i2400m/usb-fw.c | 2 +- + drivers/net/wimax/i2400m/usb-tx.c | 2 +- + drivers/net/wimax/i2400m/usb.c | 2 +- + drivers/net/wireless/ath/ath11k/core.c | 2 +- + drivers/net/wireless/ath/ath11k/dp.c | 2 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +- + drivers/net/wireless/ath/ath11k/mac.c | 22 ++-- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/channel.c | 4 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 6 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/carl9170/rx.c | 2 +- + drivers/net/wireless/ath/carl9170/tx.c | 6 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 2 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 2 +- + drivers/net/wireless/atmel/atmel.c | 2 +- + drivers/net/wireless/broadcom/b43/dma.c | 2 +- + drivers/net/wireless/broadcom/b43/main.c | 8 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- + drivers/net/wireless/broadcom/b43/pio.c | 2 +- + drivers/net/wireless/broadcom/b43/tables_nphy.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/dma.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 - + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 - + .../wireless/broadcom/brcm80211/brcmsmac/rate.c | 1 - + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 4 +- + drivers/net/wireless/intel/iwlegacy/common.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/scan.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/led.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 4 +- + drivers/net/wireless/intersil/orinoco/main.c | 4 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 8 +- + drivers/net/wireless/intersil/prism54/isl_38xx.c | 2 +- + drivers/net/wireless/intersil/prism54/isl_ioctl.c | 2 +- + drivers/net/wireless/intersil/prism54/islpci_dev.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 8 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 2 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 6 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 1 - + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/usb.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/dma.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/mac.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 42 ++++---- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 1 - + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 - + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 3 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 1 - + drivers/net/wireless/ray_cs.c | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 8 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 2 +- + drivers/net/wireless/realtek/rtw88/main.c | 4 +- + drivers/net/wireless/realtek/rtw88/phy.c | 6 +- + drivers/net/wireless/ti/wlcore/main.c | 4 +- + drivers/net/wireless/zydas/zd1201.c | 2 +- + drivers/net/xen-netback/hash.c | 2 +- + drivers/net/xen-netback/xenbus.c | 2 +- + drivers/net/xen-netfront.c | 2 +- + drivers/nfc/pn533/pn533.c | 4 +- + drivers/nfc/st21nfca/dep.c | 2 +- + drivers/nfc/trf7970a.c | 4 +- + drivers/ntb/ntb_transport.c | 4 +- + drivers/nvme/host/core.c | 12 +-- + drivers/nvme/host/pci.c | 2 +- + drivers/nvme/host/rdma.c | 2 +- + drivers/nvme/host/tcp.c | 1 - + drivers/nvme/target/core.c | 2 +- + drivers/nvme/target/fcloop.c | 2 +- + drivers/nvme/target/io-cmd-bdev.c | 1 - + drivers/nvme/target/rdma.c | 4 +- + drivers/parport/ieee1284.c | 6 +- + drivers/parport/parport_pc.c | 2 +- + drivers/pci/controller/dwc/pci-imx6.c | 6 +- + drivers/pci/controller/pci-rcar-gen2.c | 2 +- + drivers/pci/hotplug/ibmphp_res.c | 2 +- + drivers/pci/hotplug/pciehp_ctrl.c | 4 +- + drivers/pci/hotplug/shpchp_ctrl.c | 4 +- + drivers/pci/pci.c | 4 +- + drivers/pci/proc.c | 2 +- + drivers/pci/quirks.c | 4 +- + drivers/pci/setup-bus.c | 2 +- + drivers/pci/xen-pcifront.c | 2 +- + drivers/pcmcia/db1xxx_ss.c | 8 +- + drivers/perf/arm-ccn.c | 2 +- + drivers/perf/arm_spe_pmu.c | 4 +- + drivers/phy/qualcomm/phy-qcom-usb-hs.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 8 +- + drivers/platform/olpc/olpc-xo175-ec.c | 2 +- + drivers/platform/x86/acer-wmi.c | 8 +- + drivers/platform/x86/dell-laptop.c | 4 +- + drivers/platform/x86/surfacepro3_button.c | 8 +- + drivers/platform/x86/thinkpad_acpi.c | 6 +- + drivers/platform/x86/toshiba_acpi.c | 2 +- + drivers/power/supply/ab8500_charger.c | 4 +- + drivers/power/supply/ab8500_fg.c | 4 +- + drivers/power/supply/abx500_chargalg.c | 26 ++--- + drivers/power/supply/axp20x_usb_power.c | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 2 +- + drivers/power/supply/max8925_power.c | 2 +- + drivers/power/supply/wm831x_power.c | 2 +- + drivers/power/supply/wm8350_power.c | 2 +- + drivers/ps3/ps3av.c | 2 +- + drivers/ps3/ps3av_cmd.c | 4 +- + drivers/rapidio/devices/rio_mport_cdev.c | 2 +- + drivers/regulator/axp20x-regulator.c | 8 +- + drivers/regulator/core.c | 2 +- + drivers/regulator/slg51000-regulator.c | 2 +- + drivers/regulator/twl6030-regulator.c | 2 +- + drivers/remoteproc/omap_remoteproc.c | 1 - + drivers/reset/reset-imx7.c | 14 +-- + drivers/rpmsg/qcom_glink_native.c | 4 +- + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-pcf85063.c | 2 +- + drivers/rtc/rtc-pcf8523.c | 2 +- + drivers/rtc/rtc-stmp3xxx.c | 2 +- + drivers/s390/net/ctcm_fsms.c | 2 +- + drivers/s390/net/ctcm_mpc.c | 6 +- + drivers/s390/net/qeth_core_main.c | 4 +- + drivers/s390/net/qeth_ethtool.c | 6 +- + drivers/s390/net/qeth_l2_main.c | 2 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/scsi/53c700.c | 2 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/FlashPoint.c | 9 +- + drivers/scsi/NCR5380.c | 2 +- + drivers/scsi/aacraid/aachba.c | 8 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 40 ++++---- + drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 28 ++--- + drivers/scsi/aic94xx/aic94xx_scb.c | 10 +- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- + drivers/scsi/arm/fas216.c | 12 +-- + drivers/scsi/be2iscsi/be_iscsi.c | 2 +- + drivers/scsi/be2iscsi/be_main.c | 2 +- + drivers/scsi/bfa/bfa_fcpim.c | 6 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 4 +- + drivers/scsi/bfa/bfa_fcs_rport.c | 14 +-- + drivers/scsi/bfa/bfa_ioc.c | 6 +- + drivers/scsi/bfa/bfa_svc.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 1 - + drivers/scsi/csiostor/csio_hw.c | 2 +- + drivers/scsi/csiostor/csio_lnode.c | 1 - + drivers/scsi/csiostor/csio_wr.c | 2 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 2 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 +- + drivers/scsi/cxlflash/main.c | 28 ++--- + drivers/scsi/cxlflash/superpipe.c | 10 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 4 +- + drivers/scsi/esas2r/esas2r_flash.c | 2 +- + drivers/scsi/esas2r/esas2r_init.c | 4 +- + drivers/scsi/esp_scsi.c | 4 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 8 +- + drivers/scsi/g_NCR5380.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- + drivers/scsi/hpsa.c | 10 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 6 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 6 +- + drivers/scsi/imm.c | 14 +-- + drivers/scsi/isci/phy.c | 2 +- + drivers/scsi/isci/remote_device.c | 4 +- + drivers/scsi/isci/remote_node_context.c | 6 +- + drivers/scsi/isci/request.c | 2 +- + drivers/scsi/libfc/fc_exch.c | 4 +- + drivers/scsi/libfc/fc_fcp.c | 8 +- + drivers/scsi/libfc/fc_lport.c | 2 +- + drivers/scsi/libfc/fc_rport.c | 2 +- + drivers/scsi/libiscsi.c | 6 +- + drivers/scsi/libiscsi_tcp.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/libsas/sas_discover.c | 6 +- + drivers/scsi/libsas/sas_expander.c | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 2 +- + drivers/scsi/lpfc/lpfc_ct.c | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 7 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- + drivers/scsi/lpfc/lpfc_nvme.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 28 ++--- + drivers/scsi/megaraid.c | 12 +-- + drivers/scsi/megaraid/megaraid_mbox.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/mesh.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 +- + drivers/scsi/myrb.c | 8 +- + drivers/scsi/ncr53c8xx.c | 14 +-- + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/ppa.c | 10 +- + drivers/scsi/qla2xxx/qla_gs.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 2 +- + drivers/scsi/qla2xxx/qla_iocb.c | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 10 +- + drivers/scsi/qla2xxx/qla_sup.c | 6 +- + drivers/scsi/qla2xxx/qla_target.c | 6 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/qlogicpti.c | 20 ++-- + drivers/scsi/scsi_error.c | 28 ++--- + drivers/scsi/scsi_ioctl.c | 4 +- + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 17 ++- + drivers/scsi/sr.c | 4 +- + drivers/scsi/st.c | 8 +- + drivers/scsi/sun3_scsi.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_fw.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_nvram.c | 2 +- + drivers/scsi/ufs/ufs_bsg.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 8 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/scsi/wd33c93.c | 2 +- + drivers/scsi/xen-scsifront.c | 2 +- + drivers/soc/qcom/socinfo.c | 22 ++-- + drivers/soc/tegra/pmc.c | 2 +- + drivers/spi/spi-bcm2835aux.c | 4 +- + drivers/spi/spi-fsl-cpm.c | 4 +- + drivers/spi/spi-sprd-adi.c | 2 +- + drivers/ssb/driver_chipcommon.c | 2 +- + drivers/ssb/driver_mipscore.c | 2 +- + drivers/ssb/scan.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 2 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 8 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 1 - + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 2 +- + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 2 +- + drivers/staging/media/atomisp/pci/sh_css.c | 2 +- + drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c | 2 +- + .../staging/media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 2 +- + drivers/staging/media/usbvision/usbvision-i2c.c | 6 +- + drivers/target/iscsi/cxgbit/cxgbit_main.c | 2 +- + drivers/target/iscsi/iscsi_target.c | 2 +- + drivers/target/target_core_pr.c | 4 +- + drivers/target/target_core_sbc.c | 2 +- + drivers/target/target_core_transport.c | 4 +- + drivers/target/tcm_fc/tfc_cmd.c | 2 +- + drivers/thermal/qcom/tsens-v0_1.c | 8 +- + drivers/thermal/qcom/tsens-v1.c | 4 +- + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/switch.c | 2 +- + drivers/thunderbolt/tunnel.c | 4 +- + drivers/tty/hvc/hvc_xen.c | 2 +- + drivers/tty/mips_ejtag_fdc.c | 2 +- + drivers/tty/n_gsm.c | 4 +- + drivers/tty/n_hdlc.c | 2 +- + drivers/tty/n_r3964.c | 1 - + drivers/tty/serial/8250/8250_em.c | 2 +- + drivers/tty/serial/8250/8250_fintek.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/tty/serial/8250/8250_port.c | 2 +- + drivers/tty/serial/8250/8250_uniphier.c | 6 +- + drivers/tty/serial/atmel_serial.c | 2 +- + drivers/tty/serial/omap-serial.c | 2 - + drivers/tty/serial/rda-uart.c | 2 +- + drivers/tty/serial/serial-tegra.c | 2 +- + drivers/tty/serial/serial_core.c | 2 +- + drivers/tty/serial/sunsu.c | 2 +- + drivers/tty/serial/sunzilog.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 2 +- + drivers/tty/tty_ioctl.c | 2 +- + drivers/tty/vt/vt.c | 6 +- + drivers/usb/c67x00/c67x00-sched.c | 3 +- + drivers/usb/core/hub.c | 2 +- + drivers/usb/dwc3/core.c | 5 +- + drivers/usb/gadget/function/f_mass_storage.c | 1 - + drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 2 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 4 +- + drivers/usb/host/isp116x-hcd.c | 6 +- + drivers/usb/host/pci-quirks.c | 3 +- + drivers/usb/host/xhci-dbgcap.c | 2 +- + drivers/usb/host/xhci-hub.c | 2 +- + drivers/usb/host/xhci-mem.c | 4 +- + drivers/usb/host/xhci-ring.c | 2 +- + drivers/usb/host/xhci.c | 2 +- + drivers/usb/musb/cppi_dma.c | 2 +- + drivers/usb/musb/musb_core.c | 13 ++- + drivers/usb/musb/musb_dsps.c | 6 +- + drivers/usb/musb/musb_gadget_ep0.c | 4 +- + drivers/usb/musb/musb_host.c | 6 +- + drivers/usb/musb/musb_virthub.c | 2 +- + drivers/usb/musb/omap2430.c | 2 +- + drivers/usb/musb/tusb6010.c | 2 +- + drivers/usb/storage/sddr55.c | 2 +- + drivers/usb/storage/uas.c | 2 +- + drivers/usb/typec/tcpm/tcpci.c | 2 +- + drivers/vfio/pci/vfio_pci.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + drivers/video/backlight/adp8860_bl.c | 2 +- + drivers/video/fbdev/acornfb.c | 2 +- + drivers/video/fbdev/arcfb.c | 2 +- + drivers/video/fbdev/atmel_lcdfb.c | 4 +- + drivers/video/fbdev/aty/radeon_pm.c | 6 +- + drivers/video/fbdev/cirrusfb.c | 4 +- + drivers/video/fbdev/controlfb.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 2 +- + drivers/video/fbdev/fsl-diu-fb.c | 4 +- + drivers/video/fbdev/gxt4500.c | 2 +- + drivers/video/fbdev/hyperv_fb.c | 4 +- + drivers/video/fbdev/i740fb.c | 2 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 2 - + drivers/video/fbdev/nvidia/nv_hw.c | 2 +- + drivers/video/fbdev/offb.c | 4 +- + drivers/video/fbdev/omap/lcdc.c | 4 +- + drivers/video/fbdev/omap/omapfb_main.c | 20 ++-- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 4 +- + drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- + drivers/video/fbdev/pm2fb.c | 4 +- + drivers/video/fbdev/pxa168fb.c | 4 - + drivers/video/fbdev/pxafb.c | 2 +- + drivers/video/fbdev/riva/fbdev.c | 2 +- + drivers/video/fbdev/s3c-fb.c | 6 +- + drivers/video/fbdev/sa1100fb.c | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 2 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 4 +- + drivers/video/fbdev/sis/sis_main.c | 8 +- + drivers/video/fbdev/sm501fb.c | 2 +- + drivers/video/fbdev/stifb.c | 4 +- + drivers/video/fbdev/tdfxfb.c | 2 +- + drivers/video/fbdev/via/lcd.c | 2 +- + drivers/video/fbdev/xen-fbfront.c | 2 +- + drivers/watchdog/sc1200wdt.c | 2 +- + drivers/watchdog/wdrtas.c | 2 +- + drivers/xen/pvcalls-front.c | 2 +- + drivers/xen/xen-acpi-memhotplug.c | 2 +- + drivers/xen/xen-pciback/xenbus.c | 2 +- + drivers/xen/xen-scsiback.c | 2 +- + drivers/xen/xenbus/xenbus_probe_frontend.c | 4 +- + fs/9p/vfs_file.c | 2 +- + fs/adfs/dir_f.c | 12 +-- + fs/affs/inode.c | 2 +- + fs/affs/super.c | 6 +- + fs/afs/cmservice.c | 16 +-- + fs/afs/file.c | 2 +- + fs/afs/flock.c | 2 +- + fs/afs/fsclient.c | 42 ++++---- + fs/afs/misc.c | 18 ++-- + fs/afs/rotate.c | 2 +- + fs/afs/rxrpc.c | 6 +- + fs/afs/vlclient.c | 24 ++--- + fs/afs/write.c | 2 +- + fs/afs/yfsclient.c | 50 ++++----- + fs/aio.c | 2 +- + fs/buffer.c | 2 +- + fs/ceph/dir.c | 2 +- + fs/ceph/file.c | 2 +- + fs/cifs/cifssmb.c | 2 +- + fs/cifs/connect.c | 10 +- + fs/cifs/sess.c | 6 +- + fs/cifs/smb2pdu.c | 2 +- + fs/configfs/dir.c | 4 +- + fs/dax.c | 2 +- + fs/dlm/lock.c | 2 +- + fs/erofs/zmap.c | 6 +- + fs/ext2/inode.c | 4 +- + fs/ext2/super.c | 2 +- + fs/ext4/hash.c | 4 +- + fs/ext4/indirect.c | 12 +-- + fs/ext4/readpage.c | 4 +- + fs/f2fs/f2fs.h | 2 +- + fs/f2fs/node.c | 4 +- + fs/fcntl.c | 4 +- + fs/fs_context.c | 2 +- + fs/fsopen.c | 2 +- + fs/gfs2/bmap.c | 4 +- + fs/gfs2/quota.c | 2 +- + fs/hfsplus/wrapper.c | 2 +- + fs/io_uring.c | 2 +- + fs/iomap/seek.c | 4 +- + fs/jffs2/fs.c | 2 +- + fs/jffs2/readinode.c | 2 +- + fs/libfs.c | 4 +- + fs/locks.c | 6 +- + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/dir.c | 2 +- + fs/nfs/filelayout/filelayout.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 4 +- + fs/nfs/fs_context.c | 22 ++-- + fs/nfs/nfs3acl.c | 4 +- + fs/nfs/nfs4file.c | 2 +- + fs/nfs/nfs4idmap.c | 4 +- + fs/nfs/nfs4proc.c | 32 +++--- + fs/nfs/nfs4state.c | 14 +-- + fs/nfs/pagelist.c | 2 +- + fs/nfs/pnfs.c | 2 +- + fs/nfs_common/nfsacl.c | 2 +- + fs/nfsd/blocklayout.c | 4 +- + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4layouts.c | 2 +- + fs/nfsd/nfs4proc.c | 2 +- + fs/nfsd/nfs4state.c | 12 +-- + fs/nfsd/nfsfh.c | 4 +- + fs/nfsd/nfsproc.c | 2 +- + fs/nfsd/nfssvc.c | 2 +- + fs/nfsd/vfs.c | 4 +- + fs/nilfs2/bmap.c | 2 +- + fs/nilfs2/recovery.c | 2 +- + fs/nilfs2/segment.c | 19 ++-- + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/ocfs2/cluster/quorum.c | 2 +- + fs/pstore/zone.c | 1 - + fs/quota/quota.c | 2 +- + fs/seq_file.c | 2 +- + fs/signalfd.c | 2 +- + fs/ubifs/lprops.c | 4 +- + fs/udf/symlink.c | 2 +- + fs/ufs/util.h | 12 +-- + fs/vboxsf/utils.c | 2 +- + include/linux/compat.h | 6 +- + include/linux/filter.h | 2 +- + include/linux/jhash.h | 26 ++--- + include/linux/mm.h | 9 +- + include/linux/signal.h | 12 +-- + include/linux/skbuff.h | 12 +-- + include/math-emu/op-common.h | 10 +- + ipc/sem.c | 4 +- + ipc/shm.c | 4 +- + kernel/auditfilter.c | 2 +- + kernel/bpf/cgroup.c | 2 +- + kernel/bpf/cpumap.c | 2 +- + kernel/bpf/syscall.c | 2 +- + kernel/bpf/verifier.c | 4 +- + kernel/capability.c | 2 +- + kernel/compat.c | 6 +- + kernel/debug/gdbstub.c | 6 +- + kernel/debug/kdb/kdb_keyboard.c | 4 +- + kernel/debug/kdb/kdb_support.c | 6 +- + kernel/events/core.c | 2 +- + kernel/irq/handle.c | 2 +- + kernel/irq/manage.c | 4 +- + kernel/kallsyms.c | 4 +- + kernel/power/hibernate.c | 2 +- + kernel/power/qos.c | 4 +- + kernel/sched/core.c | 2 +- + kernel/sched/topology.c | 6 +- + kernel/signal.c | 2 +- + kernel/sys.c | 2 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/posix-timers.c | 4 +- + kernel/time/tick-broadcast.c | 2 +- + kernel/time/timer.c | 2 +- + kernel/trace/blktrace.c | 2 +- + kernel/trace/trace_events_filter.c | 4 +- + lib/asn1_decoder.c | 4 +- + lib/assoc_array.c | 2 +- + lib/bootconfig.c | 4 +- + lib/cmdline.c | 10 +- + lib/dim/net_dim.c | 2 +- + lib/dim/rdma_dim.c | 4 +- + lib/glob.c | 2 +- + lib/nlattr.c | 6 +- + lib/siphash.c | 36 +++---- + lib/ts_fsm.c | 2 +- + lib/vsprintf.c | 15 +-- + lib/xz/xz_dec_lzma2.c | 4 +- + lib/xz/xz_dec_stream.c | 16 +-- + lib/zlib_inflate/inflate.c | 24 ++--- + lib/zstd/bitstream.h | 10 +- + lib/zstd/compress.c | 2 +- + lib/zstd/decompress.c | 12 +-- + lib/zstd/huf_compress.c | 4 +- + net/8021q/vlan_dev.c | 2 +- + net/9p/trans_xen.c | 2 +- + net/atm/common.c | 4 +- + net/atm/lec.c | 2 +- + net/atm/resources.c | 8 +- + net/bpf/test_run.c | 2 +- + net/can/j1939/socket.c | 2 +- + net/can/j1939/transport.c | 20 ++-- + net/ceph/ceph_hash.c | 20 ++-- + net/ceph/crush/mapper.c | 2 +- + net/ceph/messenger.c | 4 +- + net/ceph/mon_client.c | 2 +- + net/ceph/osd_client.c | 4 +- + net/core/dev.c | 4 +- + net/core/dev_ioctl.c | 6 +- + net/core/devlink.c | 4 +- + net/core/drop_monitor.c | 2 +- + net/core/filter.c | 2 +- + net/core/pktgen.c | 2 +- + net/core/skmsg.c | 1 - + net/core/sock.c | 2 +- + net/dccp/ccids/ccid3.c | 2 +- + net/dccp/feat.c | 3 +- + net/dccp/input.c | 10 +- + net/dccp/options.c | 2 +- + net/dccp/output.c | 8 +- + net/dccp/proto.c | 8 +- + net/decnet/af_decnet.c | 6 +- + net/decnet/dn_nsp_in.c | 2 +- + net/decnet/dn_table.c | 2 +- + net/decnet/sysctl_net_decnet.c | 2 +- + net/dsa/slave.c | 2 +- + net/ieee802154/6lowpan/reassembly.c | 2 +- + net/ieee802154/6lowpan/rx.c | 4 +- + net/iucv/af_iucv.c | 10 +- + net/mpls/af_mpls.c | 2 +- + net/mptcp/protocol.c | 3 +- + net/ncsi/ncsi-manage.c | 4 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 2 +- + net/netlink/policy.c | 2 +- + net/netrom/nr_in.c | 2 +- + net/netrom/nr_route.c | 8 +- + net/openvswitch/conntrack.c | 4 +- + net/openvswitch/flow.c | 2 +- + net/packet/af_packet.c | 2 +- + net/phonet/pep.c | 10 +- + net/rds/send.c | 2 +- + net/rose/rose_in.c | 2 +- + net/rose/rose_route.c | 4 +- + net/rxrpc/af_rxrpc.c | 6 +- + net/rxrpc/call_accept.c | 2 +- + net/rxrpc/conn_client.c | 2 +- + net/rxrpc/input.c | 6 +- + net/rxrpc/local_object.c | 2 +- + net/rxrpc/peer_event.c | 2 +- + net/rxrpc/recvmsg.c | 2 +- + net/rxrpc/sendmsg.c | 6 +- + net/sched/sch_cake.c | 2 +- + net/sctp/ipv6.c | 2 +- + net/sctp/outqueue.c | 6 +- + net/sctp/sm_make_chunk.c | 2 +- + net/sctp/sm_sideeffect.c | 2 +- + net/sctp/sm_statefuns.c | 2 +- + net/smc/smc_close.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +- + net/sunrpc/clnt.c | 22 ++-- + net/sunrpc/xprt.c | 2 +- + net/sunrpc/xprtrdma/verbs.c | 2 +- + net/sunrpc/xprtsock.c | 8 +- + net/tipc/bearer.c | 2 +- + net/tipc/group.c | 2 +- + net/tipc/link.c | 2 +- + net/tipc/socket.c | 4 +- + net/unix/af_unix.c | 2 +- + net/wireless/chan.c | 4 +- + net/wireless/mlme.c | 2 +- + net/wireless/nl80211.c | 20 ++-- + net/wireless/scan.c | 2 +- + net/wireless/sme.c | 4 +- + net/wireless/util.c | 4 +- + net/wireless/wext-compat.c | 4 +- + net/x25/x25_facilities.c | 2 +- + net/x25/x25_in.c | 2 +- + net/xfrm/xfrm_policy.c | 2 +- + samples/bpf/hbm.c | 2 +- + security/apparmor/domain.c | 2 +- + security/apparmor/lib.c | 4 +- + security/integrity/ima/ima_appraise.c | 4 +- + security/integrity/ima/ima_policy.c | 8 +- + security/integrity/ima/ima_template_lib.c | 2 +- + security/keys/process_keys.c | 6 +- + security/keys/request_key.c | 8 +- + security/selinux/hooks.c | 8 +- + security/selinux/ss/mls.c | 4 +- + security/smack/smack_lsm.c | 2 +- + security/tomoyo/common.c | 18 ++-- + security/tomoyo/file.c | 2 +- + sound/ppc/snd_ps3.c | 4 +- + sound/soc/atmel/mchp-i2s-mcc.c | 2 +- + sound/soc/codecs/jz4770.c | 2 +- + sound/soc/codecs/pcm186x.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 2 +- + sound/soc/hisilicon/hi6210-i2s.c | 4 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/skylake/skl-pcm.c | 2 +- + sound/soc/meson/axg-tdm-interface.c | 10 +- + sound/soc/pxa/pxa-ssp.c | 2 +- + sound/soc/rockchip/rockchip_pdm.c | 6 +- + sound/soc/samsung/i2s.c | 2 +- + sound/soc/soc-core.c | 2 +- + sound/soc/soc-topology.c | 4 +- + sound/soc/sof/intel/hda-dai.c | 4 +- + sound/soc/sof/pcm.c | 4 +- + sound/soc/ti/davinci-i2s.c | 2 +- + sound/soc/ti/n810.c | 2 +- + sound/soc/ti/omap-dmic.c | 4 +- + sound/soc/ti/omap-mcpdm.c | 8 +- + sound/soc/ti/rx51.c | 2 +- + sound/soc/zte/zx-i2s.c | 4 +- + sound/soc/zte/zx-spdif.c | 2 +- + 1285 files changed, 2938 insertions(+), 3017 deletions(-) +$ git am -3 ../patches/0001-revert-part-of-treewide-Use-fallthrough-pseudo-keywo.patch +Applying: revert part of "treewide: Use fallthrough pseudo-keyword" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/net/bpf_jit_comp64.c +$ git add -A . +$ git commit -v -a --amend +[master 11120658ce1a] Merge remote-tracking branch 'kspp-gustavo/for-next/kspp' into master + Date: Tue Aug 18 09:17:21 2020 +1000 +$ git reset --hard HEAD^ +HEAD is now at ddf860520297 Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes' into master +Merging next-20200817 version of kspp-gustavo +$ git merge -m next-20200817/kspp-gustavo 48778464bb7d346b47157d21ffde2af6b2d39110 +Already up to date. +Merging kbuild/for-next (514bad879fdb Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging scripts/link-vmlinux.sh +Auto-merging scripts/kconfig/qconf.h +CONFLICT (content): Merge conflict in scripts/kconfig/qconf.h +Auto-merging scripts/kconfig/qconf.cc +Auto-merging scripts/kconfig/lexer.l +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging scripts/Makefile.kcsan +Auto-merging lib/Makefile +Auto-merging kernel/trace/Makefile +Auto-merging arch/xtensa/boot/boot-redboot/Makefile +Auto-merging arch/xtensa/boot/boot-elf/Makefile +Auto-merging Makefile +Auto-merging Documentation/kbuild/kconfig-language.rst +Resolved 'scripts/kconfig/qconf.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e7c4a1c1e705] Merge remote-tracking branch 'kbuild/for-next' into master +$ git diff -M --stat --summary HEAD^.. + scripts/kconfig/qconf.cc | 7 +++++++ + scripts/kconfig/qconf.h | 4 ++++ + 2 files changed, 11 insertions(+) +Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (d7e673ec2c8e dma-pool: Only allocate from CMA when in same memory zone) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + drivers/iommu/dma-iommu.c | 4 +- + include/linux/dma-direct.h | 3 - + include/linux/dma-mapping.h | 5 +- + kernel/dma/direct.c | 13 ++-- + kernel/dma/pool.c | 145 ++++++++++++++++++++++++-------------------- + 5 files changed, 92 insertions(+), 78 deletions(-) +Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (def9d2780727 Linux 5.5-rc7) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (4dffbda6a996 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (3df14264ad99 recordmcount: Fix build failure on non arm64) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (55fdc1f44cd6 arm64: perf: Expose some new events via sysfs) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (e7e7df91deea soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/soc-for-next-contents.txt | 229 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 229 insertions(+) + create mode 100644 arch/arm/soc-for-next-contents.txt +Merging amlogic/for-next (c943b84fab78 Merge branch 'v5.10/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 88 -------------------- + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 94 +++++++++++++++++++++- + 2 files changed, 92 insertions(+), 90 deletions(-) +Merging aspeed/for-next (2c887638a5fa ARM: dts: Aspeed: tacoma: Enable EHCI controller) +$ git merge aspeed/for-next +Already up to date. +Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-memory/for-next (ea0c0ad6b6eb memory: Enable compile testing for most of the drivers) +$ git merge drivers-memory/for-next +Merge made by the 'recursive' strategy. + drivers/memory/Kconfig | 51 ++++++--- + drivers/memory/Makefile | 2 +- + drivers/memory/omap-gpmc.c | 152 ++++++++++++++++---------- + drivers/memory/renesas-rpc-if.c | 4 +- + drivers/memory/samsung/exynos5422-dmc.c | 4 + + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 2 +- + 6 files changed, 138 insertions(+), 77 deletions(-) +Merging imx-mxs/for-next (3c1a41dab7b8 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 (50c950e2c8b6 Merge branch 'for_5.9/driver-soc' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (647a84d1e4dc Merge branch 'v5.8-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (29bd9d8c2ac1 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 (a5b4d0a1b174 Merge branch 'omap-for-v5.9/ti-sysc-drop-pdata-take2' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (0854ab24c098 Merge branch 'arm64-defconfig-for-5.10' into for-next) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 1 + + 1 file changed, 1 insertion(+) +Merging raspberrypi/for-next (25c6f3960764 ARM: dts: bcm2711: Add HDMI DVP) +$ git merge raspberrypi/for-next +Already up to date. +Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (923afaacb49d Merge branches 'renesas-arm-defconfig-for-v5.10' and 'renesas-arm-dt-for-v5.10' into renesas-next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 46 + + arch/arm/boot/dts/r8a7742.dtsi | 221 ++++ + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 112 +- + arch/arm/configs/shmobile_defconfig | 2 + + .../boot/dts/renesas/r8a774b1-hihope-rzg2n-ex.dts | 5 + + .../boot/dts/renesas/r8a774e1-hihope-rzg2h.dts | 11 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1180 +++++++++++++++++++- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + + arch/arm64/configs/defconfig | 5 + + 9 files changed, 1502 insertions(+), 81 deletions(-) +Merging reset/reset/next (2983e2385ff6 reset: imx7: add the cm4 reset for i.MX8MQ) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + .../bindings/reset/xlnx,zynqmp-reset.txt | 11 ++- + drivers/reset/Kconfig | 5 +- + drivers/reset/core.c | 3 +- + drivers/reset/reset-imx7.c | 13 ++- + drivers/reset/reset-zynqmp.c | 50 ++++++++-- + include/dt-bindings/reset/imx8mq-reset.h | 5 +- + include/dt-bindings/reset/xlnx-versal-resets.h | 105 +++++++++++++++++++++ + 7 files changed, 176 insertions(+), 16 deletions(-) + create mode 100644 include/dt-bindings/reset/xlnx-versal-resets.h +Merging rockchip/for-next (088d74f51158 Merge branch 'v5.9-clk/next' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging samsung-krzk/for-next (552233163db8 Merge branch 'next/soc-s3c-cleanup' into for-next) +$ git merge samsung-krzk/for-next +Removing arch/arm/plat-samsung/include/plat/samsung-time.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/samsung/pmu.yaml | 22 +++++- + MAINTAINERS | 6 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 42 +++++++++++- + arch/arm/boot/dts/exynos4412-i9300.dts | 4 ++ + arch/arm/boot/dts/exynos4412-midas.dtsi | 78 ++++++++++++++++++---- + arch/arm/boot/dts/exynos4412-n710x.dts | 37 +++++++++- + arch/arm/configs/exynos_defconfig | 8 +-- + arch/arm/mach-s3c24xx/bast-irq.c | 1 - + arch/arm/mach-s3c24xx/common-smdk.c | 1 - + arch/arm/mach-s3c24xx/common.c | 1 + + arch/arm/mach-s3c24xx/common.h | 25 +++---- + arch/arm/mach-s3c24xx/h1940-bluetooth.c | 1 - + arch/arm/mach-s3c24xx/mach-amlm5900.c | 3 - + arch/arm/mach-s3c24xx/mach-anubis.c | 2 - + arch/arm/mach-s3c24xx/mach-at2440evb.c | 2 - + arch/arm/mach-s3c24xx/mach-bast.c | 2 - + arch/arm/mach-s3c24xx/mach-gta02.c | 2 - + arch/arm/mach-s3c24xx/mach-h1940.c | 5 +- + arch/arm/mach-s3c24xx/mach-jive.c | 1 - + arch/arm/mach-s3c24xx/mach-mini2440.c | 2 - + arch/arm/mach-s3c24xx/mach-n30.c | 1 - + arch/arm/mach-s3c24xx/mach-nexcoder.c | 2 - + arch/arm/mach-s3c24xx/mach-osiris.c | 2 - + arch/arm/mach-s3c24xx/mach-otom.c | 2 - + arch/arm/mach-s3c24xx/mach-qt2410.c | 2 - + arch/arm/mach-s3c24xx/mach-rx1950.c | 1 - + arch/arm/mach-s3c24xx/mach-rx3715.c | 2 - + arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 - + arch/arm/mach-s3c24xx/mach-smdk2413.c | 1 - + arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 - + arch/arm/mach-s3c24xx/mach-smdk2440.c | 2 - + arch/arm/mach-s3c24xx/mach-smdk2443.c | 2 - + arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 - + arch/arm/mach-s3c24xx/mach-vr1000.c | 2 - + arch/arm/mach-s3c24xx/mach-vstms.c | 2 - + arch/arm/mach-s3c24xx/pm-s3c2410.c | 1 - + arch/arm/mach-s3c24xx/pm-s3c2412.c | 1 - + arch/arm/mach-s3c24xx/s3c2440.c | 1 - + arch/arm/mach-s3c24xx/s3c2442.c | 1 - + arch/arm/mach-s3c24xx/s3c2443.c | 1 + + arch/arm/mach-s3c24xx/setup-i2c.c | 1 - + arch/arm/mach-s3c24xx/setup-sdhci-gpio.c | 1 + + arch/arm/mach-s3c24xx/setup-ts.c | 4 +- + arch/arm/mach-s3c24xx/simtec-audio.c | 1 - + arch/arm/mach-s3c24xx/simtec-pm.c | 2 - + arch/arm/mach-s3c24xx/simtec-usb.c | 1 - + arch/arm/mach-s3c64xx/common.c | 1 + + arch/arm/mach-s3c64xx/common.h | 15 ++++- + arch/arm/mach-s3c64xx/dev-audio.c | 1 - + arch/arm/mach-s3c64xx/mach-anw6410.c | 1 - + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 5 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 1 - + arch/arm/mach-s3c64xx/mach-hmt.c | 1 - + arch/arm/mach-s3c64xx/mach-mini6410.c | 1 - + arch/arm/mach-s3c64xx/mach-ncp.c | 1 - + arch/arm/mach-s3c64xx/mach-real6410.c | 1 - + arch/arm/mach-s3c64xx/mach-smartq.c | 1 - + arch/arm/mach-s3c64xx/mach-smartq5.c | 1 - + arch/arm/mach-s3c64xx/mach-smartq7.c | 1 - + arch/arm/mach-s3c64xx/mach-smdk6400.c | 1 - + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 - + arch/arm/mach-s3c64xx/setup-spi.c | 1 + + arch/arm/mach-s3c64xx/setup-usb-phy.c | 2 +- + arch/arm/plat-samsung/Kconfig | 4 +- + arch/arm/plat-samsung/devs.c | 1 - + arch/arm/plat-samsung/include/plat/samsung-time.h | 26 -------- + arch/arm/plat-samsung/pm-common.c | 2 + + drivers/clk/samsung/clk-s3c2410.c | 1 + + drivers/clk/samsung/clk-s3c2412.c | 1 + + drivers/clk/samsung/clk-s3c2443.c | 1 + + drivers/clk/samsung/clk-s3c64xx.c | 1 + + drivers/cpuidle/cpuidle-big_little.c | 3 +- + drivers/mmc/host/s3cmci.c | 1 - + include/linux/clk/samsung.h | 56 ++++++++++++++++ + 74 files changed, 274 insertions(+), 145 deletions(-) + delete mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h + create mode 100644 include/linux/clk/samsung.h +Merging scmi/for-linux-next (bcf876870b95 Linux 5.8) +$ git merge scmi/for-linux-next +Already up to date. +Merging sunxi/sunxi/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge sunxi/sunxi/for-next +Already up to date. +Merging tegra/for-next (8617339892a6 Merge branch for-5.9/arm64/dt into for-next) +$ git merge tegra/for-next +Auto-merging drivers/clk/tegra/clk-pll.c +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-pll.c | 7 ++----- + drivers/clk/tegra/clk-tegra210-emc.c | 2 ++ + 2 files changed, 4 insertions(+), 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 uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next) +$ git merge uniphier/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7) +$ git merge clk-samsung/for-next +Already up to date. +Merging csky/linux-next (bdcd93ef9afb csky: Add context tracking support) +$ git merge csky/linux-next +Already up to date. +Merging h8300/h8300-next (9d48776fc609 Merge remote-tracking branch 'origin/master' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Auto-merging drivers/net/ethernet/smsc/Kconfig +Merge made by the 'recursive' strategy. + arch/h8300/Kconfig.cpu | 4 ++ + arch/h8300/boot/dts/edosk2674.dts | 10 ++++- + arch/h8300/configs/edosk2674_defconfig | 10 ++--- + arch/h8300/configs/h8300h-sim_defconfig | 8 +--- + arch/h8300/configs/h8s-sim_defconfig | 8 +--- + arch/h8300/lib/memset.S | 17 +++++---- + 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 +-- + 12 files changed, 120 insertions(+), 59 deletions(-) +Merging ia64/next (1a9d3c34c593 x86/cpu: Add Lakefield, Alder Lake and Rocket Lake to Intel family) +$ git merge ia64/next +Merge made by the 'recursive' strategy. +Merging m68k/for-next (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (89d77da0166d binfmt_flat: revert "binfmt_flat: don't offset the data start") +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + fs/binfmt_flat.c | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) +Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (07989ee3abad MIPS: BCM47xx: Include bcm47xx_sprom.h) +$ git merge mips/mips-next +Merge made by the 'recursive' strategy. + arch/mips/bcm63xx/boards/board_bcm963xx.c | 625 +++++++++++++-------------- + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 +- + arch/mips/kernel/ftrace.c | 4 - + arch/mips/lantiq/xway/sysctrl.c | 10 +- + drivers/firmware/broadcom/bcm47xx_sprom.c | 1 + + include/linux/bcm47xx_sprom.h | 10 + + 7 files changed, 326 insertions(+), 329 deletions(-) +Merging nds32/next (0a2e478902c7 nds32: use get_kernel_nofault in dump_mem) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/configs/defconfig | 1 - + arch/nds32/kernel/time.c | 2 +- + arch/nds32/kernel/traps.c | 50 +++----------------------------------------- + 3 files changed, 4 insertions(+), 49 deletions(-) +Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (bcf876870b95 Linux 5.8) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) +$ git merge fsl/next +Already up to date. +Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register) +$ git merge soc-fsl/next +Already up to date. +Merging risc-v/for-next (a407942f1825 Documentation/features: refresh RISC-V arch support files) +$ git merge risc-v/for-next +Merge made by the 'recursive' strategy. +Merging s390/features (9123e3a74ec7 Linux 5.9-rc1) +$ git merge s390/features +Already up to date. +Merging sh/for-next (0c64a0dce51f sh: landisk: Add missing initialization of sh_io_port_base) +$ git merge sh/for-next +Already up to date. +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 (f6e8c474390b um: virtio: Replace zero-length array with flexible-array) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (a0fc1436f1f4 xtensa: add missing exclusive access state management) +$ git merge xtensa/xtensa-for-next +Already up to date. +Merging fscrypt/master (55e32c54bbd5 fscrypt: don't load ->i_crypt_info before it's known to be valid) +$ git merge fscrypt/master +Already up to date. +Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) +$ git merge afs/afs-next +Already up to date. +Merging btrfs/for-next (cd37cdd68ef1 Merge branch 'for-next-current-v5.7-20200730' into for-next-20200730) +$ git merge btrfs/for-next +Auto-merging fs/btrfs/super.c +CONFLICT (content): Merge conflict in fs/btrfs/super.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent-tree.c +Resolved 'fs/btrfs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 38821a1b86cd] Merge remote-tracking branch 'btrfs/for-next' into master +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/extent-tree.c | 7 ++++--- + fs/btrfs/inode.c | 11 +++-------- + include/trace/events/btrfs.h | 10 ++++++---- + 3 files changed, 13 insertions(+), 15 deletions(-) +Merging ceph/master (02e37571f9e7 ceph: handle zero-length feature mask in session messages) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge cifs/for-next +Already up to date. +Merging configfs/for-next (059ccbfff8a8 configfs: use flush file op to commit writes to a binary file) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/file.c | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) +Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge ecryptfs/next +Already up to date. +Merging erofs/dev (cfcedfe21820 erofs: avoid duplicated permission check for "trusted." xattrs) +$ git merge erofs/dev +Merge made by the 'recursive' strategy. + fs/erofs/xattr.c | 2 -- + 1 file changed, 2 deletions(-) +Merging exfat/dev (34d41dbe5455 exfat: use i_blocksize() to get blocksize) +$ git merge exfat/dev +Merge made by the 'recursive' strategy. + fs/exfat/exfat_fs.h | 2 +- + fs/exfat/file.c | 2 +- + fs/exfat/namei.c | 2 +- + fs/exfat/nls.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging ext3/for_next (de575ac602ab Pull reiserfs spelling fixes.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (0f9be45c0814 ext4: correctly restore system zone info when remount fails) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/file.c +Auto-merging Documentation/admin-guide/ext4.rst +Merge made by the 'recursive' strategy. + Documentation/admin-guide/ext4.rst | 20 +-- + Documentation/filesystems/ext4/about.rst | 2 +- + fs/ext4/Kconfig | 2 +- + fs/ext4/balloc.c | 16 ++- + fs/ext4/block_validity.c | 159 +++++++++------------ + fs/ext4/ext4.h | 81 +++++++---- + fs/ext4/extents.c | 32 ++--- + fs/ext4/file.c | 9 +- + fs/ext4/indirect.c | 6 +- + fs/ext4/inode.c | 22 +-- + fs/ext4/ioctl.c | 32 ++--- + fs/ext4/mballoc.c | 161 +++++++++++++++++++-- + fs/ext4/namei.c | 54 ++++--- + fs/ext4/super.c | 237 ++++++++++++++++++++++--------- + fs/ext4/sysfs.c | 11 ++ + fs/ext4/xattr.c | 3 +- + fs/jbd2/journal.c | 16 ++- + fs/jbd2/transaction.c | 10 ++ + include/trace/events/ext4.h | 68 ++++++++- + 19 files changed, 646 insertions(+), 295 deletions(-) +Merging f2fs/dev (9123e3a74ec7 Linux 5.9-rc1) +$ git merge f2fs/dev +Already up to date. +Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info) +$ git merge fsverity/fsverity +Already up to date. +Merging fuse/for-next (9e9e23bd2d36 fuse: update project homepage) +$ git merge fuse/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/fuse.rst | 2 +- + MAINTAINERS | 2 +- + fs/fuse/Kconfig | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion")) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge nfsd/nfsd-next +Already up to date. +Merging cel/cel-next (34b09af4f54e nfsd: fix oops on mixed NFSv4/NFSv3 client access) +$ git merge cel/cel-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4state.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (4518dfcf761e ovl: fix lookup of indexed hardlinks with metacopy) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (798b7347e4f2 jffs2: fix UAF problem) +$ git merge ubifs/next +Already up to date. +Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory allocation) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (96cf2a2c7556 xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init) +$ git merge xfs/for-next +Already up to date. +Merging zonefs/for-next (2f4b7462d2fa zonefs: update documentation to reflect zone size vs capacity) +$ git merge zonefs/for-next +Auto-merging fs/zonefs/super.c +Merge made by the 'recursive' strategy. +Merging iomap/iomap-for-next (60263d5889e6 iomap: fall back to buffered writes for invalidation failures) +$ git merge iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate()) +$ git merge djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (c0842fbc1b18 random32: move the pseudo-random 32-bit definitions to prandom.h) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (bcf876870b95 Linux 5.8) +$ git merge vfs/for-next +Already up to date. +Merging printk/for-next (4f910e587667 Merge branch 'printk-rework' into for-next) +$ git merge printk/for-next +Auto-merging init/Kconfig +Auto-merging include/linux/crash_core.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/linux/crash_core.h | 3 + + init/Kconfig | 3 +- + kernel/printk/Makefile | 1 + + kernel/printk/printk.c | 954 +++++++++++---------- + kernel/printk/printk_ringbuffer.c | 1685 +++++++++++++++++++++++++++++++++++++ + kernel/printk/printk_ringbuffer.h | 400 +++++++++ + 7 files changed, 2590 insertions(+), 457 deletions(-) + create mode 100644 kernel/printk/printk_ringbuffer.c + create mode 100644 kernel/printk/printk_ringbuffer.h +Merging pci/next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao) +$ git merge pstore/for-next/pstore +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 115 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 58 insertions(+), 57 deletions(-) +Merging hid/for-next (b14f43e0cbc8 Merge branch 'for-5.9/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-apple.c | 2 ++ + drivers/hid/hid-cougar.c | 2 +- + drivers/hid/hid-cp2112.c | 19 ++++++++++--------- + drivers/hid/hid-ids.h | 3 +++ + drivers/hid/hid-macally.c | 2 +- + drivers/hid/hid-quirks.c | 3 +++ + drivers/hid/i2c-hid/i2c-hid-core.c | 34 +++++++++++++++++++++++++--------- + drivers/hid/usbhid/hiddev.c | 4 ++++ + 8 files changed, 49 insertions(+), 20 deletions(-) +Merging i2c/i2c/for-next (8cd60a71c849 Merge branch 'i2c/for-5.9' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i3c/i3c/next (b4203ce05563 i3c master: GETMRL's 3rd byte is optional even with BCR_IBI_PAYLOAD) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT) +$ git merge dmi/dmi-for-next +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (4f31c8c48312 hwmon: (ltc2947) use simple i2c probe) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/drivetemp.rst | 18 +++++++++ + Documentation/hwmon/pmbus-core.rst | 3 +- + Documentation/hwmon/pmbus.rst | 22 ++++++++--- + Documentation/hwmon/sysfs-interface.rst | 70 +++++++++++++++++++++++++++++++++ + drivers/hwmon/ad7414.c | 5 +-- + drivers/hwmon/ad7418.c | 9 +++-- + drivers/hwmon/adm1021.c | 9 +++-- + drivers/hwmon/adm1025.c | 5 +-- + drivers/hwmon/adm1026.c | 5 +-- + drivers/hwmon/adm1029.c | 5 +-- + drivers/hwmon/adm1031.c | 9 +++-- + drivers/hwmon/adm1177.c | 5 +-- + drivers/hwmon/adm9240.c | 5 +-- + drivers/hwmon/adt7410.c | 5 +-- + drivers/hwmon/adt7411.c | 5 +-- + drivers/hwmon/adt7462.c | 5 +-- + drivers/hwmon/adt7470.c | 5 +-- + drivers/hwmon/adt7475.c | 6 +-- + drivers/hwmon/amc6821.c | 5 +-- + drivers/hwmon/asb100.c | 8 ++-- + drivers/hwmon/asc7621.c | 4 +- + drivers/hwmon/atxp1.c | 5 +-- + drivers/hwmon/ds1621.c | 9 +++-- + drivers/hwmon/ds620.c | 5 +-- + drivers/hwmon/emc1403.c | 8 ++-- + drivers/hwmon/emc2103.c | 4 +- + drivers/hwmon/emc6w201.c | 5 +-- + drivers/hwmon/fschmd.c | 10 ++--- + drivers/hwmon/ftsteutates.c | 4 +- + drivers/hwmon/g760a.c | 5 +-- + drivers/hwmon/g762.c | 4 +- + drivers/hwmon/gl518sm.c | 5 +-- + drivers/hwmon/gl520sm.c | 5 +-- + drivers/hwmon/hih6130.c | 5 +-- + drivers/hwmon/hwmon.c | 10 +++++ + drivers/hwmon/ina209.c | 5 +-- + drivers/hwmon/ina2xx.c | 9 +++-- + drivers/hwmon/ina3221.c | 5 +-- + drivers/hwmon/jc42.c | 4 +- + drivers/hwmon/lineage-pem.c | 5 +-- + drivers/hwmon/lm63.c | 9 +++-- + drivers/hwmon/lm73.c | 4 +- + drivers/hwmon/lm75.c | 9 +++-- + drivers/hwmon/lm77.c | 4 +- + drivers/hwmon/lm78.c | 9 +++-- + drivers/hwmon/lm80.c | 5 +-- + drivers/hwmon/lm83.c | 9 +++-- + drivers/hwmon/lm85.c | 8 ++-- + drivers/hwmon/lm90.c | 7 ++-- + drivers/hwmon/lm92.c | 5 +-- + drivers/hwmon/lm93.c | 5 +-- + drivers/hwmon/lm95234.c | 9 +++-- + drivers/hwmon/lm95241.c | 5 +-- + drivers/hwmon/lm95245.c | 5 +-- + drivers/hwmon/ltc2945.c | 5 +-- + drivers/hwmon/ltc2947-i2c.c | 5 +-- + drivers/hwmon/ltc2990.c | 5 +-- + drivers/hwmon/ltc4151.c | 5 +-- + drivers/hwmon/ltc4215.c | 5 +-- + drivers/hwmon/ltc4222.c | 5 +-- + drivers/hwmon/ltc4245.c | 5 +-- + drivers/hwmon/ltc4260.c | 5 +-- + drivers/hwmon/ltc4261.c | 5 +-- + drivers/hwmon/max16065.c | 8 ++-- + drivers/hwmon/max1619.c | 5 +-- + drivers/hwmon/max1668.c | 9 +++-- + drivers/hwmon/max31730.c | 4 +- + drivers/hwmon/max31790.c | 5 +-- + drivers/hwmon/max6621.c | 5 +-- + drivers/hwmon/max6639.c | 5 +-- + drivers/hwmon/max6642.c | 5 +-- + drivers/hwmon/max6650.c | 10 +++-- + drivers/hwmon/max6697.c | 9 +++-- + drivers/hwmon/mcp3021.c | 9 +++-- + drivers/hwmon/nct7802.c | 5 +-- + drivers/hwmon/nct7904.c | 5 +-- + drivers/hwmon/occ/p8_i2c.c | 5 +-- + drivers/hwmon/pcf8591.c | 5 +-- + drivers/hwmon/pmbus/adm1275.c | 11 +++--- + drivers/hwmon/pmbus/bel-pfe.c | 11 +++--- + drivers/hwmon/pmbus/ibm-cffps.c | 19 +++++---- + drivers/hwmon/pmbus/inspur-ipsps.c | 7 ++-- + drivers/hwmon/pmbus/ir35221.c | 7 ++-- + drivers/hwmon/pmbus/ir38064.c | 7 ++-- + drivers/hwmon/pmbus/irps5401.c | 7 ++-- + drivers/hwmon/pmbus/isl68137.c | 11 +++--- + drivers/hwmon/pmbus/lm25066.c | 11 +++--- + drivers/hwmon/pmbus/ltc2978.c | 14 ++++--- + drivers/hwmon/pmbus/ltc3815.c | 7 ++-- + drivers/hwmon/pmbus/max16064.c | 7 ++-- + drivers/hwmon/pmbus/max16601.c | 7 ++-- + drivers/hwmon/pmbus/max20730.c | 11 +++--- + drivers/hwmon/pmbus/max20751.c | 7 ++-- + drivers/hwmon/pmbus/max31785.c | 9 ++--- + drivers/hwmon/pmbus/max34440.c | 13 +++--- + drivers/hwmon/pmbus/max8688.c | 7 ++-- + drivers/hwmon/pmbus/pmbus.c | 11 +++--- + drivers/hwmon/pmbus/pmbus.h | 16 +++++++- + drivers/hwmon/pmbus/pmbus_core.c | 52 +++++++++++++++++++----- + drivers/hwmon/pmbus/pxe1610.c | 7 ++-- + drivers/hwmon/pmbus/tps40422.c | 7 ++-- + drivers/hwmon/pmbus/tps53679.c | 11 +++--- + drivers/hwmon/pmbus/ucd9000.c | 13 +++--- + drivers/hwmon/pmbus/ucd9200.c | 13 +++--- + drivers/hwmon/pmbus/xdpe12284.c | 7 ++-- + drivers/hwmon/pmbus/zl6100.c | 11 +++--- + drivers/hwmon/powr1220.c | 5 +-- + drivers/hwmon/sht21.c | 5 +-- + drivers/hwmon/sht3x.c | 9 +++-- + drivers/hwmon/shtc1.c | 9 +++-- + drivers/hwmon/smm665.c | 9 +++-- + drivers/hwmon/smsc47m192.c | 5 +-- + drivers/hwmon/stts751.c | 5 +-- + drivers/hwmon/tc654.c | 5 +-- + drivers/hwmon/tc74.c | 5 +-- + drivers/hwmon/thmc50.c | 9 +++-- + drivers/hwmon/tmp102.c | 5 +-- + drivers/hwmon/tmp103.c | 5 +-- + drivers/hwmon/tmp108.c | 5 +-- + drivers/hwmon/tmp401.c | 7 ++-- + drivers/hwmon/tmp421.c | 7 ++-- + drivers/hwmon/w83773g.c | 5 +-- + drivers/hwmon/w83781d.c | 9 +++-- + drivers/hwmon/w83791d.c | 8 ++-- + drivers/hwmon/w83792d.c | 7 ++-- + drivers/hwmon/w83793.c | 8 ++-- + drivers/hwmon/w83l785ts.c | 8 ++-- + drivers/hwmon/w83l786ng.c | 4 +- + include/linux/hwmon.h | 20 ++++++++++ + 129 files changed, 585 insertions(+), 457 deletions(-) +Merging jc_docs/docs-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (f45882cfb152 media: camss: fix memory leaks on error handling paths in probe) +$ git merge v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it") +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (395313eda153 Merge branches 'acpi-soc' and 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (f259eab3ea0e cpufreq: make schedutil the default for arm and arm64) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (94bd8ea151da cpupowerutils: fix spelling mistake "dependant" -> "dependent") +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/debug/i386/intel_gsic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devfreq/devfreq-next (d6efb3ac3e6c Merge tag 'tty-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty) +$ git merge devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (06a8a059e88b opp: Allow disabled OPPs in dev_pm_opp_get_freq()) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (c569e805c7bc thermal: intel: intel_pch_thermal: Add Cannon Lake Low Power PCH support) +$ git merge thermal/thermal/linux-next +Already up to date. +Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) +$ git merge thermal-rzhang/next +Already up to date. +Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 2 -- + 1 file changed, 2 deletions(-) +Merging dlm/next (fa601a9ebd49 fs: dlm: implement tcp graceful shutdown) +$ git merge dlm/next +Auto-merging net/core/sock.c +Auto-merging include/net/sock.h +Auto-merging fs/dlm/lockspace.c +Auto-merging fs/dlm/config.h +Auto-merging fs/dlm/config.c +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 6 ++++++ + fs/dlm/config.h | 1 + + fs/dlm/dlm_internal.h | 1 + + fs/dlm/lockspace.c | 1 + + fs/dlm/plock.c | 20 ++++++++++++++++++++ + fs/dlm/recoverd.c | 1 + + 6 files changed, 30 insertions(+) +Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) +$ git merge swiotlb/linux-next +Auto-merging include/linux/page-flags.h +Auto-merging drivers/xen/swiotlb-xen.c +CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c +Resolved 'drivers/xen/swiotlb-xen.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d9f1e715391a] Merge remote-tracking branch 'swiotlb/linux-next' into master +$ git diff -M --stat --summary HEAD^.. +Merging rdma/for-next (23fcc7dee2c6 RDMA/mlx5: Fix flow destination setting for RDMA TX flow table) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (7fca4dee610d Merge tag 'powerpc-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (da7955405fb2 sfc: Fix build with CONFIG_RFS_ACCEL disabled.) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (7fca4dee610d Merge tag 'powerpc-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge netfilter-next/master +Already up to date. +Merging ipvs-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (9123e3a74ec7 Linux 5.9-rc1) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (3b799254cf6f Bluetooth: hci_uart: Cancel init work before unregistering) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_sdio.c | 54 +++-------------------------------------- + drivers/bluetooth/hci_h5.c | 2 -- + drivers/bluetooth/hci_ldisc.c | 1 + + drivers/bluetooth/hci_serdev.c | 2 ++ + 4 files changed, 7 insertions(+), 52 deletions(-) +Merging mac80211-next/master (7fca4dee610d Merge tag 'powerpc-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (e28c02b94f9e gfs2: When gfs2_dirty_inode gets a glock error, dump the glock) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (6a1380271b75 Merge tag 'nand/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (da151e3458c8 dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (e93a977367b2 mtd: revert "spi-nor: intel: provide a range for poll_timout") +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (3cbfe80737c1 crypto: sa2ul - Fix inconsistent IS_ERR and PTR_ERR) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (62975d27d647 drm/ttm: revert "drm/ttm: make TT creation purely optional v3") +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (ed6b26c2fb7f Revert "drm/radeon: handle PCIe root ports with addressing limitations") +$ git merge amdgpu/drm-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_internal.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +Auto-merging drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +Auto-merging drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h +Auto-merging drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/display/modules/freesync/freesync.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +Auto-merging drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_link_encoder.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_types.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_stream.h +Auto-merging drivers/gpu/drm/amd/display/dc/dc_bios_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc_bios_types.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_stream.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/dc_bios_types.h' +Recorded preimage for 'drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h' +Recorded preimage for 'drivers/gpu/drm/amd/pm/inc/smu_v11_0.h' +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/dc_bios_types.h'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/inc/smu_v11_0.h'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c'. +[master 218e6f9a189c] Merge remote-tracking branch 'amdgpu/drm-next' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu.rst | 6 + + drivers/gpu/drm/amd/amdgpu/Makefile | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 34 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 62 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 183 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 127 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_rap.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 219 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 138 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 64 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 2 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 71 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 55 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 62 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 81 ++ + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 234 ++- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 167 +-- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 26 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 14 - + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 106 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.h | 11 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 24 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.h | 12 - + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 48 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/si.c | 104 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 15 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 + + drivers/gpu/drm/amd/amdgpu/ta_rap_if.h | 84 ++ + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 14 - + drivers/gpu/drm/amd/amdgpu/umc_v8_7.c | 331 +++++ + drivers/gpu/drm/amd/amdgpu/umc_v8_7.h | 51 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 29 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 23 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 174 +-- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 75 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 2 + + drivers/gpu/drm/amd/display/Kconfig | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 585 ++++---- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 13 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 441 ++++++ + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 33 +- + drivers/gpu/drm/amd/display/dc/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/bios/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 16 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 4 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 33 +- + .../gpu/drm/amd/display/dc/bios/command_table2.h | 3 +- + .../drm/amd/display/dc/bios/command_table_helper.c | 8 + + .../drm/amd/display/dc/bios/command_table_helper.h | 3 + + .../amd/display/dc/bios/command_table_helper2.c | 8 + + .../amd/display/dc/bios/command_table_helper2.h | 3 + + .../dc/bios/dce60/command_table_helper_dce60.c | 354 +++++ + .../dc/bios/dce60/command_table_helper_dce60.h | 33 + + drivers/gpu/drm/amd/display/dc/calcs/Makefile | 7 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 18 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 6 + + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 174 +++ + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.h | 36 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 49 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 14 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 29 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 131 ++ + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 23 + + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 37 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 18 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 46 + + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.h | 49 + + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 369 +++++ + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 38 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 176 ++- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 103 ++ + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 205 +++ + drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 49 + + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 6 +- + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.h | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 330 +++++ + drivers/gpu/drm/amd/display/dc/dce/dce_transform.h | 178 +++ + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 33 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce60/Makefile | 34 + + .../drm/amd/display/dc/dce60/dce60_hw_sequencer.c | 432 ++++++ + .../drm/amd/display/dc/dce60/dce60_hw_sequencer.h | 37 + + .../gpu/drm/amd/display/dc/dce60/dce60_resource.c | 1527 ++++++++++++++++++++ + .../gpu/drm/amd/display/dc/dce60/dce60_resource.h | 47 + + .../amd/display/dc/dce60/dce60_timing_generator.c | 266 ++++ + .../amd/display/dc/dce60/dce60_timing_generator.h | 39 + + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 7 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 154 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 6 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 81 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 16 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 14 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 2 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 7 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 4 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 5 +- + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.h | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 32 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 13 + + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 4 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 5 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 20 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 12 + + .../amd/display/dc/gpio/dce60/hw_factory_dce60.c | 175 +++ + .../amd/display/dc/gpio/dce60/hw_factory_dce60.h | 32 + + .../amd/display/dc/gpio/dce60/hw_translate_dce60.c | 411 ++++++ + .../amd/display/dc/gpio/dce60/hw_translate_dce60.h | 32 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 10 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 10 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 11 + + drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 11 + + .../amd/display/dc/irq/dce60/irq_service_dce60.c | 395 +++++ + .../amd/display/dc/irq/dce60/irq_service_dce60.h | 40 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 3 + + drivers/gpu/drm/amd/display/dc/os_types.h | 4 + + .../display/dc/virtual/virtual_stream_encoder.c | 13 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 16 +- + .../drm/amd/display/include/bios_parser_types.h | 7 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 40 + + drivers/gpu/drm/amd/display/include/dal_types.h | 3 + + drivers/gpu/drm/amd/display/include/fixed31_32.h | 3 + + .../drm/amd/display/modules/freesync/freesync.c | 36 +- + .../drm/amd/display/modules/power/power_helpers.c | 19 +- + .../drm/amd/display/modules/power/power_helpers.h | 4 +- + .../gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h | 76 + + .../drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h | 104 ++ + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 22 + + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 2 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 25 + + .../amd/include/asic_reg/umc/umc_8_7_0_offset.h | 33 + + .../amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h | 79 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 109 ++ + drivers/gpu/drm/amd/pm/Makefile | 46 + + drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_dpm.c | 473 +++++- + drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_pm.c | 547 ++----- + .../drm/amd/{powerplay => pm}/inc/amd_powerplay.h | 0 + .../gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_dpm.h | 33 +- + drivers/gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_pm.h | 8 - + .../gpu/drm/amd/{powerplay => pm}/inc/amdgpu_smu.h | 10 + + .../drm/amd/{powerplay => pm}/inc/arcturus_ppsmc.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/cz_ppsmc.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/fiji_ppsmc.h | 0 + .../amd/{powerplay => pm}/inc/hardwaremanager.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/hwmgr.h | 1 + + .../amd/{powerplay => pm}/inc/polaris10_pwrvirus.h | 0 + .../drm/amd/{powerplay => pm}/inc/power_state.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/pp_debug.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/pp_endian.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/pp_thermal.h | 0 + .../drm/amd/{powerplay => pm}/inc/ppinterrupt.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/rv_ppsmc.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu10.h | 0 + .../amd/{powerplay => pm}/inc/smu10_driver_if.h | 0 + .../amd/{powerplay => pm}/inc/smu11_driver_if.h | 0 + .../inc/smu11_driver_if_arcturus.h | 0 + .../{powerplay => pm}/inc/smu11_driver_if_navi10.h | 39 + + .../inc/smu11_driver_if_sienna_cichlid.h | 6 +- + .../amd/{powerplay => pm}/inc/smu12_driver_if.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu71.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu71_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu72.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu72_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu73.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu73_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu74.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu74_discrete.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu75.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu75_discrete.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu7_common.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu7_discrete.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu7_fusion.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu7_ppsmc.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu8.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu8_fusion.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smu9.h | 0 + .../drm/amd/{powerplay => pm}/inc/smu9_driver_if.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu_types.h | 0 + .../amd/{powerplay => pm}/inc/smu_ucode_xfer_cz.h | 0 + .../amd/{powerplay => pm}/inc/smu_ucode_xfer_vi.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0.h | 14 +- + .../amd/{powerplay => pm}/inc/smu_v11_0_7_ppsmc.h | 0 + .../{powerplay => pm}/inc/smu_v11_0_7_pptable.h | 0 + .../amd/{powerplay => pm}/inc/smu_v11_0_ppsmc.h | 4 +- + .../amd/{powerplay => pm}/inc/smu_v11_0_pptable.h | 0 + .../gpu/drm/amd/{powerplay => pm}/inc/smu_v12_0.h | 2 + + .../amd/{powerplay => pm}/inc/smu_v12_0_ppsmc.h | 0 + drivers/gpu/drm/amd/{powerplay => pm}/inc/smumgr.h | 0 + .../drm/amd/{powerplay => pm}/inc/tonga_ppsmc.h | 0 + .../drm/amd/{powerplay => pm}/inc/vega10_ppsmc.h | 0 + .../{powerplay => pm}/inc/vega12/smu9_driver_if.h | 0 + .../drm/amd/{powerplay => pm}/inc/vega12_ppsmc.h | 0 + .../drm/amd/{powerplay => pm}/inc/vega20_ppsmc.h | 0 + drivers/gpu/drm/amd/{ => pm}/powerplay/Makefile | 23 +- + .../gpu/drm/amd/{ => pm}/powerplay/amd_powerplay.c | 19 + + .../gpu/drm/amd/{amdgpu => pm/powerplay}/cik_dpm.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/Makefile | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.c | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/common_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/common_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/hardwaremanager.c | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/hwmgr.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/hwmgr_ppt.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/polaris_baco.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/polaris_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/pp_overdriver.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/pp_overdriver.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.c | 0 + .../gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.h | 9 - + .../amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/ppevvmath.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/pptable_v1_0.h | 0 + .../powerplay/hwmgr/process_pptables_v1_0.c | 0 + .../powerplay/hwmgr/process_pptables_v1_0.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/processpptables.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/processpptables.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu10_inc.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.h | 0 + .../powerplay/hwmgr/smu7_clockpowergating.c | 0 + .../powerplay/hwmgr/smu7_clockpowergating.h | 0 + .../{ => pm}/powerplay/hwmgr/smu7_dyn_defaults.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.c | 16 +- + .../drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_powertune.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_powertune.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/smu7_thermal.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega10_inc.h | 0 + .../{ => pm}/powerplay/hwmgr/vega10_powertune.c | 0 + .../{ => pm}/powerplay/hwmgr/vega10_powertune.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_pptable.h | 0 + .../powerplay/hwmgr/vega10_processpptables.c | 0 + .../powerplay/hwmgr/vega10_processpptables.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega10_thermal.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.c | 138 +- + .../amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.h | 1 + + .../drm/amd/{ => pm}/powerplay/hwmgr/vega12_inc.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_pptable.h | 0 + .../powerplay/hwmgr/vega12_processpptables.c | 0 + .../powerplay/hwmgr/vega12_processpptables.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega12_thermal.h | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.c | 0 + .../drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.c | 196 ++- + .../amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.h | 1 + + .../drm/amd/{ => pm}/powerplay/hwmgr/vega20_inc.h | 0 + .../{ => pm}/powerplay/hwmgr/vega20_powertune.c | 0 + .../{ => pm}/powerplay/hwmgr/vega20_powertune.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_pptable.h | 0 + .../powerplay/hwmgr/vega20_processpptables.c | 2 +- + .../powerplay/hwmgr/vega20_processpptables.h | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_thermal.c | 0 + .../amd/{ => pm}/powerplay/hwmgr/vega20_thermal.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.c | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/kv_smc.c | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/ppsmc.h | 0 + .../drm/amd/{amdgpu => pm/powerplay}/r600_dpm.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.c | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.h | 0 + .../gpu/drm/amd/{amdgpu => pm/powerplay}/si_smc.c | 0 + .../amd/{amdgpu => pm/powerplay}/sislands_smc.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/smumgr/Makefile | 0 + .../drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.c | 0 + .../drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/fiji_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/fiji_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/iceland_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/iceland_smumgr.h | 0 + .../{ => pm}/powerplay/smumgr/polaris10_smumgr.c | 0 + .../{ => pm}/powerplay/smumgr/polaris10_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu10_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu10_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu7_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu7_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu8_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu8_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/smu9_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/smu9_smumgr.h | 0 + .../gpu/drm/amd/{ => pm}/powerplay/smumgr/smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/tonga_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/tonga_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vega10_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vega10_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vega12_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vega12_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vega20_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vega20_smumgr.h | 0 + .../amd/{ => pm}/powerplay/smumgr/vegam_smumgr.c | 0 + .../amd/{ => pm}/powerplay/smumgr/vegam_smumgr.h | 0 + drivers/gpu/drm/amd/pm/swsmu/Makefile | 36 + + .../drm/amd/{powerplay => pm/swsmu}/amdgpu_smu.c | 38 + + drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile | 33 + + .../{powerplay => pm/swsmu/smu11}/arcturus_ppt.c | 119 +- + .../{powerplay => pm/swsmu/smu11}/arcturus_ppt.h | 0 + .../amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.c | 157 +- + .../amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.h | 3 - + .../swsmu/smu11}/sienna_cichlid_ppt.c | 117 +- + .../swsmu/smu11}/sienna_cichlid_ppt.h | 3 - + .../amd/{powerplay => pm/swsmu/smu11}/smu_v11_0.c | 72 + + drivers/gpu/drm/amd/pm/swsmu/smu12/Makefile | 31 + + .../amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.c | 112 +- + .../amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.h | 0 + .../amd/{powerplay => pm/swsmu/smu12}/smu_v12_0.c | 12 + + .../gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.c | 47 +- + .../gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.h | 8 + + .../drm/amd/{powerplay => pm/swsmu}/smu_internal.h | 0 + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_device.c | 13 +- + drivers/gpu/drm/radeon/radeon_gart.c | 10 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + include/uapi/drm/amdgpu_drm.h | 1 + + include/uapi/linux/kfd_ioctl.h | 9 +- + sound/pci/hda/hda_intel.c | 3 + + 409 files changed, 12086 insertions(+), 1919 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rap.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_rap_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_7.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_7.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_hw_sequencer.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_factory_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dce60/hw_translate_dce60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dce60/irq_service_dce60.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_7_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/Makefile + rename drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_dpm.c (76%) + rename drivers/gpu/drm/amd/{amdgpu => pm}/amdgpu_pm.c (89%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/amd_powerplay.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_dpm.h (94%) + rename drivers/gpu/drm/amd/{amdgpu => pm/inc}/amdgpu_pm.h (84%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/amdgpu_smu.h (98%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/arcturus_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/cz_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/fiji_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/hardwaremanager.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/hwmgr.h (99%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/polaris10_pwrvirus.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/power_state.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/pp_debug.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/pp_endian.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/pp_thermal.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/ppinterrupt.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/rv_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu10.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu10_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if_arcturus.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if_navi10.h (97%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu11_driver_if_sienna_cichlid.h (99%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu12_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu71.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu71_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu72.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu72_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu73.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu73_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu74.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu74_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu75.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu75_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_common.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_discrete.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_fusion.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu8.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu8_fusion.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu9.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_types.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_ucode_xfer_cz.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_ucode_xfer_vi.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0.h (94%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_7_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_7_pptable.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_ppsmc.h (98%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v11_0_pptable.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v12_0.h (96%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smu_v12_0_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/smumgr.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/tonga_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega10_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega12/smu9_driver_if.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega12_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm}/inc/vega20_ppsmc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/Makefile (70%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/amd_powerplay.c (98%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/cik_dpm.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/Makefile (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ci_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/common_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/common_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/fiji_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/hardwaremanager.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/hwmgr_ppt.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/polaris_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/polaris_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_overdriver.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_overdriver.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pp_psm.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomctrl.h (98%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppatomfwctrl.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/ppevvmath.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pppcielanes.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/pptable_v1_0.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/process_pptables_v1_0.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/process_pptables_v1_0.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/processpptables.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu10_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu10_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_clockpowergating.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_clockpowergating.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_dyn_defaults.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_powertune.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_powertune.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu7_thermal.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu8_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu9_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/smu_helper.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/tonga_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_hwmgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_powertune.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_powertune.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_pptable.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_processpptables.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega10_thermal.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.c (95%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_hwmgr.h (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_pptable.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_processpptables.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega12_thermal.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_baco.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.c (96%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_hwmgr.h (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_inc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_powertune.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_powertune.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_pptable.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_processpptables.c (99%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_processpptables.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_thermal.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/hwmgr/vega20_thermal.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/kv_dpm.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/kv_smc.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/ppsmc.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/r600_dpm.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/si_dpm.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/si_smc.c (100%) + rename drivers/gpu/drm/amd/{amdgpu => pm/powerplay}/sislands_smc.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/Makefile (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/ci_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/fiji_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/fiji_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/iceland_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/iceland_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/polaris10_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/polaris10_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu10_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu10_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu7_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu7_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu8_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu8_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu9_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smu9_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/tonga_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/tonga_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega10_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega10_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega12_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega12_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega20_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vega20_smumgr.h (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vegam_smumgr.c (100%) + rename drivers/gpu/drm/amd/{ => pm}/powerplay/smumgr/vegam_smumgr.h (100%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/Makefile + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/amdgpu_smu.c (98%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu11/Makefile + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/arcturus_ppt.c (95%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/arcturus_ppt.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.c (94%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/navi10_ppt.h (96%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/sienna_cichlid_ppt.c (96%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/sienna_cichlid_ppt.h (92%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu11}/smu_v11_0.c (96%) + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu12/Makefile + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.c (91%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu12}/renoir_ppt.h (100%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu/smu12}/smu_v12_0.c (95%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.c (93%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/smu_cmn.h (92%) + rename drivers/gpu/drm/amd/{powerplay => pm/swsmu}/smu_internal.h (100%) +Merging drm-intel/for-linux-next (3a3d26153c81 Merge tag 'gvt-next-fixes-2020-08-05' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gt/intel_lrc.c | 15 ++- + drivers/gpu/drm/i915/gvt/cfg_space.c | 24 ++++ + drivers/gpu/drm/i915/gvt/gtt.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.h | 2 + + drivers/gpu/drm/i915/gvt/gvt.h | 3 + + drivers/gpu/drm/i915/gvt/vgpu.c | 20 +++- + drivers/gpu/drm/i915/i915_pmu.c | 7 +- + drivers/gpu/drm/i915/i915_request.c | 146 +++++++++++++++-------- + drivers/gpu/drm/i915/i915_sw_fence.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 + + 10 files changed, 164 insertions(+), 68 deletions(-) +Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (62975d27d647 drm/ttm: revert "drm/ttm: make TT creation purely optional v3") +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (20925fe84463 drm: msm: a6xx: use dev_pm_opp_set_bw to scale DDR) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 25 +++++++++++++++++-------- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 20 +++++++++++--------- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 ++-- + drivers/gpu/drm/msm/msm_ringbuffer.c | 3 ++- + 6 files changed, 34 insertions(+), 22 deletions(-) +Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (b93080622eb3 drm/imx: dw_hdmi-imx: use imx_drm_encoder_parse_of) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/dw_hdmi-imx.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/dw_hdmi-imx.c | 12 ++----- + drivers/gpu/ipu-v3/ipu-common.c | 67 --------------------------------------- + include/video/imx-ipu-v3.h | 3 -- + 3 files changed, 3 insertions(+), 79 deletions(-) +Merging etnaviv/etnaviv/next (c5d5a32ead1e drm/etnaviv: fix ref count leak via pm_runtime_get_sync) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging regmap/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (d8d0db7bb358 ALSA: usb-audio: ignore broken processing/extension unit) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (01006be3554f Merge remote-tracking branch 'asoc/for-5.10' into asoc-next) +$ git merge sound-asoc/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging modules/modules-next (262e6ae7081d modules: inherit TAINT_PROPRIETARY_MODULE) +$ git merge modules/modules-next +Already up to date. +Merging input/next (d862a3068ea5 Input: exc3000 - add support to query model and fw_version) +$ git merge input/next +Already up to date. +Merging block/for-next (86cfccb66937 Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge block/for-next +Already up to date. +Merging device-mapper/for-next (a9cb9f4148ef dm: don't call report zones for more than the user requested) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (7f4bc2e8687e mmc: mediatek: make function msdc_cqe_disable() static) +$ git merge mmc/next +Already up to date. +Merging mfd/for-mfd-next (e15d7f2b81d2 mfd: syscon: Use a unique name with regmap_config) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (7eb99a39ef76 video: backlight: cr_bllcd: Remove unused variable 'intensity') +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (46cbd0b05799 power: supply: wilco_ec: Add long life charging mode) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (f10c1d395994 Merge remote-tracking branch 'regulator/for-5.10' into regulator-next) +$ git merge regulator/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging security/next-testing (ddcf4ecd547e Merge branch 'for-v5.8' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) +$ git merge apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (3db0d0c276a7 integrity: remove redundant initialization of variable ret) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) +$ git merge keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (0476c865ded6 LSM: SafeSetID: Fix warnings reported by test bot) +$ git merge safesetid/safesetid-next +Auto-merging kernel/sys.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/SafeSetID.rst | 29 +++-- + kernel/capability.c | 2 +- + kernel/groups.c | 2 +- + kernel/sys.c | 10 +- + security/safesetid/lsm.c | 190 +++++++++++++++++++++------- + security/safesetid/lsm.h | 38 ++++-- + security/safesetid/securityfs.c | 190 ++++++++++++++++++++-------- + 7 files changed, 336 insertions(+), 125 deletions(-) +Merging selinux/next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge selinux/next +Already up to date. +Merging smack/next (42a2df3e829f Smack: prevent underflow in smk_set_cipso()) +$ git merge smack/next +Already up to date. +Merging tomoyo/master (9123e3a74ec7 Linux 5.9-rc1) +$ git merge tomoyo/master +Already up to date. +Merging tpmdd/next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (d5b29c2c5ba2 watchdog: rti-wdt: balance pm runtime enable calls) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (e46b3c0d011e Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next) +$ git merge iommu/next +Already up to date. +Merging vfio/next (ccd59dce1a21 vfio/type1: Refactor vfio_iommu_type1_ioctl()) +$ git merge vfio/next +Already up to date. +Merging audit/next (265c32072b0c audit: uninitialize variable audit_sig_sid) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/audit.c | 6 +++--- + kernel/audit.h | 4 ---- + 2 files changed, 3 insertions(+), 7 deletions(-) +Merging devicetree/for-next (f516fb704d02 dt-bindings: Whitespace clean-ups in schema files) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (884996986347 mailbox: mediatek: cmdq: clear task in channel before shutdown) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (67d263acd44f Merge remote-tracking branch 'spi/for-5.10' into spi-next) +$ git merge spi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (d8211042f91d Merge branch 'perf/urgent') +$ git merge tip/auto-latest +Removing drivers/firmware/efi/libstub/hidden.h +Merge made by the 'recursive' strategy. + arch/x86/boot/compressed/Makefile | 39 +---- + arch/x86/boot/compressed/head_32.S | 99 ++++-------- + arch/x86/boot/compressed/head_64.S | 165 ++++++++----------- + arch/x86/boot/compressed/kaslr.c | 238 ++++++++++++---------------- + arch/x86/boot/compressed/misc.h | 4 +- + arch/x86/boot/compressed/mkpiggy.c | 6 + + arch/x86/boot/compressed/vmlinux.lds.S | 24 ++- + arch/x86/boot/setup.ld | 2 +- + arch/x86/entry/entry_64.S | 4 +- + arch/x86/entry/vdso/vdso32/vclock_gettime.c | 1 + + arch/x86/events/intel/uncore_snb.c | 52 +++++- + arch/x86/include/asm/fixmap.h | 2 +- + arch/x86/include/asm/idtentry.h | 4 +- + arch/x86/include/asm/paravirt.h | 151 ++---------------- + arch/x86/include/asm/paravirt_types.h | 23 --- + arch/x86/include/asm/pgtable-3level_types.h | 5 - + arch/x86/include/asm/pgtable.h | 7 +- + arch/x86/include/asm/pgtable_64_types.h | 2 - + arch/x86/include/asm/required-features.h | 2 +- + arch/x86/include/asm/segment.h | 4 - + arch/x86/kernel/cpu/common.c | 8 - + arch/x86/kernel/kprobes/core.c | 1 - + arch/x86/kernel/kprobes/opt.c | 1 - + arch/x86/kernel/paravirt.c | 19 --- + arch/x86/kernel/paravirt_patch.c | 17 -- + arch/x86/mm/init_64.c | 20 +-- + arch/x86/xen/enlighten_pv.c | 6 - + arch/x86/xen/mmu_pv.c | 8 - + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/firmware/efi/libstub/hidden.h | 6 - + include/linux/hidden.h | 19 +++ + include/trace/events/xen.h | 20 --- + 32 files changed, 346 insertions(+), 615 deletions(-) + delete mode 100644 drivers/firmware/efi/libstub/hidden.h + create mode 100644 include/linux/hidden.h +Merging clockevents/timers/drivers/next (9fba22584e54 clocksource: Ingenic: Add support for the Ingenic X1000 OST.) +$ git merge clockevents/timers/drivers/next +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Merge made by the 'recursive' strategy. +Merging edac/edac-for-next (6816f862e524 Merge branch 'edac-misc' into edac-for-next) +$ git merge edac/edac-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/edac/amazon,al-mc-edac.yaml | 67 ++++ + MAINTAINERS | 9 +- + drivers/edac/Kconfig | 7 + + drivers/edac/Makefile | 1 + + drivers/edac/al_mc_edac.c | 354 +++++++++++++++++++++ + drivers/edac/e752x_edac.c | 2 +- + drivers/edac/ghes_edac.c | 2 +- + drivers/edac/i5400_edac.c | 4 +- + drivers/edac/i7300_edac.c | 4 +- + drivers/edac/i7core_edac.c | 4 +- + drivers/edac/ie31200_edac.c | 6 +- + drivers/edac/mce_amd.c | 11 +- + drivers/edac/sb_edac.c | 2 +- + drivers/edac/thunderx_edac.c | 2 +- + drivers/edac/ti_edac.c | 2 +- + 15 files changed, 461 insertions(+), 16 deletions(-) + create mode 100644 Documentation/devicetree/bindings/edac/amazon,al-mc-edac.yaml + create mode 100644 drivers/edac/al_mc_edac.c +Merging irqchip/irq/irqchip-next (7828a3ef8646 irqchip: Fix probing deferal when using IRQCHIP_PLATFORM_DRIVER helpers) +$ git merge irqchip/irq/irqchip-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt +Removing Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/ti,sci-inta.txt | 66 --------- + .../bindings/interrupt-controller/ti,sci-inta.yaml | 98 +++++++++++++ + .../bindings/interrupt-controller/ti,sci-intr.txt | 82 ----------- + .../bindings/interrupt-controller/ti,sci-intr.yaml | 102 ++++++++++++++ + MAINTAINERS | 4 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 36 +++-- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 12 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 4 +- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 10 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 43 +++--- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 12 +- + drivers/firmware/ti_sci.c | 155 +++++++++------------ + drivers/irqchip/irq-ti-sci-inta.c | 95 ++++++++++--- + drivers/irqchip/irq-ti-sci-intr.c | 152 ++++++++++++-------- + drivers/irqchip/irqchip.c | 2 +- + include/linux/soc/ti/ti_sci_protocol.h | 13 ++ + 17 files changed, 517 insertions(+), 377 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.yaml +Merging ftrace/for-next (38ce2a9e33db tracing: Add trace_array_init_printk() to initialize instance trace_printk() buffers) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (398b53b5b375 rcu: Remove unused __rcu_is_watching() function) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../RCU/Design/Data-Structures/Data-Structures.rst | 2 +- + .../RCU/Design/Requirements/Requirements.rst | 4 +- + Documentation/RCU/whatisRCU.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 153 ++- + .../litmus-tests/locking/DCL-broken.litmus | 55 + + .../litmus-tests/locking/DCL-fixed.litmus | 56 + + .../litmus-tests/locking/RM-broken.litmus | 42 + + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 + + Documentation/memory-barriers.txt | 6 +- + MAINTAINERS | 3 +- + arch/x86/kvm/mmu/page_track.c | 6 +- + include/asm-generic/atomic-instrumented.h | 330 +++--- + include/asm-generic/bitops/instrumented-atomic.h | 6 +- + include/asm-generic/bitops/instrumented-lock.h | 2 +- + .../asm-generic/bitops/instrumented-non-atomic.h | 6 +- + include/linux/instrumented.h | 30 + + include/linux/kcsan-checks.h | 45 +- + include/linux/rculist.h | 48 + + include/linux/rcupdate.h | 19 +- + include/linux/rcutiny.h | 1 - + include/linux/rcutree.h | 1 - + include/linux/smp.h | 3 + + include/linux/smp_types.h | 3 + + include/trace/events/rcu.h | 54 +- + kernel/Makefile | 2 + + kernel/entry/common.c | 2 +- + kernel/kcsan/core.c | 181 +++- + kernel/kcsan/debugfs.c | 130 +-- + kernel/kcsan/kcsan-test.c | 128 ++- + kernel/kcsan/kcsan.h | 12 +- + kernel/kcsan/report.c | 10 +- + kernel/kcsan/selftest.c | 8 +- + kernel/locking/locktorture.c | 2 +- + kernel/rcu/Kconfig | 8 +- + kernel/rcu/Kconfig.debug | 17 +- + kernel/rcu/Makefile | 2 +- + kernel/rcu/rcu_segcblist.c | 10 +- + kernel/rcu/{rcuperf.c => rcuscale.c} | 324 +++--- + kernel/rcu/rcutorture.c | 61 +- + kernel/rcu/refscale.c | 8 +- + kernel/rcu/srcutree.c | 13 - + kernel/rcu/tree.c | 151 ++- + kernel/rcu/tree.h | 2 + + kernel/rcu/tree_exp.h | 6 +- + kernel/rcu/tree_plugin.h | 40 +- + kernel/rcu/tree_stall.h | 8 +- + kernel/rcu/update.c | 13 - + kernel/scftorture.c | 575 +++++++++++ + kernel/smp.c | 134 +++ + kernel/time/tick-sched.c | 2 +- + lib/Kconfig.debug | 21 + + lib/Kconfig.kcsan | 5 + + lib/nmi_backtrace.c | 6 +- + scripts/Makefile.kcsan | 2 +- + scripts/atomic/gen-atomic-instrumented.sh | 21 +- + tools/memory-model/Documentation/README | 82 ++ + tools/memory-model/Documentation/cheatsheet.txt | 27 +- + tools/memory-model/Documentation/litmus-tests.txt | 1074 ++++++++++++++++++++ + tools/memory-model/Documentation/locking.txt | 320 ++++++ + tools/memory-model/Documentation/ordering.txt | 462 +++++++++ + tools/memory-model/Documentation/recipes.txt | 4 +- + tools/memory-model/Documentation/references.txt | 2 +- + tools/memory-model/Documentation/simple.txt | 271 +++++ + tools/memory-model/README | 164 +-- + tools/memory-model/control-dependencies.txt | 256 +++++ + 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/objtool/check.c | 55 + + ...rf-ftrace.sh => kvm-recheck-rcuscale-ftrace.sh} | 6 +- + ...-recheck-rcuperf.sh => kvm-recheck-rcuscale.sh} | 14 +- + .../selftests/rcutorture/bin/kvm-recheck-scf.sh | 38 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 15 +- + .../selftests/rcutorture/bin/parse-console.sh | 11 +- + .../selftests/rcutorture/configs/rcu/TREE05 | 1 + + .../selftests/rcutorture/configs/rcuperf/CFcommon | 2 - + .../configs/{rcuperf => rcuscale}/CFLIST | 0 + .../selftests/rcutorture/configs/rcuscale/CFcommon | 2 + + .../rcutorture/configs/{rcuperf => rcuscale}/TINY | 0 + .../rcutorture/configs/{rcuperf => rcuscale}/TREE | 0 + .../configs/{rcuperf => rcuscale}/TREE54 | 0 + .../configs/{rcuperf => rcuscale}/ver_functions.sh | 4 +- + .../selftests/rcutorture/configs/scf/CFLIST | 2 + + .../selftests/rcutorture/configs/scf/CFcommon | 2 + + .../selftests/rcutorture/configs/scf/NOPREEMPT | 9 + + .../rcutorture/configs/scf/NOPREEMPT.boot | 1 + + .../selftests/rcutorture/configs/scf/PREEMPT | 9 + + .../rcutorture/configs/scf/ver_functions.sh | 30 + + tools/testing/selftests/rcutorture/doc/initrd.txt | 36 +- + .../selftests/rcutorture/doc/rcu-test-image.txt | 41 +- + 103 files changed, 5270 insertions(+), 981 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 + rename kernel/rcu/{rcuperf.c => rcuscale.c} (65%) + create mode 100644 kernel/scftorture.c + create mode 100644 tools/memory-model/Documentation/README + create mode 100644 tools/memory-model/Documentation/litmus-tests.txt + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100644 tools/memory-model/Documentation/ordering.txt + create mode 100644 tools/memory-model/Documentation/simple.txt + create mode 100644 tools/memory-model/control-dependencies.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 + rename tools/testing/selftests/rcutorture/bin/{kvm-recheck-rcuperf-ftrace.sh => kvm-recheck-rcuscale-ftrace.sh} (92%) + rename tools/testing/selftests/rcutorture/bin/{kvm-recheck-rcuperf.sh => kvm-recheck-rcuscale.sh} (84%) + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-scf.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/CFLIST (100%) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcuscale/CFcommon + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/TINY (100%) + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/TREE (100%) + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/TREE54 (100%) + rename tools/testing/selftests/rcutorture/configs/{rcuperf => rcuscale}/ver_functions.sh (88%) + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/PREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/scf/ver_functions.sh +$ git reset --hard HEAD^ +HEAD is now at 57c4482fe0d4 Merge remote-tracking branch 'irqchip/irq/irqchip-next' into master +Merging next-20200817 version of rcu +$ git merge -m next-20200817/rcu 71e05e558a5fd9c1001f4781298470fb4cd0ec0f +Already up to date! +Merge made by the 'recursive' strategy. +Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (16314874b12b Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (81ab595ddd3c KVM: PPC: Book3S HV: Rework secure mem slot dropping) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (585c6ed738a5 drm/xen-front: Pass dumb buffer data offset to the backend) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (4fa640dc5230 Merge tag 'vfio-v5.8-rc7' of git://github.com/awilliam/linux-vfio into master) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON()) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (242b81170fb8 leds: lp50xx: Add the LP50XX family of the RGB LED driver) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lp50xx.yaml | 130 +++++ + .../devicetree/bindings/leds/leds-pca955x.txt | 1 + + Documentation/leds/ledtrig-transient.rst | 7 - + drivers/leds/Kconfig | 12 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-lp50xx.c | 634 +++++++++++++++++++++ + drivers/leds/leds-mt6323.c | 18 +- + drivers/leds/leds-pca955x.c | 8 + + drivers/leds/leds-s3c24xx.c | 2 - + drivers/leds/leds-sgm3140.c | 2 +- + 10 files changed, 796 insertions(+), 19 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-lp50xx.yaml + create mode 100644 drivers/leds/leds-lp50xx.c +Merging ipmi/for-next (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (f5e46aa4a124 usb: dwc3: gadget: when the started list is empty stop the active xfer) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (47ec5303d73e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (d6f93d21001e usb: chipidea: imx: get available runtime dr mode for wakeup setting) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up to date. +Merging phy-next/next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (9b3b4b3f2f2a soundwire: intel: Add basic power management support) +$ git merge soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/intel.c | 81 ++++++++++++++++++++++++++++++++++++++++++++-- + drivers/soundwire/master.c | 2 ++ + 2 files changed, 81 insertions(+), 2 deletions(-) +Merging thunderbolt/next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging icc/icc-next (12a400b016ab interconnect: Mark all dummy functions as static inline) +$ git merge icc/icc-next +Already up to date. +Merging dmaengine/next (e8ee6c8cb61b dmaengine: dw: Add DMA-channels mask cell support) +$ git merge dmaengine/next +Auto-merging drivers/dma/idxd/irq.c +Merge made by the 'recursive' strategy. + .../bindings/dma/snps,dma-spear1340.yaml | 7 +- + drivers/dma/dw/core.c | 6 +- + drivers/dma/dw/dw.c | 7 +- + drivers/dma/dw/idma32.c | 5 +- + drivers/dma/dw/of.c | 7 +- + drivers/dma/idxd/irq.c | 2 +- + drivers/dma/pch_dma.c | 35 +--- + drivers/dma/ti/Makefile | 5 +- + drivers/dma/ti/k3-psil-j7200.c | 175 +++++++++++++++++ + drivers/dma/ti/k3-psil-j721e.c | 3 + + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 19 +- + drivers/dma/ti/omap-dma.c | 2 +- + drivers/dma/xilinx/xilinx_dpdma.c | 209 +++++++++++++++++++++ + include/linux/platform_data/dma-dw.h | 2 + + 15 files changed, 439 insertions(+), 46 deletions(-) + create mode 100644 drivers/dma/ti/k3-psil-j7200.c +Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (747eab70283e Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (7e0e8be3a1fd scsi: lpfc: Update lpfc version to 12.8.0.3) +$ git merge scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (8a7c3213db06 vdpa/mlx5: fix up endian-ness for mtu) +$ git merge vhost/linux-next +Already up to date. +Merging rpmsg/for-next (ca69dba7f13a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (22cc422070d9 gpio: wcove: Request IRQ after all initialisation done) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (4941b8dedb3f gpio: sch: Add a blank line between declaration and code) +$ git merge gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (b4f2fcb53487 pinctrl: intel: Add Intel Emmitsburg pin controller support) +$ git merge pinctrl-intel/for-next +Already up to date. +Merging pinctrl-samsung/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (6ced5ff0be8e pwm: bcm-iproc: handle clk_get_rate() return) +$ git merge pwm/for-next +Already up to date. +Merging userns/for-next (7fce69dff8db Implement kernel_execve) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't") +$ git merge ktest/for-next +Already up to date. +Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) +$ git merge random/dev +Already up to date. +Merging kselftest/next (850d0cc64c8e selftests/harness: Limit step counter reporting) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (bf14b015bf51 Merge branch 'for-5.9/selftests-cleanup' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (ff1304be0a05 coresight: etm4x: Add Support for HiSilicon ETM device) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm4x.c | 67 ++++++++++++------------ + drivers/hwtracing/coresight/coresight-platform.c | 10 ++-- + drivers/hwtracing/coresight/coresight-stm.c | 11 ++-- + include/uapi/linux/coresight-stm.h | 1 + + 4 files changed, 46 insertions(+), 43 deletions(-) +Merging rtc/rtc-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (03b68d5d7d4b Merge branch 'for-5.9/copy_mc' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Removing tools/testing/selftests/powerpc/copyloops/memcpy_mcsafe_64.S +Removing tools/perf/bench/mem-memcpy-x86-64-lib.c +Auto-merging tools/perf/bench/Build +Auto-merging tools/objtool/check.c +Removing tools/arch/x86/include/asm/mcsafe_test.h +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig +Auto-merging include/linux/uio.h +Auto-merging include/linux/uaccess.h +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/md/dm-writecache.c +Auto-merging arch/x86/lib/Makefile +Auto-merging arch/x86/kernel/quirks.c +Auto-merging arch/x86/kernel/cpu/mce/core.c +Auto-merging arch/x86/include/asm/uaccess.h +Removing arch/x86/include/asm/mcsafe_test.h +Auto-merging arch/x86/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/lib/Makefile +Auto-merging arch/powerpc/include/asm/uaccess.h +Auto-merging arch/powerpc/include/asm/string.h +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/string.h | 2 - + arch/powerpc/include/asm/uaccess.h | 40 +++-- + arch/powerpc/lib/Makefile | 2 +- + .../lib/{memcpy_mcsafe_64.S => copy_mc_64.S} | 4 +- + arch/x86/Kconfig | 2 +- + arch/x86/Kconfig.debug | 2 +- + arch/x86/include/asm/copy_mc_test.h | 75 ++++++++++ + arch/x86/include/asm/mcsafe_test.h | 75 ---------- + arch/x86/include/asm/string_64.h | 32 ---- + arch/x86/include/asm/uaccess.h | 21 +++ + arch/x86/include/asm/uaccess_64.h | 20 --- + arch/x86/kernel/cpu/mce/core.c | 8 +- + arch/x86/kernel/quirks.c | 9 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/copy_mc.c | 64 ++++++++ + arch/x86/lib/copy_mc_64.S | 165 +++++++++++++++++++++ + arch/x86/lib/memcpy_64.S | 115 -------------- + arch/x86/lib/usercopy_64.c | 21 --- + drivers/md/dm-writecache.c | 15 +- + drivers/nvdimm/claim.c | 2 +- + drivers/nvdimm/pmem.c | 6 +- + include/linux/string.h | 9 +- + include/linux/uaccess.h | 9 ++ + include/linux/uio.h | 10 +- + lib/Kconfig | 7 +- + lib/iov_iter.c | 43 +++--- + tools/arch/x86/include/asm/mcsafe_test.h | 13 -- + tools/arch/x86/lib/memcpy_64.S | 115 -------------- + tools/objtool/check.c | 5 +- + tools/perf/bench/Build | 1 - + tools/perf/bench/mem-memcpy-x86-64-lib.c | 24 --- + tools/testing/nvdimm/test/nfit.c | 48 +++--- + .../testing/selftests/powerpc/copyloops/.gitignore | 2 +- + tools/testing/selftests/powerpc/copyloops/Makefile | 6 +- + .../selftests/powerpc/copyloops/copy_mc_64.S | 1 + + .../selftests/powerpc/copyloops/memcpy_mcsafe_64.S | 1 - + 37 files changed, 451 insertions(+), 526 deletions(-) + rename arch/powerpc/lib/{memcpy_mcsafe_64.S => copy_mc_64.S} (98%) + create mode 100644 arch/x86/include/asm/copy_mc_test.h + delete mode 100644 arch/x86/include/asm/mcsafe_test.h + create mode 100644 arch/x86/lib/copy_mc.c + create mode 100644 arch/x86/lib/copy_mc_64.S + delete mode 100644 tools/arch/x86/include/asm/mcsafe_test.h + delete mode 100644 tools/perf/bench/mem-memcpy-x86-64-lib.c + create mode 120000 tools/testing/selftests/powerpc/copyloops/copy_mc_64.S + delete mode 120000 tools/testing/selftests/powerpc/copyloops/memcpy_mcsafe_64.S +Merging at24/at24/for-next (9123e3a74ec7 Linux 5.9-rc1) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (16b89f695313 net/scm: Fix typo in SCM_RIGHTS compat refactoring) +$ git merge seccomp/for-next/seccomp +Already up to date. +Merging kspp/for-next/kspp (55dde35fdb7f overflow: Add __must_check attribute to check_*() helpers) +$ git merge kspp/for-next/kspp +Merge made by the 'recursive' strategy. + include/linux/overflow.h | 39 ++++++++++++++++++++++++--------------- + 1 file changed, 24 insertions(+), 15 deletions(-) +Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/next (4ca8b73f16f0 fsi: aspeed: Support CFAM reset GPIO) +$ git merge fsi/next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-fsi | 8 ++ + .../devicetree/bindings/fsi/fsi-master-aspeed.txt | 12 ++ + drivers/fsi/fsi-core.c | 31 ++++- + drivers/fsi/fsi-master-aspeed.c | 134 ++++++++++++++++++--- + drivers/fsi/fsi-master-ast-cf.c | 7 +- + drivers/fsi/fsi-master-gpio.c | 5 +- + drivers/fsi/fsi-master-hub.c | 15 ++- + drivers/fsi/fsi-master.h | 3 +- + drivers/fsi/fsi-occ.c | 2 +- + drivers/fsi/fsi-sbefifo.c | 12 +- + drivers/fsi/fsi-scom.c | 2 +- + 11 files changed, 194 insertions(+), 37 deletions(-) +Merging slimbus/for-next (b3a9e3b9622a Linux 5.8-rc1) +$ git merge slimbus/for-next +Already up to date. +Merging nvmem/for-next (a24ef5be460b nvmem: qcom-spmi-sdam: Enable multiple devices) +$ git merge nvmem/for-next +Auto-merging MAINTAINERS +CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml +Auto-merging Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml +Resolved 'Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ea1161067cde] Merge remote-tracking branch 'nvmem/for-next' into master +$ git diff -M --stat --summary HEAD^.. +Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked) +$ git merge xarray/xarray +Auto-merging include/linux/xarray.h +Auto-merging drivers/infiniband/core/device.c +Merge made by the 'recursive' strategy. + Documentation/core-api/xarray.rst | 13 +++++++------ + drivers/infiniband/core/device.c | 6 +----- + include/linux/xarray.h | 23 +++++++++++++++++++++- + lib/idr.c | 1 + + lib/test_xarray.c | 20 +++++++++++++++++++ + lib/xarray.c | 39 +++++++++++++++++++++++++++++++------ + tools/testing/radix-tree/idr-test.c | 29 +++++++++++++++++++++++++++ + 7 files changed, 113 insertions(+), 18 deletions(-) +Merging hyperv/hyperv-next (95c20aa04897 Drivers: hv: vmbus: Add parsing of VMbus interrupt in ACPI DSDT) +$ git merge hyperv/hyperv-next +Auto-merging include/asm-generic/mshyperv.h +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/hv/hv.c +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/x86/include/asm/mshyperv.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/mshyperv.h | 1 + + arch/x86/kernel/cpu/mshyperv.c | 7 ++++++- + drivers/hv/hv.c | 2 +- + drivers/hv/vmbus_drv.c | 30 +++++++++++++++++++++++++++--- + include/asm-generic/mshyperv.h | 4 +++- + 5 files changed, 38 insertions(+), 6 deletions(-) +Merging auxdisplay/auxdisplay (46d4a403a04c auxdisplay: Replace HTTP links with HTTPS ones) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + drivers/auxdisplay/arm-charlcd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kgdb/kgdb/for-next (2c308ef41351 kgdb: Make "kgdbcon" work properly with "kgdb_earlycon") +$ git merge kgdb/kgdb/for-next +Auto-merging kernel/debug/kdb/kdb_io.c +Auto-merging kernel/debug/debug_core.c +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 22 ++++++++++++++-------- + kernel/debug/kdb/kdb_io.c | 14 +++++++------- + 2 files changed, 21 insertions(+), 15 deletions(-) +Merging pidfd/for-next (da83d0cb9237 Merge branch 'cap_checkpoint_restore' into for-next) +$ git merge pidfd/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging hmm/hmm (7d17e83abec1 mm/hmm/test: use the new migration invalidation) +$ git merge hmm/hmm +Already up to date. +Merging fpga/for-next (3359f5f44cb5 fpga: dfl: change data type of feature id to u16) +$ git merge fpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + drivers/fpga/dfl-fme-perf.c | 2 +- + drivers/fpga/dfl.c | 29 +++++++++++++++-------------- + drivers/fpga/dfl.h | 10 +++++----- + drivers/fpga/stratix10-soc.c | 23 +++-------------------- + 5 files changed, 26 insertions(+), 40 deletions(-) +Merging kunit/test (48778464bb7d Linux 5.8-rc2) +$ git merge kunit/test +Already up to date. +Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) +$ git merge generic-ioremap/for-next +Already up to date. +Merging cfi/cfi/next (11399346ac39 mtd: Replace zero-length array with flexible-array) +$ git merge cfi/cfi/next +Already up to date. +Merging kunit-next/kunit (d43c7fb05765 kunit: tool: fix improper treatment of file location) +$ git merge kunit-next/kunit +Already up to date. +Merging trivial/for-next (c1a371cf80fb printk: fix global comment) +$ git merge trivial/for-next +Auto-merging lib/bitmap.c +Auto-merging kernel/printk/printk_safe.c +Merge made by the 'recursive' strategy. + fs/vboxsf/dir.c | 2 +- + kernel/printk/printk_safe.c | 2 +- + lib/bitmap.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) +$ git merge zx2c4/for-next +Already up to date. +Merging mhi/mhi-next (d0dc371b39a7 bus: mhi: fix doubled words and struct image_info kernel-doc) +$ git merge mhi/mhi-next +Merge made by the 'recursive' strategy. + include/linux/mhi.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) +$ git merge notifications/notifications-pipe-core +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/namespace.c +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Merge made by the 'recursive' strategy. + Documentation/watch_queue.rst | 12 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 9 ++ + fs/Makefile | 1 + + fs/mount.h | 18 +++ + fs/mount_notify.c | 222 ++++++++++++++++++++++++++++ + fs/namespace.c | 22 +++ + include/linux/dcache.h | 1 + + include/linux/lsm_hook_defs.h | 3 + + include/linux/lsm_hooks.h | 6 + + include/linux/sched/user.h | 3 + + include/linux/security.h | 8 + + include/linux/syscalls.h | 2 + + include/linux/watch_queue.h | 7 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/watch_queue.h | 31 +++- + kernel/sys_ni.c | 3 + + kernel/watch_queue.c | 8 + + samples/watch_queue/watch_test.c | 41 ++++- + security/security.c | 7 + + 37 files changed, 422 insertions(+), 6 deletions(-) + create mode 100644 fs/mount_notify.c +Merging fsinfo/fsinfo-core (13917414b9cc fs: mount_notify.c: fix build without CONFIG_FSINFO) +$ git merge fsinfo/fsinfo-core +Auto-merging samples/vfs/Makefile +CONFLICT (content): Merge conflict in samples/vfs/Makefile +Auto-merging kernel/sys_ni.c +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging include/linux/syscalls.h +CONFLICT (content): Merge conflict in include/linux/syscalls.h +Auto-merging include/linux/fs.h +Auto-merging fs/namespace.c +Auto-merging fs/internal.h +CONFLICT (content): Merge conflict in fs/internal.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/ia64/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Resolved 'fs/internal.h' using previous resolution. +Resolved 'include/linux/syscalls.h' using previous resolution. +Resolved 'samples/vfs/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3a2246c6fa28] Merge remote-tracking branch 'fsinfo/fsinfo-core' into master +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/fsinfo.rst | 574 ++++++++++++++++++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/Kconfig | 7 + + fs/Makefile | 1 + + fs/afs/internal.h | 1 + + fs/afs/super.c | 216 ++++++- + fs/d_path.c | 2 +- + fs/ext4/Makefile | 1 + + fs/ext4/ext4.h | 6 + + fs/ext4/fsinfo.c | 97 +++ + fs/ext4/super.c | 3 + + fs/fsinfo.c | 748 +++++++++++++++++++++++ + fs/internal.h | 16 + + fs/mount.h | 6 + + fs/mount_notify.c | 16 +- + fs/namespace.c | 427 +++++++++++++- + fs/super.c | 2 + + include/linux/errseq.h | 1 + + include/linux/fs.h | 7 + + include/linux/fsinfo.h | 112 ++++ + include/linux/syscalls.h | 4 + + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/fsinfo.h | 344 +++++++++++ + include/uapi/linux/mount.h | 13 +- + kernel/sys_ni.c | 1 + + lib/errseq.c | 33 +- + samples/vfs/Makefile | 2 +- + samples/vfs/test-fsinfo.c | 883 ++++++++++++++++++++++++++++ + samples/vfs/test-mntinfo.c | 277 +++++++++ + 46 files changed, 3811 insertions(+), 13 deletions(-) + create mode 100644 Documentation/filesystems/fsinfo.rst + create mode 100644 fs/ext4/fsinfo.c + create mode 100644 fs/fsinfo.c + create mode 100644 include/linux/fsinfo.h + create mode 100644 include/uapi/linux/fsinfo.h + create mode 100644 samples/vfs/test-fsinfo.c + create mode 100644 samples/vfs/test-mntinfo.c +Merging memblock/for-next (762d4d1a174c arch/ia64: Restore arch-specific pgd_offset_k implementation) +$ git merge memblock/for-next +Merge made by the 'recursive' strategy. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge init/init-user-pointers +Already up to date. +Merging akpm-current/current (8d7fe396c9e5 aio: simplify read_events()) +$ git merge --no-ff akpm-current/current +Auto-merging mm/memory.c +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/filesystems/proc.rst | 3 + + arch/arm64/mm/init.c | 19 +- + arch/mips/mm/pgtable-32.c | 1 - + arch/mips/mm/pgtable-64.c | 1 - + arch/powerpc/mm/numa.c | 35 +++- + arch/x86/kernel/setup.c | 12 +- + drivers/base/memory.c | 2 +- + fs/aio.c | 9 +- + fs/buffer.c | 56 +++++- + fs/ocfs2/namei.c | 17 +- + fs/proc/page.c | 40 ++-- + fs/ramfs/inode.c | 12 ++ + include/linux/memremap.h | 6 + + include/linux/mm.h | 12 +- + include/linux/nmi.h | 1 + + include/linux/page-flags.h | 6 +- + include/linux/sched.h | 8 + + include/linux/wait.h | 4 +- + include/ras/ras_event.h | 3 + + kernel/fork.c | 1 - + kernel/hung_task.c | 44 +++++ + kernel/sysctl.c | 8 +- + kernel/watchdog.c | 21 ++ + kernel/watchdog_hld.c | 1 + + lib/Kconfig.debug | 6 + + lib/cpumask.c | 102 ++++++++-- + mm/huge_memory.c | 4 +- + mm/hugetlb.c | 11 +- + mm/hwpoison-inject.c | 18 +- + mm/madvise.c | 39 ++-- + mm/memory-failure.c | 331 ++++++++++++++------------------ + mm/memory.c | 8 +- + mm/memremap.c | 20 ++ + mm/migrate.c | 11 +- + mm/mmap.c | 43 +++-- + mm/page_alloc.c | 64 ++++-- + mm/vmstat.c | 32 +-- + scripts/checkpatch.pl | 12 +- + 39 files changed, 665 insertions(+), 362 deletions(-) +$ 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/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
[KSuccessfully rebased and updated refs/heads/akpm. +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + e79c866c37f1...f0b863ac0f64 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (f0b863ac0f64 mm/madvise: check fatal signal pending of target process) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + fs/io_uring.c | 2 +- + include/linux/compat.h | 4 + + include/linux/mm.h | 3 +- + include/linux/pid.h | 1 + + include/linux/syscalls.h | 2 + + include/uapi/asm-generic/unistd.h | 4 +- + kernel/exit.c | 17 --- + kernel/pid.c | 17 +++ + kernel/sys_ni.c | 2 + + mm/madvise.c | 190 ++++++++++++++++++++++++---- + mm/memory-failure.c | 18 +-- + mm/memory_hotplug.c | 46 ++++--- + 30 files changed, 245 insertions(+), 82 deletions(-) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4eba27654a85 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20200818 |