diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-03-22 14:34:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-03-22 14:34:17 +1100 |
| commit | e382d91f5f806abd770edeebe41851733aef1f93 (patch) | |
| tree | ee609221f076a2e46670928c085e306f88b4e1c0 | |
| parent | 81dcbe78ba6d2c491fd067f4a21eae52100362ad (diff) | |
| download | linux-next-next-20190322.tar.gz | |
Add linux-next specific files for 20190322next-20190322
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 300 | ||||
| -rw-r--r-- | Next/Trees | 302 | ||||
| -rw-r--r-- | Next/merge.log | 3525 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4130 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..042433619d94 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,300 @@ +Name SHA1 +---- ---- +origin d92da1fbb72490f999b7d0e809d13d0d52dc78ac +fixes b352face4ca9f3d10731477c9718ad1f9a1142af +kspp-gustavo 1f7ae812f87e656f535146fcd33af6b151c3607a +kbuild-current 688931a5ad4e55ba0c215248ba510cd67bc3afb4 +arc-current 9a18b5a412baf23137c8fddb4ea7f0c14087f31c +arm-current d410a8a49e3e00e07d43037e90f776d522b25a6a +arm64-fixes e5a5af7718610c819c4d368bb62655ee43a38011 +m68k-current 28713169d879b67be2ef2f84dcf54905de238294 +powerpc-fixes 92edf8df0ff2ae86cc632eeca0e651fd8431d40d +sparc 7d762d69145a54d169f58e56d6dac57a5508debc +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 6b70fc94afd165342876e53fc4b2f7d085009945 +bpf 0803278b0b4d8eeb2b461fb698785df65a725d9e +ipsec bfc01ddff2b0c33de21af436324a669e95ac7e78 +netfilter b25a31bf0ca091aa8bdb9ab329b0226257568bbe +ipvs b2e3d68d1251a051a620f9086e18f7ffa6833b5b +wireless-drivers 7dfc45e6282a7662279d168cc1219929456f8750 +mac80211 d235c48b40d399328585a68f3f9bf7cc3062d586 +rdma-fixes ec4fe4bcc584b55e24e8d1768f5510a62c0fd619 +sound-current 667a8f73753908c4d0171e52b71774f9be5d6713 +sound-asoc-fixes 0ff4e8c61b794a4bf6c854ab071a1abaaa80f358 +regmap-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +regulator-fixes 3e8a4628a4d4cc87b34952f4fd2a2e1bea31ca60 +spi-fixes 35137ca07194dcdd740e42276cc5b06a38000f19 +pci-current 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +driver-core.current cd1b772d4881d1cd15b90ec17aab9ac7950e8850 +tty.current 93bcefd4c6bad4c69dbc4edcd3fbf774b24d930d +usb.current 22feda47b574c2854cc1a8447a2ae18598752375 +usb-gadget-fixes a53469a68eb886e84dd8b69a1458a623d3591793 +usb-serial-fixes 2908b076f5198d231de62713cb2b633a3a4b95ac +usb-chipidea-fixes d6d768a0ec3c088a88635c64620e1fb34e298aef +phy 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +staging.current 6a8ca24590a2136921439b376c926c11a6effc0e +char-misc.current 5cec2d2e5839f9c0fec319c523a911e0a7fd299f +soundwire-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +thunderbolt-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +input-current 44fc95e218a09d7966a9d448941fdb003f6bb69f +crypto-current 00e87449430dc130b43d84bdee71ef94524d9c39 +ide dc5c37736d16ec90559888fb4c974977fc8ed1ca +vfio-fixes 9a71ac7e15a723e90fc40388b4b92eefaabf747c +kselftest-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +backlight-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +mtd-fixes 3e35730dd7540bad2d4e002703996391d9be49a0 +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 48a2ca0ee3994df53da230c7079a18a70ec914f9 +v4l-dvb-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +reset-fixes 8ec49035c8a67a9622b132b16f9e4eb7de64d246 +mips-fixes f6cab793d4a70808e4946baa8f5df4ea9adacc82 +at91-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +omap-fixes dc30e70391376ba3987aeb856ae6d9c0706534f1 +kvm-fixes de3ccd26fafc707b09792d9b633c8b5b48865315 +kvms390-fixes b10bd9a256aec504c14a7c9b6fccb6301ecf290a +hwmon-fixes 99effd8af527042a7bb2b4523327ba1eb13af9b3 +nvdimm-fixes 11189c1089da413aa4b5fd6be4c4d47c78968819 +btrfs-fixes fb7d5dc911b1f05d4d96a8f1fd4778bd78da40ec +vfs-fixes d3d6a18d7d351cbcc9b33dbedf710e65f8ce1595 +dma-mapping-fixes 60d8cd572f655aac6107a2330dced004ad1fe3d7 +i3c-fixes f36c1f9a8dfd6a78e6c3fe7aff5e722b84307597 +drivers-x86-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +samsung-krzk-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +pinctrl-samsung-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +devicetree-fixes 5fa98c2eda35fcd1a1d91a9785c390f54688240c +scsi-fixes 7f5203c13ba8a7b7f9f6ecfe5a4d5567188d7835 +drm-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +amdgpu-fixes f7b1844bacecca96dd8d813675e4d8adec02cd66 +drm-intel-fixes 69903dfae0310afe8a15f5cd4e376ebb7c6da1d2 +mmc-fixes c9a9497ccef205ed4ed2e247011382627876d831 +rtc-fixes 15d82d22498784966df8e4696174a16b02cc1052 +gnss-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +hyperv-fixes 46fc15487d02451448c11b83c4d086d87a6ad588 +drm-misc-fixes e9abc611a941d4051cde1d94b2ab7473fdb50102 +kbuild 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +compiler-attributes a3b22b9f11d9fbc48b0291ea92259a5a810e9438 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 9eb9e96e97b3381e94cba81d93f4a390c26ca6cb +asm-generic d724444ab97d2cdf1c4dbfc1ff65d0b18a9631e0 +arc 5908e6b738e3357af42c10e1183753c70a0117a9 +arm 4c2741ac5e103ef2a63a1d4be2c762f52cb3593e +arm64 b855b58ac1b7891b219e1d9ef60c45c774cadefe +arm-perf cf2d65ec1d21f986bc128697aff5f52fef1ff12a +arm-soc 48d1dbf3918f75dc4f3d3b01534fccd39e52bea4 +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic e37c380254efe2c4f8a9d45c479d2ab126c8e4b8 +aspeed e1542521499070f88b18846f676b4cd2a166aee5 +at91 69dd6b9f7d5826118532f1301b06306a6be6f821 +bcm2835 1ee128f4fff29c1938f25160b0dafbe9feb57d1f +imx-mxs b4a83340190a5b33e0b62e7f8fe9d449064d8afd +keystone 3c3a43c81bdaaec61aef208f94e8273b0309635c +mediatek d542127adb0cc087c8aa93418a18a9648a4e6316 +mvebu c51f7f86355238c3baf230444484c5d61846eb4d +omap af3b69ea03a28ec3382673ce8342639a7dd63dd0 +reset 22815f1825e4c50314e7084ca375f7368704fdd4 +qcom 75920dd0498d445273ce7ca634a4cb61f30f7bf2 +renesas 647bcd505199709667afa1dbed1d6f107700e619 +rockchip 6a8281008f6134f28643d9f7652d7416495c5c5f +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 8a7e0f327b8ee78c4ee36482a740a2d70746001f +sunxi ebbbe24420974cede20398aea0947cfb62df3aef +tegra d92dde4f12f1b48e3a1d330ad25e3780c99e8f60 +clk 1772ee64946d67b6d16061aeab84e28a560eacae +clk-samsung 81faa30df9b6e9088ea5ca488860616192e7b763 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky 88d5f20a813960499a82151846754d7843412030 +h8300 21c7acc439b55d0569d7c2fc2eea5194b3910406 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k 28713169d879b67be2ef2f84dcf54905de238294 +m68knommu 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips 371a415153be953520003ffe4a4eca3fecc0e8c2 +nds32 4e8fa54d3d99026b95c3bccd9cf98308ce11d5af +nios2 21e6bff5e0ef0033d776e64c40e6873d7c75e74b +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd 4433887f3cd2b087ddc1a64ac6bf78dfc2a36624 +powerpc 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +risc-v-pjw 467e050e9760fc31dcf854ec88401e18419f5f78 +risc-v 13fd5de06514458eb320188b7a815d65696efd99 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 152e9b8676c6e788c6bff095c1eaae7b86df5003 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml aea05eb56e47046de1e5b508d40931dca969f1e5 +xtensa 036ef74b3ecb3804fd5c024a764d793c34b72644 +fscrypt 129ca2d2a83f44551e73a408fa5e75a7b5169abb +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 836b12f8c30d74dafa241d239dad6bdcf1af596a +ceph 9d4a227f6ef189cf37eb22641f6ee788b7dc41bb +cifs c68ccd02af3fcfc79f2cc6b107939d88601b9c22 +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs d43388dea04b18f516bd7c837d9222fe7309b12d +ext3 b0ad51173b3d21f92ea49a6557ac3de652407d40 +ext4 6c7328400e0488f7d49e19e02290ba343b6811b2 +f2fs 54c490164523de90c42b1d89e7de3befe3284d1b +fuse fabf7e0262d0bd57739d29aeac94c44b0542ff1f +jfs 2e3bc6125154c691e987e2554f2c99ec10f83b73 +nfs 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +nfs-anna a3b22b9f11d9fbc48b0291ea92259a5a810e9438 +nfsd f875a792abe933d0b4553ab6e29c624b58932e41 +orangefs 6e356d45950e2d26b63531a2fd112c987da7a933 +overlayfs 993a0b2aec52754f0897b1dab4c453be8217cae5 +ubifs 5578e48e5c0bf4684e68ae08caa2293bfb3f5307 +v9fs bb06c388fa20ae24cfe80c52488de718a7e3a53f +xfs 6ef50fe9afae63d11220f3f66b5f4c75d09c8bf0 +file-locks b9637d08f1a55eed1ad776d63e591e07539d6a34 +vfs c0abe5af73411c10e82f130cdd748f00c5182d65 +printk 943ca6ad81e5b37bd5d22cbab5ad06dc97fc001c +pci 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +pstore 93ee4b7d9f0632690713aee604c49e298e634094 +hid 53be96ab821a73e992846b7e16e3f6b7d8a6d9d0 +i2c 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +i3c 988bb4a1937bd083267444dda21b901dc6a959b3 +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging ab69001fa2bdc5b405b19c2632441efa5c27294d +jc_docs 9834857754fffde7008123503fe8f1d66f526eb5 +v4l-dvb 8a3946cad244e8453e26f3ded5fe40bf2627bb30 +v4l-dvb-next 81527254e15103f73c03b6b9322f0e372cf3a366 +fbdev 9a9f1d1a81a972513636c333e26c542f8aebae55 +pm 2c9e385d1d4c16e45282150b0907c6f928dce952 +cpufreq-arm 0334906c06967142c8805fbe88acf787f65d3d26 +cpupower ae2917093fb60bdc1ed3e5757b74801420569a9a +opp a9a744dd5b82843a9c99d9f97794fb51bc2ed8dd +thermal 2d7c4e17811f766321b9c054609551fa40f0b445 +thermal-soc 8834f5600cf3c8db365e18a3d5cac2c2780c81e5 +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm 8526e331c56f35bb52e88e8c0d3cba2195bc348f +swiotlb 22cb45d7692ab502dd47dc5a607b3af240ee1e37 +rdma 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +net-next 1d965c4def07defeb2f3b0eb927e891c45f46748 +bpf-next 48e5d98a0eb1e4cec308ed63444a505a7e7dd9e3 +ipsec-next 590ce401c207fd944827eb5aa5e87d834eddb149 +mlx5-next 37b6bb77c6fdad36f0d7bd425c005a014d5dffe4 +netfilter-next 8c4238df4d0cc3420c5ee14b54d200d74267cfe5 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next e2f7cc72cbf42e037229d8bd998966569662442f +wireless-drivers-next 501faf710230b67e470b314868110357cf3a554d +bluetooth bbcece3d418c9d5e35f9bb4e36934648aff60483 +mac80211-next be9cefe796f3abfbef02e66fbe3bff766b93b867 +gfs2 d86dbd82b9a0c4f33df68b57a930055d66b4f012 +mtd 9220d7befc9c28bf714701e6e26163644750d871 +nand 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +spi-nor 7cbae399bde16d984b921156cc52c49a9554529d +crypto 0918f18c7179e8cdf718d01531a81b28130b4217 +drm 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +amdgpu 463fabd56188960e13b9a799f1c1e76a2b57b7c2 +drm-intel 754a25442705c4f90e0d05f1a7bd303ffe700ca9 +drm-tegra ca52507efc03f6e81bd1b845882b049ed96bd192 +drm-misc ff01e6971ecd9ba6a9c0538c46d713f38a751f11 +drm-msm 745b19d74716be488f91cd7737e7046242ec376b +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp b4a650fb0d727d75682cb406acb92fd01e91f030 +imx-drm a0ea4ffff2662c10ca69d5e246adf5543fd945b9 +etnaviv 9e05352340d3a3e68c144136db9810b26ebb88c3 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap cc6a8d69ba624f0ad7a09ed095b7bd4b86476489 +sound cc4f8e91c4ed04a9a972c6e10c158d4b71be3f2f +sound-asoc e9d5a868525995e37d1ab47d78a5d54b385d07ed +modules 9672e2cb0fbdcb11d64ac43bcb4ee86a76b4221f +input 6d3a41ab0c37320068e28e1f9b45e4304bb30db0 +block 602d674ce90f64ac135452fb9b2b058acb53b226 +device-mapper 225557446856448039a9e495da37b72c20071ef2 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 15e7c91b26dfb20ad976b5a99b4e8d7dd287fd06 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd d2d833e0bf2bad221a955626b942b38312630894 +backlight cec2b18832e26bc866bef2be22eff4e25bbc4034 +battery 655ab0bc462d1ae2aa344b1ecf35ca1a3ed726dc +regulator c5137274647521b2b866e9f0cb36552da9232cbd +security 3963bdb87e66e670548d6d8252aa1f0f3be6fa1d +apparmor 6c07c1c743947c2e2613115c07a6fc5ad12e08ff +integrity e7fde070f39bc058c356cf366cb17ac2d643abb0 +selinux e19dfdc83b60f196e0653d683499f7bc5548128f +tpmdd 5812f97c0a225958a34b5af3888f55bdd8cdaf29 +watchdog 458c8961c194f2d2cb6ffed3dd9b6692d74ad65e +iommu 1150bc31ffe6ebcb2092635a2fe095ba445fd818 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 0cfd027be1d6def4a462cdc180c055143af24069 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 16add411645cff83360086e102daa67b25f1e39a +devicetree 935665c1a117f34662549f01e1c9bc5ea7132556 +mailbox 17b860bbfc844a3d8e38135ef430d4af8e436b9e +spi 2880fca899ad1c9f39d5a83db153724302c8d975 +tip 796a7fd73cd9b740379abe63047119e6b13fa58e +clockevents dbfc6db7ba46e73b97dc32b9013f01d9b91d630e +edac-amd 580b5cf50ca8f4781961382d54959683341b3126 +irqchip fca269f201a8d9985c0a31fb60b15d4eb57cef80 +ftrace 85f726a35e504418607b77c5e7da165dc1ea63ce +rcu e880edadc14970cad557e65849ba6d1457d18589 +kvm 4a605bc08e98381d8df61c30a4acb2eac15eb7da +kvm-arm c88b093693ccbe41991ef2e9b1d251945e6e54ed +kvm-ppc 2b57ecd0208f7ac0b20b1b171698f027481a39f6 +kvms390 11ba5961a2156a4f210627ed8421387e2531b100 +xen-tip 0266def913771e718fd0c998eecb072e0685e2c9 +percpu cb453ce4846b4d421cd7ef595348bab28e9e2d69 +workqueues 8194fe94ab08f56ea55653df924647d23873d18c +drivers-x86 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +chrome-platform 9309d60c0274804c9553886b59a6178d6836a563 +hsi 1ff85bfa1614df6cacec780cd5922dc0b1c340c7 +leds bd7a59173aea501d969d67b32f48113851ae1650 +ipmi 906242774f866d3b015fd25e8d7787e814f7183b +driver-core 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +usb bb31b352510be206d2797b2225e6ae37ff567c8e +usb-gadget 5895d311d28f2605e2f71c1a3e043ed38f3ac9d2 +usb-serial 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +usb-chipidea-next bc65fae4b1f01e269dad0cf62d721107d6bc93e2 +phy-next b8998e9280302e54b499ba36cf6019e3b2cddf83 +tty 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +char-misc 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +extcon 9d8e2af50df7c40cc432e2b37eab324632dec6b3 +soundwire bfeffd155283772bbe78c6a05dec7c0128ee500c +thunderbolt 9c6601f889f3b294a78c99d7c4c8578dd0e4fe94 +staging ac22353f803befce570b53f08b5d10d5ca668967 +mux a1ad5ff63944ea4c3666d9a454fb3203930829a0 +icc fcf9d0b7d2f50003efe0ba280be458f27671010d +slave-dma 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +cgroup 0fcc4c8c044e117ac126ab6df4138ea9a67fa2a9 +scsi 69a3c01d588ea1fb8245acd3bf18ec5acb714acc +scsi-mkp f55d0b40eccfcfb50f93cc7d03c95e25ab19917e +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost 3fbdb54c7d5adb935b67939264653612c52dcce6 +rpmsg 6e9b4f32f9fabad43a0fe2fc3acd5468edd69c86 +gpio 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gpio-brgl 2e35bb6cd421fa2c488a82432a14ac2c894846fd +pinctrl 9bc8fee96e9a4b8f17ba1544bf323f1ae6ded81d +pinctrl-samsung 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +pwm 9ff06679e109a216fc4a0cf5b4069a5305df141c +userns cf43a757fd49442bc38f76088b70c2299eed2c2f +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 05cbbb6f9ed50c9a64a25c1903712681d4480edb +kselftest 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc +livepatching b420648f103d74bd6c96da4ecf09d78356e6a700 +coresight 0b7ba42535b73fea195b4eb621e534d95b22ed59 +rtc ba1afcd68cd256bebf935219d8f08e565067777b +nvdimm 1ffc664f9b8ca7346f2af0fb4f62b923193bf65c +at24 d333bad1f6f3e0df224db181c991fb8d65bbc2be +ntb 6202b3c150bc1067b058d8327894016cfacadbd5 +kspp 50ceaa95ea09703722b30b4afa617c972071cd7f +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi d20810530b7109a95abef5130e6dcec09c5180d7 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 80471330ec58a212ce516d239d257600e383ee54 +nvmem 6b37a3af354e065bf79e75190298968155db67a0 +xarray dd12805ed1db79bdad53ce0fb8d69e48feada10c +hyperv 396ae57ef1ef978d1d21cdb7586ba184a3f22453 +auxdisplay cc5d04d840d62d7c75e268c51da7cd0be2ee03c0 +kgdb-dt 97498c96a1869f6e8563a042e490f187a39f68e7 +pidfd 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +devfreq ca740a8f3e7f769a5a8d4eb94e147b3f6ca985d5 +akpm-current 90dcc77f765ad14d0a0e436b1b3d22a547eb27b0 +akpm 0bd0b3fec9dd921b9c7ed5702da7c576bd97ad4c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..f4cd0bb96e08 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,302 @@ +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 +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +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 +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 +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/davem/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/kishon/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 +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.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.infradead.org/linux-mtd.git#master +spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +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/arm/arm-soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/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 +bcm2835 git git://github.com/anholt/linux.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.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-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 +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 +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-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 +risc-v-pjw git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/riscv.git#for-next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-next +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +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 +befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave 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 +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 +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 +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.infradead.org/ubifs-2.6.git#linux-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 +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/pmladek/printk.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 quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +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 +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/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/davem/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 +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-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.infradead.org/linux-mtd.git#mtd/next +nand git git://git.infradead.org/linux-mtd.git#nand/next +spi-nor git git://git.infradead.org/linux-mtd.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 +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +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 +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-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 +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-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 +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +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 +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-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#clockevents/next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#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/j.anaszewski/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/kishon/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 +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.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 +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.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 +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi.git#master +siox git https://git.pengutronix.de/git/ukl/linux#siox/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-dt 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 +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git#for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..48991cf877d2 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3525 @@ +$ date -R +Fri, 22 Mar 2019 07:44:12 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 54c490164523 Merge tag 'arc-5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc +Merging origin/master (d92da1fbb724 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge origin/master +Updating 54c490164523..d92da1fbb724 +Fast-forward + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/cputype.h | 6 +++- + arch/arm64/kernel/cpufeature.c | 1 + + arch/arm64/kernel/probes/kprobes.c | 56 +++++++++++++++++++++----------------- + arch/arm64/kernel/stacktrace.c | 1 + + fs/notify/fanotify/fanotify_user.c | 12 +++++++- + fs/notify/inotify/inotify_user.c | 7 +++-- + fs/udf/inode.c | 4 ++- + fs/udf/truncate.c | 8 ++++-- + fs/udf/udfdecl.h | 2 +- + security/selinux/ss/policydb.c | 13 ++++++--- + 11 files changed, 73 insertions(+), 38 deletions(-) +Merging fixes/master (b352face4ca9 adfs: mark expected switch fall-throughs) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + fs/adfs/dir_f.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging kspp-gustavo/for-next/kspp (1f7ae812f87e x86/syscalls: Mark expected switch fall-throughs) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/locks.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/ext4/indirect.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ceph/file.c +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/ref-verify.c +Auto-merging fs/afs/yfsclient.c +Auto-merging fs/afs/rxrpc.c +Auto-merging fs/afs/flock.c +Auto-merging drivers/scsi/osst.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/lpfc/lpfc_nvme.c +Auto-merging drivers/scsi/lpfc/lpfc_nportdisc.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/lpfc/lpfc_ct.c +Auto-merging drivers/scsi/be2iscsi/be_main.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/syscall.h | 28 ++++++++++++++++++ + drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c | 17 +++++++++++ + drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 2 ++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c | 2 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c | 1 + + drivers/scsi/aic7xxx/aic7xxx_core.c | 12 ++++++-- + drivers/scsi/be2iscsi/be_iscsi.c | 1 + + drivers/scsi/be2iscsi/be_main.c | 1 + + drivers/scsi/bfa/bfa_fcpim.c | 6 ++-- + drivers/scsi/csiostor/csio_wr.c | 1 + + drivers/scsi/imm.c | 33 +++++++++++----------- + drivers/scsi/lpfc/lpfc_ct.c | 2 ++ + drivers/scsi/lpfc/lpfc_els.c | 1 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++- + drivers/scsi/lpfc/lpfc_nportdisc.c | 1 + + drivers/scsi/lpfc/lpfc_nvme.c | 1 + + drivers/scsi/lpfc/lpfc_scsi.c | 8 +++--- + drivers/scsi/osst.c | 6 ++++ + drivers/scsi/ppa.c | 1 + + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 ++ + drivers/scsi/sym53c8xx_2/sym_nvram.c | 1 + + fs/affs/super.c | 3 +- + fs/afs/cmservice.c | 8 ++++++ + fs/afs/file.c | 2 ++ + fs/afs/flock.c | 1 + + fs/afs/fsclient.c | 31 ++++++++++++-------- + fs/afs/misc.c | 9 ++++++ + fs/afs/rxrpc.c | 1 + + fs/afs/vlclient.c | 18 +++++++----- + fs/afs/yfsclient.c | 30 +++++++++++++------- + fs/btrfs/ref-verify.c | 1 + + fs/btrfs/volumes.h | 1 + + fs/ceph/file.c | 1 + + fs/configfs/dir.c | 2 ++ + fs/f2fs/node.c | 2 ++ + fs/fcntl.c | 2 +- + fs/gfs2/bmap.c | 4 +-- + fs/jffs2/fs.c | 1 + + fs/libfs.c | 2 ++ + fs/locks.c | 2 +- + fs/nfsd/nfs4proc.c | 1 + + fs/nfsd/nfs4state.c | 1 + + fs/ocfs2/cluster/quorum.c | 1 + + fs/seq_file.c | 1 + + fs/signalfd.c | 1 + + fs/ufs/util.h | 4 +-- + lib/asn1_decoder.c | 4 +++ + lib/cmdline.c | 5 ++++ + lib/zstd/bitstream.h | 5 ++++ + lib/zstd/compress.c | 1 + + lib/zstd/decompress.c | 5 +++- + lib/zstd/huf_compress.c | 2 ++ + 58 files changed, 225 insertions(+), 64 deletions(-) +Merging kbuild-current/fixes (688931a5ad4e kbuild: skip sub-make for in-tree build with GNU Make 4.x) +$ git merge kbuild-current/fixes +Merge made by the 'recursive' strategy. + Makefile | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) +Merging arc-current/for-curr (9a18b5a412ba arch: arc: Kconfig: pedantic formatting) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (d410a8a49e3e ARM: 8849/1: NOMMU: Fix encodings for PMSAv8's PRBAR4/PRLAR4) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (e5a5af771861 arm64: remove obsolete selection of MULTI_IRQ_HANDLER) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (28713169d879 m68k: Add -ffreestanding to CFLAGS) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (92edf8df0ff2 powerpc/security: Fix spectre_v2 reporting) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/mmu.h | 2 +- + arch/powerpc/include/asm/vdso_datapage.h | 8 ++++---- + arch/powerpc/kernel/cpu_setup_6xx.S | 3 --- + arch/powerpc/kernel/head_32.S | 6 ++++++ + arch/powerpc/kernel/security.c | 23 ++++++++--------------- + arch/powerpc/kernel/vdso64/gettimeofday.S | 4 ++-- + arch/powerpc/mm/hash_low_32.S | 8 ++++---- + 7 files changed, 25 insertions(+), 29 deletions(-) +Merging sparc/master (7d762d69145a afs: Fix manually set volume location server list) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (6b70fc94afd1 net-sysfs: Fix memory leak in netdev_register_kobject) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/msg_zerocopy.rst | 2 +- + Documentation/networking/netdev-FAQ.rst | 13 + + Documentation/networking/nf_flowtable.txt | 8 +- + Documentation/networking/snmp_counter.rst | 12 +- + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/net/bpf_jit.h | 17 +- + arch/powerpc/net/bpf_jit32.h | 4 + + arch/powerpc/net/bpf_jit64.h | 20 ++ + arch/powerpc/net/bpf_jit_comp64.c | 12 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 3 +- + drivers/net/Kconfig | 4 +- + drivers/net/ethernet/3com/3c515.c | 2 +- + drivers/net/ethernet/8390/mac8390.c | 19 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 5 +- + drivers/net/ethernet/cadence/macb_main.c | 10 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 2 +- + drivers/net/ethernet/micrel/ks8851.c | 42 +-- + drivers/net/ethernet/micrel/ks8851.h | 93 +++--- + drivers/net/ethernet/micrel/ks8851_mll.c | 317 +-------------------- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 + + drivers/net/ethernet/realtek/atp.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +- + drivers/net/ieee802154/adf7242.c | 4 + + drivers/net/ieee802154/mac802154_hwsim.c | 2 +- + drivers/net/phy/dp83822.c | 34 ++- + drivers/net/phy/meson-gxl.c | 6 + + drivers/net/tun.c | 16 +- + drivers/net/vxlan.c | 4 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 4 +- + drivers/net/wireless/mediatek/mt76/dma.c | 7 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 18 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 4 + + drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 16 ++ + drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 4 +- + .../net/wireless/mediatek/mt76/mt76x0/initvals.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt76x02.h | 11 + + .../net/wireless/mediatek/mt76/mt76x02_debugfs.c | 27 ++ + drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 67 ++++- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.h | 2 + + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 82 +++++- + drivers/net/wireless/mediatek/mt76/mt76x02_phy.c | 2 + + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt76x2/init.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h | 1 + + .../net/wireless/mediatek/mt76/mt76x2/pci_init.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_mcu.c | 21 ++ + drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 30 +- + drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 7 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_mac.c | 1 - + drivers/net/wireless/mediatek/mt76/tx.c | 11 +- + drivers/net/wireless/mediatek/mt76/usb.c | 6 +- + drivers/net/wireless/mediatek/mt7601u/usb.c | 4 + + drivers/s390/net/qeth_core_main.c | 5 +- + drivers/s390/net/qeth_l2_main.c | 7 +- + drivers/s390/net/qeth_l3_main.c | 8 +- + include/linux/atalk.h | 2 +- + include/linux/bpf.h | 1 - + include/linux/bpf_verifier.h | 40 +++ + include/linux/net.h | 6 + + include/linux/socket.h | 12 +- + include/net/act_api.h | 9 +- + include/net/sch_generic.h | 1 + + include/net/sctp/checksum.h | 2 +- + include/net/sock.h | 6 + + include/net/tc_act/tc_gact.h | 2 +- + include/net/xdp_sock.h | 1 - + include/uapi/linux/bpf.h | 188 ++++++++---- + kernel/bpf/verifier.c | 131 +++++---- + net/appletalk/aarp.c | 15 +- + net/appletalk/ddp.c | 20 +- + net/bridge/br_netfilter_hooks.c | 1 + + net/bridge/br_netfilter_ipv6.c | 2 + + net/core/filter.c | 27 +- + net/core/net-sysfs.c | 20 +- + net/dccp/ipv6.c | 4 +- + net/ipv6/netfilter/ip6t_srh.c | 6 + + net/ipv6/route.c | 18 +- + net/ipv6/tcp_ipv6.c | 8 +- + net/mpls/mpls_iptunnel.c | 12 +- + net/ncsi/ncsi-netlink.c | 4 + + net/netfilter/Kconfig | 1 + + net/netfilter/nf_conntrack_sip.c | 37 ++- + net/netfilter/nf_tables_api.c | 5 +- + net/netfilter/nft_objref.c | 19 +- + net/netfilter/nft_redir.c | 2 +- + net/netfilter/nft_set_rbtree.c | 7 +- + net/netlink/genetlink.c | 3 +- + net/nfc/llcp_sock.c | 9 +- + net/openvswitch/datapath.c | 12 + + net/packet/af_packet.c | 7 +- + net/rose/rose_subr.c | 21 +- + net/sched/act_api.c | 101 ++++--- + net/sched/act_bpf.c | 25 +- + net/sched/act_connmark.c | 22 +- + net/sched/act_csum.c | 22 +- + net/sched/act_gact.c | 15 +- + net/sched/act_ife.c | 35 ++- + net/sched/act_ipt.c | 11 +- + net/sched/act_mirred.c | 22 +- + net/sched/act_nat.c | 15 +- + net/sched/act_pedit.c | 18 +- + net/sched/act_police.c | 13 +- + net/sched/act_sample.c | 21 +- + net/sched/act_simple.c | 54 +++- + net/sched/act_skbedit.c | 20 +- + net/sched/act_skbmod.c | 20 +- + net/sched/act_tunnel_key.c | 19 +- + net/sched/act_vlan.c | 22 +- + net/sched/cls_api.c | 2 +- + net/sched/sch_cake.c | 25 +- + net/sctp/socket.c | 54 +++- + net/socket.c | 277 ++++++++++++++++-- + net/strparser/strparser.c | 2 + + net/tipc/group.c | 3 + + net/tipc/socket.c | 22 +- + net/tipc/topsrv.c | 1 + + net/xdp/xdp_umem.c | 19 +- + tools/include/uapi/linux/bpf.h | 188 ++++++++---- + tools/lib/bpf/btf.c | 51 +++- + tools/lib/bpf/libbpf.c | 13 +- + tools/lib/bpf/xsk.c | 15 +- + tools/testing/selftests/bpf/bpf_helpers.h | 2 + + tools/testing/selftests/bpf/prog_tests/map_lock.c | 2 +- + tools/testing/selftests/bpf/prog_tests/spinlock.c | 2 +- + .../selftests/bpf/progs/test_sock_fields_kern.c | 88 ++++-- + tools/testing/selftests/bpf/test_btf.c | 44 +++ + tools/testing/selftests/bpf/test_sock_fields.c | 134 +++++++-- + .../testing/selftests/bpf/verifier/ref_tracking.c | 168 +++++++++++ + tools/testing/selftests/bpf/verifier/sock.c | 4 +- + .../selftests/tc-testing/tc-tests/actions/bpf.json | 25 ++ + .../tc-testing/tc-tests/actions/connmark.json | 25 ++ + .../tc-testing/tc-tests/actions/csum.json | 25 ++ + .../tc-testing/tc-tests/actions/gact.json | 25 ++ + .../selftests/tc-testing/tc-tests/actions/ife.json | 25 ++ + .../tc-testing/tc-tests/actions/mirred.json | 25 ++ + .../selftests/tc-testing/tc-tests/actions/nat.json | 25 ++ + .../tc-testing/tc-tests/actions/pedit.json | 51 ++++ + .../tc-testing/tc-tests/actions/police.json | 25 ++ + .../tc-testing/tc-tests/actions/sample.json | 25 ++ + .../tc-testing/tc-tests/actions/simple.json | 25 ++ + .../tc-testing/tc-tests/actions/skbedit.json | 25 ++ + .../tc-testing/tc-tests/actions/skbmod.json | 25 ++ + .../tc-testing/tc-tests/actions/tunnel_key.json | 25 ++ + .../tc-testing/tc-tests/actions/vlan.json | 25 ++ + 155 files changed, 2689 insertions(+), 1047 deletions(-) + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/pedit.json +Merging bpf/master (0803278b0b4d bpf: do not restore dst_reg when cur_state is freed) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + kernel/bpf/syscall.c | 22 +++++++++++++++------- + kernel/bpf/verifier.c | 15 ++++++++++++--- + 2 files changed, 27 insertions(+), 10 deletions(-) +Merging ipsec/master (bfc01ddff2b0 Revert "net: xfrm: Add '_rcu' tag for rcu protected pointer in netns_xfrm") +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/esp4_offload.c | 8 +++++--- + net/ipv6/esp6_offload.c | 8 +++++--- + net/ipv6/xfrm6_tunnel.c | 4 ++++ + net/xfrm/xfrm_user.c | 2 +- + 4 files changed, 15 insertions(+), 7 deletions(-) +Merging netfilter/master (b25a31bf0ca0 netfilter: nf_tables: add missing ->release_ops() in error path of newrule()) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (7dfc45e6282a mt76x02: do not enable RTS/CTS by default) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (d235c48b40d3 net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (ec4fe4bcc584 i40iw: Avoid panic when handling the inetdev event) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (667a8f737539 ALSA: hda/realtek: Enable headset MIC of Acer AIO with ALC286) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/drivers/opl3/opl3_voice.h | 2 +- + sound/firewire/motu/motu.c | 20 ++++++++++---------- + sound/isa/sb/sb8.c | 4 ++++ + sound/pci/echoaudio/echoaudio.c | 5 +++++ + sound/pci/hda/hda_codec.c | 20 +++++++++++++++++--- + sound/pci/hda/hda_intel.c | 14 ++++++++------ + sound/pci/hda/patch_realtek.c | 17 ++++++++++++++--- + 7 files changed, 59 insertions(+), 23 deletions(-) +Merging sound-asoc-fixes/for-linus (0ff4e8c61b79 ASoC: fsl_esai: fix channel swap issue when stream starts) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc.h | 2 + + sound/soc/codecs/ab8500-codec.c | 1 + + sound/soc/codecs/cs4270.c | 1 + + sound/soc/codecs/hdac_hda.c | 53 +++++++++---- + sound/soc/codecs/hdac_hda.h | 1 + + sound/soc/codecs/hdmi-codec.c | 121 ++++++++++++++--------------- + sound/soc/codecs/nau8810.c | 4 +- + sound/soc/codecs/nau8824.c | 46 +++++++++-- + sound/soc/codecs/rt5682.c | 56 ++++++------- + sound/soc/codecs/tlv320aic3x.c | 4 +- + sound/soc/codecs/wm_adsp.c | 39 ++++++++-- + sound/soc/codecs/wm_adsp.h | 1 + + sound/soc/fsl/fsl_asrc.c | 14 ++++ + sound/soc/fsl/fsl_esai.c | 47 ++++++++--- + sound/soc/intel/skylake/skl-pcm.c | 19 +++-- + sound/soc/mediatek/common/mtk-btcvsd.c | 69 +++++++++++++++- + sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 4 + + sound/soc/samsung/i2s.c | 10 ++- + sound/soc/samsung/odroid.c | 4 +- + sound/soc/sh/rcar/core.c | 2 + + sound/soc/sh/rcar/rsnd.h | 5 ++ + sound/soc/sh/rcar/src.c | 21 ++--- + sound/soc/soc-core.c | 2 + + sound/soc/soc-pcm.c | 47 ++++++++--- + sound/soc/stm/stm32_adfsdm.c | 38 ++++++++- + sound/soc/stm/stm32_i2s.c | 3 +- + sound/soc/stm/stm32_sai.c | 8 +- + sound/soc/stm/stm32_sai_sub.c | 48 +++++++++--- + 28 files changed, 481 insertions(+), 189 deletions(-) +Merging regmap-fixes/for-linus (9e98c678c2d6 Linux 5.1-rc1) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (3e8a4628a4d4 Merge branch 'regulator-5.1' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) +Merging spi-fixes/for-linus (35137ca07194 Merge branch 'spi-5.1' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/spi-fsl-lpspi.c | 4 ++-- + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-rspi.c | 48 +++++++++++++++++++----------------------- + drivers/spi/spi-stm32-qspi.c | 4 +--- + drivers/spi/spi-topcliff-pch.c | 15 +++++++++++-- + drivers/spi/spi.c | 2 ++ + 6 files changed, 41 insertions(+), 34 deletions(-) +Merging pci-current/for-linus (9e98c678c2d6 Linux 5.1-rc1) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (cd1b772d4881 driver core: remove BUS_ATTR()) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + include/linux/device.h | 2 -- + 1 file changed, 2 deletions(-) +Merging tty.current/tty-linus (93bcefd4c6ba serial: sh-sci: Fix setting SCSCR_TIE while transferring data) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/ar933x_uart.c | 24 ++++++++---------------- + drivers/tty/serial/atmel_serial.c | 4 ++++ + drivers/tty/serial/max310x.c | 2 ++ + drivers/tty/serial/mvebu-uart.c | 3 +++ + drivers/tty/serial/mxs-auart.c | 4 ++++ + drivers/tty/serial/qcom_geni_serial.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 12 ++++++++++-- + drivers/tty/serial/sh-sci.c | 12 +----------- + 8 files changed, 33 insertions(+), 30 deletions(-) +Merging usb.current/usb-linus (22feda47b574 usb: usb251xb: Remove unnecessary comparison of unsigned integer with >= 0) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/common/common.c | 2 ++ + drivers/usb/host/xhci-rcar.c | 1 + + drivers/usb/misc/usb251xb.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 27 ++++++++++++++++++++++++++- + drivers/usb/typec/tcpm/wcove.c | 9 +++++++-- + 5 files changed, 37 insertions(+), 4 deletions(-) +Merging usb-gadget-fixes/fixes (a53469a68eb8 usb: phy: am335x: fix race condition in _probe) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (2908b076f519 USB: serial: mos7720: fix mos_parport refcount imbalance on error path) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio_ids.h | 4 +++- + drivers/usb/serial/mos7720.c | 4 ++-- + drivers/usb/serial/option.c | 7 ++++++- + 4 files changed, 13 insertions(+), 4 deletions(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (6a8ca24590a2 staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc) +$ git merge staging.current/staging-linus +Removing drivers/staging/mt7621-eth/soc_mt7621.c +Removing drivers/staging/mt7621-eth/mtk_eth_soc.h +Removing drivers/staging/mt7621-eth/mtk_eth_soc.c +Removing drivers/staging/mt7621-eth/mdio_mt7620.c +Removing drivers/staging/mt7621-eth/mdio.h +Removing drivers/staging/mt7621-eth/mdio.c +Removing drivers/staging/mt7621-eth/gsw_mt7621.c +Removing drivers/staging/mt7621-eth/gsw_mt7620.h +Removing drivers/staging/mt7621-eth/ethtool.h +Removing drivers/staging/mt7621-eth/ethtool.c +Removing drivers/staging/mt7621-eth/TODO +Removing drivers/staging/mt7621-eth/Makefile +Removing drivers/staging/mt7621-eth/Kconfig +Removing drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/axis-fifo/Kconfig | 1 + + drivers/staging/comedi/comedidev.h | 2 + + drivers/staging/comedi/drivers.c | 33 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 10 +- + drivers/staging/erofs/unzip_vle.c | 4 + + drivers/staging/erofs/unzip_vle_lz4.c | 7 +- + drivers/staging/mt7621-dts/gbpc1.dts | 29 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 73 +- + .../devicetree/bindings/net/mediatek-net-gsw.txt | 48 - + drivers/staging/mt7621-eth/Kconfig | 39 - + drivers/staging/mt7621-eth/Makefile | 14 - + drivers/staging/mt7621-eth/TODO | 13 - + drivers/staging/mt7621-eth/ethtool.c | 250 --- + drivers/staging/mt7621-eth/ethtool.h | 15 - + drivers/staging/mt7621-eth/gsw_mt7620.h | 277 --- + drivers/staging/mt7621-eth/gsw_mt7621.c | 297 --- + drivers/staging/mt7621-eth/mdio.c | 275 --- + drivers/staging/mt7621-eth/mdio.h | 27 - + drivers/staging/mt7621-eth/mdio_mt7620.c | 173 -- + drivers/staging/mt7621-eth/mtk_eth_soc.c | 2176 -------------------- + drivers/staging/mt7621-eth/mtk_eth_soc.h | 716 ------- + drivers/staging/mt7621-eth/soc_mt7621.c | 161 -- + drivers/staging/mt7621-pci/Kconfig | 1 + + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 9 +- + drivers/staging/rtl8188eu/include/rtw_xmit.h | 2 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 10 +- + drivers/staging/rtl8712/rtl8712_cmd.h | 2 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 14 +- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- + drivers/staging/rtlwifi/phydm/rtl_phydm.c | 2 + + drivers/staging/rtlwifi/rtl8822be/fw.c | 2 + + drivers/staging/speakup/speakup_soft.c | 16 +- + drivers/staging/speakup/spk_priv.h | 1 + + drivers/staging/speakup/synth.c | 6 + + 37 files changed, 173 insertions(+), 4539 deletions(-) + delete mode 100644 drivers/staging/mt7621-eth/Documentation/devicetree/bindings/net/mediatek-net-gsw.txt + delete mode 100644 drivers/staging/mt7621-eth/Kconfig + delete mode 100644 drivers/staging/mt7621-eth/Makefile + delete mode 100644 drivers/staging/mt7621-eth/TODO + delete mode 100644 drivers/staging/mt7621-eth/ethtool.c + delete mode 100644 drivers/staging/mt7621-eth/ethtool.h + delete mode 100644 drivers/staging/mt7621-eth/gsw_mt7620.h + delete mode 100644 drivers/staging/mt7621-eth/gsw_mt7621.c + delete mode 100644 drivers/staging/mt7621-eth/mdio.c + delete mode 100644 drivers/staging/mt7621-eth/mdio.h + delete mode 100644 drivers/staging/mt7621-eth/mdio_mt7620.c + delete mode 100644 drivers/staging/mt7621-eth/mtk_eth_soc.c + delete mode 100644 drivers/staging/mt7621-eth/mtk_eth_soc.h + delete mode 100644 drivers/staging/mt7621-eth/soc_mt7621.c +Merging char-misc.current/char-misc-linus (5cec2d2e5839 binder: fix race between munmap() and direct reclaim) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 3 ++- + drivers/android/binder_alloc.c | 18 ++++++++---------- + 2 files changed, 10 insertions(+), 11 deletions(-) +Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (44fc95e218a0 Input: wacom_serial4 - add support for Wacom ArtPad II tablet) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (00e87449430d crypto: caam - add missing put_device() call) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (dc5c37736d16 drivers: ide: Kconfig: pedantic formatting) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (9a71ac7e15a7 vfio-pci/nvlink2: Fix ancient gcc warnings) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/master (3e35730dd754 mtd: powernv_flash: Fix device registration error) +$ git merge mtd-fixes/master +Already up to date. +Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (48a2ca0ee399 Revert "mfd: cros_ec: Use devm_kzalloc for private data") +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (8ec49035c8a6 dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets) +$ git merge reset-fixes/reset/fixes +Merge made by the 'recursive' strategy. + drivers/reset/reset-meson-audio-arb.c | 1 + + include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging mips-fixes/mips-fixes (f6cab793d4a7 MIPS: Remove custom MIPS32 __kernel_fsid_t type) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (dc30e7039137 ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized) +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (de3ccd26fafc KVM: MMU: record maximum physical address width in kvm_mmu_extended_role) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (99effd8af527 hwmon: (ntc_thermistor) Fix temperature type reporting) +$ git merge hwmon-fixes/hwmon +Merge made by the 'recursive' strategy. + drivers/hwmon/Kconfig | 1 + + drivers/hwmon/ntc_thermistor.c | 2 +- + drivers/hwmon/occ/common.c | 6 ++++-- + 3 files changed, 6 insertions(+), 3 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (11189c1089da acpi/nfit: Fix command-supported detection) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (fb7d5dc911b1 Merge branch 'misc-5.1' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/raid56.c +Merge made by the 'recursive' strategy. + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/qgroup.c | 4 ++-- + fs/btrfs/raid56.c | 3 ++- + fs/btrfs/transaction.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ + fs/btrfs/tree-log.c | 33 +++++++++++++++++++++++---------- + fs/btrfs/volumes.c | 2 +- + 6 files changed, 72 insertions(+), 21 deletions(-) +Merging vfs-fixes/fixes (d3d6a18d7d35 aio: Fix locking in aio_poll()) +$ git merge vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (60d8cd572f65 arm64/xen: fix xen-swiotlb cache flushing) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (f36c1f9a8dfd i3c: master: dw: fix deadlock) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (7f5203c13ba8 scsi: ibmvscsi: Fix empty event pool access during host removal) +$ git merge scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/hisi_sas/hisi_sas_main.c | 6 ++++++ + drivers/scsi/ibmvscsi/ibmvscsi.c | 23 +++++++++++++++++++---- + drivers/scsi/qla2xxx/qla_init.c | 7 +++++++ + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/scsi_lib.c | 15 ++++++++++++--- + drivers/scsi/scsi_transport_iscsi.c | 2 ++ + 6 files changed, 47 insertions(+), 8 deletions(-) +Merging drm-fixes/drm-fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (69903dfae031 drm/i915/icl: Fix the TRANS_DDI_FUNC_CTL2 bitfield macro) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.c | 14 +++++++++++++- + drivers/gpu/drm/i915/gvt/gtt.h | 1 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + + drivers/gpu/drm/i915/gvt/scheduler.c | 28 ++++++++++++++++++++-------- + drivers/gpu/drm/i915/i915_gem.c | 15 +++++++++------ + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 1 + + 9 files changed, 48 insertions(+), 18 deletions(-) +Merging mmc-fixes/fixes (c9a9497ccef2 mmc: renesas_sdhi: limit block count to 16 bit for old revisions) +$ git merge mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/mmc/host/alcor.c | 25 +++++++++++++++++++------ + drivers/mmc/host/davinci_mmc.c | 2 +- + drivers/mmc/host/mxcmmc.c | 16 ++++------------ + drivers/mmc/host/pxamci.c | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 8 +++++++- + drivers/mmc/host/sdhci-omap.c | 3 +++ + 6 files changed, 35 insertions(+), 21 deletions(-) +Merging rtc-fixes/rtc-fixes (15d82d224987 rtc: sh: Fix invalid alarm warning for non-enabled alarm) +$ git merge rtc-fixes/rtc-fixes +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-cros-ec.c | 4 ++-- + drivers/rtc/rtc-sh.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging gnss-fixes/gnss-linus (9e98c678c2d6 Linux 5.1-rc1) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (46fc15487d02 Drivers: hv: vmbus: Expose monitor data only when monitor pages are used) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-bus-vmbus | 12 +++-- + drivers/hv/channel_mgmt.c | 1 + + drivers/hv/hyperv_vmbus.h | 2 + + drivers/hv/vmbus_drv.c | 77 +++++++++++++++++++++++++++++++- + 4 files changed, 87 insertions(+), 5 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (e9abc611a941 drm/rockchip: vop: reset scale mode when win is disabled) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 18 +++++++++++++++--- + drivers/gpu/drm/vgem/vgem_drv.c | 6 +----- + drivers/gpu/drm/vkms/vkms_gem.c | 5 +---- + 3 files changed, 17 insertions(+), 12 deletions(-) +Merging kbuild/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge kbuild/for-next +Already up to date. +Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (9eb9e96e97b3 Documentation/DMA-API-HOWTO: update dma_mask sections) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (d724444ab97d asm-generic/page.h: fix typo in #error text requiring a real asm/page.h) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (4c2741ac5e10 Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next) +$ git merge arm/for-next +Already up to date. +Merging arm64/for-next/core (b855b58ac1b7 arm64: mmu: drop paging_init comments) +$ git merge arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (cf2d65ec1d21 perf: xgene: Remove set but not used variable 'config') +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (48d1dbf3918f arm-soc: document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 259 +++++++++++++++++++++++++++++++++ + 1 file changed, 259 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (e37c380254ef Merge branch 'v5.2/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/meson8.dtsi | 5 +++ + arch/arm/boot/dts/meson8b.dtsi | 5 +++ + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 38 +++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 19 ++++++++++ + .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 10 +++++ + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 4 ++ + drivers/soc/amlogic/meson-gx-socinfo.c | 43 ++++++++++++++-------- + 10 files changed, 111 insertions(+), 16 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1) +$ git merge aspeed/for-next +Already up to date. +Merging at91/at91-next (69dd6b9f7d58 Merge branches 'at91-soc' and 'at91-dt' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/boot/dts/sama5d2.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.txt | 1 + + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 54 ++++++ + arch/arm/boot/dts/sama5d2.dtsi | 6 +- + arch/arm/mach-at91/at91sam9.c | 18 ++ + arch/arm/mach-at91/generic.h | 2 + + arch/arm/mach-at91/pm.c | 193 ++++++++++++++------- + arch/arm/mach-at91/pm_suspend.S | 111 ++++++++---- + include/linux/clk/at91_pmc.h | 1 + + 8 files changed, 289 insertions(+), 97 deletions(-) +Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next) +$ git merge bcm2835/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (b4a83340190a Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + + .../bindings/memory-controllers/fsl/mmdc.txt | 35 ++++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 2 +- + arch/arm/boot/dts/imx6q-gw54xx.dts | 105 ++++++++++++++++ + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 29 ++++- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 138 +++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl.dtsi | 15 ++- + arch/arm/boot/dts/imx6sl.dtsi | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ull-pinfunc-snvs.h | 2 +- + arch/arm/boot/dts/imx7s-warp.dts | 2 + + arch/arm/boot/dts/imx7ulp.dtsi | 6 + + arch/arm/boot/dts/ls1021a-qds.dts | 4 + + arch/arm/boot/dts/vf610-zii-cfu1.dts | 9 +- + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 4 + + arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 5 +- + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 9 +- + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/mach-imx/cpuidle-imx6q.c | 27 ++-- + arch/arm/mach-imx/mach-imx51.c | 1 + + arch/arm/mach-imx/pm-imx6.c | 6 +- + .../boot/dts/freescale/fsl-ls1012a-oxalis.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 62 +++++++++ + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 63 ++++++++++ + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 62 +++++++++ + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 83 +++++++++++++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 81 ++++++++++++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 44 ++++++- + arch/arm64/configs/defconfig | 1 + + drivers/firmware/imx/scu-pd.c | 121 +++++++++--------- + drivers/soc/imx/gpcv2.c | 39 +++--- + include/dt-bindings/firmware/imx/rsrc.h | 25 ++-- + 37 files changed, 866 insertions(+), 142 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/mmdc.txt +Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (d542127adb0c Merge branch 'v5.0-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (c51f7f863552 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 (af3b69ea03a2 Merge branch 'omap-for-v5.1/cpsw' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging reset/reset/next (22815f1825e4 reset: Add acquire/release support for arrays) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/core.c | 180 +++++++++++++++++++++++++++++++++++--- + drivers/usb/dwc3/dwc3-of-simple.c | 3 +- + include/linux/reset.h | 113 ++++++++++++++++++------ + 3 files changed, 255 insertions(+), 41 deletions(-) +Merging qcom/for-next (75920dd0498d Merge tag 'qcom-fixes-for-5.0-rc8' into doof) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (647bcd505199 Merge branches 'arm-dt-for-v5.2', 'arm-soc-for-v5.2', 'arm64-defconfig-for-v5.2', 'arm64-dt-for-v5.2', 'drivers-for-v5.2' and 'dt-bindings-for-v5.2' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/r8a7792-blanche.dts | 20 ++ + arch/arm/boot/dts/r8a7792.dtsi | 18 ++ + arch/arm/boot/dts/r8a7794-alt.dts | 21 ++ + arch/arm/mach-shmobile/pm-rcar-gen2.c | 1 + + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 6 +- + arch/arm64/boot/dts/renesas/cat875.dtsi | 22 ++ + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 47 ++++ + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 51 ++++- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 1 + + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 1 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 11 - + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 251 +++++++++++++++++++-- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 51 ++++- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 29 +++ + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/renesas-soc.c | 3 + + include/dt-bindings/power/r8a77965-sysc.h | 1 - + 21 files changed, 502 insertions(+), 59 deletions(-) +Merging rockchip/for-next (6a8281008f61 Merge branch 'v5.1-armsoc/dts-fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 6 + + arch/arm/boot/dts/rk3288-tinker-s.dts | 5 + + arch/arm/boot/dts/rk3288-tinker.dtsi | 40 +- + arch/arm/boot/dts/rk3288.dtsi | 7 +- + arch/arm/boot/dts/rv1108-elgin-r1.dts | 1 - + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 36 +- + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 36 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 65 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 67 ++ + .../arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts | 50 ++ + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 27 +- + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 790 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 6 + + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 45 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 4 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 + + drivers/clk/rockchip/clk-rk3328.c | 18 +- + 18 files changed, 1143 insertions(+), 68 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (8a7e0f327b8e Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroidu3.dts | 5 + + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 16 + + arch/arm/boot/dts/exynos5260.dtsi | 82 ++++- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 364 ++++++++++++++++++++- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 5 +- + arch/arm/configs/exynos_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/mach-exynos/Kconfig | 12 +- + arch/arm/mach-exynos/Makefile | 2 +- + arch/arm/mach-exynos/common.h | 1 + + arch/arm/mach-exynos/exynos.c | 3 + + arch/arm/mach-exynos/firmware.c | 1 + + arch/arm/mach-exynos/smc.h | 7 + + arch/arm/mach-exynos/suspend.c | 55 +++- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 6 + + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 6 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 34 +- + 18 files changed, 550 insertions(+), 53 deletions(-) +Merging sunxi/sunxi/for-next (ebbbe2442097 Merge branches 'sunxi/fixes-for-5.1' and 'sunxi/h3-h5-for-5.2' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 797 +++++++++++++++++++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 - + arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 11 +- + arch/arm/boot/dts/sun5i.dtsi | 25 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 12 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 12 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 6 + + arch/arm/boot/dts/sun7i-a20.dtsi | 112 +++ + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 32 +- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 6 + + arch/arm/boot/dts/sun8i-a33-q8-tablet.dts | 7 + + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 11 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 20 +- + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 3 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 32 +- + arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts | 114 +++ + arch/arm/boot/dts/sun8i-h3.dtsi | 4 + + arch/arm/boot/dts/sun8i-q8-common.dtsi | 18 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 5 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 10 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 15 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 66 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 5 + + arch/arm/mach-sunxi/mc_smp.c | 5 +- + arch/arm/mach-sunxi/platsmp.c | 4 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 15 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 68 ++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 13 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 33 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 4 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 11 + + arch/arm64/configs/defconfig | 1 + + drivers/clk/Kconfig | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 3 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 2 +- + drivers/clk/sunxi/Kconfig | 43 ++ + drivers/clk/sunxi/Makefile | 49 +- + 46 files changed, 1362 insertions(+), 231 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/sunxi.yaml + create mode 100644 arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts + create mode 100644 drivers/clk/sunxi/Kconfig +Merging tegra/for-next (d92dde4f12f1 Merge branch for-5.1/fixes into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm64/boot/dts/nvidia/tegra186.dtsi +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 1 - + 1 file changed, 1 deletion(-) +Merging clk/clk-next (1772ee64946d Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/at91/clk-programmable.c | 57 ++++++++++++++++++++++++++++--------- + drivers/clk/at91/pmc.h | 2 ++ + drivers/clk/at91/sama5d2.c | 10 ++++++- + drivers/clk/meson/g12a.c | 6 ++-- + drivers/clk/meson/gxbb.c | 2 ++ + 5 files changed, 59 insertions(+), 18 deletions(-) +Merging clk-samsung/for-next (81faa30df9b6 clk: samsung: exynos5433: Add selected IMEM clocks) +$ git merge clk-samsung/for-next +Already up to date. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (88d5f20a8139 csky: Fixup vdsp&fpu issues in kernel) +$ git merge csky/linux-next +Merge made by the 'recursive' strategy. + arch/csky/Makefile | 2 +- + arch/csky/abiv2/memmove.S | 6 +----- + 2 files changed, 2 insertions(+), 6 deletions(-) +Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq) +$ git merge h8300/h8300-next +Already up to date. +Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (28713169d879 m68k: Add -ffreestanding to CFLAGS) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (371a415153be arch: mips: Kconfig: pedantic formatting) +$ git merge mips/mips-next +Removing arch/mips/net/bpf_jit_asm.S +Removing arch/mips/net/bpf_jit.c +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 64 +- + arch/mips/bcm47xx/Kconfig | 8 +- + arch/mips/bcm63xx/boards/Kconfig | 2 +- + arch/mips/include/asm/uasm.h | 8 + + arch/mips/include/uapi/asm/inst.h | 6 +- + arch/mips/kernel/entry.S | 5 +- + arch/mips/mm/uasm-mips.c | 14 + + arch/mips/mm/uasm.c | 39 +- + arch/mips/net/Makefile | 1 - + arch/mips/net/bpf_jit.c | 1270 ------------------------------------- + arch/mips/net/bpf_jit_asm.S | 285 --------- + arch/mips/net/ebpf_jit.c | 191 ++++-- + arch/mips/pic32/Kconfig | 8 +- + 13 files changed, 229 insertions(+), 1672 deletions(-) + delete mode 100644 arch/mips/net/bpf_jit.c + delete mode 100644 arch/mips/net/bpf_jit_asm.S +Merging nds32/next (4e8fa54d3d99 nds32: fix semicolon code style issue) +$ git merge nds32/next +Auto-merging arch/nds32/mm/init.c +Merge made by the 'recursive' strategy. + arch/nds32/kernel/cacheinfo.c | 2 +- + arch/nds32/mm/init.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (4433887f3cd2 Revert: parisc: Use F_EXTEND() macro in iosapic code) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + drivers/parisc/iosapic.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging powerpc/next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge risc-v-pjw/for-next +Already up to date. +Merging risc-v/for-next (13fd5de06514 RISC-V: Fixmap support and MM cleanups) +$ git merge risc-v/for-next +Already up to date. +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (152e9b8676c6 s390/vtime: steal time exponential moving average) +$ git merge s390/features +Auto-merging arch/s390/kernel/smp.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/elf.h | 11 +++++--- + arch/s390/include/asm/lowcore.h | 61 ++++++++++++++++++++-------------------- + arch/s390/kernel/smp.c | 3 +- + arch/s390/kernel/vtime.c | 19 ++++++++----- + drivers/s390/crypto/ap_bus.c | 9 +++++- + drivers/s390/crypto/ap_bus.h | 2 ++ + drivers/s390/crypto/ap_queue.c | 26 +++++++++++++---- + drivers/s390/crypto/zcrypt_api.c | 30 ++++++++++++-------- + 8 files changed, 101 insertions(+), 60 deletions(-) +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (aea05eb56e47 um: Fix for a possible OOPS in ubd initialization) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (036ef74b3ecb Merge branch 'xtensa-5.1' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (129ca2d2a83f MAINTAINERS: add Eric Biggers as an fscrypt maintainer) +$ git merge fscrypt/master +Already up to date. +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (836b12f8c30d Merge branch 'for-next-next-v5.0-20190228' into for-next-20190228) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/transaction.c +CONFLICT (content): Merge conflict in fs/btrfs/transaction.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Resolved 'fs/btrfs/transaction.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e1a0b1fe9e91] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/disk-io.c | 82 ++++++++++++++++----------- + fs/btrfs/extent_io.c | 108 ++++++++++++++++++++++++++++------- + fs/btrfs/file.c | 2 +- + fs/btrfs/inode.c | 146 ++++++++++++++++++++++++++---------------------- + fs/btrfs/ioctl.c | 27 +++++---- + fs/btrfs/props.c | 32 ++++++++--- + fs/btrfs/root-tree.c | 13 +++-- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/transaction.c | 6 +- + fs/btrfs/tree-checker.c | 24 +++++++- + fs/btrfs/tree-checker.h | 8 +++ + fs/btrfs/volumes.c | 6 +- + fs/btrfs/zstd.c | 11 ++-- + 13 files changed, 310 insertions(+), 157 deletions(-) +Merging ceph/master (9d4a227f6ef1 rbd: drop wait_for_latest_osdmap()) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 28 ++++++---------------------- + include/linux/ceph/libceph.h | 2 ++ + net/ceph/ceph_common.c | 18 +++++++++++++++++- + net/ceph/mon_client.c | 9 +++++++++ + 4 files changed, 34 insertions(+), 23 deletions(-) +Merging cifs/for-next (c68ccd02af3f cifs: update internal module version number) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/file.c | 148 ++++++++++++++++++++++++++++--------------------- + fs/cifs/smb2maperror.c | 3 +- + fs/cifs/smb2pdu.c | 8 ++- + 5 files changed, 96 insertions(+), 67 deletions(-) +Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 29 +++++++++++++++++++++++------ + fs/ecryptfs/keystore.c | 5 +++-- + 2 files changed, 26 insertions(+), 8 deletions(-) +Merging ext3/for_next (b0ad51173b3d Pull udf truncate fix.) +$ git merge ext3/for_next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ext4/dev (6c7328400e04 ext4: report real fs size after failed resize) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4_jbd2.h +Merge made by the 'recursive' strategy. + fs/ext4/ext4_jbd2.h | 2 +- + fs/ext4/file.c | 2 +- + fs/ext4/inode.c | 30 ------------------------------ + fs/ext4/resize.c | 17 ++++++++++++++--- + fs/ext4/super.c | 16 +++++++++++++--- + 5 files changed, 29 insertions(+), 38 deletions(-) +Merging f2fs/dev (54c490164523 Merge tag 'arc-5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (fabf7e0262d0 fuse: cache readdir calls if filesystem opts out of opendir) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (2e3bc6125154 fs/jfs: Switch to use new generic UUID API) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/acl.c | 3 ++- + fs/jfs/jfs_incore.h | 6 ++++-- + fs/jfs/jfs_logmgr.c | 18 +++++++++--------- + fs/jfs/jfs_logmgr.h | 10 +++++----- + fs/jfs/jfs_mount.c | 4 ++-- + fs/jfs/jfs_superblock.h | 8 ++++---- + fs/jfs/namei.c | 2 +- + fs/jfs/super.c | 8 +++++--- + 8 files changed, 32 insertions(+), 27 deletions(-) +Merging nfs/linux-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (a3b22b9f11d9 Linux 5.0-rc7) +$ git merge nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (f875a792abe9 nfsd: allow nfsv3 readdir request to be larger.) +$ git merge nfsd/nfsd-next +Already up to date. +Merging orangefs/for-next (6e356d45950e orangefs: remove two un-needed BUG_ONs...) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (993a0b2aec52 ovl: Do not lose security.capability xattr over metadata file copy-up) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (5578e48e5c0b ubi: wl: Silence uninitialized variable warning) +$ git merge ubifs/linux-next +Already up to date. +Merging v9fs/9p-next (bb06c388fa20 9p/net: fix memory leak in p9_client_create) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (6ef50fe9afae xfs: clean up xfs_dir2_leaf_addname) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (b9637d08f1a5 locks: ignore same lock in blocked_lock_hash) +$ git merge file-locks/locks-next +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/locks.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging vfs/for-next (c0abe5af7341 Merge branches 'work.mount', 'work.misc' and 'work.iov_iter' into for-next) +$ git merge vfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging printk/for-next (943ca6ad81e5 printk/docs: Add extra integer types to printk-formats) +$ git merge printk/for-next +Already up to date. +Merging pci/next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (53be96ab821a Merge branch 'for-5.1/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 1 + + drivers/hid/hid-core.c | 6 +- + drivers/hid/hid-debug.c | 5 + + drivers/hid/hid-logitech-hidpp.c | 13 ++- + drivers/hid/hid-quirks.c | 6 +- + drivers/hid/hid-steam.c | 26 +++-- + drivers/hid/hid-uclogic-params.c | 4 - + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 168 +++++++++++++++------------ + drivers/hid/intel-ish-hid/ishtp-hid.c | 49 +++++++- + drivers/hid/intel-ish-hid/ishtp-hid.h | 14 ++- + drivers/hid/intel-ish-hid/ishtp/bus.c | 96 ++++++++++++++- + drivers/hid/intel-ish-hid/ishtp/bus.h | 37 +----- + drivers/hid/intel-ish-hid/ishtp/client.c | 60 ++++++++-- + drivers/hid/intel-ish-hid/ishtp/client.h | 24 ---- + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 31 ----- + include/linux/intel-ish-client-if.h | 112 ++++++++++++++++++ + 16 files changed, 440 insertions(+), 212 deletions(-) + create mode 100644 include/linux/intel-ish-client-if.h +Merging i2c/i2c/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge i2c/i2c/for-next +Already up to date. +Merging i3c/i3c/next (988bb4a1937b i3c: master: dw-i3c-master: mark expected switch fall-through) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (ab69001fa2bd hwmon: (ntc_thermistor) Use new HWMON_CHANNEL_INFO() macro) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/mlxreg-fan.c | 73 +++++++++++++++++++++++++++++++++++++++--- + drivers/hwmon/ntc_thermistor.c | 24 ++------------ + include/linux/hwmon.h | 8 +++++ + 3 files changed, 78 insertions(+), 27 deletions(-) +Merging jc_docs/docs-next (9834857754ff doc:it_IT: translations for documents in process/) +$ git merge jc_docs/docs-next +Removing Documentation/translations/zh_CN/magic-number.txt +Merge made by the 'recursive' strategy. + .mailmap | 6 + + Documentation/process/deprecated.rst | 2 + + Documentation/translations/index.rst | 42 ++ + .../translations/it_IT/disclaimer-ita.rst | 13 +- + Documentation/translations/it_IT/index.rst | 65 +-- + .../translations/it_IT/networking/netdev-FAQ.rst | 13 + + .../translations/it_IT/process/deprecated.rst | 129 ++++++ + .../it_IT/process/kernel-enforcement-statement.rst | 168 +++++++- + .../translations/it_IT/process/license-rules.rst | 452 +++++++++++++++++++++ + .../it_IT/process/stable-kernel-rules.rst | 194 ++++++++- + .../translations/zh_CN/disclaimer-zh_CN.rst | 9 + + Documentation/translations/zh_CN/index.rst | 17 +- + Documentation/translations/zh_CN/magic-number.txt | 153 ------- + Documentation/translations/zh_CN/oops-tracing.txt | 2 +- + .../zh_CN/{ => process}/coding-style.rst | 0 + .../email-clients.rst} | 53 +-- + .../zh_CN/{HOWTO => process/howto.rst} | 69 ++-- + Documentation/translations/zh_CN/process/index.rst | 53 +++ + .../translations/zh_CN/process/magic-number.rst | 151 +++++++ + .../stable-api-nonsense.rst} | 67 +-- + .../stable-kernel-rules.rst} | 32 +- + .../submitting-drivers.rst} | 34 +- + .../submitting-patches.rst} | 58 ++- + .../volatile-considered-harmful.rst} | 35 +- + Documentation/translations/zh_CN/sparse.txt | 6 +- + Documentation/userspace-api/seccomp_filter.rst | 8 +- + Documentation/x86/boot.txt | 4 + + MAINTAINERS | 1 - + 28 files changed, 1454 insertions(+), 382 deletions(-) + create mode 100644 Documentation/translations/it_IT/networking/netdev-FAQ.rst + create mode 100644 Documentation/translations/it_IT/process/deprecated.rst + create mode 100644 Documentation/translations/it_IT/process/license-rules.rst + create mode 100644 Documentation/translations/zh_CN/disclaimer-zh_CN.rst + delete mode 100644 Documentation/translations/zh_CN/magic-number.txt + rename Documentation/translations/zh_CN/{ => process}/coding-style.rst (100%) + rename Documentation/translations/zh_CN/{email-clients.txt => process/email-clients.rst} (82%) + rename Documentation/translations/zh_CN/{HOWTO => process/howto.rst} (95%) + create mode 100644 Documentation/translations/zh_CN/process/index.rst + create mode 100644 Documentation/translations/zh_CN/process/magic-number.rst + rename Documentation/translations/zh_CN/{stable_api_nonsense.txt => process/stable-api-nonsense.rst} (80%) + rename Documentation/translations/zh_CN/{stable_kernel_rules.txt => process/stable-kernel-rules.rst} (76%) + rename Documentation/translations/zh_CN/{SubmittingDrivers => process/submitting-drivers.rst} (86%) + rename Documentation/translations/zh_CN/{SubmittingPatches => process/submitting-patches.rst} (92%) + rename Documentation/translations/zh_CN/{volatile-considered-harmful.txt => process/volatile-considered-harmful.rst} (81%) +Merging v4l-dvb/master (8a3946cad244 media: v4l2-fwnode: Add a deprecation note in the old ACPI parsing example) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/media/cedrus.txt | 1 + + .../devicetree/bindings/media/rcar_vin.txt | 1 + + .../bindings/media/renesas,rcar-csi2.txt | 1 + + drivers/media/cec/cec-core.c | 1 + + drivers/media/common/videobuf2/videobuf2-core.c | 15 +-- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 1 - + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 10 +- + drivers/media/dvb-frontends/m88ds3103.c | 9 +- + drivers/media/dvb-frontends/si2165.c | 8 +- + drivers/media/i2c/Kconfig | 77 +++++++-------- + drivers/media/i2c/ov7670.c | 32 ++++++- + drivers/media/media-devnode.c | 1 + + drivers/media/media-entity.c | 33 +------ + drivers/media/pci/cobalt/cobalt-irq.c | 2 +- + drivers/media/pci/cx18/cx18-fileops.c | 2 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 5 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 1 + + drivers/media/pci/ivtv/ivtv-fileops.c | 2 +- + drivers/media/pci/saa7146/hexium_gemini.c | 5 +- + drivers/media/pci/saa7146/hexium_orion.c | 5 +- + drivers/media/platform/atmel/atmel-isc-regs.h | 2 + + drivers/media/platform/atmel/atmel-isc.c | 7 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 +- + drivers/media/platform/pxa_camera.c | 2 +- + drivers/media/platform/rcar-vin/rcar-core.c | 47 +++++++--- + drivers/media/platform/rcar-vin/rcar-csi2.c | 4 + + drivers/media/platform/rcar_drif.c | 8 +- + drivers/media/platform/sh_veu.c | 6 -- + drivers/media/platform/stm32/stm32-dcmi.c | 23 ++++- + drivers/media/platform/ti-vpe/cal.c | 12 +-- + drivers/media/platform/vicodec/codec-fwht.c | 29 +++--- + drivers/media/platform/vicodec/vicodec-core.c | 8 +- + drivers/media/platform/vim2m.c | 35 ++++--- + drivers/media/platform/vimc/vimc-capture.c | 17 +++- + drivers/media/platform/vimc/vimc-common.c | 4 +- + drivers/media/platform/vimc/vimc-common.h | 2 + + drivers/media/platform/vimc/vimc-core.c | 2 + + drivers/media/platform/vimc/vimc-debayer.c | 17 +++- + drivers/media/platform/vimc/vimc-scaler.c | 15 ++- + drivers/media/platform/vimc/vimc-sensor.c | 19 +++- + drivers/media/platform/vimc/vimc-streamer.c | 38 ++++---- + drivers/media/platform/vimc/vimc-streamer.h | 16 +++- + drivers/media/platform/vivid/vivid-vid-out.c | 14 ++- + drivers/media/radio/wl128x/fmdrv_common.c | 5 +- + drivers/media/rc/ir-rcmm-decoder.c | 1 - + drivers/media/rc/serial_ir.c | 9 +- + drivers/media/usb/au0828/au0828-video.c | 4 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 3 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 104 +++++++++++---------- + drivers/media/usb/dvb-usb-v2/af9035.h | 12 +++ + drivers/media/usb/dvb-usb-v2/dvbsky.c | 18 ++-- + drivers/media/usb/em28xx/em28xx-input.c | 2 +- + drivers/media/usb/go7007/go7007-fw.c | 4 +- + drivers/media/usb/gspca/gspca.c | 8 +- + drivers/media/v4l2-core/v4l2-device.c | 19 +++- + drivers/media/v4l2-core/v4l2-fwnode.c | 17 +++- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + drivers/media/v4l2-core/v4l2-subdev.c | 22 ++--- + drivers/staging/media/davinci_vpfe/Kconfig | 2 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 2 +- + drivers/staging/media/imx/imx-ic-common.c | 2 +- + drivers/staging/media/imx/imx-media-csi.c | 18 +++- + drivers/staging/media/imx/imx-media-dev.c | 11 +-- + drivers/staging/media/imx/imx-media-internal-sd.c | 32 ++----- + drivers/staging/media/imx/imx-media-of.c | 73 ++++++++++----- + drivers/staging/media/imx/imx-media-vdic.c | 10 +- + drivers/staging/media/imx/imx-media.h | 7 +- + drivers/staging/media/imx/imx7-media-csi.c | 6 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 4 +- + drivers/staging/media/ipu3/ipu3-css.c | 35 ++++--- + drivers/staging/media/ipu3/ipu3-v4l2.c | 40 +++++--- + drivers/staging/media/ipu3/ipu3.c | 2 +- + .../staging/media/rockchip/vpu/rockchip_vpu_drv.c | 1 - + drivers/staging/media/sunxi/cedrus/cedrus.c | 9 ++ + drivers/staging/media/sunxi/cedrus/cedrus.h | 3 + + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 3 +- + drivers/staging/media/zoran/videocodec.c | 2 +- + include/media/dvb-usb-ids.h | 1 + + include/media/media-entity.h | 24 ----- + include/media/v4l2-subdev.h | 15 ++- + include/media/videobuf2-core.h | 21 ++--- + 81 files changed, 642 insertions(+), 454 deletions(-) +Merging v4l-dvb-next/master (81527254e151 media: seco: depend on CONFIG_RC_CORE=y when not a module) +$ git merge v4l-dvb-next/master +Merge made by the 'recursive' strategy. + drivers/media/platform/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fbdev/fbdev-for-next (9a9f1d1a81a9 fbdev: mbx: fix a misspelled variable name) +$ git merge fbdev/fbdev-for-next +Already up to date. +Merging pm/linux-next (2c9e385d1d4c Merge branches 'pm-domains' and 'pm-tools' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/utils.c | 1 + + drivers/base/power/domain.c | 13 ++++++------- + drivers/base/swnode.c | 4 ++-- + tools/power/x86/turbostat/turbostat.c | 3 +++ + 4 files changed, 12 insertions(+), 9 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (0334906c0696 cpufreq: kryo: Release OPP tables on module removal) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (ae2917093fb6 tools/power/cpupower: Display boost frequency separately) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (a9a744dd5b82 cpufreq: OMAP: Register an Energy Model) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (2d7c4e17811f Merge branches 'fixes' and 'thermal-intel' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/broadcom/bcm2835_thermal.c | 9 ++++----- + drivers/thermal/cpu_cooling.c | 3 +-- + .../thermal/intel/int340x_thermal/int3400_thermal.c | 21 +++++++++++++++++---- + drivers/thermal/intel/intel_powerclamp.c | 4 ++-- + drivers/thermal/mtk_thermal.c | 7 +++++-- + drivers/thermal/samsung/exynos_tmu.c | 2 +- + 6 files changed, 30 insertions(+), 16 deletions(-) +Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/core-device.c | 2 +- + drivers/firewire/core-iso.c | 2 +- + drivers/firewire/core-topology.c | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging dlm/next (8526e331c56f dlm: Fix test for -ERESTARTSYS) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/lockspace.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging swiotlb/linux-next (22cb45d7692a swiotlb: drop pointless static qualifier in swiotlb_create_debugfs()) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (1d965c4def07 Merge branch 'Refactor-flower-classifier-to-remove-dependency-on-rtnl-lock') +$ git merge net-next/master +Auto-merging net/packet/af_packet.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv6/route.c +Auto-merging drivers/net/ethernet/cadence/macb_main.c +Merge made by the 'recursive' strategy. + .clang-format | 8 +- + Documentation/networking/ip-sysctl.txt | 15 + + drivers/infiniband/hw/hfi1/vnic_main.c | 3 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 6 +- + drivers/isdn/i4l/isdn_ppp.c | 9 +- + drivers/net/bonding/bond_main.c | 3 +- + drivers/net/dsa/bcm_sf2.c | 9 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 13 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 3 +- + drivers/net/ethernet/cadence/macb_main.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 5 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 2 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- + drivers/net/ethernet/ibm/ibmveth.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 93 ++- + drivers/net/ethernet/ibm/ibmvnic.h | 18 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 4 +- + drivers/net/ethernet/intel/ice/ice.h | 16 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 5 +- + drivers/net/ethernet/intel/ice/ice_common.c | 24 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 10 + + drivers/net/ethernet/intel/ice/ice_lib.c | 72 +- + drivers/net/ethernet/intel/ice/ice_main.c | 71 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 10 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 1 + + drivers/net/ethernet/intel/ice/ice_type.h | 1 + + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 100 ++- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +- + drivers/net/ethernet/intel/igb/igb_main.c | 5 +- + drivers/net/ethernet/intel/igc/igc.h | 68 +- + drivers/net/ethernet/intel/igc/igc_base.h | 4 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 17 + + drivers/net/ethernet/intel/igc/igc_ethtool.c | 839 ++++++++++++++++++++- + drivers/net/ethernet/intel/igc/igc_main.c | 447 ++++++++++- + drivers/net/ethernet/intel/igc/igc_regs.h | 16 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 5 +- + drivers/net/ethernet/microchip/enc28j60.c | 541 +++++++------ + .../net/ethernet/netronome/nfp/nfp_net_common.c | 3 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 3 - + drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 6 +- + drivers/net/ethernet/qlogic/qede/qede.h | 3 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 24 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 5 +- + drivers/net/ethernet/renesas/ravb_main.c | 3 +- + drivers/net/ethernet/sun/ldmvsw.c | 3 +- + drivers/net/ethernet/sun/sunvnet.c | 3 +- + drivers/net/hyperv/netvsc_drv.c | 10 +- + drivers/net/macvlan.c | 48 ++ + drivers/net/net_failover.c | 8 +- + drivers/net/phy/Kconfig | 5 +- + drivers/net/phy/aquantia_main.c | 63 +- + drivers/net/phy/at803x.c | 26 +- + drivers/net/phy/bcm-cygnus.c | 147 +++- + drivers/net/phy/bcm-phy-lib.c | 52 ++ + drivers/net/phy/bcm-phy-lib.h | 20 + + drivers/net/phy/bcm7xxx.c | 76 +- + drivers/net/phy/mdio-bcm-unimac.c | 2 +- + drivers/net/phy/phy.c | 8 +- + drivers/net/phy/rockchip.c | 31 +- + drivers/net/team/team.c | 3 +- + drivers/net/tun.c | 18 +- + drivers/net/virtio_net.c | 8 +- + drivers/net/wireless/marvell/mwifiex/main.c | 3 +- + drivers/net/xen-netback/interface.c | 6 +- + drivers/net/xen-netfront.c | 3 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 3 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 3 +- + include/linux/netdevice.h | 20 +- + include/linux/rhashtable.h | 53 +- + include/net/dst.h | 11 - + include/net/ip.h | 4 + + include/net/ip6_fib.h | 3 +- + include/net/netns/ipv6.h | 2 + + include/net/request_sock.h | 10 +- + include/net/tls.h | 15 +- + include/uapi/linux/if_tun.h | 1 + + include/uapi/linux/tipc_netlink.h | 2 + + include/uapi/linux/tls.h | 15 + + lib/rhashtable.c | 54 +- + net/bridge/br_multicast.c | 2 +- + net/core/datagram.c | 8 +- + net/core/dev.c | 26 +- + net/core/dst.c | 17 - + net/core/netpoll.c | 2 +- + net/ipv4/fib_trie.c | 14 +- + net/ipv4/route.c | 2 +- + net/ipv4/syncookies.c | 17 +- + net/ipv4/sysctl_net_ipv4.c | 9 + + net/ipv4/tcp_input.c | 5 +- + net/ipv6/af_inet6.c | 2 + + net/ipv6/icmp.c | 28 +- + net/ipv6/route.c | 63 +- + net/ipv6/tcp_ipv6.c | 44 +- + net/mac80211/iface.c | 6 +- + net/packet/af_packet.c | 16 +- + net/sched/cls_flower.c | 433 ++++++++--- + net/tipc/bcast.c | 272 ++++++- + net/tipc/bcast.h | 12 + + net/tipc/core.c | 2 + + net/tipc/core.h | 3 + + net/tipc/link.c | 8 + + net/tipc/msg.h | 10 + + net/tipc/netlink.c | 4 +- + net/tipc/node.c | 18 + + net/tipc/node.h | 6 +- + net/tipc/socket.c | 6 + + net/tls/tls_main.c | 31 +- + net/tls/tls_sw.c | 73 +- + net/xfrm/xfrm_device.c | 2 +- + 122 files changed, 3372 insertions(+), 1063 deletions(-) +Merging bpf-next/master (48e5d98a0eb1 selftests/bpf: Add arm target register definitions) +$ git merge bpf-next/master +Merge made by the 'recursive' strategy. + tools/testing/selftests/bpf/bpf_helpers.h | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) +Merging ipsec-next/master (590ce401c207 dt-bindings: net: dsa: ksz9477: fix indentation for switch spi bindings) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (37b6bb77c6fd net/mlx5: Factor out HCA capabilities functions) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (8c4238df4d0c Merge branch 'mlxsw-minimal-Add-ethtool-and-resource-query-support') +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging drivers/nfc/fdp/i2c.c +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 5 +++-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 6 ++++-- + 6 files changed, 29 insertions(+), 53 deletions(-) +Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (501faf710230 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (bbcece3d418c Bluetooth: mediatek: Fixed incorrect type in assignment) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/Kconfig | 11 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/btmtksdio.c | 956 ++++++++++++++++++++++++++++++++++++++++++ + drivers/bluetooth/btmtkuart.c | 2 +- + drivers/bluetooth/btqca.h | 2 +- + drivers/bluetooth/btsdio.c | 15 +- + drivers/bluetooth/hci_qca.c | 45 +- + include/linux/mmc/sdio_func.h | 12 + + include/linux/mmc/sdio_ids.h | 2 + + net/bluetooth/l2cap_core.c | 9 +- + net/bluetooth/l2cap_sock.c | 7 +- + 11 files changed, 1020 insertions(+), 42 deletions(-) + create mode 100644 drivers/bluetooth/btmtksdio.c +Merging mac80211-next/master (be9cefe796f3 selftests: rtnetlink: use internal netns switch for ip commands) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (d86dbd82b9a0 gfs2: Fix loop in gfs2_rbm_find (v2)) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/rgrp.c | 54 +++++++++++++++++++++++++----------------------------- + 1 file changed, 25 insertions(+), 29 deletions(-) +Merging mtd/mtd/next (9220d7befc9c Merge tag 'nand/for-5.1' of git://git.infradead.org/linux-mtd into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (7cbae399bde1 spi-nor: s25fl512s supports region locking) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/intel-spi.c | 8 ++++++++ + drivers/mtd/spi-nor/spi-nor.c | 10 ++++++---- + 2 files changed, 14 insertions(+), 4 deletions(-) +Merging crypto/master (0918f18c7179 crypto: s5p - add AES support for Exynos5433) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (463fabd56188 drm/amd/display: Only allow VRR when vrefresh is within supported range) +$ git merge amdgpu/drm-next +Removing drivers/gpu/drm/amd/lib/chash.c +Removing drivers/gpu/drm/amd/lib/Makefile +Removing drivers/gpu/drm/amd/lib/Kconfig +Removing drivers/gpu/drm/amd/include/linux/chash.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.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/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 09b0e84edbf8] Merge remote-tracking branch 'amdgpu/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 2 - + drivers/gpu/drm/Makefile | 1 - + drivers/gpu/drm/amd/amdgpu/Kconfig | 7 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 129 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 138 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 9 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 82 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 59 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 34 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 185 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 505 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 226 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 32 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1481 ++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 235 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 268 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 875 ++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 116 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 248 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 109 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 145 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 19 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 199 ++ + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 63 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 644 +++--- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 93 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 36 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 212 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 14 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 108 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 80 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 16 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 4 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 658 +++--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 155 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 21 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 119 +- + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 5 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 47 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 49 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 247 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 109 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 97 + + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 13 + + drivers/gpu/drm/amd/display/dc/dc.h | 47 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 76 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 8 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 146 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 5 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 22 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 8 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 2 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 8 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 58 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 20 + + .../drm/amd/display/dc/dce112/dce112_resource.c | 8 + + .../drm/amd/display/dc/dce120/dce120_resource.c | 8 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 17 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 19 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 7 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 7 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 20 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 3 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 89 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 4 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 28 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 28 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 2 + + drivers/gpu/drm/amd/display/dc/dm_services.h | 36 +- + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 40 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 5 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 5 +- + .../amd/display/dc/dml/display_rq_dlg_helpers.c | 3 + + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 14 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 6 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 + + drivers/gpu/drm/amd/display/include/fixed31_32.h | 2 + + drivers/gpu/drm/amd/display/include/signal_types.h | 5 + + .../drm/amd/display/modules/color/color_gamma.c | 2 + + .../drm/amd/display/modules/freesync/freesync.c | 168 +- + .../drm/amd/display/modules/power/power_helpers.c | 15 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 + + .../drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h | 2 + + .../drm/amd/include/asic_reg/vcn/vcn_1_0_sh_mask.h | 5 + + drivers/gpu/drm/amd/include/atomfirmware.h | 97 +- + drivers/gpu/drm/amd/include/linux/chash.h | 366 --- + drivers/gpu/drm/amd/lib/Kconfig | 28 - + drivers/gpu/drm/amd/lib/Makefile | 32 - + drivers/gpu/drm/amd/lib/chash.c | 638 ------ + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 10 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 1250 ++++++++++ + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 3 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 13 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.c | 66 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.h | 31 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 39 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.h | 5 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c | 119 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 5 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_inc.h | 2 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 12 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.h | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 11 +- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 769 +++++++ + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 89 + + .../gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h | 128 ++ + .../gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h | 147 ++ + drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h | 3 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 2026 ++++++++++++++++ + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 4 + + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 20 + + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h | 1 + + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 2413 ++++++++++++++++++++ + drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 129 ++ + drivers/gpu/drm/ast/ast_drv.h | 2 - + drivers/gpu/drm/ast/ast_ttm.c | 10 +- + drivers/gpu/drm/bochs/bochs.h | 2 - + drivers/gpu/drm/bochs/bochs_mm.c | 10 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 1 - + drivers/gpu/drm/cirrus/cirrus_ttm.c | 10 +- + drivers/gpu/drm/drm_gem.c | 17 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 12 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - + drivers/gpu/drm/mgag200/mgag200_ttm.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 - + drivers/gpu/drm/nouveau/nouveau_ttm.c | 4 - + drivers/gpu/drm/qxl/qxl_drv.h | 3 - + drivers/gpu/drm/qxl/qxl_ttm.c | 11 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 17 +- + drivers/gpu/drm/ttm/ttm_bo.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 + + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 2 - + drivers/gpu/drm/ttm/ttm_memory.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 11 +- + drivers/staging/vboxvideo/vbox_drv.h | 2 - + drivers/staging/vboxvideo/vbox_ttm.c | 12 +- + include/drm/drm_vma_manager.h | 12 + + include/drm/ttm/ttm_bo_driver.h | 2 +- + include/uapi/drm/amdgpu_drm.h | 35 + + include/uapi/linux/kfd_ioctl.h | 12 +- + 208 files changed, 14454 insertions(+), 3836 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_ras_if.h + delete mode 100644 drivers/gpu/drm/amd/include/linux/chash.h + delete mode 100644 drivers/gpu/drm/amd/lib/Kconfig + delete mode 100644 drivers/gpu/drm/amd/lib/Makefile + delete mode 100644 drivers/gpu/drm/amd/lib/chash.c + create mode 100644 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smu_v11_0.c + create mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.c + create mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.h +Merging drm-intel/for-linux-next (754a25442705 drm/i915: Skip object locking around a no-op set-domain ioctl) +$ git merge drm-intel/for-linux-next +Auto-merging include/sound/hdaudio.h +Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_scheduler.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_active.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/mmio_context.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/mmio_context.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Recorded preimage for 'drivers/gpu/drm/i915/gvt/mmio_context.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/gvt/mmio_context.c'. +[master 30ef6a67ad54] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_fourcc.c | 10 + + drivers/gpu/drm/i915/Makefile | 11 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 44 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- + drivers/gpu/drm/i915/gvt/execlist.c | 17 +- + drivers/gpu/drm/i915/gvt/handlers.c | 26 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 2 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 241 ++-- + drivers/gpu/drm/i915/gvt/scheduler.c | 31 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 2 +- + drivers/gpu/drm/i915/i915_active.c | 23 +- + drivers/gpu/drm/i915/i915_active.h | 16 - + drivers/gpu/drm/i915/i915_cmd_parser.c | 12 +- + drivers/gpu/drm/i915/i915_debugfs.c | 143 +-- + drivers/gpu/drm/i915/i915_drv.c | 545 +++++---- + drivers/gpu/drm/i915/i915_drv.h | 165 ++- + drivers/gpu/drm/i915/i915_gem.c | 713 ++++------- + drivers/gpu/drm/i915/i915_gem.h | 9 +- + drivers/gpu/drm/i915/i915_gem_context.c | 436 ++++--- + drivers/gpu/drm/i915/i915_gem_context.h | 255 +--- + drivers/gpu/drm/i915/i915_gem_context_types.h | 173 +++ + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 3 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 18 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 42 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 156 +-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 111 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 18 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 2 +- + drivers/gpu/drm/i915/i915_gem_object.c | 42 + + drivers/gpu/drm/i915/i915_gem_object.h | 4 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 4 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 6 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/i915/i915_globals.c | 135 +++ + drivers/gpu/drm/i915/i915_globals.h | 35 + + drivers/gpu/drm/i915/i915_gpu_error.c | 112 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 49 +- + drivers/gpu/drm/i915/i915_irq.c | 175 +-- + drivers/gpu/drm/i915/i915_pci.c | 219 ++-- + drivers/gpu/drm/i915/i915_perf.c | 102 +- + drivers/gpu/drm/i915/i915_pmu.c | 67 +- + drivers/gpu/drm/i915/i915_pvinfo.h | 2 +- + drivers/gpu/drm/i915/i915_query.c | 39 +- + drivers/gpu/drm/i915/i915_reg.h | 475 +++++--- + drivers/gpu/drm/i915/i915_request.c | 353 ++++-- + drivers/gpu/drm/i915/i915_request.h | 71 +- + drivers/gpu/drm/i915/i915_reset.c | 388 +++--- + drivers/gpu/drm/i915/i915_reset.h | 6 + + drivers/gpu/drm/i915/i915_scheduler.c | 90 +- + drivers/gpu/drm/i915/i915_scheduler.h | 43 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 4 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 3 + + drivers/gpu/drm/i915/i915_timeline.c | 299 ++++- + drivers/gpu/drm/i915/i915_timeline.h | 75 +- + drivers/gpu/drm/i915/i915_timeline_types.h | 79 ++ + drivers/gpu/drm/i915/i915_trace.h | 106 +- + drivers/gpu/drm/i915/i915_vgpu.c | 11 +- + drivers/gpu/drm/i915/i915_vgpu.h | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 51 +- + drivers/gpu/drm/i915/i915_vma.h | 3 + + drivers/gpu/drm/i915/icl_dsi.c | 8 +- + drivers/gpu/drm/i915/intel_atomic.c | 3 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 56 +- + drivers/gpu/drm/i915/intel_audio.c | 23 +- + drivers/gpu/drm/i915/intel_bios.c | 29 +- + drivers/gpu/drm/i915/intel_cdclk.c | 63 +- + drivers/gpu/drm/i915/intel_color.c | 591 +++++++--- + drivers/gpu/drm/i915/intel_connector.c | 2 + + drivers/gpu/drm/i915/intel_context.c | 269 +++++ + drivers/gpu/drm/i915/intel_context.h | 87 ++ + drivers/gpu/drm/i915/intel_context_types.h | 73 ++ + drivers/gpu/drm/i915/intel_ddi.c | 133 ++- + drivers/gpu/drm/i915/intel_device_info.c | 10 +- + drivers/gpu/drm/i915/intel_device_info.h | 13 +- + drivers/gpu/drm/i915/intel_display.c | 570 ++++++--- + drivers/gpu/drm/i915/intel_dp.c | 447 ++++++- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 735 ++++++------ + drivers/gpu/drm/i915/intel_dpll_mgr.h | 5 +- + drivers/gpu/drm/i915/intel_drv.h | 163 ++- + drivers/gpu/drm/i915/intel_dsi_vbt.c | 6 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 299 +++-- + drivers/gpu/drm/i915/intel_engine_types.h | 525 +++++++++ + drivers/gpu/drm/i915/intel_gpu_commands.h | 9 +- + drivers/gpu/drm/i915/intel_guc.c | 20 +- + drivers/gpu/drm/i915/intel_guc.h | 1 + + drivers/gpu/drm/i915/intel_guc_ads.c | 3 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 94 +- + drivers/gpu/drm/i915/intel_guc_ct.h | 3 + + drivers/gpu/drm/i915/intel_guc_fw.c | 4 +- + drivers/gpu/drm/i915/intel_guc_log.c | 5 + + drivers/gpu/drm/i915/intel_guc_submission.c | 22 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 18 +- + drivers/gpu/drm/i915/intel_hdcp.c | 1242 ++++++++++++++++++-- + drivers/gpu/drm/i915/intel_hdmi.c | 770 ++++++++++-- + drivers/gpu/drm/i915/intel_huc_fw.c | 4 +- + drivers/gpu/drm/i915/intel_lrc.c | 484 ++++---- + drivers/gpu/drm/i915/intel_lspcon.c | 13 +- + drivers/gpu/drm/i915/intel_lvds.c | 57 +- + drivers/gpu/drm/i915/intel_mocs.c | 14 +- + drivers/gpu/drm/i915/intel_overlay.c | 2 +- + drivers/gpu/drm/i915/intel_panel.c | 5 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 228 ++-- + drivers/gpu/drm/i915/intel_pm.c | 435 ++++--- + drivers/gpu/drm/i915/intel_psr.c | 295 +++-- + drivers/gpu/drm/i915/intel_ringbuffer.c | 251 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 598 +--------- + drivers/gpu/drm/i915/intel_runtime_pm.c | 57 +- + drivers/gpu/drm/i915/intel_sdvo.c | 156 ++- + drivers/gpu/drm/i915/intel_sprite.c | 210 +++- + drivers/gpu/drm/i915/intel_uc.c | 23 +- + drivers/gpu/drm/i915/intel_uc.h | 1 + + drivers/gpu/drm/i915/intel_uncore.c | 811 +++++++------ + drivers/gpu/drm/i915/intel_uncore.h | 56 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 3 + + drivers/gpu/drm/i915/intel_workarounds.c | 117 +- + drivers/gpu/drm/i915/intel_workarounds.h | 13 +- + drivers/gpu/drm/i915/intel_workarounds_types.h | 27 + + drivers/gpu/drm/i915/selftests/huge_gem_object.c | 2 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 24 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 9 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 229 ++-- + drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 1 + + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 20 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 37 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 9 +- + drivers/gpu/drm/i915/selftests/i915_timeline.c | 117 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 16 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 4 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 9 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 4 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 298 ++++- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 192 ++- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 146 ++- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 418 ++++++- + drivers/gpu/drm/i915/selftests/mock_context.c | 26 +- + drivers/gpu/drm/i915/selftests/mock_engine.c | 145 ++- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 54 +- + drivers/gpu/drm/i915/selftests/mock_request.c | 12 +- + drivers/gpu/drm/i915/selftests/mock_request.h | 7 - + drivers/gpu/drm/i915/selftests/mock_timeline.c | 1 + + drivers/gpu/drm/i915/selftests/mock_uncore.c | 6 +- + drivers/gpu/drm/i915/selftests/mock_uncore.h | 2 +- + .../drm/i915/test_i915_active_types_standalone.c | 7 + + .../i915/test_i915_gem_context_types_standalone.c | 7 + + .../drm/i915/test_i915_timeline_types_standalone.c | 7 + + .../drm/i915/test_intel_context_types_standalone.c | 7 + + .../drm/i915/test_intel_engine_types_standalone.c | 7 + + .../i915/test_intel_workarounds_types_standalone.c | 7 + + include/drm/drm_audio_component.h | 7 +- + include/drm/drm_hdcp.h | 7 +- + include/drm/i915_pciids.h | 31 +- + include/sound/hdaudio.h | 2 +- + include/uapi/drm/drm_fourcc.h | 27 + + include/uapi/drm/i915_drm.h | 63 +- + sound/hda/hdac_component.c | 18 +- + 161 files changed, 12201 insertions(+), 6249 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_gem_context_types.h + create mode 100644 drivers/gpu/drm/i915/i915_globals.c + create mode 100644 drivers/gpu/drm/i915/i915_globals.h + create mode 100644 drivers/gpu/drm/i915/i915_timeline_types.h + create mode 100644 drivers/gpu/drm/i915/intel_context.c + create mode 100644 drivers/gpu/drm/i915/intel_context.h + create mode 100644 drivers/gpu/drm/i915/intel_context_types.h + create mode 100644 drivers/gpu/drm/i915/intel_engine_types.h + create mode 100644 drivers/gpu/drm/i915/intel_workarounds_types.h + create mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c + create mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c + create mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c + create mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c + create mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c + create mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c +Merging drm-tegra/drm/tegra/for-next (ca52507efc03 drm/tegra: vic: Fix implicit function declaration warning) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/hub.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/hub.c | 4 +++- + drivers/gpu/drm/tegra/vic.c | 2 ++ + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging drm-misc/for-linux-next (ff01e6971ecd drm/fourcc: Fix conflicting Y41x definitions) +$ git merge drm-misc/for-linux-next +Removing include/drm/tinydrm/tinydrm.h +Removing drivers/staging/vboxvideo/TODO +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/gpu/drm/vboxvideo/vbox_drv.h +Removing drivers/gpu/drm/tinydrm/core/tinydrm-core.c +Removing drivers/gpu/drm/meson/meson_canvas.h +Removing drivers/gpu/drm/meson/meson_canvas.c +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_connector.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.h +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/Makefile +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-model/devres.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Resolved 'drivers/gpu/drm/i915/intel_hdmi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 18b9755baa4c] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/amlogic,meson-vpu.txt | 5 +- + .../bindings/display/panel/ronbo,rb070d30.yaml | 51 ++ + .../devicetree/bindings/gpu/brcm,bcm-v3d.txt | 11 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/driver-api/component.rst | 2 + + Documentation/driver-model/devres.txt | 3 + + Documentation/gpu/drm-internals.rst | 5 + + Documentation/gpu/drm-kms-helpers.rst | 12 + + Documentation/gpu/tinydrm.rst | 30 +- + Documentation/gpu/todo.rst | 12 +- + MAINTAINERS | 7 + + drivers/dma-buf/reservation.c | 8 + + drivers/gpu/drm/Kconfig | 8 + + drivers/gpu/drm/Makefile | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- + drivers/gpu/drm/arm/malidp_drv.c | 48 +- + drivers/gpu/drm/arm/malidp_drv.h | 6 + + drivers/gpu/drm/arm/malidp_hw.c | 249 +++++++- + drivers/gpu/drm/arm/malidp_hw.h | 31 +- + drivers/gpu/drm/arm/malidp_mw.c | 7 +- + drivers/gpu/drm/arm/malidp_planes.c | 271 ++++++++- + drivers/gpu/drm/arm/malidp_regs.h | 20 + + drivers/gpu/drm/bochs/bochs_kms.c | 11 - + drivers/gpu/drm/drm_atomic_helper.c | 4 +- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_connector.c | 91 ++- + drivers/gpu/drm/drm_dp_mst_topology.c | 1 - + drivers/gpu/drm/drm_drv.c | 206 ++++++- + drivers/gpu/drm/drm_dsc.c | 269 +++++++-- + drivers/gpu/drm/drm_edid.c | 76 +++ + drivers/gpu/drm/drm_fb_helper.c | 6 +- + drivers/gpu/drm/drm_file.c | 7 +- + drivers/gpu/drm/drm_fourcc.c | 23 +- + drivers/gpu/drm/drm_gem.c | 121 ++++ + drivers/gpu/drm/drm_gem_shmem_helper.c | 625 +++++++++++++++++++++ + drivers/gpu/drm/drm_kms_helper_common.c | 2 +- + drivers/gpu/drm/drm_memory.c | 19 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 13 + + drivers/gpu/drm/drm_prime.c | 1 + + drivers/gpu/drm/drm_syncobj.c | 3 +- + drivers/gpu/drm/drm_vm.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 - + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 16 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 4 - + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 - + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 22 +- + drivers/gpu/drm/i915/intel_atomic.c | 1 + + drivers/gpu/drm/i915/intel_connector.c | 8 + + drivers/gpu/drm/i915/intel_display.c | 18 +- + drivers/gpu/drm/i915/intel_drv.h | 1 + + drivers/gpu/drm/i915/intel_hdmi.c | 13 + + drivers/gpu/drm/i915/intel_sprite.c | 30 +- + drivers/gpu/drm/i915/intel_vdsc.c | 133 +---- + drivers/gpu/drm/imx/imx-drm-core.c | 2 +- + drivers/gpu/drm/meson/Makefile | 2 +- + drivers/gpu/drm/meson/meson_canvas.c | 73 --- + drivers/gpu/drm/meson/meson_canvas.h | 51 -- + drivers/gpu/drm/meson/meson_crtc.c | 84 +-- + drivers/gpu/drm/meson/meson_drv.c | 68 +-- + drivers/gpu/drm/meson/meson_drv.h | 1 - + drivers/gpu/drm/meson/meson_overlay.c | 8 - + drivers/gpu/drm/meson/meson_plane.c | 6 +- + drivers/gpu/drm/meson/meson_viu.c | 1 - + drivers/gpu/drm/msm/msm_drv.c | 1 - + drivers/gpu/drm/msm/msm_drv.h | 1 - + drivers/gpu/drm/msm/msm_gem.c | 27 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 7 - + drivers/gpu/drm/msm/msm_gem_submit.c | 8 +- + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 258 +++++++++ + drivers/gpu/drm/qxl/qxl_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_device.c | 2 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 12 +- + drivers/gpu/drm/stm/Kconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 35 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 29 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 74 ++- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 2 - + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 179 ++++-- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 2 + + drivers/gpu/drm/sun4i/sun8i_mixer.c | 49 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 2 + + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 54 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 11 + + drivers/gpu/drm/tinydrm/core/Makefile | 2 +- + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 183 ------ + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 2 + + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 24 +- + drivers/gpu/drm/tinydrm/hx8357d.c | 59 +- + drivers/gpu/drm/tinydrm/ili9225.c | 87 ++- + drivers/gpu/drm/tinydrm/ili9341.c | 59 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 67 ++- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 178 ++++-- + drivers/gpu/drm/tinydrm/repaper.c | 144 +++-- + drivers/gpu/drm/tinydrm/st7586.c | 145 +++-- + drivers/gpu/drm/tinydrm/st7735r.c | 59 +- + drivers/gpu/drm/udl/udl_drv.c | 1 + + drivers/gpu/drm/v3d/Kconfig | 1 + + drivers/gpu/drm/v3d/v3d_bo.c | 314 +++-------- + drivers/gpu/drm/v3d/v3d_debugfs.c | 8 + + drivers/gpu/drm/v3d/v3d_drv.c | 63 +-- + drivers/gpu/drm/v3d/v3d_drv.h | 33 +- + drivers/gpu/drm/v3d/v3d_gem.c | 104 +--- + drivers/gpu/drm/v3d/v3d_irq.c | 58 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 11 +- + drivers/gpu/drm/v3d/v3d_regs.h | 2 + + drivers/gpu/drm/v3d/v3d_sched.c | 13 +- + drivers/{staging => gpu/drm}/vboxvideo/Kconfig | 0 + drivers/{staging => gpu/drm}/vboxvideo/Makefile | 0 + .../{staging => gpu/drm}/vboxvideo/hgsmi_base.c | 0 + .../drm}/vboxvideo/hgsmi_ch_setup.h | 0 + .../drm}/vboxvideo/hgsmi_channels.h | 0 + .../{staging => gpu/drm}/vboxvideo/hgsmi_defs.h | 0 + .../{staging => gpu/drm}/vboxvideo/modesetting.c | 0 + drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.c | 25 - + drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.h | 7 - + drivers/{staging => gpu/drm}/vboxvideo/vbox_fb.c | 0 + .../{staging => gpu/drm}/vboxvideo/vbox_hgsmi.c | 0 + drivers/{staging => gpu/drm}/vboxvideo/vbox_irq.c | 10 +- + drivers/{staging => gpu/drm}/vboxvideo/vbox_main.c | 6 +- + drivers/{staging => gpu/drm}/vboxvideo/vbox_mode.c | 21 +- + .../{staging => gpu/drm}/vboxvideo/vbox_prime.c | 0 + drivers/{staging => gpu/drm}/vboxvideo/vbox_ttm.c | 0 + drivers/{staging => gpu/drm}/vboxvideo/vboxvideo.h | 0 + .../drm}/vboxvideo/vboxvideo_guest.h | 0 + .../{staging => gpu/drm}/vboxvideo/vboxvideo_vbe.h | 0 + drivers/{staging => gpu/drm}/vboxvideo/vbva_base.c | 0 + drivers/gpu/drm/vc4/vc4_bo.c | 15 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 8 + + drivers/gpu/drm/vc4/vc4_debugfs.c | 10 + + drivers/gpu/drm/vc4/vc4_drv.c | 4 +- + drivers/gpu/drm/vc4/vc4_drv.h | 30 +- + drivers/gpu/drm/vc4/vc4_gem.c | 18 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 95 ++++ + drivers/gpu/drm/vc4/vc4_kms.c | 122 +++- + drivers/gpu/drm/vc4/vc4_plane.c | 59 +- + drivers/gpu/drm/vc4/vc4_regs.h | 51 +- + drivers/gpu/drm/vc4/vc4_txp.c | 3 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 22 +- + drivers/gpu/drm/xen/xen_drm_front.c | 1 + + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/vboxvideo/TODO | 10 - + include/drm/drm_cache.h | 2 +- + include/drm/drm_connector.h | 42 ++ + include/drm/drm_crtc.h | 2 +- + include/drm/drm_drv.h | 3 + + include/drm/drm_dsc.h | 9 +- + include/drm/drm_edid.h | 6 + + include/drm/drm_gem.h | 25 + + include/drm/drm_gem_shmem_helper.h | 159 ++++++ + include/drm/drm_modes.h | 17 + + include/drm/drm_utils.h | 4 + + include/drm/tinydrm/mipi-dbi.h | 32 +- + include/drm/tinydrm/tinydrm-helpers.h | 13 + + include/drm/tinydrm/tinydrm.h | 75 --- + include/linux/reservation.h | 3 +- + include/uapi/drm/drm_fourcc.h | 36 +- + 167 files changed, 4275 insertions(+), 1909 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/ronbo,rb070d30.yaml + create mode 100644 drivers/gpu/drm/drm_gem_shmem_helper.c + delete mode 100644 drivers/gpu/drm/meson/meson_canvas.c + delete mode 100644 drivers/gpu/drm/meson/meson_canvas.h + create mode 100644 drivers/gpu/drm/panel/panel-ronbo-rb070d30.c + delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-core.c + rename drivers/{staging => gpu/drm}/vboxvideo/Kconfig (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/Makefile (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_base.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_ch_setup.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_channels.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_defs.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/modesetting.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.c (89%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.h (97%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_fb.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_hgsmi.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_irq.c (93%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_main.c (98%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_mode.c (97%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_prime.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_ttm.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_guest.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_vbe.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbva_base.c (100%) + delete mode 100644 drivers/staging/vboxvideo/TODO + create mode 100644 include/drm/drm_gem_shmem_helper.h + delete mode 100644 include/drm/tinydrm/tinydrm.h +Merging drm-msm/msm-next (745b19d74716 drm/msm/dpu: check split role for single flush) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 69 +------- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 119 +++++++++++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 15 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 5 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 177 ++++++--------------- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 3 - + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 4 +- + drivers/gpu/drm/msm/msm_gem.c | 7 + + drivers/gpu/drm/msm/msm_gem_vma.c | 2 +- + drivers/gpu/drm/msm/msm_iommu.c | 13 +- + 11 files changed, 169 insertions(+), 247 deletions(-) +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (b4a650fb0d72 drm/komeda: Add debugfs node "register" for register dump) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/display/include/malidp_utils.h | 31 + + drivers/gpu/drm/arm/display/komeda/Makefile | 3 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 684 +++++++++++++++++++++ + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 377 +++++++++++- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h | 50 ++ + drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h | 530 ++++++++++++++++ + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 18 + + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 64 ++ + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 51 ++ + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 38 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 5 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 111 +++- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 48 +- + 13 files changed, 1980 insertions(+), 30 deletions(-) + create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_component.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h +Merging imx-drm/imx-drm/next (a0ea4ffff266 drm/imx: only send commit done event when all state has been applied) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (9e05352340d3 drm/etnaviv: potential NULL dereference) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (cc6a8d69ba62 regmap: debugfs: Jump to the next readable register) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-debugfs.c | 30 ++++++++++++++++++++++++------ + 1 file changed, 24 insertions(+), 6 deletions(-) +Merging sound/for-next (cc4f8e91c4ed ALSA: firewire-lib: use 8 byte header for IR context to get isochronous cycle) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/firewire/amdtp-stream.c | 44 +++++++++++++++------------------- + sound/firewire/motu/amdtp-motu.c | 6 +++++ + sound/firewire/motu/motu-protocol-v2.c | 43 +++++++++++++++++++++++---------- + sound/firewire/motu/motu.c | 15 ++++++++++++ + sound/firewire/motu/motu.h | 1 + + 5 files changed, 72 insertions(+), 37 deletions(-) +Merging sound-asoc/for-next (e9d5a8685259 Merge branch 'asoc-5.2' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,axi-i2s.txt | 7 +- + .../devicetree/bindings/sound/cirrus,lochnagar.txt | 39 + + Documentation/devicetree/bindings/sound/da7219.txt | 8 +- + .../devicetree/bindings/sound/mchp-i2s-mcc.txt | 43 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 7 +- + Documentation/devicetree/bindings/sound/rt5651.txt | 5 + + .../devicetree/bindings/sound/simple-amplifier.txt | 2 +- + MAINTAINERS | 2 + + include/sound/da7219.h | 8 +- + include/sound/simple_card_utils.h | 236 +++-- + sound/soc/adi/axi-i2s.c | 68 +- + sound/soc/amd/acp-da7219-max98357a.c | 2 +- + sound/soc/atmel/Kconfig | 14 + + sound/soc/atmel/Makefile | 2 + + sound/soc/atmel/mchp-i2s-mcc.c | 974 +++++++++++++++++++ + sound/soc/codecs/Kconfig | 8 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/cs47l24.c | 4 +- + sound/soc/codecs/da7219.c | 523 +++++++--- + sound/soc/codecs/da7219.h | 6 +- + sound/soc/codecs/lochnagar-sc.c | 266 +++++ + sound/soc/codecs/nau8810.c | 24 +- + sound/soc/codecs/rt5651.c | 47 +- + sound/soc/codecs/rt5651.h | 1 + + sound/soc/codecs/simple-amplifier.c | 3 +- + sound/soc/codecs/tlv320aic32x4.c | 82 +- + sound/soc/codecs/wm5102.c | 4 +- + sound/soc/codecs/wm5110.c | 4 +- + sound/soc/codecs/wm_adsp.c | 1013 +++++++++++++++----- + sound/soc/codecs/wm_adsp.h | 50 +- + sound/soc/codecs/wmfw.h | 30 + + sound/soc/generic/audio-graph-card.c | 429 ++++----- + sound/soc/generic/simple-card-utils.c | 379 ++++---- + sound/soc/generic/simple-card.c | 379 +++----- + sound/soc/intel/boards/bytcr_rt5651.c | 22 +- + sound/soc/jz4740/Kconfig | 2 +- + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 51 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 13 - + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 16 - + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 16 - + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 20 - + sound/soc/qcom/Kconfig | 2 +- + sound/soc/samsung/i2s.c | 27 +- + sound/soc/soc-topology.c | 22 +- + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/stm/stm32_i2s.c | 25 +- + sound/soc/stm/stm32_spdifrx.c | 42 +- + sound/soc/ti/Kconfig | 4 +- + sound/soc/ti/ams-delta.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 2 + + sound/soc/ti/edma-pcm.c | 5 +- + sound/soc/ti/sdma-pcm.c | 9 +- + 52 files changed, 3581 insertions(+), 1372 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/sound/mchp-i2s-mcc.txt + create mode 100644 sound/soc/atmel/mchp-i2s-mcc.c + create mode 100644 sound/soc/codecs/lochnagar-sc.c +Merging modules/modules-next (9672e2cb0fbd vmlinux.lds.h: drop unused __vermagic) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + include/asm-generic/vmlinux.lds.h | 1 - + 1 file changed, 1 deletion(-) +Merging input/next (6d3a41ab0c37 Input: edt-ft5x06 - convert to use SPDX identifier) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/touchscreen/edt-ft5x06.c | 23 ++++------------------- + 1 file changed, 4 insertions(+), 19 deletions(-) +Merging block/for-next (602d674ce90f nvme-tcp: support C2HData with SUCCESS flag) +$ git merge block/for-next +Already up to date. +Merging device-mapper/for-next (225557446856 dm integrity: limit the rate of error messages) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (15e7c91b26df Merge branch 'fixes' into next) +$ git merge mmc/next +Removing drivers/mmc/host/mmci_qcom_dml.h +Merge made by the 'recursive' strategy. + drivers/mmc/host/Kconfig | 43 ++++++++++++------------ + drivers/mmc/host/mmc_spi.c | 4 +++ + drivers/mmc/host/mmci.c | 13 +------- + drivers/mmc/host/mmci.h | 14 ++++++++ + drivers/mmc/host/mmci_qcom_dml.c | 11 +++++-- + drivers/mmc/host/mmci_qcom_dml.h | 30 ----------------- + drivers/mmc/host/mxs-mmc.c | 3 +- + drivers/mmc/host/renesas_sdhi.h | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 4 +-- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 3 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 4 +-- + drivers/mmc/host/sdhci-of-esdhc.c | 47 +++++++++++++++++++++++++++ + drivers/mmc/host/tmio_mmc.h | 4 +-- + drivers/mmc/host/tmio_mmc_core.c | 4 +-- + 14 files changed, 109 insertions(+), 77 deletions(-) + delete mode 100644 drivers/mmc/host/mmci_qcom_dml.h +Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/debug/kdb/kdb_bt.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5ac0081cc56a] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (d2d833e0bf2b mfd: mxs-lradc: Mark expected switch fall-through) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (cec2b18832e2 backlight: pwm_bl: Use gpiod_get_value_cansleep() to get initial state) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (655ab0bc462d power: reset: at91-reset: add support for sam9x60 SoC) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (c51372746475 Merge branch 'regulator-5.2' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/gpio-regulator.txt | 30 +++-- + drivers/mfd/wm831x-core.c | 2 +- + drivers/mfd/wm8400-core.c | 6 - + drivers/regulator/88pm800.c | 18 +-- + drivers/regulator/88pm8607.c | 43 ++----- + drivers/regulator/Kconfig | 1 + + drivers/regulator/ab3100.c | 24 +--- + drivers/regulator/as3711-regulator.c | 37 ++---- + drivers/regulator/as3722-regulator.c | 2 - + drivers/regulator/axp20x-regulator.c | 23 ++-- + drivers/regulator/core.c | 2 - + drivers/regulator/cpcap-regulator.c | 15 +-- + drivers/regulator/da9052-regulator.c | 35 +----- + drivers/regulator/da9055-regulator.c | 69 ++--------- + drivers/regulator/da9062-regulator.c | 127 ++++++--------------- + drivers/regulator/da9063-regulator.c | 112 ++++++------------ + drivers/regulator/da9211-regulator.c | 4 + + drivers/regulator/gpio-regulator.c | 22 +--- + drivers/regulator/lp8755.c | 15 ++- + drivers/regulator/lp87565-regulator.c | 49 ++------ + drivers/regulator/ltc3589.c | 10 +- + drivers/regulator/ltc3676.c | 10 +- + drivers/regulator/max14577-regulator.c | 55 --------- + drivers/regulator/max77650-regulator.c | 2 +- + drivers/regulator/max8925-regulator.c | 76 ++---------- + drivers/regulator/mt6323-regulator.c | 20 ++-- + drivers/regulator/mt6380-regulator.c | 8 +- + drivers/regulator/mt6397-regulator.c | 16 +-- + drivers/regulator/of_regulator.c | 5 +- + drivers/regulator/palmas-regulator.c | 12 -- + drivers/regulator/pv88060-regulator.c | 4 + + drivers/regulator/pv88080-regulator.c | 4 + + drivers/regulator/pv88090-regulator.c | 4 + + drivers/regulator/rn5t618-regulator.c | 8 +- + drivers/regulator/tps65086-regulator.c | 4 +- + drivers/regulator/tps65132-regulator.c | 29 +++-- + drivers/regulator/tps65217-regulator.c | 3 +- + drivers/regulator/wm831x-dcdc.c | 4 + + drivers/regulator/wm831x-isink.c | 47 ++------ + drivers/regulator/wm831x-ldo.c | 2 + + drivers/regulator/wm8350-regulator.c | 81 ++----------- + drivers/regulator/wm8400-regulator.c | 19 ++- + include/linux/mfd/palmas.h | 1 - + include/linux/mfd/wm831x/regulator.h | 2 +- + include/linux/mfd/wm8400-private.h | 8 -- + include/linux/regulator/consumer.h | 5 + + 46 files changed, 289 insertions(+), 786 deletions(-) +Merging security/next-testing (3963bdb87e66 Merge branch 'next-general' into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (6c07c1c74394 apparmor: fix blob compression when ns is forced on a policy load) +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/Kconfig +Merge made by the 'recursive' strategy. + security/apparmor/Kconfig | 2 + + security/apparmor/apparmorfs.c | 130 ++++++++++++++++++++++++++++-- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/lsm.c | 47 +++++++++++ + security/apparmor/policy.c | 3 +- + security/apparmor/policy_unpack.c | 112 ++++++++++++++++++++++++- + 7 files changed, 291 insertions(+), 12 deletions(-) +Merging integrity/next-integrity (e7fde070f39b evm: Use defined constant for UUID representation) +$ git merge integrity/next-integrity +Already up to date. +Merging selinux/next (e19dfdc83b60 kernfs: initialize security of newly created nodes) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + fs/kernfs/dir.c | 24 ++-- + fs/kernfs/inode.c | 166 +++++++++++------------- + fs/kernfs/kernfs-internal.h | 8 +- + fs/kernfs/symlink.c | 4 +- + include/linux/kernfs.h | 15 +++ + include/linux/lsm_hooks.h | 13 ++ + include/linux/security.h | 9 ++ + scripts/selinux/genheaders/genheaders.c | 1 - + scripts/selinux/install_policy.sh | 92 +++++++------ + scripts/selinux/mdp/Makefile | 2 +- + scripts/selinux/mdp/mdp.c | 166 ++++++++++++++++++++---- + security/security.c | 6 + + security/selinux/hooks.c | 223 +++++++++++++++++++++----------- + security/selinux/include/classmap.h | 1 + + security/selinux/include/security.h | 1 + + 15 files changed, 484 insertions(+), 247 deletions(-) +Merging tpmdd/next (5812f97c0a22 tpm: Fix the type of the return value in calc_tpm2_event_size()) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/eventlog/tpm2.c | 4 +- + include/keys/trusted.h | 2 +- + security/keys/trusted.c | 4 +- + tools/testing/selftests/tpm2/tpm2.py | 5 ++- + tools/testing/selftests/tpm2/tpm2_tests.py | 63 ++++++++++++++++++++++++++++++ + 5 files changed, 71 insertions(+), 7 deletions(-) +Merging watchdog/master (458c8961c194 watchdog: w83877f_wdt: Mark expected switch fall-through) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (1150bc31ffe6 Merge branches 'iommu/fixes' and 'x86/vt-d' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/amd_iommu.c | 7 ++++++- + drivers/iommu/intel_irq_remapping.c | 7 +++---- + 2 files changed, 9 insertions(+), 5 deletions(-) +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (0cfd027be1d6 vfio_pci: Enable memory accesses before calling pci_map_rom) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (16add411645c syscall_get_arch: add "struct task_struct *" argument) +$ git merge audit/next +Auto-merging arch/x86/include/asm/syscall.h +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/syscall.h | 2 +- + arch/arc/include/asm/elf.h | 6 +----- + arch/arc/include/asm/syscall.h | 11 +++++++++++ + arch/arm/include/asm/syscall.h | 2 +- + arch/arm64/include/asm/syscall.h | 4 ++-- + arch/c6x/include/asm/syscall.h | 7 +++++++ + arch/csky/include/asm/syscall.h | 2 +- + arch/h8300/include/asm/syscall.h | 6 ++++++ + arch/hexagon/include/asm/elf.h | 6 +----- + arch/hexagon/include/asm/syscall.h | 8 ++++++++ + arch/ia64/include/asm/syscall.h | 2 +- + arch/m68k/include/asm/syscall.h | 12 ++++++++++++ + arch/microblaze/include/asm/syscall.h | 2 +- + arch/mips/include/asm/syscall.h | 6 +++--- + arch/mips/kernel/ptrace.c | 2 +- + arch/nds32/include/asm/elf.h | 3 +-- + arch/nds32/include/asm/syscall.h | 9 +++++++++ + arch/nios2/include/asm/syscall.h | 6 ++++++ + arch/openrisc/include/asm/syscall.h | 2 +- + arch/parisc/include/asm/syscall.h | 4 ++-- + arch/powerpc/include/asm/syscall.h | 10 ++++++++-- + arch/riscv/include/asm/syscall.h | 2 +- + arch/s390/include/asm/syscall.h | 4 ++-- + arch/sh/include/asm/syscall_32.h | 2 +- + arch/sh/include/asm/syscall_64.h | 2 +- + arch/sparc/include/asm/syscall.h | 5 +++-- + arch/unicore32/include/asm/elf.h | 3 +-- + arch/unicore32/include/asm/syscall.h | 12 ++++++++++++ + arch/x86/include/asm/syscall.h | 8 +++++--- + arch/x86/um/asm/syscall.h | 2 +- + arch/xtensa/include/asm/syscall.h | 2 +- + include/asm-generic/syscall.h | 5 +++-- + include/uapi/linux/audit.h | 12 ++++++++++++ + include/uapi/linux/elf-em.h | 6 ++++++ + kernel/audit.c | 2 +- + kernel/auditsc.c | 22 ++++++++++++++++------ + kernel/seccomp.c | 4 ++-- + 37 files changed, 152 insertions(+), 53 deletions(-) + create mode 100644 arch/m68k/include/asm/syscall.h + create mode 100644 arch/unicore32/include/asm/syscall.h +Merging devicetree/for-next (935665c1a117 of: unittest: unflatten device tree on UML when testing) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (17b860bbfc84 mailbox: imx: keep MU irq working during suspend/resume) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (2880fca899ad Merge branch 'spi-5.2' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/fsl-spi.txt | 4 + + .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 10 +- + .../devicetree/bindings/spi/spi-fsl-lpspi.txt | 10 +- + drivers/spi/spi-dw-mmio.c | 12 + + drivers/spi/spi-fsl-lib.h | 2 + + drivers/spi/spi-fsl-lpspi.c | 543 ++++++++++++++++++--- + drivers/spi/spi-fsl-qspi.c | 2 +- + drivers/spi/spi-fsl-spi.c | 40 +- + drivers/spi/spi-imx.c | 7 + + drivers/spi/spi-mxic.c | 6 +- + drivers/spi/spi-orion.c | 4 + + drivers/spi/spi-pxa2xx-dma.c | 4 +- + drivers/spi/spi-pxa2xx-pci.c | 5 +- + drivers/spi/spi-pxa2xx.c | 4 + + drivers/spi/spi-stm32-qspi.c | 39 +- + drivers/spi/spi.c | 2 + + drivers/spi/spidev.c | 4 +- + include/linux/spi/pxa2xx_spi.h | 1 + + include/linux/spi/spi.h | 3 +- + include/uapi/linux/spi/spidev.h | 6 +- + 20 files changed, 629 insertions(+), 79 deletions(-) +Merging tip/auto-latest (796a7fd73cd9 Merge branch 'x86/cpu') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/include/asm/cpu_device_id.h | 31 +++++++------ + kernel/sched/core.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 59 +++++++++++-------------- + kernel/sched/fair.c | 84 +++++++++++++++++++++++++++--------- + 4 files changed, 104 insertions(+), 72 deletions(-) +Merging clockevents/clockevents/next (dbfc6db7ba46 soc/tegra: default select TEGRA_TIMER for Tegra210) +$ git merge clockevents/clockevents/next +Auto-merging drivers/clocksource/arm_arch_timer.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging Documentation/arm64/silicon-errata.txt +Merge made by the 'recursive' strategy. +Merging edac-amd/for-next (580b5cf50ca8 EDAC/altera: Add separate SDRAM EDAC config) +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irq/irqchip-next (fca269f201a8 irqchip/mbigen: Don't clear eventid when freeing an MSI) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-stm32-exti.c +Auto-merging drivers/irqchip/irq-mmp.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/renesas,irqc.txt | 1 + + arch/arm/mach-cns3xxx/core.c | 2 +- + drivers/irqchip/irq-brcmstb-l2.c | 4 +- + drivers/irqchip/irq-gic-v3-its.c | 2 +- + drivers/irqchip/irq-gic.c | 45 ++++++++-------------- + drivers/irqchip/irq-imx-irqsteer.c | 8 +++- + drivers/irqchip/irq-mbigen.c | 3 ++ + drivers/irqchip/irq-mmp.c | 2 +- + drivers/irqchip/irq-stm32-exti.c | 10 ----- + include/linux/irqchip/arm-gic.h | 3 +- + 10 files changed, 32 insertions(+), 48 deletions(-) +Merging ftrace/for-next (85f726a35e50 tracing: Use strncpy instead of memcpy when copying comm in trace.c) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (e880edadc149 Merge LKMM and RCU) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + tools/memory-model/Documentation/explanation.txt | 289 ++++++++++++----------- + tools/memory-model/README | 33 ++- + tools/memory-model/linux-kernel.bell | 35 ++- + tools/memory-model/linux-kernel.cat | 39 ++- + tools/memory-model/linux-kernel.def | 5 + + tools/memory-model/lock.cat | 3 - + 6 files changed, 243 insertions(+), 161 deletions(-) +Merging kvm/linux-next (4a605bc08e98 kvm: vmx: fix formatting of a comment) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (c88b093693cc arm64: KVM: Fix architecturally invalid reset value for FPEXC32_EL2) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (2b57ecd0208f KVM: PPC: Book3S: Add count cache flush parameters to kvmppc_get_cpu_char()) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (11ba5961a215 KVM: s390: add debug logging for cpu model subfunctions) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (0266def91377 xen/balloon: Fix mapping PG_offline pages to user space) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (cb453ce4846b Merge branch 'for-5.2' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu.h | 12 +- + mm/percpu-internal.h | 15 +- + mm/percpu-km.c | 2 +- + mm/percpu-stats.c | 5 +- + mm/percpu.c | 551 ++++++++++++++++++++++++++++++++++--------------- + 5 files changed, 404 insertions(+), 181 deletions(-) +Merging workqueues/for-next (8194fe94ab08 kernel/workqueue: Document wq_worker_last_func() argument) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging drivers-x86/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (9309d60c0274 Merge tag 'tag-chrome-platform-fixes-for-v5.1-rc2' into chrome-platform-5.2) +$ git merge chrome-platform/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (bd7a59173aea leds: lt3593: drop pdata handling code) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/acpi/dsd/leds.txt | 99 +++++++++++++++++++++++++++++++++++ + drivers/leds/Kconfig | 19 +++---- + drivers/leds/leds-as3645a.c | 93 +++++++++++++++++--------------- + drivers/leds/leds-lt3593.c | 56 -------------------- + drivers/leds/leds-pca9532.c | 8 ++- + drivers/leds/leds-pca955x.c | 22 +------- + drivers/leds/leds-pca963x.c | 22 +------- + drivers/leds/trigger/ledtrig-netdev.c | 13 ++--- + 8 files changed, 174 insertions(+), 158 deletions(-) + create mode 100644 Documentation/acpi/dsd/leds.txt +Merging ipmi/for-next (906242774f86 ipmi: Make ipmi_interfaces_srcu variable static) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) +Merging driver-core/driver-core-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (bb31b352510b usb: typec: fusb302: Add __printf attribute to fusb302_log function) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/typec/altmodes/displayport.c | 2 +- + drivers/usb/typec/mux/pi3usb30532.c | 3 +- + drivers/usb/typec/tcpm/fusb302.c | 447 +++++++++++++------------------ + drivers/usb/usbip/vhci_hcd.c | 8 +- + include/linux/usb.h | 2 +- + 5 files changed, 196 insertions(+), 266 deletions(-) +Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. +Merging phy-next/next (b8998e928030 phy: tegra: xusb: Add Tegra186 support) +$ git merge phy-next/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 9 + + MAINTAINERS | 5 + + drivers/phy/tegra/Makefile | 1 + + drivers/phy/tegra/xusb-tegra186.c | 899 +++++++++++++++++++++ + drivers/phy/tegra/xusb.c | 67 +- + drivers/phy/tegra/xusb.h | 35 + + 6 files changed, 1014 insertions(+), 2 deletions(-) + create mode 100644 drivers/phy/tegra/xusb-tegra186.c +Merging tty/tty-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (9d8e2af50df7 extcon: mrfld: Introduce extcon driver for Basin Cove PMIC) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/Kconfig | 9 +- + drivers/extcon/Makefile | 1 + + drivers/extcon/devres.c | 2 +- + drivers/extcon/extcon-intel-cht-wc.c | 81 ++++++++-- + drivers/extcon/extcon-intel-mrfld.c | 284 +++++++++++++++++++++++++++++++++++ + drivers/extcon/extcon-intel.h | 20 +++ + 6 files changed, 379 insertions(+), 18 deletions(-) + create mode 100644 drivers/extcon/extcon-intel-mrfld.c + create mode 100644 drivers/extcon/extcon-intel.h +Merging soundwire/next (bfeffd155283 Linux 5.0-rc1) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (9c6601f889f3 thunderbolt: Fix to check for kmemdup failure) +$ git merge thunderbolt/next +Merge made by the 'recursive' strategy. + drivers/thunderbolt/property.c | 9 +++++++++ + drivers/thunderbolt/switch.c | 15 +++++++++++---- + 2 files changed, 20 insertions(+), 4 deletions(-) +Merging staging/staging-next (ac22353f803b staging: rtl8188eu: remove unused WFD defines) +$ git merge staging/staging-next +Auto-merging drivers/staging/rtl8723bs/os_dep/os_intfs.c +Auto-merging drivers/staging/rtl8712/rtl8712_cmd.c +Auto-merging drivers/staging/media/zoran/videocodec.c +Auto-merging drivers/staging/erofs/unzip_vle.c +Auto-merging drivers/staging/comedi/drivers/ni_mio_common.c +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/gpu/drm/vboxvideo/vbox_mode.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vboxvideo/vbox_mode.c | 3 +- + drivers/gpu/drm/vboxvideo/vbox_prime.c | 10 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 30 +++-- + drivers/staging/emxx_udc/emxx_udc.c | 7 +- + drivers/staging/erofs/inode.c | 14 +- + drivers/staging/erofs/namei.c | 3 +- + drivers/staging/erofs/super.c | 25 ++-- + drivers/staging/erofs/unzip_vle.c | 57 +++++---- + drivers/staging/erofs/utils.c | 2 +- + drivers/staging/erofs/xattr.c | 34 ++--- + drivers/staging/fbtft/fb_agm1264k-fl.c | 2 +- + drivers/staging/fbtft/fb_ra8875.c | 2 +- + drivers/staging/fbtft/fb_ssd1306.c | 3 +- + drivers/staging/fbtft/fb_ssd1331.c | 3 +- + drivers/staging/fbtft/fb_watterott.c | 15 +-- + drivers/staging/fbtft/fbtft-io.c | 12 +- + drivers/staging/fbtft/fbtft.h | 1 + + drivers/staging/fbtft/fbtft_device.c | 2 +- + drivers/staging/fbtft/flexfb.c | 7 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 4 +- + drivers/staging/fwserial/fwserial.c | 5 +- + drivers/staging/gasket/apex_driver.c | 4 +- + drivers/staging/gasket/gasket_interrupt.c | 6 +- + drivers/staging/gasket/gasket_sysfs.c | 9 +- + drivers/staging/gasket/gasket_sysfs.h | 4 +- + drivers/staging/gdm724x/gdm_mux.c | 7 +- + drivers/staging/greybus/audio_codec.h | 122 +++++++++--------- + drivers/staging/greybus/bundle.c | 2 +- + drivers/staging/iio/addac/adt7316.c | 3 +- + drivers/staging/ks7010/ks_hostif.c | 16 +-- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 23 ++-- + drivers/staging/media/zoran/videocodec.c | 14 +- + drivers/staging/media/zoran/zoran_device.c | 4 +- + drivers/staging/most/dim2/errors.h | 2 +- + drivers/staging/most/dim2/hal.h | 2 +- + drivers/staging/most/dim2/reg.h | 2 +- + drivers/staging/most/dim2/sysfs.h | 2 +- + drivers/staging/most/i2c/Kconfig | 2 +- + drivers/staging/most/net/Kconfig | 2 +- + drivers/staging/most/sound/Kconfig | 2 +- + drivers/staging/most/usb/Kconfig | 2 +- + drivers/staging/most/video/Kconfig | 2 +- + drivers/staging/mt7621-mmc/dbg.c | 2 - + drivers/staging/mt7621-mmc/mt6575_sd.h | 13 +- + drivers/staging/mt7621-mmc/sd.c | 48 +++---- + drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c | 126 +++++++++--------- + drivers/staging/mt7621-pci/pci-mt7621.c | 2 +- + drivers/staging/netlogic/xlr_net.c | 4 +- + drivers/staging/octeon-usb/octeon-hcd.c | 4 +- + drivers/staging/octeon-usb/octeon-hcd.h | 8 +- + drivers/staging/octeon/ethernet-tx.c | 20 +-- + drivers/staging/pi433/rf69.c | 4 +- + drivers/staging/ralink-gdma/ralink-gdma.c | 77 ++++++----- + drivers/staging/rtl8188eu/core/rtw_ap.c | 7 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 24 ++-- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 6 +- + drivers/staging/rtl8188eu/include/wifi.h | 130 ------------------- + drivers/staging/rtl8192e/dot11d.c | 9 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 21 ++- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 30 ++--- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 22 ++-- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 24 ++-- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 78 +++++------ + drivers/staging/rtl8192u/r8180_93cx6.c | 24 ++-- + drivers/staging/rtl8192u/r8192U_dm.c | 29 ++--- + drivers/staging/rtl8712/Kconfig | 10 +- + drivers/staging/rtl8712/drv_types.h | 6 +- + drivers/staging/rtl8712/hal_init.c | 3 +- + drivers/staging/rtl8712/ieee80211.c | 3 +- + drivers/staging/rtl8712/ieee80211.h | 3 +- + drivers/staging/rtl8712/os_intfs.c | 8 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 6 +- + drivers/staging/rtl8712/rtl8712_io.c | 4 +- + drivers/staging/rtl8712/rtl8712_led.c | 6 +- + drivers/staging/rtl8712/rtl8712_recv.c | 26 ++-- + drivers/staging/rtl8712/rtl871x_eeprom.c | 23 ++-- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 18 +-- + drivers/staging/rtl8712/rtl871x_mlme.c | 6 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 4 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 8 +- + drivers/staging/rtl8712/usb_intf.c | 12 +- + drivers/staging/rtl8712/usb_ops_linux.c | 26 ++-- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 41 ++---- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 32 ----- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 11 -- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 11 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 8 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 16 +-- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 12 +- + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 8 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 8 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 9 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 10 -- + drivers/staging/rtl8723bs/include/cmd_osdep.h | 4 +- + drivers/staging/rtl8723bs/include/drv_types.h | 4 - + drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 - + drivers/staging/rtl8723bs/include/rtw_mlme.h | 27 ---- + drivers/staging/rtl8723bs/include/wifi.h | 4 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 55 -------- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 19 +-- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 29 ++--- + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 2 +- + drivers/staging/rtlwifi/phydm/phydm.c | 2 +- + drivers/staging/rtlwifi/phydm/phydm_hwconfig.c | 2 +- + drivers/staging/sm750fb/ddk750_chip.c | 21 ++- + drivers/staging/sm750fb/ddk750_chip.h | 2 +- + drivers/staging/sm750fb/ddk750_display.c | 10 +- + drivers/staging/sm750fb/ddk750_display.h | 2 +- + drivers/staging/sm750fb/ddk750_dvi.c | 40 +++--- + drivers/staging/sm750fb/ddk750_power.h | 2 +- + drivers/staging/sm750fb/ddk750_sii164.c | 114 ++++++++--------- + drivers/staging/sm750fb/sm750_accel.c | 32 ++--- + drivers/staging/sm750fb/sm750_hw.c | 2 +- + drivers/staging/speakup/kobjects.c | 14 +- + drivers/staging/speakup/speakup_decpc.c | 2 +- + drivers/staging/speakup/speakup_keypc.c | 6 +- + drivers/staging/speakup/spk_ttyio.c | 2 +- + drivers/staging/unisys/include/iochannel.h | 2 +- + drivers/staging/unisys/visorhba/Kconfig | 12 +- + drivers/staging/unisys/visorinput/Kconfig | 14 +- + drivers/staging/unisys/visornic/Kconfig | 14 +- + .../vc04_services/bcm2835-audio/bcm2835-ctl.c | 12 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 51 +++----- + .../staging/vc04_services/interface/vchi/vchi.h | 4 +- + .../vc04_services/interface/vchi/vchi_common.h | 142 ++++++++++----------- + drivers/staging/vt6655/card.h | 6 +- + drivers/staging/vt6655/channel.h | 2 +- + drivers/staging/vt6655/desc.h | 2 +- + drivers/staging/vt6655/device.h | 2 +- + drivers/staging/vt6655/dpc.h | 2 +- + drivers/staging/vt6655/key.h | 2 +- + drivers/staging/vt6655/mac.c | 25 ---- + drivers/staging/vt6655/mac.h | 9 +- + drivers/staging/vt6655/power.c | 7 +- + drivers/staging/vt6655/rf.c | 4 +- + drivers/staging/vt6655/rxtx.c | 2 +- + drivers/staging/wilc1000/host_interface.c | 12 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 3 +- + drivers/staging/wlan-ng/hfa384x.h | 4 +- + 144 files changed, 936 insertions(+), 1333 deletions(-) +Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. +Merging icc/icc-next (fcf9d0b7d2f5 drm/msm/a6xx: Add support for an interconnect path) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge slave-dma/next +Already up to date. +Merging cgroup/for-next (0fcc4c8c044e device_cgroup: fix RCU imbalance in error case) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + security/device_cgroup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging scsi/for-next (69a3c01d588e Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Removing include/scsi/osd_types.h +Removing include/scsi/osd_sense.h +Removing include/scsi/osd_sec.h +Removing include/scsi/osd_protocol.h +Removing include/scsi/osd_attributes.h +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/lpfc/lpfc_nvme.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/scsi/lpfc/lpfc_ct.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/phy-mtk-ufs.txt | 38 + + .../devicetree/bindings/ufs/ufs-mediatek.txt | 40 + + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptctl.c | 2 +- + drivers/message/fusion/mptsas.c | 36 +- + drivers/message/fusion/mptscsih.c | 2 +- + drivers/message/fusion/mptspi.c | 5 - + drivers/phy/mediatek/Kconfig | 10 + + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-ufs.c | 245 +++++ + drivers/scsi/NCR5380.c | 11 +- + drivers/scsi/atp870u.c | 7 +- + drivers/scsi/be2iscsi/be_cmds.c | 2 +- + drivers/scsi/dpt_i2o.c | 12 +- + drivers/scsi/hpsa.c | 27 +- + drivers/scsi/lpfc/lpfc.h | 1 + + drivers/scsi/lpfc/lpfc_attr.c | 26 +- + drivers/scsi/lpfc/lpfc_bsg.c | 123 ++- + drivers/scsi/lpfc/lpfc_bsg.h | 4 +- + drivers/scsi/lpfc/lpfc_ct.c | 31 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 12 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 25 +- + drivers/scsi/lpfc/lpfc_hw4.h | 25 +- + drivers/scsi/lpfc/lpfc_init.c | 125 ++- + drivers/scsi/lpfc/lpfc_nvme.c | 4 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 31 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 3 +- + drivers/scsi/lpfc/lpfc_scsi.c | 9 +- + drivers/scsi/lpfc/lpfc_sli.c | 181 ++-- + drivers/scsi/lpfc/lpfc_sli.h | 19 +- + drivers/scsi/lpfc/lpfc_sli4.h | 54 +- + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/mpt3sas/Kconfig | 1 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 178 +++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 22 +- + drivers/scsi/mvsas/mv_64xx.c | 3 +- + drivers/scsi/mvsas/mv_94xx.c | 3 +- + drivers/scsi/mvsas/mv_sas.c | 2 +- + drivers/scsi/mvumi.c | 6 +- + drivers/scsi/pm8001/pm8001_hwi.c | 8 +- + drivers/scsi/pm8001/pm8001_sas.c | 4 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 44 +- + drivers/scsi/qedi/qedi_fw.c | 4 - + drivers/scsi/qla2xxx/qla_attr.c | 274 ++++-- + drivers/scsi/qla2xxx/qla_bsg.c | 67 +- + drivers/scsi/qla2xxx/qla_bsg.h | 11 + + drivers/scsi/qla2xxx/qla_dbg.c | 190 ++-- + drivers/scsi/qla2xxx/qla_dbg.h | 10 +- + drivers/scsi/qla2xxx/qla_def.h | 186 +++- + drivers/scsi/qla2xxx/qla_dfs.c | 6 +- + drivers/scsi/qla2xxx/qla_fw.h | 31 +- + drivers/scsi/qla2xxx/qla_gbl.h | 91 +- + drivers/scsi/qla2xxx/qla_gs.c | 85 +- + drivers/scsi/qla2xxx/qla_init.c | 1029 ++++++++++++-------- + drivers/scsi/qla2xxx/qla_iocb.c | 5 +- + drivers/scsi/qla2xxx/qla_isr.c | 30 +- + drivers/scsi/qla2xxx/qla_mbx.c | 319 ++++-- + drivers/scsi/qla2xxx/qla_mr.c | 46 +- + drivers/scsi/qla2xxx/qla_nx.c | 17 +- + drivers/scsi/qla2xxx/qla_nx2.c | 8 +- + drivers/scsi/qla2xxx/qla_os.c | 123 ++- + drivers/scsi/qla2xxx/qla_sup.c | 971 ++++++++++++------ + drivers/scsi/qla2xxx/qla_target.c | 7 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 447 ++++----- + drivers/scsi/qla2xxx/qla_tmpl.h | 76 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qlogicfas408.c | 4 +- + drivers/scsi/scsi_error.c | 1 - + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/smartpqi/Makefile | 1 + + drivers/scsi/smartpqi/smartpqi.h | 15 +- + drivers/scsi/smartpqi/smartpqi_init.c | 51 +- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 15 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 15 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 15 +- + drivers/scsi/ufs/Kconfig | 14 + + drivers/scsi/ufs/Makefile | 1 + + drivers/scsi/ufs/ufs-hisi.c | 113 +-- + drivers/scsi/ufs/ufs-mediatek.c | 364 +++++++ + drivers/scsi/ufs/ufs-mediatek.h | 53 + + drivers/scsi/ufs/ufs-qcom.c | 106 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 98 ++ + drivers/scsi/ufs/ufshcd-pltfrm.h | 21 + + drivers/scsi/virtio_scsi.c | 2 +- + drivers/target/iscsi/iscsi_target_login.c | 9 +- + drivers/target/target_core_configfs.c | 158 ++- + include/scsi/osd_attributes.h | 398 -------- + include/scsi/osd_protocol.h | 676 ------------- + include/scsi/osd_sec.h | 45 - + include/scsi/osd_sense.h | 263 ----- + include/scsi/osd_types.h | 45 - + include/scsi/scsi_host.h | 6 +- + 93 files changed, 4358 insertions(+), 3560 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt + create mode 100644 Documentation/devicetree/bindings/ufs/ufs-mediatek.txt + create mode 100644 drivers/phy/mediatek/phy-mtk-ufs.c + create mode 100644 drivers/scsi/ufs/ufs-mediatek.c + create mode 100644 drivers/scsi/ufs/ufs-mediatek.h + delete mode 100644 include/scsi/osd_attributes.h + delete mode 100644 include/scsi/osd_protocol.h + delete mode 100644 include/scsi/osd_sec.h + delete mode 100644 include/scsi/osd_sense.h + delete mode 100644 include/scsi/osd_types.h +Merging scsi-mkp/for-next (f55d0b40eccf scsi: target: iscsi: Free conn_ops when zalloc_cpumask_var failed) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging vhost/linux-next (3fbdb54c7d5a arch: move common mmap flags to linux/mman.h) +$ git merge vhost/linux-next +Auto-merging include/drm/drmP.h +Auto-merging drivers/pci/of.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/iommu/Makefile +CONFLICT (content): Merge conflict in drivers/iommu/Makefile +Auto-merging drivers/iommu/Kconfig +CONFLICT (content): Merge conflict in drivers/iommu/Kconfig +Auto-merging MAINTAINERS +Resolved 'drivers/iommu/Kconfig' using previous resolution. +Resolved 'drivers/iommu/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dff742b5a94b] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/virtio/iommu.txt | 66 ++ + Documentation/devicetree/bindings/virtio/mmio.txt | 30 + + Documentation/memory-barriers.txt | 20 + + MAINTAINERS | 7 + + arch/alpha/include/asm/barrier.h | 1 + + drivers/iommu/Kconfig | 11 + + drivers/iommu/Makefile | 1 + + drivers/iommu/virtio-iommu.c | 1158 ++++++++++++++++++++ + drivers/net/virtio_net.c | 27 +- + drivers/of/base.c | 10 +- + drivers/pci/of.c | 7 + + drivers/virtio/virtio_ring.c | 13 +- + include/asm-generic/barrier.h | 18 + + include/linux/compiler.h | 6 +- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_iommu.h | 161 +++ + 16 files changed, 1521 insertions(+), 16 deletions(-) + create mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt + create mode 100644 drivers/iommu/virtio-iommu.c + create mode 100644 include/uapi/linux/virtio_iommu.h +Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt | 5 +++++ + drivers/rpmsg/rpmsg_core.c | 3 ++- + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging gpio/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (2e35bb6cd421 gpio: vf610: Don't use explicit &pdev->dev in vf610_gpio_probe()) +$ git merge gpio-brgl/gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-vf610.c | 85 ++++++++++++++++++++--------------------------- + 1 file changed, 36 insertions(+), 49 deletions(-) +Merging pinctrl/for-next (9bc8fee96e9a pinctrl: imx: fix scu link errors) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9ff06679e109 pwm: sysfs: fix typo "its" -> "it's") +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt | 1 + + drivers/pwm/Kconfig | 5 ++--- + drivers/pwm/core.c | 10 +++++----- + drivers/pwm/pwm-img.c | 2 +- + drivers/pwm/pwm-tiehrpwm.c | 2 ++ + drivers/pwm/sysfs.c | 16 ++-------------- + include/linux/pwm.h | 5 ----- + 7 files changed, 13 insertions(+), 28 deletions(-) +Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static) +$ git merge random/dev +Auto-merging drivers/char/random.c +Merge made by the 'recursive' strategy. + drivers/char/random.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging kselftest/next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) +$ git merge y2038/y2038 +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. +Merging livepatching/for-next (b420648f103d Merge branch 'for-5.1-atomic-replace' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (0b7ba42535b7 coresight: catu: fix clang build warning) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-catu.h | 5 ----- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 5 +++-- + 2 files changed, 3 insertions(+), 7 deletions(-) +Merging rtc/rtc-next (ba1afcd68cd2 rtc: x1205: Add DT probing support) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/rtc/rtc.txt | 1 + + drivers/rtc/class.c | 7 +- + drivers/rtc/dev.c | 7 +- + drivers/rtc/hctosys.c | 7 +- + drivers/rtc/interface.c | 7 +- + drivers/rtc/lib.c | 7 +- + drivers/rtc/nvmem.c | 5 +- + drivers/rtc/proc.c | 7 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 155 ++++++++------------------ + drivers/rtc/rtc-abx80x.c | 43 ++----- + drivers/rtc/rtc-da9063.c | 14 +-- + drivers/rtc/rtc-mv.c | 35 +++--- + drivers/rtc/rtc-omap.c | 22 +--- + drivers/rtc/rtc-x1205.c | 7 ++ + drivers/rtc/rtc-zynqmp.c | 13 +-- + drivers/rtc/sysfs.c | 7 +- + drivers/rtc/systohc.c | 7 +- + 17 files changed, 106 insertions(+), 245 deletions(-) +Merging nvdimm/libnvdimm-for-next (1ffc664f9b8c Merge branch 'for-5.1/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging fs/dax.c +CONFLICT (content): Merge conflict in fs/dax.c +Resolved 'fs/dax.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8d2f7df6f855] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. +Merging at24/at24/for-next (d333bad1f6f3 dt-bindings: at24: add Renesas R1EX24016) +$ git merge at24/at24/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.txt | 1 + + MAINTAINERS | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files) +$ git merge ntb/ntb-next +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 12 +++------ + drivers/ntb/hw/idt/ntb_hw_idt.c | 6 ----- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 4 --- + drivers/ntb/hw/intel/ntb_hw_gen3.c | 6 ++--- + drivers/ntb/ntb.c | 9 ++----- + drivers/ntb/ntb_transport.c | 1 + + drivers/ntb/test/ntb_perf.c | 43 +++++++++++++++++++++++++-------- + drivers/ntb/test/ntb_pingpong.c | 14 +++++------ + drivers/ntb/test/ntb_tool.c | 9 +++---- + tools/testing/selftests/ntb/ntb_test.sh | 2 +- + 10 files changed, 54 insertions(+), 52 deletions(-) +Merging kspp/for-next/kspp (50ceaa95ea09 lib: Introduce test_stackinit module) +$ git merge kspp/for-next/kspp +Already up to date. +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) +$ git merge fsi/master +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (80471330ec58 slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. + drivers/slimbus/qcom-ngd-ctrl.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging nvmem/for-next (6b37a3af354e nvmem: core: add nvmem_cell_read_u16) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/imx-ocotp.txt | 4 +- + .../devicetree/bindings/nvmem/st,stm32-romem.txt | 31 ++++ + drivers/nvmem/Kconfig | 14 +- + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 37 ++++ + drivers/nvmem/imx-ocotp.c | 7 + + drivers/nvmem/stm32-romem.c | 202 +++++++++++++++++++++ + drivers/nvmem/sunxi_sid.c | 98 ++++------ + include/linux/nvmem-consumer.h | 7 + + 9 files changed, 340 insertions(+), 62 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt + create mode 100644 drivers/nvmem/stm32-romem.c +Merging xarray/xarray (dd12805ed1db XArray: Remove radix tree compatibility) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + include/linux/radix-tree.h | 13 +++++++++++-- + include/linux/xarray.h | 29 ++++++++++++++--------------- + lib/radix-tree.c | 2 +- + lib/test_xarray.c | 38 ++++++++++++++++++++++++++++++++++++++ + 4 files changed, 64 insertions(+), 18 deletions(-) +Merging hyperv/hyperv-next (396ae57ef1ef Drivers: hv: vmbus: Expose counters for interrupts and full conditions) +$ git merge hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (cc5d04d840d6 auxdisplay: charlcd: make backlight initial state configurable) +$ git merge auxdisplay/auxdisplay +Merge made by the 'recursive' strategy. + drivers/auxdisplay/Kconfig | 38 ++++++++++++++++++++++++++---- + drivers/auxdisplay/Makefile | 2 +- + drivers/auxdisplay/charlcd.c | 55 ++++++++++++++++++++++++++++---------------- + drivers/auxdisplay/hd44780.c | 4 +++- + drivers/auxdisplay/panel.c | 4 ++-- + include/misc/charlcd.h | 1 + + 6 files changed, 75 insertions(+), 29 deletions(-) +Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops) +$ git merge kgdb-dt/kgdb/for-next +Auto-merging arch/x86/kernel/kgdb.c +Auto-merging arch/sparc/kernel/smp_64.c +Auto-merging arch/sh/kernel/kgdb.c +Auto-merging arch/powerpc/kernel/kgdb.c +Auto-merging arch/mips/kernel/kgdb.c +Auto-merging arch/arm64/kernel/kgdb.c +Merge made by the 'recursive' strategy. +Merging pidfd/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge pidfd/for-next +Already up to date. +Merging devfreq/for-next (ca740a8f3e7f PM / devfreq: Fix static checker warning in try_then_request_governor) +$ git merge devfreq/for-next +Merge made by the 'recursive' strategy. + drivers/devfreq/devfreq-event.c | 2 +- + drivers/devfreq/devfreq.c | 85 +++++++++++++++++++++++------------- + drivers/devfreq/event/exynos-ppmu.c | 2 +- + drivers/devfreq/event/rockchip-dfi.c | 2 +- + drivers/devfreq/rk3399_dmc.c | 2 +- + drivers/devfreq/tegra-devfreq.c | 7 +-- + 6 files changed, 60 insertions(+), 40 deletions(-) +Merging akpm-current/current (90dcc77f765a ipc: do cyclic id allocation with ipcmni_extend mode) +$ git merge --no-ff akpm-current/current +Auto-merging mm/memory_hotplug.c +Auto-merging kernel/signal.c +Auto-merging arch/powerpc/include/asm/book3s/64/hugetlb.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/dma-mapping.c +Merge made by the 'recursive' strategy. + Documentation/accounting/psi.txt | 107 ++++ + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/kernel-parameters.txt | 16 + + Documentation/core-api/genalloc.rst | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/hugetlb.h | 7 +- + arch/powerpc/include/asm/book3s/64/hugetlb.h | 4 +- + arch/powerpc/kernel/process.c | 12 +- + arch/powerpc/mm/fault.c | 6 +- + arch/powerpc/perf/callchain.c | 20 +- + arch/powerpc/perf/core-book3s.c | 8 +- + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 10 +- + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/hugetlb.h | 7 +- + arch/sparc/include/asm/pgtable_64.h | 30 - + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/hugetlb.h | 7 +- + drivers/misc/sram-exec.c | 2 +- + fs/Kconfig | 2 +- + fs/buffer.c | 56 +- + fs/ocfs2/alloc.c | 15 + + fs/ocfs2/aops.c | 22 +- + fs/ocfs2/dlm/dlmunlock.c | 23 +- + fs/ramfs/inode.c | 12 + + include/linux/genalloc.h | 2 +- + include/linux/gfp.h | 2 +- + include/linux/ipc_namespace.h | 1 + + include/linux/list.h | 17 + + include/linux/memblock.h | 41 ++ + include/linux/memcontrol.h | 27 + + include/linux/mm.h | 53 +- + include/linux/mm_types.h | 3 + + include/linux/mmzone.h | 59 ++ + include/linux/psi.h | 8 + + include/linux/psi_types.h | 83 ++- + include/linux/sched.h | 10 + + include/linux/sched/signal.h | 18 + + include/linux/uaccess.h | 34 ++ + init/Kconfig | 23 + + ipc/ipc_sysctl.c | 14 +- + ipc/util.c | 27 +- + ipc/util.h | 46 +- + kernel/cgroup/cgroup.c | 95 +++- + kernel/dma/remap.c | 2 +- + kernel/fork.c | 1 + + kernel/ptrace.c | 15 +- + kernel/sched/psi.c | 607 ++++++++++++++++++-- + kernel/signal.c | 2 +- + kernel/sysctl.c | 6 +- + lib/Kconfig.debug | 6 + + lib/debugobjects.c | 66 ++- + lib/genalloc.c | 5 +- + mm/Makefile | 7 +- + mm/compaction.c | 4 +- + mm/hugetlb.c | 81 ++- + mm/kasan/kasan.h | 5 +- + mm/memblock.c | 64 +++ + mm/memcontrol.c | 27 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 3 + + mm/mincore.c | 17 +- + mm/page_alloc.c | 708 ++++++++++++++---------- + mm/shuffle.c | 207 +++++++ + mm/shuffle.h | 64 +++ + mm/swapfile.c | 4 +- + mm/vmalloc.c | 32 +- + mm/vmscan.c | 108 +++- + scripts/checkpatch.pl | 24 +- + 70 files changed, 2422 insertions(+), 606 deletions(-) + create mode 100644 mm/shuffle.c + create mode 100644 mm/shuffle.h +$ 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 +First, rewinding head to replay your work on top of it... +Applying: pinctrl: fix pxa2xx.c build warnings +Applying: scripts/atomic/gen-atomics.sh: don't assume that scripts are executable +Applying: fs: fs_parser: fix printk format warning +Applying: include/linux/sched/signal.h: replace `tsk' with `task' +Applying: mm, memcg: rename ambiguously named memory.stat counters and functions +Applying: mm, memcg: consider subtrees in memory.events +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8a8a883f3e54...0bd0b3fec9dd akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (0bd0b3fec9dd drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 9 ++ + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + fs/fs_parser.c | 2 +- + include/linux/cgroup-defs.h | 5 + + include/linux/memcontrol.h | 34 ++++--- + include/linux/sched/signal.h | 51 +++++----- + kernel/cgroup/cgroup.c | 16 ++- + mm/memcontrol.c | 144 ++++++++++++++------------- + scripts/atomic/gen-atomics.sh | 2 +- + 10 files changed, 153 insertions(+), 115 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ebc034a1a1b4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4e7417186b12 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190322 |