diff options
| -rw-r--r-- | Next/SHA1s | 279 | ||||
| -rw-r--r-- | Next/Trees | 281 | ||||
| -rw-r--r-- | Next/merge.log | 3747 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4310 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..95894c2a044e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,279 @@ +Name SHA1 +---- ---- +origin be779f03d563981c65cc7417cc5e0dbbc5b89d30 +fixes 147a89bc71e7db40f011454a40add7ff2d10f8d8 +kbuild-current c90fca951e90ba470a3dc6087667edffcf8db21b +arc-current 661e50bc853209e41a5c14a290ca4decc43cbfd1 +arm-current 92d44a42af81e850a038c38278ff4f434b2871df +arm64-fixes 82034c23fcbc2389c73d97737f61fa2dd6526413 +m68k-current b12c8a70643ffe2598c572cd206e4f68c524eb6f +powerpc-fixes faf37c44a105f3608115785f17cbbf3500f8bc71 +sparc 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 60d061e3470357b902c74f811772b2effc9ec5a0 +bpf 3bce593ac06b4f18710274cfb084369b3d7909eb +ipsec d6990976af7c5d8f55903bfb4289b6fb030bf754 +netfilter 60d061e3470357b902c74f811772b2effc9ec5a0 +ipvs 312564269535892cc082bc80592150cd1f5e8ec3 +wireless-drivers ab1068d6866e28bf6427ceaea681a381e5870a4a +mac80211 885892fb378dc096693557ba4f2b875188619b36 +rdma-fixes 3dc7c7badb7502ec3e3aa817a8bdd9e53aa54c52 +sound-current d9d5ed1ad5d8a256c8c3f6b7736d9dad10232637 +sound-asoc-fixes 2858e2cfc2ef6501bc9a8cccf847a4ee58b5c9bf +regmap-fixes 97fe106a8027a6781f8ce42ef80d072d1f793adc +regulator-fixes 59ce5f3e55308a3bc726126fea0cd872d9be8c7c +spi-fixes 5d3257b8ea4883ccf153e1fe3070c05ba0f08229 +pci-current 0cf22d6b317ce0103b7d5a47878aa5ef94240433 +driver-core.current 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +tty.current 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +usb.current 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +usb-gadget-fixes 6d08b06e67cd117f6992c46611dfb4ce267cd71e +usb-serial-fixes 75bc37fefc4471e718ba8e651aa74673d4e0a9eb +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 60cc43fc888428bb2f18f08997432d426a243338 +staging.current 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +char-misc.current 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +input-current 01f7e67a053f7f5696fbdefe2b066303469b6db5 +crypto-current b268b3506d9910ca8238e92cb1dc51340574b2f2 +ide 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +vfio-fixes 89c29def6b0101fff66a3d74d0178b844f88d732 +kselftest-fixes 75bc37fefc4471e718ba8e651aa74673d4e0a9eb +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes dbad41e7bb5f4b9949ff5ea1d76c20711f326308 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +mtd-fixes 9f825e74d761c13b0cfaa5f65344d64ff970e252 +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 11799564fc7eedff50801950090773928f867996 +v4l-dvb-fixes e88f5e9ebd54bdf75c9833e3d9add7c2c0d39b0b +reset-fixes e6914365fd280fce303a89b8a8d4529af5a2e0f9 +mips-fixes d8a9a51afaa98f319e18b95b7dc99d606a94525a +omap-fixes 41bd6adf3c5d3990d7a67639aff53d54483744fa +kvm-fixes 696ca779a928d0e93d61c38ffc3a4d8914a9b9a0 +kvms390-fixes f4a551b72358facbbe5714248dff78404272feee +hwmon-fixes da81850b2c82ae4bde6303c1dc0c1072fb132fc6 +nvdimm-fixes 75bc37fefc4471e718ba8e651aa74673d4e0a9eb +btrfs-fixes 3a7e0e2622f6ddede799faf6bf62baf7aa6a541d +vfs-fixes b1b94fcbd39936d4e544792fb6fd13e6a5b2efc0 +dma-mapping-fixes 4dc6d8e22728569f37821a7dc661afa414b79f9b +drivers-x86-fixes 32ffd6e8d1f6cef94bedca15dfcdebdeb590499d +samsung-krzk-fixes 60cc43fc888428bb2f18f08997432d426a243338 +pinctrl-samsung-fixes 60cc43fc888428bb2f18f08997432d426a243338 +devicetree-fixes 737dd8e1a4c4789ac37723f4e80d0387c06f2a05 +scsi-fixes 5b10177e2dd8adeb9459ba8b0437e4a836d9612d +drm-intel-fixes 65b3bdc807ac7bd83f5b27bc2c29a3c631eed7dd +mmc-fixes 3de06d5a1f05c11c94cbb68af14dbfa7fb81d78b +rtc-fixes 60cc43fc888428bb2f18f08997432d426a243338 +drm-misc-fixes c7d6d511eb56495f065600c90336da0f0fe1b174 +kbuild 00979ce4fcc90d488c7f27f750097adc6b11bd07 +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 2550bbfd495227945e17ed1fa1c05bce4753b86b +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 0ac000e86703dedea1000513dbb8a64d02930668 +arm-perf 73acc0315cd72174729141856c6607d1c91419cb +arm-soc c7953e19db50de6a3f62cb09a5712341c9b43920 +actions 7858428186dba0cf96a64ef88d0904b4c18538a9 +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 793d8ab66802999cdb57404373676477a1086248 +aspeed 6534b2d0de3693b8508375c2f01951d6eb5c69be +at91 20d3f36b0feaad5ab90ccff77e18c13939065cad +bcm2835 5c483a0c319cdc7fa46676939da59df1fa8abb5a +imx-mxs 452daaaf6021e7ff1d9d849493f8b7a740b206e4 +keystone fb5d812c3cb33d0410cb6d3beebca670b3af097d +mediatek 9378b342734132ddf6d95ed035e1124eacf762a1 +mvebu 78e5d8c26c70bf14e1b4d918e8d65209ffe12123 +omap 1b7e42c1dfe837642cfcc426776a3f98c6fb2d3e +reset d7bab65b1f57cdf2d81fc469cea6b2160a50e917 +qcom 509d20563e5d72c2b3a85cc6d05bee30006b8127 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas 550ca2e6c090eb9b52083718e42ccb31e4486e9e +rockchip 42568f346f6545c3b80fb9fe09d5d2a13766db02 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk fba97222728d6067f7d26da3136631a1cd4e44ac +sunxi e9736005439109315e474dfc59c734e724d3e071 +tegra 6de9ae597a799a1f753385a08ef0d48c6c683917 +arm64 0fe42512b2f03f9e5a20b9f55ef1013a68b4cd48 +clk 55913c2d33307ac11797531ebbe7c122a73cc0fd +clk-samsung e8cf870f253bdeadd4ce8a10e34655ef89ad57b1 +c6x 85fa2cc51104ee5b529ce85b12f4c8421888544f +m68k b12c8a70643ffe2598c572cd206e4f68c524eb6f +m68knommu 082f55c459845088c3fee99c3a88ee117c148218 +microblaze 5cf8da7bc03570bc15ef1b59e584dfb9e0f47e51 +mips 9ed8b56b80c11ef7c25230b93f2c486fe6b41c4d +nds32 e5dd7e2f8a59051c01365880c9019cd7d32a5fa4 +nios2 3d9644ef9a0f6c3ca0c1bd2aea1d82e7ea0a7f24 +openrisc d56f3af9e801970d21c57621de3b42bc17eac152 +parisc-hd 8d40c754fbacc2432e53ab2b2a98b86beba251c0 +powerpc ff5bc793e47b537bf3e904fada585e102c54dd8b +powerpc-pkey d86a4ba02fc6bea4670b2f59b208152a4a34c3c0 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 29dcea88779c856c7dc92040a0c01233263101d4 +s390 ec530174c43798099d305fbd6511e5d7fc7616d4 +sparc-next 1aaccb5fa0eac996adde53538ca4b87a0b229ab7 +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt e1cc40e5d42acb1d99652babb17e6a5ee4247409 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave e4eada7b2b40772b303405fe6f3fbe1c0be8cdc1 +ceph 23edca864951250af845a11da86bb3ea63522ed2 +cifs 58a509972e1c94f9778e69a3e2fbf2130356fff4 +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs e86281e700cca8a773f9a572fa406adf2784ba5c +ext3 20a653d458c346553fe0a3bba802702d3ba41bff +ext4 4f2f76f751433908364ccff82f437a57d0e6e9b7 +f2fs d54d35c501bcbd57b9722a6b371c0608b5d34199 +fuse 543b8f8662fe6d21f19958b666ab0051af9db21a +jfs 92d34134193e5b129dc24f8d79cb9196626e8d7a +nfs 93b7f7ad2018d2037559b1d0892417864c78b371 +nfs-anna ffbfa2ce88f169aa4b5cc90065cdc1c3c8003c27 +nfsd fdfeda224cb71e8501d77b6cd8f536f55bb3c977 +orangefs b1116bc03c00255b7e5feaed561e8bb2fc38c0f8 +overlayfs c03e30790cadcaa8e88f15017a93ab4b2787cdb6 +ubifs f5a926dd529870de4bd19199ce7b36985f130d70 +xfs 89e9b5c0915aaeaf673a14e794c559768eda5534 +file-locks 716a685fdb89942a50c4138141027e38336a895f +vfs 5f181c9ca1087df69a9c7ac7458d65086b358d0d +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk 8bafa2a44ff3647904eaa3c9228bfbd36742b9b4 +pci ce4c7b241227ed49c0b6f0f1867653e1ee0007ef +pstore e698aaf37f9fac419ac6c1867137cce83c90c80b +hid f1b6ae6701a772bba1150b5f1b8d43803f039be4 +i2c 1840b5ac656f50c5b4936d459d4468d19067e357 +dmi 5cb06cfce4a8a15bda8c7bcf8012f6ce301cad0e +hwmon-staging c9bdf291542e14dbc5b9a71aa11f995de0e54f0d +jc_docs a49d9c0ae46e149a22aefa8251d07dddd5611851 +v4l-dvb f2809d20b9250c675fca8268a0f6274277cca7ff +v4l-dvb-next f10379aad39e9da8bc7d1822e251b5f0673067ef +fbdev 85ebd164de56c5146e0f65cebee7fcc4babe52e3 +pm 3d1509808ee4f63e0ba02bab6585064c2896004a +cpupower f9652d5cae04eb5e85303c087f5842d320499c65 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 8a352fd8787cefcb19c25ca1390301f874797b9c +thermal e9ed3ee61aa62ce280aadeeea1ec959f0c66a290 +thermal-soc 6d7c70d1cd6526dc79e3d3b3faae1c40c1681168 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm da3627c30d229fea1e070e984366f80a1c4d9166 +swiotlb 4855c92dbb7b3b85c23e88ab7ca04f99b9677b41 +rdma c1191a19fecad92b73c25770a7f47174280ca564 +net-next f0dc7f9c6dd99891611fca5849cbc4c6965b690e +bpf-next f0dc7f9c6dd99891611fca5849cbc4c6965b690e +ipsec-next f03329627b46c28f0682040e7ddbfd346b78bd4e +netfilter-next f0dc7f9c6dd99891611fca5849cbc4c6965b690e +nfc-next 7579d009c4a1e01d0c21e72ee9c4dbf0832f83f3 +ipvs-next e523452ac0e046d38fcfb7c16748ab8090bf98cd +wireless-drivers-next 76606886c9f433bb46ed9c8910cabce780b23f36 +bluetooth 3a979e8c07e3ee9933016368db0a55943b00a089 +mac80211-next 7d840a606515b04dfb4f13d1abb86dd59163799c +gfs2 f0dc7f9c6dd99891611fca5849cbc4c6965b690e +mtd b771327a4530e7ff05ae173d4903cd70357bb803 +nand f567c71f4f91d173795a2f46d6fc493387ce084d +spi-nor 771ff17e82fac54686f149e311d4ea74a70255b1 +crypto b268b3506d9910ca8238e92cb1dc51340574b2f2 +drm 33ce21d6a2491ef9adb8dc395e3f5bbbfcdc95b5 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 807cba6559cf333a74df1fbd74f0597e8e7fa020 +drm-tegra 6134534ca24f42043cacdd7108026803577f6c59 +drm-misc 069035c5db3459b9b5f12caf3bffed9a863fa5c4 +drm-msm ef2e83fb8feedea0812503566339372d68ace0ae +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 6e810eb508f4b937bc2a718bd4e5cd74cca55500 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 518665524272e4e993e9579bd8c4aba9d8bc7343 +etnaviv f6ffbd4fc1a1caafe2ab840993b917fba5324598 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 66431563e0d9cf449e53ae3b77ae86f95ee58e11 +sound d9d5ed1ad5d8a256c8c3f6b7736d9dad10232637 +sound-asoc 5544717d416d9a095edc616be789bdab69e284dc +modules c554b89868015d86cd330d9cc10656c3756352a5 +input 5aff29efbec020f0997e5cdbefce0ff383518986 +block 28313cee1d4f8b5f012677802e8cb6c5de21b490 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 48debafe4f2feabcc99f8e2659e80557e3ca6b39 +pcmcia c3a5307873d4a47efd4373f4a50f450a17b5d9c1 +mmc ef5332c10d4f332a2ac79e9ad5452f4e89d1815a +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 07ecb3a36765caeb9c15f4880284f972d7bc7408 +mfd 556c242045f0c1613aac2e64dc5b2ff0e4bc89e1 +backlight d5318d302e7cf6583ec85a2a8bfbb3a3910ae372 +battery c42812da1395bf57a6f7b5934b5339a3a42c2c7d +regulator 13ed4964057e5ad183da9f7f8160841d261e9517 +security d19289133b1d3d7b11ab52216ea4ac4a7c86942b +apparmor 338d0be437ef10e247a35aed83dbab182cf406a2 +integrity b5c90a7526fe39164c2204f0404ce8f8ff21e522 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux d141136f523a3a6372d22981bdff7a8906f36fea +tpmdd 3ac7e6225c0b4047be91c750ccecb97ae8d93f7a +watchdog 16a7eec2fcd020c73cf0ca38bf774775167d22eb +iommu 1f568357117cafb48aafb10413cbd1567dc015b1 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio c1abca96b252a9627f99f39215b84e5de92bf1e3 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 5b71388663c0920848c0ee7de946970a2692b76d +devicetree 44acf10587907ff77c28fd97906220b2d8eb4f05 +mailbox f83d1cfc8bcddf93bb6f55940fd59f5b047863e5 +spi 39202ebf0939433550e2a629a7764e7870857a3a +tip cc82cbbdd454778f8ddd2274a44c43c610af2ecd +clockevents 6bd9549d8a7dd06087a06fa7a6df651b02d6f21e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd eaa3a1d46cfdbf1af50311e7a22f5d38c0418b56 +irqchip 6a88c221acbaaa0460d190f99093ab8114f23c09 +ftrace a9235b544a0ae95fbd56443bdbd251358c7df4c5 +rcu 443da8397d9ffe612a20beceb41c477d638d96ff +kvm 766d3571d8e50d3a73b77043dc632226f9e6b389 +kvm-arm e25028c8ded011d19f9a11164807507c94febc01 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc f61e0d3cc4aee194014074471658a5a037e311ce +kvms390 2c8180e885c1b2844a24dcaf4a675972b8ce8edc +xen-tip 7f47e1c52d0c850cbd24aab763ce6bab11bdb4b2 +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 66448bc274cadedb71fda7d914e7c29d8dead217 +drivers-x86 26ed9d1c07efa5c3a3810dbb7c668e132e91d426 +chrome-platform 5cd7e690bdc12a08e3d9a2a2260728f771b382f3 +hsi 70d52ba9e57eb93cfe916f7f4d14a09750890ffd +leds 6d71021ab3b0bd6ff98270343353b03dfae5d550 +ipmi 048f7c3e352eeef50ed2c14dd89683f8a3af2f9b +driver-core 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +usb 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +usb-gadget 47265c067c0d129f3a0e94bc221293a780af9d78 +usb-serial 7041d9c3f01b365daa50340a5d2dce84a09ea813 +usb-chipidea-next 8bcf4c0bd7fbff64ec3fc70b5ecb0d1285e71eca +phy-next c1eb8f83845b6ca9e53c41c26a4dff57597d4969 +tty 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +char-misc 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +extcon 1da1063a16b496a33178bd052c81a4146a143b25 +staging 3ca24ce9ff764bc27bceb9b2fd8ece74846c3fd3 +mux 6a3d4baac84a624d7f4ae602254d022fea1eb5f2 +slave-dma c79c2212f7c9a2d1d6ac7cb57713e94c9b9aa58c +cgroup d8742e22902186e30c346b1ba881cb52942ae3e4 +scsi 3cedc8797b9c0f2222fd45a01f849c57c088828b +scsi-mkp 1b5c2cb196684f1418fe82257a1b0a8cb0aabc9d +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +libata ed058253618efe5555e95189236d1adcaeff72a7 +vhost 2eb98105f8c7f4b867f7f714a998f5b8c1bb009b +rpmsg 1601c6923d66507ffd5c64a749507629442f3cdf +gpio 6310b930ccbba55168f30b610fae681d73bd7bd2 +pinctrl 86c5dd6860a60e9b69558ecfce2c4769045d110c +pinctrl-samsung 7c24e71c8a6423dfa5a7f19b253726b23af0c507 +pwm 414c52b7899aa9097c2fa8444654a866e1df4a0c +userns 4b245b90065bee3231ca41a8c7f017f55a212656 +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random bfe80ed3d7c7697878c88d8e3cf6a23113690ab1 +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest 53c3daf8cfeae4b1289723c7abeb9540c1630cf8 +y2038 e0ffebf0f3f34e7f1091f29af96f369921697cf4 +livepatching d7ab8e67aa52e27837aefdc0d67af93ae0931abc +coresight b66e01615a291e12765e1ff7d1ca1222f5dff392 +rtc e4302aec8a0646828a701443e303eb5ef48b37f5 +nvdimm d95363c957059e87e012597cc756c1a97b537738 +at24 73b0d922cd5be4219eb5528a961714d740291b0e +ntb c9160b69258ef46ab62c27a09decb8fef311e700 +kspp 45888b40d2a6221d46bb69959e2600ddba71cc1f +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco 5997aab0a11ea27ee8e520ecc551ed18fd3e8296 +akpm-current 8a85411459a4153d4c5519019b68d1946e534d68 +akpm 4ef6a05c5d572d3f7e2d43f349d6477cd8e853c5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..5df04429dc8d --- /dev/null +++ b/Next/Trees @@ -0,0 +1,281 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +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/linux/kernel/git/tytso/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 +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 +nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes +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 +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 +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-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 +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 +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +uuid git git://git.infradead.org/users/hch/uuid.git#for-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 +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/nferre/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 +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.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 +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +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 +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 +powerpc-pkey git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/pkey +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.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/linux/kernel/git/tytso/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 +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 +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#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/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-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 +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/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 +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 +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-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 git://people.freedesktop.org/~robclark/linux#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 +sunxi-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +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 +lightnvm git git://github.com/OpenChannelSSD/linux.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 +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +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 git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_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-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.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/tj/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/bleung/chrome-platform.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 +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 +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 +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.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 +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 +aio git git://git.kvack.org/~bcrl/aio-next.git#master +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/jikos/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 +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..f946e04de328 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3747 @@ +$ date -R +Thu, 14 Jun 2018 07:55:23 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 19785cf93b6c Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal +Merging origin/master (be779f03d563 Merge tag 'kbuild-v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge origin/master +Updating 19785cf93b6c..be779f03d563 +Fast-forward + Documentation/acpi/method-customizing.txt | 10 +- + Documentation/device-mapper/writecache.txt | 68 + + .../devicetree/bindings/power/power_domain.txt | 19 +- + Documentation/kbuild/kconfig-language.txt | 18 + + MAINTAINERS | 70 +- + Makefile | 147 +- + arch/Kconfig | 50 +- + arch/arm/kernel/sys_oabi-compat.c | 4 +- + arch/arm/mach-footbridge/dc21285.c | 2 +- + arch/arm/mach-ixp4xx/common-pci.c | 2 +- + arch/arm/mach-omap1/mcbsp.c | 2 +- + arch/arm/mach-omap2/hsmmc.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 4 +- + arch/arm/mach-omap2/prm_common.c | 9 +- + arch/arm/mach-vexpress/spc.c | 2 +- + arch/arm/mm/dma-mapping.c | 4 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm/probes/kprobes/test-core.c | 5 +- + arch/arm64/Kconfig | 1 + + arch/arm64/Makefile | 6 - + arch/arm64/kernel/armv8_deprecated.c | 4 +- + arch/arm64/mm/context.c | 2 +- + arch/ia64/kernel/mca_drv.c | 3 +- + arch/ia64/kernel/topology.c | 6 +- + arch/ia64/mm/tlb.c | 5 +- + arch/ia64/sn/kernel/io_common.c | 2 +- + arch/ia64/sn/kernel/irq.c | 3 +- + arch/ia64/sn/pci/pcibr/pcibr_provider.c | 2 +- + arch/mips/alchemy/common/clock.c | 2 +- + arch/mips/alchemy/common/dbdma.c | 6 +- + arch/mips/alchemy/common/platform.c | 4 +- + arch/mips/alchemy/devboards/platform.c | 4 +- + arch/mips/bmips/dma.c | 2 +- + arch/mips/txx9/rbtx4939/setup.c | 2 +- + arch/powerpc/Kconfig | 18 +- + arch/powerpc/Makefile | 13 +- + arch/powerpc/include/asm/module.h | 2 +- + arch/powerpc/kernel/module_64.c | 4 +- + arch/powerpc/kernel/rtasd.c | 3 +- + arch/powerpc/kernel/trace/ftrace.c | 6 +- + arch/powerpc/kernel/vdso.c | 4 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 2 +- + arch/powerpc/lib/rheap.c | 2 +- + arch/powerpc/mm/mmu_context_iommu.c | 2 +- + arch/powerpc/mm/numa.c | 2 +- + arch/powerpc/net/bpf_jit_comp.c | 2 +- + arch/powerpc/net/bpf_jit_comp64.c | 2 +- + arch/powerpc/oprofile/cell/spu_profiler.c | 4 +- + arch/powerpc/platforms/4xx/hsta_msi.c | 3 +- + arch/powerpc/platforms/4xx/msi.c | 2 +- + arch/powerpc/platforms/4xx/pci.c | 2 +- + arch/powerpc/platforms/powernv/opal-sysparam.c | 8 +- + arch/powerpc/sysdev/mpic.c | 9 +- + arch/powerpc/sysdev/xive/native.c | 2 +- + arch/powerpc/tools/gcc-check-mprofile-kernel.sh | 1 - + arch/s390/appldata/appldata_base.c | 2 +- + arch/s390/hypfs/hypfs_diag.c | 2 +- + arch/s390/hypfs/hypfs_diag0c.c | 3 +- + arch/s390/kernel/debug.c | 6 +- + arch/s390/kernel/module.c | 4 +- + arch/s390/kernel/perf_cpum_cf_events.c | 2 +- + arch/s390/kernel/sthyi.c | 2 +- + arch/s390/kernel/vdso.c | 4 +- + arch/s390/kvm/gaccess.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/mm/extmem.c | 2 +- + arch/sh/drivers/dma/dmabrg.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + arch/sh/include/asm/vmlinux.lds.h | 4 +- + arch/sparc/kernel/nmi.c | 3 +- + arch/sparc/kernel/sys_sparc_64.c | 8 +- + arch/sparc/net/bpf_jit_comp_32.c | 2 +- + arch/um/drivers/ubd_kern.c | 12 +- + arch/um/drivers/vector_kern.c | 12 +- + arch/unicore32/kernel/pm.c | 5 +- + arch/x86/Kconfig | 11 +- + arch/x86/events/amd/iommu.c | 2 +- + arch/x86/events/core.c | 2 +- + arch/x86/events/intel/uncore.c | 21 +- + arch/x86/kernel/cpu/mcheck/mce.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + arch/x86/kernel/cpu/mtrr/if.c | 2 +- + arch/x86/kernel/hpet.c | 6 +- + arch/x86/kernel/ksysfs.c | 2 +- + arch/x86/kvm/cpuid.c | 8 +- + arch/x86/kvm/page_track.c | 5 +- + arch/x86/kvm/svm.c | 4 +- + arch/x86/kvm/vmx.c | 3 + + arch/x86/kvm/x86.c | 5 +- + arch/x86/net/bpf_jit_comp.c | 2 +- + arch/x86/net/bpf_jit_comp32.c | 2 +- + arch/x86/pci/xen.c | 2 +- + arch/x86/platform/uv/tlb_uv.c | 2 +- + arch/x86/platform/uv/uv_time.c | 2 +- + block/bio.c | 3 +- + block/blk-mq.c | 16 +- + block/blk-tag.c | 4 +- + block/blk-zoned.c | 4 +- + block/partitions/check.c | 2 +- + block/partitions/ldm.c | 2 +- + crypto/algif_aead.c | 4 +- + crypto/algif_skcipher.c | 3 +- + crypto/testmgr.c | 3 +- + drivers/acpi/acpi_platform.c | 2 +- + drivers/acpi/acpi_video.c | 5 +- + drivers/acpi/acpica/dbnames.c | 1 + + drivers/acpi/acpica/dbobject.c | 23 +- + drivers/acpi/acpica/dsdebug.c | 12 +- + drivers/acpi/acpica/exconfig.c | 11 + + drivers/acpi/acpica/nsdump.c | 3 + + drivers/acpi/acpica/psloop.c | 51 +- + drivers/acpi/acpica/psobject.c | 30 + + drivers/acpi/acpica/pswalk.c | 34 +- + drivers/acpi/acpica/uterror.c | 10 +- + drivers/acpi/acpica/utosi.c | 1 + + drivers/acpi/apei/erst.c | 3 +- + drivers/acpi/apei/hest.c | 3 +- + drivers/acpi/fan.c | 4 +- + drivers/acpi/nfit/core.c | 7 +- + drivers/acpi/processor_perflib.c | 5 +- + drivers/acpi/processor_throttling.c | 5 +- + drivers/acpi/sysfs.c | 6 +- + drivers/android/binder_alloc.c | 4 +- + drivers/ata/libata-core.c | 2 +- + drivers/ata/libata-pmp.c | 2 +- + drivers/ata/sata_mv.c | 8 +- + drivers/atm/fore200e.c | 3 +- + drivers/atm/iphase.c | 2 +- + drivers/atm/solos-pci.c | 3 +- + drivers/auxdisplay/cfag12864b.c | 4 +- + drivers/base/dd.c | 3 +- + drivers/base/firmware_loader/fallback.c | 2 +- + drivers/base/power/common.c | 43 +- + drivers/base/power/domain.c | 134 +- + drivers/base/power/runtime.c | 27 +- + drivers/base/power/sysfs.c | 2 +- + drivers/block/DAC960.c | 4 +- + drivers/block/drbd/drbd_main.c | 3 +- + drivers/block/loop.c | 3 +- + drivers/block/null_blk.c | 9 +- + drivers/block/ps3vram.c | 5 +- + drivers/block/rsxx/core.c | 3 +- + drivers/block/rsxx/dma.c | 2 +- + drivers/block/xen-blkback/xenbus.c | 3 +- + drivers/block/xen-blkfront.c | 23 +- + drivers/block/z2ram.c | 5 +- + drivers/block/zram/zram_drv.c | 2 +- + drivers/bus/fsl-mc/fsl-mc-allocator.c | 6 +- + drivers/cdrom/cdrom.c | 2 +- + drivers/char/agp/amd-k7-agp.c | 3 +- + drivers/char/agp/ati-agp.c | 3 +- + drivers/char/agp/compat_ioctl.c | 8 +- + drivers/char/agp/isoch.c | 3 +- + drivers/char/agp/sgi-agp.c | 6 +- + drivers/char/agp/sworks-agp.c | 2 +- + drivers/char/agp/uninorth-agp.c | 4 +- + drivers/char/ipmi/ipmi_ssif.c | 3 +- + drivers/char/raw.c | 3 +- + drivers/char/tpm/tpm2-cmd.c | 2 +- + drivers/char/virtio_console.c | 18 +- + drivers/clk/bcm/clk-bcm2835.c | 4 +- + drivers/clk/renesas/clk-r8a7740.c | 2 +- + drivers/clk/renesas/clk-r8a7779.c | 2 +- + drivers/clk/renesas/clk-rcar-gen2.c | 2 +- + drivers/clk/renesas/clk-rz.c | 2 +- + drivers/clk/st/clkgen-fsyn.c | 2 +- + drivers/clk/st/clkgen-pll.c | 2 +- + drivers/clk/sunxi/clk-usb.c | 2 +- + drivers/clk/tegra/clk.c | 7 +- + drivers/clk/ti/adpll.c | 6 +- + drivers/clk/ti/apll.c | 2 +- + drivers/clk/ti/divider.c | 4 +- + drivers/clk/ti/dpll.c | 2 +- + drivers/clocksource/sh_cmt.c | 2 +- + drivers/clocksource/sh_mtu2.c | 2 +- + drivers/clocksource/sh_tmu.c | 2 +- + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/acpi-cpufreq.c | 8 +- + drivers/cpufreq/arm_big_little.c | 2 +- + drivers/cpufreq/bmips-cpufreq.c | 2 +- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 +- + drivers/cpufreq/cppc_cpufreq.c | 3 +- + drivers/cpufreq/cpufreq_governor.c | 12 +- + drivers/cpufreq/ia64-acpi-cpufreq.c | 4 +- + drivers/cpufreq/imx6q-cpufreq.c | 32 +- + drivers/cpufreq/intel_pstate.c | 181 +- + drivers/cpufreq/longhaul.c | 4 +- + drivers/cpufreq/pxa3xx-cpufreq.c | 2 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 2 +- + drivers/cpufreq/sfi-cpufreq.c | 4 +- + drivers/cpufreq/spear-cpufreq.c | 2 +- + drivers/cpufreq/ti-cpufreq.c | 7 +- + drivers/crypto/amcc/crypto4xx_core.c | 8 +- + drivers/crypto/cavium/nitrox/nitrox_isr.c | 2 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- + drivers/crypto/inside-secure/safexcel_hash.c | 2 +- + drivers/crypto/marvell/cesa.c | 2 +- + drivers/crypto/marvell/hash.c | 2 +- + drivers/crypto/n2_core.c | 4 +- + drivers/crypto/qat/qat_common/adf_isr.c | 2 +- + drivers/crypto/qat/qat_common/qat_uclo.c | 5 +- + drivers/crypto/stm32/stm32-hash.c | 5 +- + drivers/crypto/talitos.c | 13 +- + drivers/crypto/virtio/virtio_crypto_algs.c | 2 +- + drivers/devfreq/devfreq.c | 15 +- + drivers/devfreq/event/exynos-ppmu.c | 2 +- + drivers/dma/bestcomm/bestcomm.c | 3 +- + drivers/dma/ioat/init.c | 4 +- + drivers/dma/ipu/ipu_idmac.c | 3 +- + drivers/dma/k3dma.c | 8 +- + drivers/dma/mic_x100_dma.c | 3 +- + drivers/dma/mv_xor.c | 4 +- + drivers/dma/mv_xor_v2.c | 5 +- + drivers/dma/pl330.c | 4 +- + drivers/dma/s3c24xx-dma.c | 6 +- + drivers/dma/sh/shdma-base.c | 5 +- + drivers/dma/xilinx/zynqmp_dma.c | 2 +- + drivers/dma/zx_dma.c | 8 +- + drivers/edac/amd64_edac.c | 2 +- + drivers/edac/i7core_edac.c | 2 +- + drivers/extcon/extcon.c | 24 +- + drivers/firewire/core-iso.c | 4 +- + drivers/firewire/net.c | 2 +- + drivers/firmware/arm_scpi.c | 2 +- + drivers/firmware/dell_rbu.c | 2 +- + drivers/firmware/efi/capsule.c | 2 +- + drivers/firmware/efi/runtime-map.c | 2 +- + drivers/firmware/ti_sci.c | 6 +- + drivers/fmc/fmc-sdb.c | 4 +- + drivers/gpio/gpio-adnp.c | 2 +- + drivers/gpio/gpio-aspeed.c | 4 +- + drivers/gpio/gpio-bcm-kona.c | 7 +- + drivers/gpio/gpio-davinci.c | 4 +- + drivers/gpio/gpio-htc-egpio.c | 4 +- + drivers/gpio/gpio-ml-ioh.c | 2 +- + drivers/gpio/gpio-thunderx.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 2 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 9 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 5 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + drivers/gpu/drm/amd/display/dc/basics/logger.c | 2 +- + drivers/gpu/drm/amd/display/dc/basics/vector.c | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 6 +- + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 3 +- + .../drm/amd/display/modules/color/color_gamma.c | 47 +- + .../drm/amd/display/modules/freesync/freesync.c | 3 +- + drivers/gpu/drm/amd/display/modules/stats/stats.c | 12 +- + drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 2 +- + drivers/gpu/drm/drm_edid.c | 3 +- + drivers/gpu/drm/drm_hashtab.c | 2 +- + drivers/gpu/drm/drm_memory.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 5 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- + drivers/gpu/drm/gma500/mid_bios.c | 2 +- + drivers/gpu/drm/i915/gvt/gtt.c | 5 +- + drivers/gpu/drm/i915/gvt/mmio.c | 2 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 2 +- + drivers/gpu/drm/i915/intel_hdcp.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 24 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 4 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 2 +- + drivers/gpu/drm/nouveau/nvif/fifo.c | 4 +- + drivers/gpu/drm/nouveau/nvif/mmu.c | 9 +- + drivers/gpu/drm/nouveau/nvif/object.c | 2 +- + drivers/gpu/drm/nouveau/nvif/vmm.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/core/event.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 4 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 4 +- + drivers/gpu/drm/qxl/qxl_fb.c | 2 +- + drivers/gpu/drm/qxl/qxl_kms.c | 4 +- + drivers/gpu/drm/radeon/atom.c | 2 +- + drivers/gpu/drm/radeon/btc_dpm.c | 4 +- + drivers/gpu/drm/radeon/ci_dpm.c | 9 +- + drivers/gpu/drm/radeon/kv_dpm.c | 5 +- + drivers/gpu/drm/radeon/ni_dpm.c | 9 +- + drivers/gpu/drm/radeon/r600_dpm.c | 2 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 39 +- + drivers/gpu/drm/radeon/radeon_combios.c | 9 +- + drivers/gpu/drm/radeon/radeon_gart.c | 7 +- + drivers/gpu/drm/radeon/radeon_test.c | 2 +- + drivers/gpu/drm/radeon/rs780_dpm.c | 5 +- + drivers/gpu/drm/radeon/rv6xx_dpm.c | 5 +- + drivers/gpu/drm/radeon/rv770_dpm.c | 5 +- + drivers/gpu/drm/radeon/si_dpm.c | 9 +- + drivers/gpu/drm/radeon/sumo_dpm.c | 5 +- + drivers/gpu/drm/radeon/trinity_dpm.c | 5 +- + drivers/gpu/drm/savage/savage_bci.c | 5 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 24 +- + drivers/gpu/drm/tinydrm/repaper.c | 2 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 8 +- + drivers/gpu/drm/vc4/vc4_plane.c | 2 +- + drivers/gpu/drm/via/via_dmablit.c | 2 +- + drivers/hid/hid-core.c | 9 +- + drivers/hid/hid-debug.c | 6 +- + drivers/hid/hid-picolcd_fb.c | 3 +- + drivers/hid/hid-sensor-hub.c | 3 +- + drivers/hid/hidraw.c | 2 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 4 +- + drivers/hid/wacom_sys.c | 4 +- + drivers/hv/hv.c | 2 +- + drivers/hv/ring_buffer.c | 2 +- + drivers/hwmon/acpi_power_meter.c | 7 +- + drivers/hwmon/aspeed-pwm-tacho.c | 2 +- + drivers/hwmon/coretemp.c | 2 +- + drivers/hwmon/gpio-fan.c | 8 +- + drivers/hwmon/i5k_amb.c | 5 +- + drivers/hwmon/ibmpex.c | 2 +- + drivers/hwmon/ibmpowernv.c | 9 +- + drivers/hwmon/iio_hwmon.c | 4 +- + drivers/hwmon/nct6683.c | 4 +- + drivers/hwmon/nct6775.c | 4 +- + drivers/hwmon/pmbus/pmbus_core.c | 4 +- + drivers/hwmon/pmbus/ucd9000.c | 4 +- + drivers/hwmon/pwm-fan.c | 2 +- + drivers/hwtracing/coresight/coresight-etb10.c | 4 +- + drivers/hwtracing/coresight/of_coresight.c | 9 +- + drivers/i2c/busses/i2c-amd756-s4882.c | 4 +- + drivers/i2c/busses/i2c-nforce2-s4985.c | 4 +- + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/busses/i2c-qup.c | 8 +- + drivers/i2c/i2c-dev.c | 2 +- + drivers/i2c/i2c-stub.c | 5 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 9 +- + drivers/i2c/muxes/i2c-mux-reg.c | 4 +- + drivers/ide/hpt366.c | 2 +- + drivers/ide/ide-probe.c | 5 +- + drivers/ide/it821x.c | 2 +- + drivers/iio/adc/at91_adc.c | 7 +- + drivers/iio/adc/max1027.c | 4 +- + drivers/iio/adc/max1363.c | 6 +- + drivers/iio/adc/twl6030-gpadc.c | 7 +- + drivers/iio/dac/ad5592r-base.c | 5 +- + drivers/iio/imu/adis_buffer.c | 2 +- + drivers/iio/inkern.c | 2 +- + drivers/iio/multiplexer/iio-mux.c | 7 +- + drivers/infiniband/core/cache.c | 5 +- + drivers/infiniband/core/cma.c | 4 +- + drivers/infiniband/core/device.c | 4 +- + drivers/infiniband/core/fmr_pool.c | 5 +- + drivers/infiniband/core/iwpm_util.c | 10 +- + drivers/infiniband/core/umem_odp.c | 16 +- + drivers/infiniband/core/uverbs_cmd.c | 4 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 4 +- + drivers/infiniband/hw/cxgb4/device.c | 7 +- + drivers/infiniband/hw/cxgb4/id_table.c | 4 +- + drivers/infiniband/hw/cxgb4/qp.c | 8 +- + drivers/infiniband/hw/hfi1/sdma.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 2 +- + drivers/infiniband/hw/mlx4/mad.c | 3 +- + drivers/infiniband/hw/mlx4/main.c | 12 +- + drivers/infiniband/hw/mlx4/qp.c | 4 +- + drivers/infiniband/hw/mlx5/srq.c | 4 +- + drivers/infiniband/hw/mthca/mthca_allocator.c | 18 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 6 +- + drivers/infiniband/hw/mthca/mthca_eq.c | 6 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +- + drivers/infiniband/hw/mthca/mthca_mr.c | 4 +- + drivers/infiniband/hw/mthca/mthca_profile.c | 2 +- + drivers/infiniband/hw/mthca/mthca_qp.c | 4 +- + drivers/infiniband/hw/mthca/mthca_srq.c | 2 +- + drivers/infiniband/hw/nes/nes_mgt.c | 3 +- + drivers/infiniband/hw/nes/nes_nic.c | 2 +- + drivers/infiniband/hw/nes/nes_verbs.c | 5 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 11 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 15 +- + drivers/infiniband/hw/qedr/main.c | 4 +- + drivers/infiniband/hw/qedr/verbs.c | 4 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 9 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 9 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 34 +- + drivers/infiniband/hw/qib/qib_init.c | 14 +- + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 +- + drivers/infiniband/hw/usnic/usnic_vnic.c | 2 +- + drivers/infiniband/sw/rdmavt/qp.c | 11 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 10 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 5 +- + drivers/infiniband/ulp/isert/ib_isert.c | 5 +- + drivers/infiniband/ulp/srp/ib_srp.c | 9 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/input/joystick/joydump.c | 2 +- + drivers/input/keyboard/clps711x-keypad.c | 4 +- + drivers/input/keyboard/matrix_keypad.c | 6 +- + drivers/input/keyboard/omap4-keypad.c | 3 +- + drivers/input/keyboard/samsung-keypad.c | 2 +- + drivers/input/matrix-keymap.c | 4 +- + drivers/input/misc/rotary_encoder.c | 4 +- + drivers/input/rmi4/rmi_driver.c | 9 +- + drivers/input/rmi4/rmi_f11.c | 15 +- + drivers/input/rmi4/rmi_f12.c | 15 +- + drivers/input/rmi4/rmi_f54.c | 2 +- + drivers/input/rmi4/rmi_spi.c | 9 +- + drivers/iommu/arm-smmu.c | 2 +- + drivers/iommu/dmar.c | 2 +- + drivers/iommu/intel-iommu.c | 4 +- + drivers/iommu/omap-iommu.c | 2 +- + drivers/iommu/rockchip-iommu.c | 2 +- + drivers/iommu/tegra-gart.c | 2 +- + drivers/ipack/carriers/tpci200.c | 4 +- + drivers/irqchip/irq-alpine-msi.c | 3 +- + drivers/irqchip/irq-gic-v2m.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 19 +- + drivers/irqchip/irq-gic-v3.c | 5 +- + drivers/irqchip/irq-imgpdc.c | 2 +- + drivers/irqchip/irq-mvebu-gicp.c | 8 +- + drivers/irqchip/irq-partition-percpu.c | 2 +- + drivers/irqchip/irq-s3c24xx.c | 2 +- + drivers/isdn/capi/capi.c | 2 +- + drivers/isdn/capi/capidrv.c | 3 +- + drivers/isdn/gigaset/capi.c | 6 +- + drivers/isdn/gigaset/common.c | 4 +- + drivers/isdn/gigaset/i4l.c | 2 +- + drivers/isdn/hardware/avm/b1.c | 2 +- + drivers/isdn/hisax/fsm.c | 4 +- + drivers/isdn/hisax/hfc_2bds0.c | 2 +- + drivers/isdn/hisax/hfc_2bs0.c | 3 +- + drivers/isdn/hisax/netjet.c | 12 +- + drivers/isdn/i4l/isdn_bsdcomp.c | 5 +- + drivers/isdn/i4l/isdn_common.c | 10 +- + drivers/isdn/mISDN/fsm.c | 6 +- + drivers/leds/leds-adp5520.c | 2 +- + drivers/leds/leds-apu.c | 4 +- + drivers/leds/leds-cr0014114.c | 3 +- + drivers/leds/leds-da9052.c | 4 +- + drivers/leds/leds-lp5521.c | 4 +- + drivers/leds/leds-lp5523.c | 4 +- + drivers/leds/leds-lp5562.c | 4 +- + drivers/leds/leds-lp55xx-common.c | 2 +- + drivers/leds/leds-lp8501.c | 4 +- + drivers/leds/leds-lt3593.c | 4 +- + drivers/leds/leds-mc13783.c | 4 +- + drivers/leds/leds-mlxcpld.c | 6 +- + drivers/leds/leds-netxbig.c | 16 +- + drivers/leds/leds-ns2.c | 7 +- + drivers/leds/leds-pca955x.c | 8 +- + drivers/leds/leds-pca963x.c | 6 +- + drivers/leds/leds-tca6507.c | 4 +- + drivers/lightnvm/pblk-gc.c | 2 +- + drivers/lightnvm/pblk-init.c | 8 +- + drivers/lightnvm/pblk-recovery.c | 2 +- + drivers/mailbox/hi6220-mailbox.c | 8 +- + drivers/mailbox/mailbox-sti.c | 4 +- + drivers/mailbox/omap-mailbox.c | 10 +- + drivers/mailbox/pcc.c | 3 +- + drivers/mailbox/ti-msgmgr.c | 4 +- + drivers/md/Kconfig | 11 + + drivers/md/Makefile | 1 + + drivers/md/bcache/super.c | 11 +- + drivers/md/bcache/sysfs.c | 3 +- + drivers/md/dm-bio-prison-v1.c | 2 +- + drivers/md/dm-bio-prison-v2.c | 2 +- + drivers/md/dm-cache-policy-smq.c | 4 +- + drivers/md/dm-cache-target.c | 61 +- + drivers/md/dm-core.h | 38 +- + drivers/md/dm-crypt.c | 31 +- + drivers/md/dm-integrity.c | 18 +- + drivers/md/dm-ioctl.c | 3 +- + drivers/md/dm-kcopyd.c | 3 +- + drivers/md/dm-region-hash.c | 15 +- + drivers/md/dm-snap.c | 9 +- + drivers/md/dm-stats.c | 4 +- + drivers/md/dm-switch.c | 3 +- + drivers/md/dm-table.c | 2 +- + drivers/md/dm-thin.c | 9 +- + drivers/md/dm-verity-target.c | 5 +- + drivers/md/dm-writecache.c | 2305 ++++++++++++++++++++ + drivers/md/dm-zoned-target.c | 2 +- + drivers/md/md-bitmap.c | 6 +- + drivers/md/md-cluster.c | 6 +- + drivers/md/md-multipath.c | 3 +- + drivers/md/raid0.c | 10 +- + drivers/md/raid1.c | 13 +- + drivers/md/raid10.c | 15 +- + drivers/md/raid5.c | 15 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 15 +- + drivers/media/dvb-core/dmxdev.c | 3 +- + drivers/media/dvb-core/dvb_demux.c | 6 +- + drivers/media/dvb-frontends/dib7000p.c | 4 +- + drivers/media/dvb-frontends/dib8000.c | 4 +- + drivers/media/dvb-frontends/dib9000.c | 4 +- + drivers/media/i2c/s5k5baf.c | 2 +- + drivers/media/pci/bt8xx/bttv-risc.c | 3 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 2 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 2 +- + drivers/media/pci/cx88/cx88-alsa.c | 2 +- + drivers/media/pci/ivtv/ivtvfb.c | 2 +- + drivers/media/pci/meye/meye.c | 2 +- + drivers/media/pci/pt1/pt1.c | 2 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 2 +- + drivers/media/pci/ttpci/av7110_ipack.c | 2 +- + drivers/media/platform/am437x/am437x-vpfe.c | 6 +- + drivers/media/platform/davinci/vpif_capture.c | 10 +- + .../media/platform/qcom/camss-8x16/camss-csid.c | 8 +- + .../media/platform/qcom/camss-8x16/camss-csiphy.c | 11 +- + .../media/platform/qcom/camss-8x16/camss-ispif.c | 9 +- + drivers/media/platform/qcom/camss-8x16/camss-vfe.c | 8 +- + drivers/media/platform/qcom/camss-8x16/camss.c | 3 +- + drivers/media/platform/soc_camera/soc_camera.c | 3 +- + drivers/media/platform/vivid/vivid-core.c | 9 +- + drivers/media/platform/vsp1/vsp1_entity.c | 3 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 2 +- + drivers/media/usb/au0828/au0828-video.c | 6 +- + drivers/media/usb/cpia2/cpia2_usb.c | 3 +- + drivers/media/usb/cx231xx/cx231xx-audio.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 8 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 4 +- + drivers/media/usb/go7007/go7007-fw.c | 2 +- + drivers/media/usb/go7007/go7007-usb.c | 3 +- + drivers/media/usb/gspca/t613.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-std.c | 2 +- + drivers/media/usb/stk1160/stk1160-core.c | 5 +- + drivers/media/usb/stk1160/stk1160-video.c | 6 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 5 +- + drivers/media/usb/tm6000/tm6000-video.c | 13 +- + drivers/media/usb/usbtv/usbtv-video.c | 2 +- + drivers/media/usb/usbvision/usbvision-video.c | 3 +- + drivers/media/usb/uvc/uvc_video.c | 4 +- + drivers/media/v4l2-core/v4l2-event.c | 3 +- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 7 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 7 +- + drivers/memory/of_memory.c | 4 +- + drivers/memstick/core/ms_block.c | 6 +- + drivers/message/fusion/mptlan.c | 7 +- + drivers/mfd/ab8500-debugfs.c | 12 +- + drivers/mfd/cros_ec_dev.c | 7 +- + drivers/mfd/htc-i2cpld.c | 4 +- + drivers/mfd/mfd-core.c | 2 +- + drivers/mfd/motorola-cpcap.c | 6 +- + drivers/mfd/sprd-sc27xx-spi.c | 5 +- + drivers/mfd/timberdale.c | 4 +- + drivers/mfd/twl-core.c | 5 +- + drivers/mfd/wm8994-core.c | 7 +- + drivers/misc/altera-stapl/altera.c | 6 +- + drivers/misc/cxl/guest.c | 2 +- + drivers/misc/cxl/of.c | 2 +- + drivers/misc/eeprom/idt_89hpesx.c | 2 +- + drivers/misc/genwqe/card_ddcb.c | 9 +- + drivers/misc/sgi-xp/xpc_main.c | 8 +- + drivers/misc/sgi-xp/xpc_partition.c | 2 +- + drivers/misc/sgi-xp/xpnet.c | 5 +- + drivers/misc/sram.c | 6 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 6 +- + drivers/mmc/host/sdhci-omap.c | 6 +- + drivers/mtd/ar7part.c | 2 +- + drivers/mtd/bcm47xxpart.c | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 9 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 7 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 5 +- + drivers/mtd/devices/docg3.c | 4 +- + drivers/mtd/ftl.c | 15 +- + drivers/mtd/inftlmount.c | 6 +- + drivers/mtd/lpddr/lpddr_cmds.c | 2 +- + drivers/mtd/maps/physmap_of_core.c | 4 +- + drivers/mtd/maps/vmu-flash.c | 8 +- + drivers/mtd/mtdconcat.c | 5 +- + drivers/mtd/mtdoops.c | 6 +- + drivers/mtd/mtdswap.c | 6 +- + drivers/mtd/nand/onenand/onenand_base.c | 6 +- + drivers/mtd/nand/raw/nand_bch.c | 2 +- + drivers/mtd/nand/raw/nandsim.c | 7 +- + drivers/mtd/nand/raw/qcom_nandc.c | 4 +- + drivers/mtd/nand/raw/s3c2410.c | 2 +- + drivers/mtd/nftlmount.c | 7 +- + drivers/mtd/ofpart.c | 4 +- + drivers/mtd/parsers/parser_trx.c | 2 +- + drivers/mtd/parsers/sharpslpart.c | 5 +- + drivers/mtd/rfd_ftl.c | 3 +- + drivers/mtd/sm_ftl.c | 6 +- + drivers/mtd/ssfdc.c | 5 +- + drivers/mtd/tests/pagetest.c | 2 +- + drivers/mtd/tests/stresstest.c | 2 +- + drivers/mtd/ubi/eba.c | 14 +- + drivers/mtd/ubi/wl.c | 2 +- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/can/grcan.c | 4 +- + drivers/net/can/slcan.c | 2 +- + drivers/net/dsa/b53/b53_common.c | 8 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 8 +- + drivers/net/ethernet/amd/lance.c | 8 +- + drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 4 +- + drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 4 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 4 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 +- + drivers/net/ethernet/broadcom/bnx2.c | 9 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 13 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 4 +- + drivers/net/ethernet/broadcom/cnic.c | 10 +- + drivers/net/ethernet/broadcom/tg3.c | 5 +- + drivers/net/ethernet/brocade/bna/bnad.c | 4 +- + drivers/net/ethernet/calxeda/xgmac.c | 4 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 9 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 5 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 10 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 4 +- + drivers/net/ethernet/ethoc.c | 3 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 12 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 3 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 6 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 5 +- + drivers/net/ethernet/ibm/ibmveth.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 16 +- + drivers/net/ethernet/intel/igb/igb_main.c | 7 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 5 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 8 +- + drivers/net/ethernet/jme.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/alloc.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 21 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 20 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 5 +- + drivers/net/ethernet/mellanox/mlx4/icm.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 5 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 26 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 16 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 5 +- + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 3 +- + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/moxa/moxart_ether.c | 8 +- + drivers/net/ethernet/neterion/vxge/vxge-config.c | 21 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 2 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 3 +- + drivers/net/ethernet/ni/nixge.c | 5 +- + drivers/net/ethernet/nvidia/forcedeth.c | 6 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 16 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 6 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 5 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 5 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 15 +- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 8 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 3 +- + drivers/net/ethernet/sfc/ef10.c | 3 +- + drivers/net/ethernet/sfc/falcon/farch.c | 3 +- + drivers/net/ethernet/sfc/farch.c | 3 +- + drivers/net/ethernet/socionext/netsec.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 4 +- + drivers/net/ethernet/ti/cpsw.c | 9 +- + drivers/net/ethernet/ti/netcp_ethss.c | 24 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 5 +- + drivers/net/gtp.c | 6 +- + drivers/net/hippi/rrunner.c | 2 +- + drivers/net/phy/dp83640.c | 5 +- + drivers/net/phy/phy_led_triggers.c | 6 +- + drivers/net/ppp/bsd_comp.c | 4 +- + drivers/net/ppp/pptp.c | 2 +- + drivers/net/slip/slip.c | 2 +- + drivers/net/team/team.c | 5 +- + drivers/net/usb/asix_common.c | 8 +- + drivers/net/usb/ax88179_178a.c | 4 +- + drivers/net/usb/smsc95xx.c | 2 +- + drivers/net/usb/usbnet.c | 4 +- + drivers/net/virtio_net.c | 12 +- + drivers/net/wan/fsl_ucc_hdlc.c | 6 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2 +- + drivers/net/wireless/ath/ath5k/debug.c | 2 +- + drivers/net/wireless/ath/ath5k/phy.c | 3 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 4 +- + drivers/net/wireless/ath/carl9170/main.c | 7 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 5 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 7 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 8 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 5 +- + drivers/net/wireless/cisco/airo.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 11 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 10 +- + drivers/net/wireless/intel/iwlegacy/common.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- + drivers/net/wireless/intersil/hostap/hostap_info.c | 5 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 4 +- + drivers/net/wireless/intersil/p54/eeprom.c | 12 +- + drivers/net/wireless/intersil/prism54/oid_mgt.c | 2 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 4 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 9 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/efuse.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 2 +- + drivers/net/wireless/st/cw1200/queue.c | 10 +- + drivers/net/wireless/st/cw1200/scan.c | 6 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 3 +- + drivers/net/xen-netback/xenbus.c | 4 +- + drivers/nfc/fdp/i2c.c | 4 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 +- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 4 +- + drivers/ntb/ntb_transport.c | 4 +- + drivers/nvmem/rockchip-efuse.c | 6 +- + drivers/nvmem/sunxi_sid.c | 2 +- + drivers/of/platform.c | 2 +- + drivers/of/unittest.c | 2 +- + drivers/opp/ti-opp-supply.c | 4 +- + drivers/oprofile/event_buffer.c | 2 +- + drivers/pci/Kconfig | 4 +- + drivers/pci/Makefile | 6 +- + drivers/pci/cadence/Kconfig | 27 - + drivers/pci/cadence/Makefile | 4 - + drivers/pci/{host => controller}/Kconfig | 31 +- + drivers/pci/{host => controller}/Makefile | 6 + + drivers/pci/{ => controller}/dwc/Kconfig | 0 + drivers/pci/{ => controller}/dwc/Makefile | 0 + drivers/pci/{ => controller}/dwc/pci-dra7xx.c | 6 +- + drivers/pci/{ => controller}/dwc/pci-exynos.c | 0 + drivers/pci/{ => controller}/dwc/pci-imx6.c | 0 + drivers/pci/{ => controller}/dwc/pci-keystone-dw.c | 0 + drivers/pci/{ => controller}/dwc/pci-keystone.c | 0 + drivers/pci/{ => controller}/dwc/pci-keystone.h | 0 + drivers/pci/{ => controller}/dwc/pci-layerscape.c | 0 + drivers/pci/{ => controller}/dwc/pcie-armada8k.c | 0 + drivers/pci/{ => controller}/dwc/pcie-artpec6.c | 0 + .../pci/{ => controller}/dwc/pcie-designware-ep.c | 8 +- + .../{ => controller}/dwc/pcie-designware-host.c | 2 +- + .../{ => controller}/dwc/pcie-designware-plat.c | 0 + drivers/pci/{ => controller}/dwc/pcie-designware.c | 0 + drivers/pci/{ => controller}/dwc/pcie-designware.h | 0 + drivers/pci/{ => controller}/dwc/pcie-hisi.c | 2 +- + drivers/pci/{ => controller}/dwc/pcie-histb.c | 0 + drivers/pci/{ => controller}/dwc/pcie-kirin.c | 0 + drivers/pci/{ => controller}/dwc/pcie-qcom.c | 0 + drivers/pci/{ => controller}/dwc/pcie-spear13xx.c | 0 + drivers/pci/{host => controller}/pci-aardvark.c | 0 + drivers/pci/{host => controller}/pci-ftpci100.c | 0 + drivers/pci/{host => controller}/pci-host-common.c | 0 + .../pci/{host => controller}/pci-host-generic.c | 0 + drivers/pci/{host => controller}/pci-hyperv.c | 0 + drivers/pci/{host => controller}/pci-mvebu.c | 0 + drivers/pci/{host => controller}/pci-rcar-gen2.c | 0 + drivers/pci/{host => controller}/pci-tegra.c | 0 + .../pci/{host => controller}/pci-thunder-ecam.c | 0 + drivers/pci/{host => controller}/pci-thunder-pem.c | 0 + drivers/pci/{host => controller}/pci-v3-semi.c | 0 + drivers/pci/{host => controller}/pci-versatile.c | 0 + drivers/pci/{host => controller}/pci-xgene-msi.c | 0 + drivers/pci/{host => controller}/pci-xgene.c | 0 + drivers/pci/{host => controller}/pcie-altera-msi.c | 0 + drivers/pci/{host => controller}/pcie-altera.c | 0 + .../pci/{cadence => controller}/pcie-cadence-ep.c | 3 +- + .../{cadence => controller}/pcie-cadence-host.c | 0 + drivers/pci/{cadence => controller}/pcie-cadence.c | 0 + drivers/pci/{cadence => controller}/pcie-cadence.h | 0 + drivers/pci/{host => controller}/pcie-iproc-bcma.c | 0 + drivers/pci/{host => controller}/pcie-iproc-msi.c | 0 + .../pci/{host => controller}/pcie-iproc-platform.c | 0 + drivers/pci/{host => controller}/pcie-iproc.c | 0 + drivers/pci/{host => controller}/pcie-iproc.h | 0 + drivers/pci/{host => controller}/pcie-mediatek.c | 0 + drivers/pci/{host => controller}/pcie-mobiveil.c | 0 + drivers/pci/{host => controller}/pcie-rcar.c | 0 + .../pci/{host => controller}/pcie-rockchip-ep.c | 2 +- + .../pci/{host => controller}/pcie-rockchip-host.c | 0 + drivers/pci/{host => controller}/pcie-rockchip.c | 0 + drivers/pci/{host => controller}/pcie-rockchip.h | 0 + drivers/pci/{host => controller}/pcie-tango.c | 0 + drivers/pci/{host => controller}/pcie-xilinx-nwl.c | 0 + drivers/pci/{host => controller}/pcie-xilinx.c | 0 + drivers/pci/{host => controller}/vmd.c | 0 + drivers/pci/msi.c | 4 +- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pcie/Kconfig | 41 +- + drivers/pci/pcie/Makefile | 3 +- + drivers/pci/pcie/aer.c | 1377 ++++++++++++ + drivers/pci/pcie/aer/Kconfig | 29 - + drivers/pci/pcie/aer/Kconfig.debug | 19 - + drivers/pci/pcie/aer/Makefile | 13 - + drivers/pci/pcie/aer/aerdrv.c | 371 ---- + drivers/pci/pcie/aer/aerdrv.h | 95 - + drivers/pci/pcie/aer/aerdrv_acpi.c | 141 -- + drivers/pci/pcie/aer/aerdrv_core.c | 496 ----- + drivers/pci/pcie/aer/aerdrv_errprint.c | 260 --- + drivers/pci/pcie/aer/ecrc.c | 117 - + drivers/pci/pcie/{aer => }/aer_inject.c | 3 +- + drivers/pci/pcie/dpc.c | 1 - + drivers/pci/pcie/portdrv.h | 15 + + drivers/pcmcia/cistpl.c | 4 +- + drivers/pcmcia/pd6729.c | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 +- + drivers/pinctrl/berlin/berlin.c | 10 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 18 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 23 +- + drivers/pinctrl/freescale/pinctrl-mxs.c | 20 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 21 +- + drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 16 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 39 +- + drivers/pinctrl/pinctrl-at91.c | 34 +- + drivers/pinctrl/pinctrl-axp209.c | 7 +- + drivers/pinctrl/pinctrl-digicolor.c | 5 +- + drivers/pinctrl/pinctrl-ingenic.c | 4 +- + drivers/pinctrl/pinctrl-lantiq.c | 3 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 5 +- + drivers/pinctrl/pinctrl-ocelot.c | 3 +- + drivers/pinctrl/pinctrl-rockchip.c | 24 +- + drivers/pinctrl/pinctrl-single.c | 26 +- + drivers/pinctrl/pinctrl-st.c | 31 +- + drivers/pinctrl/pinctrl-xway.c | 4 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 5 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 17 +- + drivers/pinctrl/sh-pfc/core.c | 6 +- + drivers/pinctrl/sh-pfc/gpio.c | 7 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 8 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 4 +- + drivers/pinctrl/spear/pinctrl-spear.c | 2 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 19 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 22 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 6 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 6 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +- + drivers/pinctrl/zte/pinctrl-zx.c | 6 +- + drivers/platform/mellanox/mlxreg-hotplug.c | 3 +- + drivers/platform/x86/alienware-wmi.c | 6 +- + drivers/platform/x86/intel_ips.c | 12 +- + drivers/platform/x86/panasonic-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/power/supply/charger-manager.c | 29 +- + drivers/power/supply/power_supply_core.c | 4 +- + drivers/power/supply/wm97xx_battery.c | 2 +- + drivers/power/supply/z2_battery.c | 2 +- + drivers/powercap/powercap_sys.c | 9 +- + drivers/pwm/pwm-lp3943.c | 2 +- + drivers/rapidio/devices/rio_mport_cdev.c | 2 +- + drivers/rapidio/rio-scan.c | 6 +- + drivers/regulator/act8865-regulator.c | 7 +- + drivers/regulator/as3711-regulator.c | 6 +- + drivers/regulator/bcm590xx-regulator.c | 6 +- + drivers/regulator/da9063-regulator.c | 4 +- + drivers/regulator/gpio-regulator.c | 10 +- + drivers/regulator/max1586.c | 6 +- + drivers/regulator/max8660.c | 6 +- + drivers/regulator/max8997-regulator.c | 5 +- + drivers/regulator/max8998.c | 5 +- + drivers/regulator/mc13xxx-regulator-core.c | 2 +- + drivers/regulator/pbias-regulator.c | 5 +- + drivers/regulator/rc5t583-regulator.c | 6 +- + drivers/regulator/s2mps11.c | 6 +- + drivers/regulator/s5m8767.c | 10 +- + drivers/regulator/ti-abb-regulator.c | 4 +- + drivers/regulator/tps65090-regulator.c | 10 +- + drivers/regulator/tps65217-regulator.c | 5 +- + drivers/regulator/tps65218-regulator.c | 5 +- + drivers/regulator/tps65910-regulator.c | 18 +- + drivers/regulator/tps80031-regulator.c | 4 +- + drivers/reset/reset-ti-syscon.c | 3 +- + drivers/s390/block/dasd_eer.c | 4 +- + drivers/s390/block/dcssblk.c | 6 +- + drivers/s390/char/keyboard.c | 2 +- + drivers/s390/char/sclp_sd.c | 2 +- + drivers/s390/char/tty3270.c | 3 +- + drivers/s390/char/vmur.c | 2 +- + drivers/s390/char/zcore.c | 2 +- + drivers/s390/cio/qdio_setup.c | 2 +- + drivers/s390/cio/qdio_thinint.c | 5 +- + drivers/s390/crypto/pkey_api.c | 8 +- + drivers/s390/net/ctcm_main.c | 2 +- + drivers/s390/net/qeth_core_main.c | 27 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/aacraid/aachba.c | 2 +- + drivers/scsi/aacraid/linit.c | 4 +- + drivers/scsi/aha1542.c | 3 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 3 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 4 +- + drivers/scsi/aic94xx/aic94xx_hwi.c | 12 +- + drivers/scsi/aic94xx/aic94xx_init.c | 2 +- + drivers/scsi/arm/queue.c | 2 +- + drivers/scsi/be2iscsi/be_main.c | 54 +- + drivers/scsi/bfa/bfad_attr.c | 2 +- + drivers/scsi/bfa/bfad_bsg.c | 5 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 8 +- + drivers/scsi/csiostor/csio_wr.c | 4 +- + drivers/scsi/esas2r/esas2r_init.c | 11 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- + drivers/scsi/fnic/fnic_debugfs.c | 7 +- + drivers/scsi/fnic/fnic_trace.c | 15 +- + drivers/scsi/hpsa.c | 36 +- + drivers/scsi/ipr.c | 16 +- + drivers/scsi/isci/init.c | 8 +- + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/libsas/sas_expander.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 7 +- + drivers/scsi/lpfc/lpfc_mem.c | 5 +- + drivers/scsi/lpfc/lpfc_sli.c | 50 +- + drivers/scsi/lpfc/lpfc_vport.c | 2 +- + drivers/scsi/mac53c94.c | 5 +- + drivers/scsi/megaraid.c | 3 +- + drivers/scsi/megaraid/megaraid_mm.c | 10 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 8 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 12 +- + drivers/scsi/osst.c | 8 +- + drivers/scsi/pm8001/pm8001_ctl.c | 2 +- + drivers/scsi/pmcraid.c | 5 +- + drivers/scsi/qedi/qedi_main.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 10 +- + drivers/scsi/qla2xxx/qla_isr.c | 5 +- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 14 +- + drivers/scsi/qla2xxx/qla_target.c | 10 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- + drivers/scsi/qla4xxx/ql4_nx.c | 2 +- + drivers/scsi/scsi_debug.c | 5 +- + drivers/scsi/sd_zbc.c | 2 +- + drivers/scsi/ses.c | 2 +- + drivers/scsi/sg.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 10 +- + drivers/scsi/st.c | 5 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 4 +- + drivers/scsi/ufs/ufshcd.c | 4 +- + drivers/scsi/virtio_scsi.c | 7 +- + drivers/sh/clk/cpg.c | 2 +- + drivers/sh/intc/core.c | 10 +- + drivers/sh/maple/maple.c | 2 +- + drivers/slimbus/qcom-ctrl.c | 2 +- + drivers/soc/bcm/raspberrypi-power.c | 6 +- + drivers/soc/fsl/qbman/qman.c | 5 +- + drivers/soc/mediatek/mtk-scpsys.c | 8 +- + drivers/soc/ti/knav_qmss_acc.c | 6 +- + drivers/spi/spi-davinci.c | 7 +- + drivers/spi/spi-ep93xx.c | 4 +- + drivers/spi/spi-gpio.c | 5 +- + drivers/spi/spi-imx.c | 5 +- + drivers/spi/spi-oc-tiny.c | 4 +- + drivers/spi/spi-pl022.c | 2 +- + drivers/spi/spi.c | 2 +- + drivers/staging/android/ion/ion_heap.c | 3 +- + drivers/staging/greybus/audio_topology.c | 2 +- + drivers/staging/greybus/camera.c | 5 +- + drivers/staging/media/imx/imx-media-dev.c | 6 +- + drivers/staging/media/zoran/zoran_driver.c | 5 +- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 26 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 5 +- + drivers/staging/rtl8192u/r8192U_core.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- + drivers/staging/rtlwifi/efuse.c | 4 +- + drivers/staging/rts5208/ms.c | 2 +- + drivers/staging/rts5208/rtsx_chip.c | 6 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- + drivers/target/target_core_transport.c | 4 +- + drivers/target/target_core_user.c | 5 +- + drivers/thermal/int340x_thermal/acpi_thermal_rel.c | 4 +- + .../thermal/int340x_thermal/int340x_thermal_zone.c | 7 +- + drivers/thermal/of-thermal.c | 4 +- + drivers/thermal/tegra/soctherm.c | 8 +- + drivers/thermal/thermal-generic-adc.c | 5 +- + drivers/thermal/x86_pkg_temp_thermal.c | 3 +- + drivers/tty/ehv_bytechan.c | 2 +- + drivers/tty/goldfish.c | 5 +- + drivers/tty/hvc/hvc_iucv.c | 2 +- + drivers/tty/hvc/hvcs.c | 3 +- + drivers/tty/isicom.c | 2 +- + drivers/tty/serial/atmel_serial.c | 5 +- + drivers/tty/serial/pch_uart.c | 2 +- + drivers/tty/serial/rp2.c | 2 +- + drivers/tty/serial/serial_core.c | 2 +- + drivers/tty/serial/sunsab.c | 5 +- + drivers/tty/vt/consolemap.c | 7 +- + drivers/tty/vt/keyboard.c | 4 +- + drivers/tty/vt/selection.c | 3 +- + drivers/uio/uio_pruss.c | 2 +- + drivers/usb/core/devio.c | 7 +- + drivers/usb/core/hub.c | 2 +- + drivers/usb/core/message.c | 6 +- + drivers/usb/dwc2/hcd.c | 11 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 6 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 3 +- + drivers/usb/host/ehci-sched.c | 5 +- + drivers/usb/host/fhci-tds.c | 2 +- + drivers/usb/host/imx21-hcd.c | 4 +- + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/xhci-mem.c | 4 +- + drivers/usb/misc/ldusb.c | 9 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 2 +- + drivers/usb/mon/mon_bin.c | 3 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 2 +- + drivers/usb/renesas_usbhs/pipe.c | 3 +- + drivers/usb/serial/iuu_phoenix.c | 4 +- + drivers/usb/storage/alauda.c | 2 +- + drivers/usb/storage/ene_ub6250.c | 16 +- + drivers/usb/storage/sddr09.c | 4 +- + drivers/usb/storage/sddr55.c | 6 +- + drivers/usb/wusbcore/wa-rpipe.c | 3 +- + drivers/uwb/est.c | 2 +- + drivers/uwb/i1480/dfu/usb.c | 2 +- + drivers/vhost/net.c | 8 +- + drivers/vhost/scsi.c | 17 +- + drivers/vhost/test.c | 2 +- + drivers/vhost/vhost.c | 14 +- + drivers/vhost/vringh.c | 2 +- + drivers/video/backlight/adp8860_bl.c | 2 +- + drivers/video/backlight/adp8870_bl.c | 2 +- + drivers/video/backlight/lp855x_bl.c | 2 +- + drivers/video/console/sticore.c | 2 +- + drivers/video/fbdev/au1100fb.c | 2 +- + drivers/video/fbdev/broadsheetfb.c | 2 +- + drivers/video/fbdev/core/bitblit.c | 4 +- + drivers/video/fbdev/core/fbcon.c | 3 +- + drivers/video/fbdev/core/fbcon_ccw.c | 7 +- + drivers/video/fbdev/core/fbcon_cw.c | 7 +- + drivers/video/fbdev/core/fbcon_rotate.c | 2 +- + drivers/video/fbdev/core/fbcon_ud.c | 4 +- + drivers/video/fbdev/core/fbmem.c | 7 +- + drivers/video/fbdev/core/fbmon.c | 9 +- + drivers/video/fbdev/imxfb.c | 2 +- + drivers/video/fbdev/mb862xx/mb862xxfb_accel.c | 2 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 4 +- + drivers/video/fbdev/mxsfb.c | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/manager.c | 4 +- + drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 4 +- + drivers/video/fbdev/omap2/omapfb/vrfb.c | 4 +- + drivers/video/fbdev/pvr2fb.c | 2 +- + drivers/video/fbdev/riva/fbdev.c | 2 +- + drivers/video/fbdev/uvesafb.c | 10 +- + drivers/video/fbdev/via/viafbdev.c | 3 +- + drivers/video/fbdev/w100fb.c | 3 +- + drivers/video/fbdev/xen-fbfront.c | 2 +- + drivers/video/of_display_timing.c | 5 +- + drivers/virt/fsl_hypervisor.c | 2 +- + drivers/virt/vboxguest/vboxguest_core.c | 7 +- + drivers/virtio/virtio_pci_common.c | 7 +- + drivers/virtio/virtio_ring.c | 2 +- + drivers/xen/arm-device.c | 6 +- + drivers/xen/evtchn.c | 2 +- + drivers/xen/grant-table.c | 7 +- + drivers/xen/xen-pciback/pciback_ops.c | 2 +- + fs/9p/fid.c | 2 +- + fs/adfs/super.c | 2 +- + fs/afs/cmservice.c | 7 +- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 3 +- + fs/block_dev.c | 3 +- + fs/btrfs/check-integrity.c | 4 +- + fs/ceph/addr.c | 11 +- + fs/ceph/mds_client.c | 5 +- + fs/cifs/asn1.c | 2 +- + fs/cifs/cifsacl.c | 4 +- + fs/cifs/cifssmb.c | 2 +- + fs/cifs/file.c | 2 +- + fs/cifs/inode.c | 2 +- + fs/cifs/misc.c | 4 +- + fs/cifs/smb2pdu.c | 6 +- + fs/cifs/transport.c | 8 +- + fs/debugfs/inode.c | 4 +- + fs/dlm/lockspace.c | 2 +- + fs/exofs/inode.c | 4 +- + fs/ext2/super.c | 4 +- + fs/ext4/extents.c | 8 +- + fs/ext4/resize.c | 10 +- + fs/ext4/super.c | 6 +- + fs/f2fs/checkpoint.c | 3 +- + fs/f2fs/file.c | 6 +- + fs/f2fs/node.c | 12 +- + fs/f2fs/segment.c | 15 +- + fs/f2fs/super.c | 20 +- + fs/fat/namei_vfat.c | 2 +- + fs/fuse/dev.c | 15 +- + fs/gfs2/dir.c | 6 +- + fs/gfs2/glock.c | 3 +- + fs/gfs2/quota.c | 2 +- + fs/gfs2/rgrp.c | 5 +- + fs/gfs2/super.c | 2 +- + fs/hpfs/dnode.c | 3 +- + fs/hpfs/map.c | 2 +- + fs/iomap.c | 6 +- + fs/jbd2/revoke.c | 2 +- + fs/jffs2/acl.c | 3 +- + fs/jffs2/acl.h | 1 + + fs/jffs2/wbuf.c | 2 +- + fs/jfs/jfs_dmap.c | 2 +- + fs/jfs/jfs_dtree.c | 9 +- + fs/jfs/jfs_unicode.c | 2 +- + fs/mbcache.c | 5 +- + fs/namei.c | 4 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 3 +- + fs/nfsd/export.c | 5 +- + fs/nfsd/nfs4recover.c | 5 +- + fs/nfsd/nfs4state.c | 20 +- + fs/nfsd/nfscache.c | 3 +- + fs/ntfs/compress.c | 2 +- + fs/ocfs2/cluster/tcp.c | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 2 +- + fs/ocfs2/journal.c | 2 +- + fs/ocfs2/sysfile.c | 9 +- + fs/overlayfs/namei.c | 2 +- + fs/proc/base.c | 3 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc/task_mmu.c | 2 +- + fs/read_write.c | 4 +- + fs/reiserfs/bitmap.c | 2 +- + fs/reiserfs/inode.c | 3 +- + fs/reiserfs/journal.c | 13 +- + fs/reiserfs/resize.c | 3 +- + fs/select.c | 2 +- + fs/splice.c | 7 +- + fs/ubifs/journal.c | 5 +- + fs/ubifs/lpt.c | 25 +- + fs/ubifs/super.c | 3 +- + fs/ubifs/tnc.c | 5 +- + fs/ubifs/tnc_commit.c | 5 +- + fs/udf/super.c | 7 +- + fs/ufs/super.c | 4 +- + fs/xfs/Makefile | 15 +- + fs/xfs/kmem.c | 14 +- + fs/xfs/kmem.h | 14 +- + fs/xfs/libxfs/xfs_ag_resv.c | 16 +- + fs/xfs/libxfs/xfs_ag_resv.h | 16 +- + fs/xfs/libxfs/xfs_alloc.c | 95 +- + fs/xfs/libxfs/xfs_alloc.h | 18 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 15 +- + fs/xfs/libxfs/xfs_alloc_btree.h | 14 +- + fs/xfs/libxfs/xfs_attr.c | 14 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 21 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 14 +- + fs/xfs/libxfs/xfs_attr_remote.c | 14 +- + fs/xfs/libxfs/xfs_attr_remote.h | 14 +- + fs/xfs/libxfs/xfs_attr_sf.h | 14 +- + fs/xfs/libxfs/xfs_bit.c | 14 +- + fs/xfs/libxfs/xfs_bit.h | 14 +- + fs/xfs/libxfs/xfs_bmap.c | 54 +- + fs/xfs/libxfs/xfs_bmap.h | 14 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 14 +- + fs/xfs/libxfs/xfs_bmap_btree.h | 14 +- + fs/xfs/libxfs/xfs_btree.c | 171 +- + fs/xfs/libxfs/xfs_btree.h | 14 +- + fs/xfs/libxfs/xfs_da_btree.c | 24 +- + fs/xfs/libxfs/xfs_da_btree.h | 14 +- + fs/xfs/libxfs/xfs_da_format.c | 14 +- + fs/xfs/libxfs/xfs_da_format.h | 14 +- + fs/xfs/libxfs/xfs_defer.c | 16 +- + fs/xfs/libxfs/xfs_defer.h | 16 +- + fs/xfs/libxfs/xfs_dir2.c | 14 +- + fs/xfs/libxfs/xfs_dir2.h | 14 +- + fs/xfs/libxfs/xfs_dir2_block.c | 22 +- + fs/xfs/libxfs/xfs_dir2_data.c | 122 +- + fs/xfs/libxfs/xfs_dir2_leaf.c | 26 +- + fs/xfs/libxfs/xfs_dir2_node.c | 17 +- + fs/xfs/libxfs/xfs_dir2_priv.h | 14 +- + fs/xfs/libxfs/xfs_dir2_sf.c | 14 +- + fs/xfs/libxfs/xfs_dquot_buf.c | 14 +- + fs/xfs/libxfs/xfs_errortag.h | 15 +- + fs/xfs/libxfs/xfs_format.h | 14 +- + fs/xfs/libxfs/xfs_fs.h | 14 +- + fs/xfs/libxfs/xfs_ialloc.c | 160 +- + fs/xfs/libxfs/xfs_ialloc.h | 21 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 14 +- + fs/xfs/libxfs/xfs_ialloc_btree.h | 14 +- + fs/xfs/libxfs/xfs_iext_tree.c | 10 +- + fs/xfs/libxfs/xfs_inode_buf.c | 34 +- + fs/xfs/libxfs/xfs_inode_buf.h | 14 +- + fs/xfs/libxfs/xfs_inode_fork.c | 14 +- + fs/xfs/libxfs/xfs_inode_fork.h | 14 +- + fs/xfs/libxfs/xfs_log_format.h | 14 +- + fs/xfs/libxfs/xfs_log_recover.h | 14 +- + fs/xfs/libxfs/xfs_log_rlimit.c | 14 +- + fs/xfs/libxfs/xfs_quota_defs.h | 14 +- + fs/xfs/libxfs/xfs_refcount.c | 63 +- + fs/xfs/libxfs/xfs_refcount.h | 16 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 17 +- + fs/xfs/libxfs/xfs_refcount_btree.h | 16 +- + fs/xfs/libxfs/xfs_rmap.c | 55 +- + fs/xfs/libxfs/xfs_rmap.h | 16 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 15 +- + fs/xfs/libxfs/xfs_rmap_btree.h | 14 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 26 +- + fs/xfs/libxfs/xfs_sb.c | 40 +- + fs/xfs/libxfs/xfs_sb.h | 14 +- + fs/xfs/libxfs/xfs_shared.h | 14 +- + fs/xfs/libxfs/xfs_symlink_remote.c | 14 +- + fs/xfs/libxfs/xfs_trans_resv.c | 30 +- + fs/xfs/libxfs/xfs_trans_resv.h | 14 +- + fs/xfs/libxfs/xfs_trans_space.h | 14 +- + fs/xfs/libxfs/xfs_types.c | 173 ++ + fs/xfs/libxfs/xfs_types.h | 33 +- + fs/xfs/mrlock.h | 14 +- + fs/xfs/scrub/agheader.c | 18 +- + fs/xfs/scrub/agheader_repair.c | 16 +- + fs/xfs/scrub/alloc.c | 16 +- + fs/xfs/scrub/attr.c | 16 +- + fs/xfs/scrub/bmap.c | 16 +- + fs/xfs/scrub/btree.c | 16 +- + fs/xfs/scrub/btree.h | 16 +- + fs/xfs/scrub/common.c | 16 +- + fs/xfs/scrub/common.h | 16 +- + fs/xfs/scrub/dabtree.c | 16 +- + fs/xfs/scrub/dabtree.h | 16 +- + fs/xfs/scrub/dir.c | 16 +- + fs/xfs/scrub/ialloc.c | 16 +- + fs/xfs/scrub/inode.c | 16 +- + fs/xfs/scrub/parent.c | 16 +- + fs/xfs/scrub/quota.c | 16 +- + fs/xfs/scrub/refcount.c | 16 +- + fs/xfs/scrub/repair.c | 16 +- + fs/xfs/scrub/repair.h | 16 +- + fs/xfs/scrub/rmap.c | 16 +- + fs/xfs/scrub/rtbitmap.c | 16 +- + fs/xfs/scrub/scrub.c | 16 +- + fs/xfs/scrub/scrub.h | 16 +- + fs/xfs/scrub/symlink.c | 16 +- + fs/xfs/scrub/trace.c | 16 +- + fs/xfs/scrub/trace.h | 16 +- + fs/xfs/scrub/xfs_scrub.h | 16 +- + fs/xfs/xfs.h | 14 +- + fs/xfs/xfs_acl.c | 14 +- + fs/xfs/xfs_acl.h | 14 +- + fs/xfs/xfs_aops.c | 25 +- + fs/xfs/xfs_aops.h | 14 +- + fs/xfs/xfs_attr.h | 14 +- + fs/xfs/xfs_attr_inactive.c | 14 +- + fs/xfs/xfs_attr_list.c | 19 +- + fs/xfs/xfs_bmap_item.c | 16 +- + fs/xfs/xfs_bmap_item.h | 16 +- + fs/xfs/xfs_bmap_util.c | 26 +- + fs/xfs/xfs_bmap_util.h | 14 +- + fs/xfs/xfs_buf.c | 15 +- + fs/xfs/xfs_buf.h | 14 +- + fs/xfs/xfs_buf_item.c | 16 +- + fs/xfs/xfs_buf_item.h | 14 +- + fs/xfs/xfs_dir2_readdir.c | 14 +- + fs/xfs/xfs_discard.c | 14 +- + fs/xfs/xfs_dquot.c | 14 +- + fs/xfs/xfs_dquot.h | 14 +- + fs/xfs/xfs_dquot_item.c | 14 +- + fs/xfs/xfs_dquot_item.h | 14 +- + fs/xfs/xfs_error.c | 19 +- + fs/xfs/xfs_error.h | 23 +- + fs/xfs/xfs_export.c | 29 +- + fs/xfs/xfs_export.h | 14 +- + fs/xfs/xfs_extent_busy.c | 14 +- + fs/xfs/xfs_extent_busy.h | 14 +- + fs/xfs/xfs_extfree_item.c | 14 +- + fs/xfs/xfs_extfree_item.h | 14 +- + fs/xfs/xfs_file.c | 14 +- + fs/xfs/xfs_filestream.c | 14 +- + fs/xfs/xfs_filestream.h | 14 +- + fs/xfs/xfs_fsmap.c | 16 +- + fs/xfs/xfs_fsmap.h | 16 +- + fs/xfs/xfs_fsops.c | 14 +- + fs/xfs/xfs_fsops.h | 14 +- + fs/xfs/xfs_globals.c | 14 +- + fs/xfs/xfs_icache.c | 14 +- + fs/xfs/xfs_icache.h | 14 +- + fs/xfs/xfs_icreate_item.c | 14 +- + fs/xfs/xfs_icreate_item.h | 14 +- + fs/xfs/xfs_inode.c | 35 +- + fs/xfs/xfs_inode.h | 14 +- + fs/xfs/xfs_inode_item.c | 14 +- + fs/xfs/xfs_inode_item.h | 14 +- + fs/xfs/xfs_ioctl.c | 33 +- + fs/xfs/xfs_ioctl.h | 14 +- + fs/xfs/xfs_ioctl32.c | 14 +- + fs/xfs/xfs_ioctl32.h | 14 +- + fs/xfs/xfs_iomap.c | 20 +- + fs/xfs/xfs_iomap.h | 18 +- + fs/xfs/xfs_iops.c | 22 +- + fs/xfs/xfs_iops.h | 14 +- + fs/xfs/xfs_itable.c | 16 +- + fs/xfs/xfs_itable.h | 14 +- + fs/xfs/xfs_linux.h | 36 +- + fs/xfs/xfs_log.c | 18 +- + fs/xfs/xfs_log.h | 14 +- + fs/xfs/xfs_log_cil.c | 14 +- + fs/xfs/xfs_log_priv.h | 14 +- + fs/xfs/xfs_log_recover.c | 67 +- + fs/xfs/xfs_message.c | 14 +- + fs/xfs/xfs_mount.c | 21 +- + fs/xfs/xfs_mount.h | 16 +- + fs/xfs/xfs_mru_cache.c | 14 +- + fs/xfs/xfs_mru_cache.h | 14 +- + fs/xfs/xfs_ondisk.h | 14 +- + fs/xfs/xfs_qm.c | 14 +- + fs/xfs/xfs_qm.h | 14 +- + fs/xfs/xfs_qm_bhv.c | 14 +- + fs/xfs/xfs_qm_syscalls.c | 14 +- + fs/xfs/xfs_quota.h | 14 +- + fs/xfs/xfs_quotaops.c | 14 +- + fs/xfs/xfs_refcount_item.c | 16 +- + fs/xfs/xfs_refcount_item.h | 16 +- + fs/xfs/xfs_reflink.c | 16 +- + fs/xfs/xfs_reflink.h | 16 +- + fs/xfs/xfs_rmap_item.c | 16 +- + fs/xfs/xfs_rmap_item.h | 16 +- + fs/xfs/xfs_rtalloc.c | 24 +- + fs/xfs/xfs_rtalloc.h | 14 +- + fs/xfs/xfs_stats.c | 14 +- + fs/xfs/xfs_stats.h | 14 +- + fs/xfs/xfs_super.c | 16 +- + fs/xfs/xfs_super.h | 14 +- + fs/xfs/xfs_symlink.c | 14 +- + fs/xfs/xfs_symlink.h | 14 +- + fs/xfs/xfs_sysctl.c | 14 +- + fs/xfs/xfs_sysctl.h | 14 +- + fs/xfs/xfs_sysfs.c | 14 +- + fs/xfs/xfs_sysfs.h | 14 +- + fs/xfs/xfs_trace.c | 14 +- + fs/xfs/xfs_trace.h | 14 +- + fs/xfs/xfs_trans.c | 14 +- + fs/xfs/xfs_trans.h | 14 +- + fs/xfs/xfs_trans_ail.c | 14 +- + fs/xfs/xfs_trans_bmap.c | 16 +- + fs/xfs/xfs_trans_buf.c | 14 +- + fs/xfs/xfs_trans_dquot.c | 14 +- + fs/xfs/xfs_trans_extfree.c | 14 +- + fs/xfs/xfs_trans_inode.c | 14 +- + fs/xfs/xfs_trans_priv.h | 14 +- + fs/xfs/xfs_trans_refcount.c | 16 +- + fs/xfs/xfs_trans_rmap.c | 16 +- + fs/xfs/xfs_xattr.c | 14 +- + include/acpi/acoutput.h | 4 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl2.h | 25 +- + include/acpi/actypes.h | 1 + + include/linux/linkage.h | 12 +- + include/linux/mm.h | 5 + + include/linux/pm_domain.h | 15 + + include/linux/pm_runtime.h | 6 +- + include/rdma/ib_verbs.h | 5 +- + init/Kconfig | 15 + + ipc/sem.c | 2 +- + kernel/bpf/btf.c | 8 +- + kernel/bpf/lpm_trie.c | 5 +- + kernel/bpf/verifier.c | 10 +- + kernel/cgroup/cgroup-v1.c | 4 +- + kernel/cgroup/cpuset.c | 5 +- + kernel/debug/kdb/kdb_main.c | 13 +- + kernel/events/ring_buffer.c | 3 +- + kernel/events/uprobes.c | 3 +- + kernel/fail_function.c | 2 +- + kernel/gcov/Kconfig | 17 +- + kernel/gcov/Makefile | 2 - + kernel/kexec_file.c | 2 +- + kernel/locking/locktorture.c | 14 +- + kernel/power/swap.c | 6 +- + kernel/rcu/rcutorture.c | 5 +- + kernel/relay.c | 3 +- + kernel/sched/fair.c | 4 +- + kernel/sched/rt.c | 4 +- + kernel/sched/topology.c | 2 +- + kernel/sysctl.c | 3 +- + kernel/trace/ftrace.c | 28 +- + kernel/trace/trace.c | 12 +- + kernel/trace/trace_events_filter.c | 6 +- + kernel/trace/tracing_map.c | 2 +- + kernel/user_namespace.c | 5 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 11 +- + lib/argv_split.c | 2 +- + lib/interval_tree_test.c | 5 +- + lib/kfifo.c | 2 +- + lib/lru_cache.c | 2 +- + lib/mpi/mpiutil.c | 4 +- + lib/rbtree_test.c | 2 +- + lib/reed_solomon/reed_solomon.c | 6 +- + lib/sbitmap.c | 2 +- + lib/scatterlist.c | 3 +- + lib/test_firmware.c | 10 +- + lib/test_kmod.c | 5 +- + lib/test_overflow.c | 2 +- + lib/test_rhashtable.c | 13 +- + mm/gup_benchmark.c | 2 +- + mm/huge_memory.c | 4 +- + mm/hugetlb.c | 3 +- + mm/percpu-stats.c | 2 +- + mm/slab.c | 3 +- + mm/slub.c | 19 +- + mm/swap_slots.c | 4 +- + mm/swap_state.c | 2 +- + mm/swapfile.c | 5 +- + net/9p/protocol.c | 11 +- + net/9p/trans_virtio.c | 3 +- + net/atm/mpc.c | 2 +- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/l2cap_core.c | 2 +- + net/bridge/br_multicast.c | 2 +- + net/bridge/netfilter/ebtables.c | 11 +- + net/can/bcm.c | 13 +- + net/ceph/osdmap.c | 5 +- + net/ceph/pagevec.c | 4 +- + net/core/dev.c | 2 +- + net/core/ethtool.c | 12 +- + net/core/pktgen.c | 3 +- + net/dcb/dcbnl.c | 3 +- + net/dccp/ccids/ccid2.c | 3 +- + net/ieee802154/nl-phy.c | 2 +- + net/ipv4/fib_frontend.c | 2 +- + net/ipv4/route.c | 5 +- + net/ipv6/icmp.c | 2 +- + net/ipv6/ila/ila_xlat.c | 3 +- + net/mac80211/chan.c | 2 +- + net/mac80211/main.c | 2 +- + net/mac80211/rc80211_minstrel.c | 4 +- + net/mac80211/rc80211_minstrel_ht.c | 4 +- + net/mac80211/scan.c | 2 +- + net/mac80211/util.c | 5 +- + net/netfilter/ipvs/ip_vs_conn.c | 3 +- + net/netfilter/nf_conntrack_proto.c | 3 +- + net/netfilter/nf_nat_core.c | 5 +- + net/netfilter/nf_tables_api.c | 6 +- + net/netfilter/nfnetlink_cthelper.c | 5 +- + net/netfilter/x_tables.c | 2 +- + net/netlink/genetlink.c | 10 +- + net/netrom/af_netrom.c | 2 +- + net/openvswitch/datapath.c | 5 +- + net/openvswitch/vport.c | 2 +- + net/packet/af_packet.c | 2 +- + net/rds/ib.c | 3 +- + net/rds/ib_cm.c | 6 +- + net/rds/info.c | 2 +- + net/rose/af_rose.c | 3 +- + net/rxrpc/rxkad.c | 2 +- + net/sched/sch_fq_codel.c | 7 +- + net/sched/sch_hhf.c | 9 +- + net/sctp/auth.c | 5 +- + net/sctp/protocol.c | 2 +- + net/smc/smc_wr.c | 6 +- + net/sunrpc/auth_gss/auth_gss.c | 3 +- + net/sunrpc/auth_gss/gss_rpc_upcall.c | 2 +- + net/sunrpc/cache.c | 2 +- + net/tipc/netlink_compat.c | 5 +- + net/wireless/nl80211.c | 4 +- + scripts/Kconfig.include | 3 + + scripts/Makefile.gcc-plugins | 91 +- + scripts/Makefile.kcov | 10 +- + scripts/clang-version.sh | 18 +- + scripts/gcc-plugins/Makefile | 5 +- + scripts/gcc-x86_32-has-stack-protector.sh | 7 +- + scripts/gcc-x86_64-has-stack-protector.sh | 5 - + scripts/kconfig/streamline_config.pl | 4 +- + security/apparmor/policy_unpack.c | 2 +- + security/keys/trusted.c | 2 +- + security/selinux/ss/services.c | 2 +- + sound/core/pcm_compat.c | 2 +- + sound/core/pcm_native.c | 4 +- + sound/core/seq/seq_memory.c | 3 +- + sound/core/seq/seq_midi_emul.c | 2 +- + sound/firewire/fireface/ff-protocol-ff400.c | 2 +- + sound/firewire/packets-buffer.c | 2 +- + sound/oss/dmasound/dmasound_core.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 7 +- + sound/pci/cs46xx/dsp_spos.c | 9 +- + sound/pci/ctxfi/ctatc.c | 18 +- + sound/pci/ctxfi/ctdaio.c | 3 +- + sound/pci/ctxfi/ctmixer.c | 5 +- + sound/pci/ctxfi/ctsrc.c | 2 +- + sound/pci/emu10k1/emu10k1_main.c | 9 +- + sound/pci/emu10k1/emufx.c | 8 +- + sound/pci/emu10k1/p16v.c | 2 +- + sound/pci/hda/hda_codec.c | 4 +- + sound/pci/hda/hda_proc.c | 5 +- + sound/pci/hda/patch_ca0132.c | 4 +- + sound/pci/maestro3.c | 5 +- + sound/pci/trident/trident_main.c | 4 +- + sound/pci/via82xx.c | 4 +- + sound/pci/via82xx_modem.c | 4 +- + sound/pci/ymfpci/ymfpci_main.c | 4 +- + sound/soc/au1x/dbdma2.c | 4 +- + sound/soc/codecs/hdmi-codec.c | 2 +- + sound/soc/codecs/rt5645.c | 5 +- + sound/soc/codecs/wm8904.c | 5 +- + sound/soc/codecs/wm8958-dsp2.c | 20 +- + sound/soc/codecs/wm8994.c | 4 +- + sound/soc/codecs/wm_adsp.c | 2 +- + sound/soc/davinci/davinci-mcasp.c | 14 +- + sound/soc/generic/audio-graph-card.c | 4 +- + sound/soc/generic/audio-graph-scu-card.c | 4 +- + sound/soc/generic/simple-card.c | 8 +- + sound/soc/generic/simple-scu-card.c | 4 +- + sound/soc/img/img-i2s-in.c | 4 +- + sound/soc/img/img-i2s-out.c | 4 +- + sound/soc/intel/common/sst-ipc.c | 4 +- + sound/soc/intel/skylake/skl-topology.c | 20 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 3 +- + sound/soc/pxa/mmp-sspa.c | 4 +- + sound/soc/rockchip/rk3399_gru_sound.c | 2 +- + sound/soc/sh/rcar/cmd.c | 2 +- + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/sh/rcar/ctu.c | 2 +- + sound/soc/sh/rcar/dvc.c | 2 +- + sound/soc/sh/rcar/mix.c | 2 +- + sound/soc/sh/rcar/src.c | 2 +- + sound/soc/sh/rcar/ssi.c | 2 +- + sound/soc/sh/rcar/ssiu.c | 2 +- + sound/soc/soc-core.c | 10 +- + sound/soc/soc-dapm.c | 2 +- + sound/soc/soc-topology.c | 2 +- + sound/soc/uniphier/aio-cpu.c | 10 +- + sound/usb/6fire/pcm.c | 10 +- + sound/usb/caiaq/audio.c | 7 +- + sound/usb/format.c | 5 +- + sound/usb/line6/capture.c | 4 +- + sound/usb/line6/pcm.c | 6 +- + sound/usb/line6/playback.c | 4 +- + sound/usb/mixer.c | 2 +- + sound/usb/pcm.c | 2 +- + sound/usb/usx2y/usbusx2y.c | 4 +- + sound/usb/usx2y/usbusx2yaudio.c | 7 +- + tools/power/cpupower/bench/parse.c | 2 +- + .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 15 + + .../cpupower/utils/idle_monitor/cpupower-monitor.c | 35 +- + .../cpupower/utils/idle_monitor/cpupower-monitor.h | 9 + + virt/kvm/arm/vgic/vgic-v4.c | 2 +- + virt/kvm/kvm_main.c | 3 +- + 1552 files changed, 9337 insertions(+), 8103 deletions(-) + create mode 100644 Documentation/device-mapper/writecache.txt + create mode 100644 drivers/md/dm-writecache.c + delete mode 100644 drivers/pci/cadence/Kconfig + delete mode 100644 drivers/pci/cadence/Makefile + rename drivers/pci/{host => controller}/Kconfig (90%) + rename drivers/pci/{host => controller}/Makefile (89%) + rename drivers/pci/{ => controller}/dwc/Kconfig (100%) + rename drivers/pci/{ => controller}/dwc/Makefile (100%) + rename drivers/pci/{ => controller}/dwc/pci-dra7xx.c (99%) + rename drivers/pci/{ => controller}/dwc/pci-exynos.c (100%) + rename drivers/pci/{ => controller}/dwc/pci-imx6.c (100%) + rename drivers/pci/{ => controller}/dwc/pci-keystone-dw.c (100%) + rename drivers/pci/{ => controller}/dwc/pci-keystone.c (100%) + rename drivers/pci/{ => controller}/dwc/pci-keystone.h (100%) + rename drivers/pci/{ => controller}/dwc/pci-layerscape.c (100%) + rename drivers/pci/{ => controller}/dwc/pcie-armada8k.c (100%) + rename drivers/pci/{ => controller}/dwc/pcie-artpec6.c (100%) + rename drivers/pci/{ => controller}/dwc/pcie-designware-ep.c (98%) + rename drivers/pci/{ => controller}/dwc/pcie-designware-host.c (99%) + rename drivers/pci/{ => controller}/dwc/pcie-designware-plat.c (100%) + rename drivers/pci/{ => controller}/dwc/pcie-designware.c (100%) + rename drivers/pci/{ => controller}/dwc/pcie-designware.h (100%) + rename drivers/pci/{ => controller}/dwc/pcie-hisi.c (99%) + rename drivers/pci/{ => controller}/dwc/pcie-histb.c (100%) + rename drivers/pci/{ => controller}/dwc/pcie-kirin.c (100%) + rename drivers/pci/{ => controller}/dwc/pcie-qcom.c (100%) + rename drivers/pci/{ => controller}/dwc/pcie-spear13xx.c (100%) + rename drivers/pci/{host => controller}/pci-aardvark.c (100%) + rename drivers/pci/{host => controller}/pci-ftpci100.c (100%) + rename drivers/pci/{host => controller}/pci-host-common.c (100%) + rename drivers/pci/{host => controller}/pci-host-generic.c (100%) + rename drivers/pci/{host => controller}/pci-hyperv.c (100%) + rename drivers/pci/{host => controller}/pci-mvebu.c (100%) + rename drivers/pci/{host => controller}/pci-rcar-gen2.c (100%) + rename drivers/pci/{host => controller}/pci-tegra.c (100%) + rename drivers/pci/{host => controller}/pci-thunder-ecam.c (100%) + rename drivers/pci/{host => controller}/pci-thunder-pem.c (100%) + rename drivers/pci/{host => controller}/pci-v3-semi.c (100%) + rename drivers/pci/{host => controller}/pci-versatile.c (100%) + rename drivers/pci/{host => controller}/pci-xgene-msi.c (100%) + rename drivers/pci/{host => controller}/pci-xgene.c (100%) + rename drivers/pci/{host => controller}/pcie-altera-msi.c (100%) + rename drivers/pci/{host => controller}/pcie-altera.c (100%) + rename drivers/pci/{cadence => controller}/pcie-cadence-ep.c (99%) + rename drivers/pci/{cadence => controller}/pcie-cadence-host.c (100%) + rename drivers/pci/{cadence => controller}/pcie-cadence.c (100%) + rename drivers/pci/{cadence => controller}/pcie-cadence.h (100%) + rename drivers/pci/{host => controller}/pcie-iproc-bcma.c (100%) + rename drivers/pci/{host => controller}/pcie-iproc-msi.c (100%) + rename drivers/pci/{host => controller}/pcie-iproc-platform.c (100%) + rename drivers/pci/{host => controller}/pcie-iproc.c (100%) + rename drivers/pci/{host => controller}/pcie-iproc.h (100%) + rename drivers/pci/{host => controller}/pcie-mediatek.c (100%) + rename drivers/pci/{host => controller}/pcie-mobiveil.c (100%) + rename drivers/pci/{host => controller}/pcie-rcar.c (100%) + rename drivers/pci/{host => controller}/pcie-rockchip-ep.c (99%) + rename drivers/pci/{host => controller}/pcie-rockchip-host.c (100%) + rename drivers/pci/{host => controller}/pcie-rockchip.c (100%) + rename drivers/pci/{host => controller}/pcie-rockchip.h (100%) + rename drivers/pci/{host => controller}/pcie-tango.c (100%) + rename drivers/pci/{host => controller}/pcie-xilinx-nwl.c (100%) + rename drivers/pci/{host => controller}/pcie-xilinx.c (100%) + rename drivers/pci/{host => controller}/vmd.c (100%) + create mode 100644 drivers/pci/pcie/aer.c + delete mode 100644 drivers/pci/pcie/aer/Kconfig + delete mode 100644 drivers/pci/pcie/aer/Kconfig.debug + delete mode 100644 drivers/pci/pcie/aer/Makefile + delete mode 100644 drivers/pci/pcie/aer/aerdrv.c + delete mode 100644 drivers/pci/pcie/aer/aerdrv.h + delete mode 100644 drivers/pci/pcie/aer/aerdrv_acpi.c + delete mode 100644 drivers/pci/pcie/aer/aerdrv_core.c + delete mode 100644 drivers/pci/pcie/aer/aerdrv_errprint.c + delete mode 100644 drivers/pci/pcie/aer/ecrc.c + rename drivers/pci/pcie/{aer => }/aer_inject.c (99%) + create mode 100644 fs/xfs/libxfs/xfs_types.c +Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (c90fca951e90 Merge tag 'powerpc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (92d44a42af81 ARM: fix kill( ,SIGFPE) breakage) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (82034c23fcbc arm64: Make sure permission updates happen for pmd/pud) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (faf37c44a105 powerpc/64s: Clear PCR on boot) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 (60d061e34703 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge net/master +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/bridge/netfilter/ebtables.c +Removing include/net/netfilter/nft_dup.h +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Merge made by the 'recursive' strategy. + drivers/net/ethernet/cavium/thunder/nic.h | 2 + + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 50 +++-- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 34 ++- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 21 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 6 +- + drivers/net/ethernet/netronome/nfp/flower/main.c | 1 + + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 4 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 4 +- + .../ethernet/netronome/nfp/nfpcore/nfp_resource.c | 7 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 7 +- + drivers/net/hyperv/Kconfig | 1 - + drivers/net/hyperv/hyperv_net.h | 4 +- + drivers/net/hyperv/netvsc_drv.c | 242 ++++++++++++++++----- + drivers/net/phy/mdio-gpio.c | 3 - + drivers/net/xen-netfront.c | 4 +- + include/linux/netfilter.h | 2 +- + include/linux/netfilter/ipset/ip_set_timeout.h | 20 +- + include/net/ip_vs.h | 30 +++ + include/net/netfilter/nf_conntrack_count.h | 3 +- + include/net/netfilter/nft_dup.h | 10 - + include/net/tls.h | 6 +- + include/uapi/linux/netfilter/nf_conntrack_common.h | 2 +- + include/uapi/linux/netfilter/nf_tables.h | 2 +- + kernel/bpf/inode.c | 14 +- + net/bridge/netfilter/ebtables.c | 25 ++- + net/bridge/netfilter/nft_reject_bridge.c | 2 +- + net/core/sock.c | 15 +- + net/dsa/tag_trailer.c | 3 +- + net/ipv4/netfilter/ip_tables.c | 1 + + net/ipv4/tcp_offload.c | 2 - + net/ipv6/addrconf.c | 2 +- + net/ipv6/netfilter/ip6_tables.c | 1 + + net/ipv6/route.c | 3 - + net/netfilter/ipset/ip_set_hash_gen.h | 5 +- + net/netfilter/ipvs/ip_vs_ctl.c | 4 + + net/netfilter/ipvs/ip_vs_xmit.c | 2 +- + net/netfilter/nf_conncount.c | 13 +- + net/netfilter/nf_conntrack_netlink.c | 3 +- + net/netfilter/nf_tables_api.c | 36 ++- + net/netfilter/nf_tables_core.c | 3 +- + net/netfilter/nfnetlink.c | 10 +- + net/netfilter/nft_chain_filter.c | 5 + + net/netfilter/nft_connlimit.c | 2 +- + net/netfilter/nft_dynset.c | 4 +- + net/netfilter/nft_set_rbtree.c | 2 +- + net/netfilter/nft_socket.c | 1 + + net/netfilter/xt_CT.c | 10 + + net/netfilter/xt_connmark.c | 2 +- + net/netfilter/xt_set.c | 10 +- + net/smc/af_smc.c | 12 +- + net/tls/tls_main.c | 2 +- + net/tls/tls_sw.c | 19 +- + net/xdp/xdp_umem.c | 3 +- + tools/testing/selftests/bpf/Makefile | 4 +- + .../selftests/tc-testing/tc-tests/actions/ife.json | 2 +- + 58 files changed, 473 insertions(+), 228 deletions(-) + delete mode 100644 include/net/netfilter/nft_dup.h +Merging bpf/master (3bce593ac06b selftests: bpf: config: add config fragments) +$ git merge bpf/master +Merge made by the 'recursive' strategy. + net/xdp/xsk.c | 3 +++ + tools/bpf/bpftool/perf.c | 5 +++-- + tools/testing/selftests/bpf/config | 10 ++++++++++ + 3 files changed, 16 insertions(+), 2 deletions(-) +Merging ipsec/master (d6990976af7c vti6: fix PMTU caching and reporting on xmit) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv6/ip6_vti.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) +Merging netfilter/master (60d061e34703 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (312564269535 net: netsec: reduce DMA mask to 40 bits) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (ab1068d6866e iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (885892fb378d mlx4_core: restore optimal ICM memory allocation) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (3dc7c7badb75 IB/mlx4: Fix an error handling path in 'mlx4_ib_rereg_user_mr()') +$ git merge rdma-fixes/for-rc +Auto-merging drivers/infiniband/hw/qedr/verbs.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/mlx4/mr.c | 7 +++++-- + drivers/infiniband/hw/mlx5/main.c | 36 +++++++++++++++++++++--------------- + drivers/infiniband/hw/qedr/verbs.c | 3 +++ + drivers/infiniband/sw/rxe/rxe_req.c | 2 +- + 4 files changed, 30 insertions(+), 18 deletions(-) +Merging sound-current/for-linus (d9d5ed1ad5d8 ALSA: usb-audio: Remove explicitly listed Mytek devices) +$ git merge sound-current/for-linus +Auto-merging sound/usb/format.c +Merge made by the 'recursive' strategy. + sound/pci/emu10k1/emupcm.c | 4 +++- + sound/pci/fm801.c | 16 ++++++++++++---- + sound/pci/hda/patch_conexant.c | 2 ++ + sound/pci/hda/patch_realtek.c | 3 +++ + sound/usb/card.h | 1 + + sound/usb/format.c | 5 ++++- + sound/usb/quirks-table.h | 5 +++++ + sound/usb/quirks.c | 19 ++++++++++++++----- + 8 files changed, 44 insertions(+), 11 deletions(-) +Merging sound-asoc-fixes/for-linus (2858e2cfc2ef Merge branch 'asoc-4.17' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regmap-fixes/for-linus (97fe106a8027 Merge branch 'regmap-4.17' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (59ce5f3e5530 Merge branch 'regulator-4.17' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging spi-fixes/for-linus (5d3257b8ea48 Merge branch 'spi-4.17' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (6d08b06e67cd Linux 4.17-rc2) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (75bc37fefc44 Linux 4.17-rc4) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (01f7e67a053f Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Auto-merging drivers/input/rmi4/rmi_f54.c +Auto-merging drivers/input/rmi4/rmi_f12.c +Auto-merging drivers/input/rmi4/rmi_f11.c +Auto-merging drivers/input/rmi4/rmi_driver.c +Auto-merging drivers/input/input-mt.c +Merge made by the 'recursive' strategy. + .../bindings/input/sprd,sc27xx-vibra.txt | 23 +++ + drivers/input/input-mt.c | 12 +- + drivers/input/keyboard/goldfish_events.c | 9 +- + drivers/input/misc/Kconfig | 10 ++ + drivers/input/misc/Makefile | 1 + + drivers/input/misc/sc27xx-vibra.c | 154 +++++++++++++++++++++ + drivers/input/rmi4/Kconfig | 1 + + drivers/input/rmi4/rmi_2d_sensor.c | 34 +++-- + drivers/input/rmi4/rmi_bus.c | 50 ++++++- + drivers/input/rmi4/rmi_bus.h | 10 +- + drivers/input/rmi4/rmi_driver.c | 52 +++---- + drivers/input/rmi4/rmi_f01.c | 10 +- + drivers/input/rmi4/rmi_f03.c | 9 +- + drivers/input/rmi4/rmi_f11.c | 42 +++--- + drivers/input/rmi4/rmi_f12.c | 8 +- + drivers/input/rmi4/rmi_f30.c | 9 +- + drivers/input/rmi4/rmi_f34.c | 5 +- + drivers/input/rmi4/rmi_f54.c | 6 - + drivers/input/touchscreen/silead.c | 1 + + include/linux/input/mt.h | 2 +- + include/linux/rmi.h | 2 + + 21 files changed, 338 insertions(+), 112 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt + create mode 100644 drivers/input/misc/sc27xx-vibra.c +Merging crypto-current/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (89c29def6b01 Revert "vfio/type1: Improve memory pinning process for raw PFN mapping") +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (75bc37fefc44 Linux 4.17-rc4) +$ 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 (dbad41e7bb5f dmaengine: qcom: bam_dma: check if the runtime pm enabled) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) +$ git merge backlight-fixes/for-backlight-fixes +Merge made by the 'recursive' strategy. +Merging mtd-fixes/master (9f825e74d761 mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit) +$ git merge mtd-fixes/master +Already up to date. +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +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 (11799564fc7e mfd: cros_ec: Retry commands when EC is known to be busy) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (e88f5e9ebd54 media: uvcvideo: Prevent setting unavailable flags) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. +Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (d8a9a51afaa9 MIPS: pb44: Fix i2c-gpio GPIO descriptor table) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/ath79/mach-pb44.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references") +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (696ca779a928 KVM: x86: fix #UD address of failed Hyper-V hypercalls) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (da81850b2c82 hwmon: (nct6775) Fix loop limit) +$ git merge hwmon-fixes/hwmon +Auto-merging drivers/hwmon/nct6775.c +Merge made by the 'recursive' strategy. + drivers/hwmon/dell-smm-hwmon.c | 7 +++++++ + drivers/hwmon/nct6775.c | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (3a7e0e2622f6 Merge branch 'misc-4.18' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/extent_io.c +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 2 +- + fs/btrfs/extent_io.c | 4 +--- + fs/btrfs/inode.c | 26 ++++++++++++-------------- + fs/btrfs/ioctl.c | 4 ++++ + fs/btrfs/scrub.c | 2 +- + 5 files changed, 19 insertions(+), 19 deletions(-) +Merging vfs-fixes/fixes (b1b94fcbd399 Revert "fs: fold open_check_o_direct into do_dentry_open") +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. +Merging dma-mapping-fixes/for-linus (4dc6d8e22728 Revert "iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()") +$ git merge dma-mapping-fixes/for-linus +Merge made by the 'recursive' strategy. +Merging drivers-x86-fixes/fixes (32ffd6e8d1f6 platform/x86: asus-wmi: Fix NULL pointer dereference) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (737dd8e1a4c4 Documentation: devicetree: tilcdc: fix spelling mistake "suppors" -> "supports") +$ git merge devicetree-fixes/dt/linus +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging scsi-fixes/fixes (5b10177e2dd8 scsi: qla2xxx: Spinlock recursion in qla_target) +$ git merge scsi-fixes/fixes +Auto-merging include/uapi/linux/target_core_user.h +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/scsi/sd_zbc.c +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/aic7xxx/aic79xx_core.c +Merge made by the 'recursive' strategy. + drivers/scsi/aacraid/commctrl.c | 4 ++-- + drivers/scsi/aic7xxx/aic79xx_core.c | 8 +++---- + drivers/scsi/hpsa.c | 10 ++++++-- + drivers/scsi/ipr.c | 2 -- + drivers/scsi/mpt3sas/mpt3sas_base.c | 1 + + drivers/scsi/qla2xxx/qla_init.c | 3 ++- + drivers/scsi/qla2xxx/qla_isr.c | 8 +++++-- + drivers/scsi/qla2xxx/qla_mbx.c | 8 +++++++ + drivers/scsi/qla2xxx/qla_target.c | 6 ++--- + drivers/scsi/sd_zbc.c | 2 +- + drivers/target/target_core_user.c | 44 ++++++++++++++++++++++++++++------- + include/uapi/linux/target_core_user.h | 4 +++- + 12 files changed, 74 insertions(+), 26 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (65b3bdc807ac drm/i915/query: nospec expects no more than an unsigned long) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (3de06d5a1f05 mmc: sdhci-iproc: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for cygnus) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (c7d6d511eb56 drm/bridge/sii8620: fix HDMI cable connection to dongle) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/qxl/qxl_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/sil-sii8620.c | 292 ++++++++++++++--------------------- + drivers/gpu/drm/qxl/qxl_display.c | 7 +- + 2 files changed, 121 insertions(+), 178 deletions(-) +Merging kbuild/for-next (00979ce4fcc9 linux/linkage.h: replace VMLINUX_SYMBOL_STR() with __stringify()) +$ git merge kbuild/for-next +Already up to date. +Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) +$ git merge leaks/leaks-next +Merge made by the 'recursive' strategy. +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up to date. +Merging dma-mapping/for-next (2550bbfd4952 dma-direct: don't crash on device without dma_mask) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (0ac000e86703 Merge branches 'fixes', 'misc' and 'spectre' into for-linus) +$ git merge arm/for-next +Already up to date. +Merging arm-perf/for-next/perf (73acc0315cd7 ARM: mcpm, perf/arm-cci: export mcpm_is_available) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (c7953e19db50 ARM: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 211 +++++++++++++++++++++++++++++++++ + 1 file changed, 211 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (7858428186db Merge branch 'v4.19/drivers' into next) +$ git merge actions/for-next +Auto-merging drivers/soc/actions/owl-sps.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/boot/dts/owl-s500-cubieboard6.dts | 3 +-- + arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 3 +-- + arch/arm/boot/dts/owl-s500-guitar.dtsi | 3 +-- + arch/arm/boot/dts/owl-s500.dtsi | 3 +-- + arch/arm64/boot/dts/actions/Makefile | 2 ++ + arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 3 +-- + arch/arm64/boot/dts/actions/s900.dtsi | 3 +-- + drivers/soc/actions/Makefile | 2 ++ + drivers/soc/actions/owl-sps-helper.c | 6 +----- + drivers/soc/actions/owl-sps.c | 6 +----- + 11 files changed, 13 insertions(+), 22 deletions(-) +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (793d8ab66802 Merge branch 'v4.18/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 12 +++++++++--- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 --- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 7 +++++++ + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 -------- + 5 files changed, 18 insertions(+), 16 deletions(-) +Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (452daaaf6021 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (78e5d8c26c70 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging omap/for-next (1b7e42c1dfe8 Merge branch 'omap-for-v4.18/soc' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/dra7.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control) +$ git merge reset/reset/next +Already up to date. +Merging qcom/for-next (509d20563e5d firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1()) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. +Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (550ca2e6c090 Merge branch 'fixes-for-v4.18' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + drivers/soc/renesas/rcar-sysc.c | 35 +++++++++++++++++++++++++++++------ + 1 file changed, 29 insertions(+), 6 deletions(-) +Merging rockchip/for-next (42568f346f65 Merge branch 'v4.18-clk/next' into for-next) +$ git merge rockchip/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (fba97222728d Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (e97360054391 Merge branch 'sunxi/dt64-for-4.18' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/clk/Makefile +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 188 +++++++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 12 ++ + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 12 ++ + drivers/clk/Makefile | 2 +- + drivers/clk/sunxi-ng/Makefile | 39 ++--- + 6 files changed, 229 insertions(+), 25 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts +Merging tegra/for-next (6de9ae597a79 Merge branch for-4.18/clk into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (0fe42512b2f0 arm64: Fix syscall restarting around signal suppressed by tracer) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (55913c2d3330 Merge branch 'clk-imx6ul' into clk-next) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. +Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse) +$ git merge c6x/for-linux-next +Already up to date. +Merging m68k/for-next (b12c8a70643f m68k: Set default dma mask for platform devices) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (082f55c45984 m68k: fix ColdFire PCI config reads and writes) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (5cf8da7bc035 microblaze: Remove architecture heart beat code) +$ git merge microblaze/next +Removing arch/microblaze/kernel/heartbeat.c +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig.debug | 7 ---- + arch/microblaze/include/asm/setup.h | 3 -- + arch/microblaze/kernel/Makefile | 2 -- + arch/microblaze/kernel/heartbeat.c | 72 ------------------------------------- + arch/microblaze/kernel/timer.c | 7 ---- + 5 files changed, 91 deletions(-) + delete mode 100644 arch/microblaze/kernel/heartbeat.c +Merging mips/mips-next (9ed8b56b80c1 MAINTAINERS: Add Paul Burton as MIPS co-maintainer) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (e5dd7e2f8a59 nds32: define __NDS32_E[BL]__ for sparse) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/Makefile | 2 ++ + 1 file changed, 2 insertions(+) +Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (8d40c754fbac parisc: Drop struct sigaction from not exported header file) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/Makefile +Merge made by the 'recursive' strategy. + arch/parisc/Makefile | 4 ---- + arch/parisc/include/asm/signal.h | 8 -------- + 2 files changed, 12 deletions(-) +Merging powerpc/next (ff5bc793e47b powerpc/64s/radix: Fix missing ptesync in flush_cache_vmap) +$ git merge powerpc/next +Already up to date. +Merging powerpc-pkey/topic/pkey (d86a4ba02fc6 powerpc/pkeys: Drop private VM_PKEY definitions) +$ git merge powerpc-pkey/topic/pkey +Already up to date. +Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-next (29dcea88779c Linux 4.17) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (ec530174c437 s390/dasd: only use preallocated requests) +$ git merge s390/features +Auto-merging drivers/s390/block/dasd_eer.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/css_chars.h | 62 +++++++------- + drivers/s390/block/dasd.c | 171 +++++++++++++------------------------- + drivers/s390/block/dasd_alias.c | 6 +- + drivers/s390/block/dasd_diag.c | 3 +- + drivers/s390/block/dasd_eckd.c | 46 +++++----- + drivers/s390/block/dasd_eer.c | 10 +-- + drivers/s390/block/dasd_fba.c | 6 +- + drivers/s390/block/dasd_int.h | 26 ++---- + drivers/s390/cio/Makefile | 1 + + drivers/s390/cio/vfio_ccw_cp.c | 140 ++++++++++++++++--------------- + drivers/s390/cio/vfio_ccw_drv.c | 5 +- + drivers/s390/cio/vfio_ccw_fsm.c | 17 +++- + drivers/s390/cio/vfio_ccw_trace.h | 54 ++++++++++++ + 13 files changed, 282 insertions(+), 265 deletions(-) + create mode 100644 drivers/s390/cio/vfio_ccw_trace.h +Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 (5ec9121195a4 um: Fix raw interface options) +$ git merge uml/linux-next +Auto-merging arch/um/drivers/vector_kern.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +-- + arch/um/drivers/vector_kern.c | 20 ++++++++++++++------ + arch/um/include/asm/common.lds.S | 6 ------ + arch/um/include/shared/init.h | 5 ----- + arch/um/os-Linux/main.c | 12 ------------ + 5 files changed, 15 insertions(+), 31 deletions(-) +Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/kernel/pci-dma.c +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/pci-dma.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations) +$ 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 (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) +$ git merge btrfs/next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging fs/block_dev.c +Auto-merging block/blk-cgroup.c +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 1 + + fs/block_dev.c | 3 +-- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/disk-io.c | 4 ++++ + fs/btrfs/inode.c | 15 ++++++++++++--- + fs/btrfs/ioctl.c | 8 +++++++- + fs/btrfs/super.c | 1 - + fs/buffer.c | 42 ++++++++++++++++++++++++++++++++++-------- + fs/ext2/inode.c | 3 ++- + fs/ext2/super.c | 1 - + fs/ext4/inode.c | 4 +++- + fs/ext4/super.c | 2 -- + include/linux/backing-dev.h | 2 +- + include/linux/buffer_head.h | 3 +++ + include/linux/fs.h | 3 ++- + kernel/cgroup/cgroup.c | 1 + + 16 files changed, 72 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch +Applying: f2fs: fixup for cgroup/writeback change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/inode.c +M fs/f2fs/super.c +$ git add -A . +$ git commit -v -a --amend +[master 42b09a5b4948] Merge remote-tracking branch 'btrfs/next' + Date: Thu Jun 14 08:38:08 2018 +1000 +Merging btrfs-kdave/for-next (e4eada7b2b40 Merge branch 'for-next-current-v4.17-20180608' into for-next-20180608) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/inode.c +Merge made by the 'recursive' strategy. + fs/btrfs/inode.c | 26 -------------------------- + fs/btrfs/super.c | 1 - + 2 files changed, 27 deletions(-) +Merging ceph/master (23edca864951 rbd: flush rbd_dev->watch_dwork after watch is unregistered) +$ git merge ceph/master +Auto-merging net/ceph/osdmap.c +Auto-merging net/ceph/osd_client.c +Auto-merging fs/ceph/addr.c +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.txt | 8 +- + drivers/block/rbd.c | 11 +- + fs/ceph/addr.c | 1 - + fs/ceph/caps.c | 160 ++++++++++++++++----------- + fs/ceph/dir.c | 2 + + fs/ceph/file.c | 1 - + fs/ceph/inode.c | 67 +++++++----- + fs/ceph/super.c | 35 ++++-- + fs/ceph/xattr.c | 60 ++++++----- + include/linux/ceph/ceph_fs.h | 1 + + include/linux/ceph/osd_client.h | 8 +- + include/linux/ceph/osdmap.h | 8 +- + net/ceph/messenger.c | 31 ++---- + net/ceph/osd_client.c | 216 ++++++++++++++++++++++--------------- + net/ceph/osdmap.c | 19 ++-- + 15 files changed, 372 insertions(+), 256 deletions(-) +Merging cifs/for-next (58a509972e1c smb3: increase initial number of credits requested to allow write) +$ git merge cifs/for-next +Auto-merging fs/cifs/transport.c +CONFLICT (content): Merge conflict in fs/cifs/transport.c +Auto-merging fs/cifs/smb2pdu.c +Auto-merging fs/cifs/misc.c +Auto-merging fs/cifs/cifssmb.c +Recorded preimage for 'fs/cifs/transport.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/cifs/transport.c'. +[master aba10a548041] Merge remote-tracking branch 'cifs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/cifs/AUTHORS | 7 +- + Documentation/filesystems/cifs/CHANGES | 3 + + Documentation/filesystems/cifs/TODO | 17 ++-- + fs/cifs/cifsencrypt.c | 23 ++++- + fs/cifs/cifsglob.h | 12 ++- + fs/cifs/cifsproto.h | 7 +- + fs/cifs/cifssmb.c | 8 +- + fs/cifs/connect.c | 5 +- + fs/cifs/misc.c | 7 +- + fs/cifs/smb2misc.c | 16 ++- + fs/cifs/smb2ops.c | 107 ++++++++++---------- + fs/cifs/smb2pdu.c | 180 ++++++++++++++++++++++++--------- + fs/cifs/smb2transport.c | 18 ++-- + fs/cifs/transport.c | 158 ++++++++++++----------------- + 14 files changed, 331 insertions(+), 237 deletions(-) +Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (20a653d458c3 Merge fsnotify cleanups from Amir into for_next) +$ git merge ext3/for_next +Auto-merging fs/ext2/super.c +Merge made by the 'recursive' strategy. + fs/ext2/ext2.h | 2 - + fs/ext2/super.c | 6 +- + fs/notify/dnotify/dnotify.c | 8 +- + fs/notify/fanotify/fanotify.c | 46 ++++++------ + fs/notify/fdinfo.c | 6 +- + fs/notify/fsnotify.c | 138 +++++++++++++++++++++-------------- + fs/notify/fsnotify.h | 6 -- + fs/notify/group.c | 2 +- + fs/notify/inotify/inotify.h | 2 - + fs/notify/inotify/inotify_fsnotify.c | 6 +- + fs/notify/inotify/inotify_user.c | 10 ++- + fs/notify/mark.c | 52 +++++++------ + fs/quota/dquot.c | 7 +- + include/linux/fsnotify_backend.h | 79 +++++++++++++++++--- + kernel/audit_fsnotify.c | 5 +- + kernel/audit_tree.c | 12 ++- + kernel/audit_watch.c | 5 +- + 17 files changed, 235 insertions(+), 157 deletions(-) +Merging ext4/dev (4f2f76f75143 ext4: fix fencepost error in check for inode count overflow during resize) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (d54d35c501bc Merge tag 'f2fs-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (543b8f8662fe fuse: don't keep dead fuse_conn at fuse_fill_super().) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (92d34134193e jfs: Fix inconsistency between memory allocation and ea_buf->max_size) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/xattr.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging nfs/linux-next (93b7f7ad2018 skip LAYOUTRETURN if layout is invalid) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. +Merging nfsd/nfsd-next (fdfeda224cb7 nfsd: update obselete comment referencing the BKL) +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'recursive' strategy. + fs/nfsd/netns.h | 1 + + fs/nfsd/nfs4proc.c | 4 ++++ + fs/nfsd/nfs4state.c | 51 ++++++++++++++++++++++++++++++++++++++++----------- + fs/nfsd/nfs4xdr.c | 40 +++++++++++++++++++++++++++++++++++++--- + fs/nfsd/nfsctl.c | 5 +++-- + fs/nfsd/nfsd.h | 1 + + include/linux/nfs4.h | 8 ++++++++ + 7 files changed, 94 insertions(+), 16 deletions(-) +Merging orangefs/for-next (b1116bc03c00 orangefs: use sparse annotations for holding locks across function calls.) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (c03e30790cad ovl: Enable metadata only feature) +$ git merge overlayfs/overlayfs-next +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xattr.c +Auto-merging fs/read_write.c +CONFLICT (content): Merge conflict in fs/read_write.c +Auto-merging fs/overlayfs/namei.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/locks.c +Auto-merging fs/ioctl.c +Auto-merging fs/btrfs/ioctl.c +CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c +Auto-merging fs/btrfs/ctree.h +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Resolved 'fs/btrfs/ioctl.c' using previous resolution. +Resolved 'fs/read_write.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5548c58b8563] Merge remote-tracking branch 'overlayfs/overlayfs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 3 +- + Documentation/filesystems/overlayfs.txt | 90 ++++-- + Documentation/filesystems/vfs.txt | 16 +- + fs/btrfs/ctree.h | 5 +- + fs/btrfs/ioctl.c | 7 +- + fs/file_table.c | 13 +- + fs/inode.c | 46 +-- + fs/internal.h | 17 +- + fs/ioctl.c | 1 + + fs/locks.c | 20 +- + fs/namei.c | 2 +- + fs/namespace.c | 69 +---- + fs/ocfs2/file.c | 10 +- + fs/open.c | 87 +++--- + fs/overlayfs/Kconfig | 19 ++ + fs/overlayfs/Makefile | 4 +- + fs/overlayfs/copy_up.c | 190 ++++++++---- + fs/overlayfs/dir.c | 105 +++++-- + fs/overlayfs/export.c | 3 + + fs/overlayfs/file.c | 508 ++++++++++++++++++++++++++++++++ + fs/overlayfs/inode.c | 175 +++++++---- + fs/overlayfs/namei.c | 195 +++++++----- + fs/overlayfs/overlayfs.h | 47 ++- + fs/overlayfs/ovl_entry.h | 6 +- + fs/overlayfs/super.c | 103 ++++--- + fs/overlayfs/util.c | 252 +++++++++++++++- + fs/read_write.c | 94 +++--- + fs/xattr.c | 9 +- + fs/xfs/xfs_file.c | 8 +- + include/linux/dcache.h | 15 +- + include/linux/fs.h | 31 +- + include/linux/fsnotify.h | 14 +- + include/uapi/linux/fs.h | 1 - + 33 files changed, 1591 insertions(+), 574 deletions(-) + create mode 100644 fs/overlayfs/file.c +Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license) +$ git merge ubifs/linux-next +Already up to date. +Merging xfs/for-next (89e9b5c0915a xfs: update incore per-AG inode count) +$ git merge xfs/for-next +Already up to date. +Merging file-locks/locks-next (716a685fdb89 Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (5f181c9ca108 Merge branch 'work.compat' into for-next) +$ git merge vfs/for-next +Auto-merging fs/splice.c +Auto-merging fs/signalfd.c +Auto-merging fs/proc/internal.h +Auto-merging fs/orangefs/devorangefs-req.c +Auto-merging fs/afs/cmservice.c +Merge made by the 'recursive' strategy. + fs/afs/cell.c | 12 +- + fs/afs/cmservice.c | 2 +- + fs/afs/fsclient.c | 100 +++--- + fs/afs/internal.h | 45 +-- + fs/afs/main.c | 33 +- + fs/afs/netdevices.c | 6 +- + fs/afs/proc.c | 787 ++++++++++++++++-------------------------- + fs/afs/rxrpc.c | 2 +- + fs/afs/super.c | 20 +- + fs/orangefs/devorangefs-req.c | 54 +-- + fs/proc/generic.c | 24 ++ + fs/proc/internal.h | 2 + + fs/proc/proc_net.c | 92 +++++ + fs/signalfd.c | 50 +-- + fs/splice.c | 98 +++--- + include/linux/proc_fs.h | 12 + + 16 files changed, 632 insertions(+), 707 deletions(-) +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up to date. +Merging printk/for-next (8bafa2a44ff3 Merge branch 'for-4.18-vsprintf-pcr-removal' into for-4.18) +$ git merge printk/for-next +Already up to date. +Merging pci/next (ce4c7b241227 Merge branch 'pci/aer-squash') +$ git merge pci/next +Already up to date. +Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (f1b6ae6701a7 Merge branch 'for-4.18/rmi' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (1840b5ac656f Merge branch 'i2c/for-4.18' into i2c/for-next) +$ git merge i2c/i2c/for-next +Removing include/linux/i2c-pnx.h +Auto-merging drivers/mfd/timberdale.c +Auto-merging drivers/mfd/sm501.c +Auto-merging drivers/media/platform/marvell-ccic/mmp-driver.c +Auto-merging drivers/i2c/muxes/i2c-mux-reg.c +Auto-merging drivers/i2c/muxes/i2c-mux-gpio.c +Auto-merging drivers/i2c/i2c-core-base.c +Auto-merging drivers/i2c/busses/i2c-qup.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging arch/arm/mach-sa1100/simpad.c +Auto-merging arch/arm/mach-pxa/viper.c +Auto-merging arch/arm/mach-pxa/palmz72.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_54xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +Auto-merging arch/arm/mach-omap2/common.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-davinci.txt | 2 +- + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 1 + + .../devicetree/bindings/i2c/i2c-s3c2410.txt | 4 +- + Documentation/i2c/busses/i2c-mlxcpld | 4 + + Documentation/i2c/busses/i2c-ocores | 2 +- + Documentation/i2c/muxes/i2c-mux-gpio | 4 +- + MAINTAINERS | 8 +- + arch/arm/mach-ks8695/board-acs5k.c | 2 +- + arch/arm/mach-omap1/board-htcherald.c | 2 +- + arch/arm/mach-omap1/common.h | 2 +- + arch/arm/mach-omap1/i2c.c | 2 +- + arch/arm/mach-omap2/common.h | 2 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- + arch/arm/mach-pxa/palmz72.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-sa1100/simpad.c | 2 +- + arch/mips/alchemy/board-gpr.c | 2 +- + arch/sh/boards/board-sh7785lcr.c | 2 +- + drivers/i2c/algos/i2c-algo-bit.c | 4 +- + drivers/i2c/algos/i2c-algo-pca.c | 5 +- + drivers/i2c/algos/i2c-algo-pcf.c | 8 +- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/Makefile | 3 +- + drivers/i2c/busses/i2c-aspeed.c | 3 +- + drivers/i2c/busses/i2c-at91.c | 12 +- + drivers/i2c/busses/i2c-axxia.c | 31 +- + drivers/i2c/busses/i2c-designware-common.c | 20 +- + drivers/i2c/busses/i2c-designware-core.h | 14 +- + drivers/i2c/busses/i2c-designware-master.c | 8 +- + drivers/i2c/busses/i2c-designware-slave.c | 6 +- + drivers/i2c/busses/i2c-diolan-u2c.c | 11 +- + drivers/i2c/busses/i2c-efm32.c | 3 +- + drivers/i2c/busses/i2c-eg20t.c | 5 +- + drivers/i2c/busses/i2c-emev2.c | 2 +- + drivers/i2c/busses/i2c-exynos5.c | 29 +- + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-hix5hd2.c | 22 +- + drivers/i2c/busses/i2c-i801.c | 7 +- + drivers/i2c/busses/i2c-ibm_iic.c | 3 - + drivers/i2c/busses/i2c-imx-lpi2c.c | 16 +- + drivers/i2c/busses/i2c-imx.c | 21 +- + drivers/i2c/busses/i2c-kempld.c | 7 +- + drivers/i2c/busses/i2c-mlxcpld.c | 68 +- + drivers/i2c/busses/i2c-mt65xx.c | 8 +- + drivers/i2c/busses/i2c-mxs.c | 16 +- + drivers/i2c/busses/i2c-nomadik.c | 2 - + drivers/i2c/busses/i2c-ocores.c | 7 +- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/i2c/busses/i2c-opal.c | 4 - + drivers/i2c/busses/i2c-pasemi.c | 2 +- + drivers/i2c/busses/i2c-pca-platform.c | 2 +- + drivers/i2c/busses/i2c-pnx.c | 21 +- + drivers/i2c/busses/i2c-qup.c | 59 +- + drivers/i2c/busses/i2c-rcar.c | 4 +- + drivers/i2c/busses/i2c-riic.c | 5 +- + drivers/i2c/busses/i2c-rk3x.c | 2 - + drivers/i2c/busses/i2c-robotfuzz-osif.c | 21 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 - + drivers/i2c/busses/i2c-sh_mobile.c | 11 - + drivers/i2c/busses/i2c-stm32.c | 153 +++ + drivers/i2c/busses/i2c-stm32.h | 37 + + drivers/i2c/busses/i2c-stm32f7.c | 1045 +++++++++++++++++++- + drivers/i2c/busses/i2c-stu300.c | 22 +- + drivers/i2c/busses/i2c-synquacer.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 33 - + drivers/i2c/busses/i2c-xiic.c | 17 +- + drivers/i2c/busses/i2c-xlp9xx.c | 89 +- + drivers/i2c/i2c-core-base.c | 10 +- + drivers/i2c/i2c-core-of.c | 51 +- + drivers/i2c/i2c-core-smbus.c | 2 + + drivers/i2c/i2c-mux.c | 2 +- + drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 2 +- + drivers/i2c/muxes/i2c-mux-ltc4306.c | 7 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 18 +- + drivers/i2c/muxes/i2c-mux-reg.c | 4 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- + drivers/mfd/sm501.c | 2 +- + drivers/mfd/timberdale.c | 4 +- + drivers/misc/eeprom/at24.c | 71 +- + include/linux/i2c-pnx.h | 38 - + include/linux/i2c.h | 12 +- + include/linux/{ => platform_data}/i2c-gpio.h | 0 + include/linux/{ => platform_data}/i2c-mux-gpio.h | 0 + include/linux/{ => platform_data}/i2c-ocores.h | 0 + include/linux/{ => platform_data}/i2c-omap.h | 0 + .../linux/{ => platform_data}/i2c-pca-platform.h | 0 + include/linux/{ => platform_data}/i2c-xiic.h | 0 + 94 files changed, 1683 insertions(+), 483 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-stm32.c + delete mode 100644 include/linux/i2c-pnx.h + rename include/linux/{ => platform_data}/i2c-gpio.h (100%) + rename include/linux/{ => platform_data}/i2c-mux-gpio.h (100%) + rename include/linux/{ => platform_data}/i2c-ocores.h (100%) + rename include/linux/{ => platform_data}/i2c-omap.h (100%) + rename include/linux/{ => platform_data}/i2c-pca-platform.h (100%) + rename include/linux/{ => platform_data}/i2c-xiic.h (100%) +Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string) +$ git merge dmi/master +Auto-merging include/linux/mod_devicetable.h +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 2 ++ + drivers/firmware/dmi_scan.c | 1 + + include/linux/mod_devicetable.h | 1 + + 3 files changed, 4 insertions(+) +Merging hwmon-staging/hwmon-next (c9bdf291542e hwmon: (asus_atk0110) Make use of device managed memory) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (a49d9c0ae46e Documentation: document hung_task_panic kernel parameter) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (f2809d20b925 media: omap2: fix compile-testing with FB_OMAP2=m) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. +Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED()) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (85ebd164de56 fb_omap2: add gpiolib dependency) +$ git merge fbdev/fbdev-for-next +Removing include/video/sh_mobile_meram.h +Removing include/video/auo_k190xfb.h +Auto-merging drivers/video/fbdev/via/viafbdev.c +Removing drivers/video/fbdev/sh_mobile_meram.c +Auto-merging drivers/video/fbdev/nvidia/nvidia.c +Auto-merging drivers/video/fbdev/mmp/fb/mmpfb.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/mmp/fb/mmpfb.c +Removing drivers/video/fbdev/auo_k190x.h +Removing drivers/video/fbdev/auo_k190x.c +Removing drivers/video/fbdev/auo_k1901fb.c +Removing drivers/video/fbdev/auo_k1900fb.c +Auto-merging drivers/video/fbdev/au1100fb.c +Auto-merging drivers/media/platform/via-camera.c +Auto-merging MAINTAINERS +Recorded preimage for 'drivers/video/fbdev/mmp/fb/mmpfb.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/video/fbdev/mmp/fb/mmpfb.c'. +[master 72b7ccb3862b] Merge remote-tracking branch 'fbdev/fbdev-for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 +- + drivers/gpu/drm/shmobile/Kconfig | 1 - + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 42 - + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 - + drivers/gpu/drm/shmobile/shmob_drm_drv.h | 2 - + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 11 - + drivers/gpu/drm/shmobile/shmob_drm_kms.h | 1 - + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 - + drivers/media/platform/via-camera.c | 5 + + drivers/video/fbdev/Kconfig | 48 +- + drivers/video/fbdev/Makefile | 4 - + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/radeon_pm.c | 8 +- + drivers/video/fbdev/au1100fb.c | 2 +- + drivers/video/fbdev/au1200fb.c | 2 +- + drivers/video/fbdev/auo_k1900fb.c | 204 ---- + drivers/video/fbdev/auo_k1901fb.c | 257 ----- + drivers/video/fbdev/auo_k190x.c | 1195 -------------------- + drivers/video/fbdev/auo_k190x.h | 129 --- + drivers/video/fbdev/core/fb_defio.c | 4 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 5 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 8 +- + drivers/video/fbdev/nvidia/nvidia.c | 2 +- + drivers/video/fbdev/omap/lcd_ams_delta.c | 4 + + drivers/video/fbdev/omap/lcd_h3.c | 4 + + drivers/video/fbdev/omap/lcd_htcherald.c | 4 + + drivers/video/fbdev/omap/lcd_inn1510.c | 4 + + drivers/video/fbdev/omap/lcd_inn1610.c | 4 + + drivers/video/fbdev/omap/lcd_osk.c | 4 + + drivers/video/fbdev/omap/lcd_palmte.c | 4 + + drivers/video/fbdev/omap/lcd_palmtt.c | 4 + + drivers/video/fbdev/omap/lcd_palmz71.c | 4 + + drivers/video/fbdev/omap/omapfb_main.c | 2 +- + drivers/video/fbdev/omap2/omapfb/Kconfig | 1 + + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 18 +- + drivers/video/fbdev/pxafb.c | 8 +- + drivers/video/fbdev/savage/savagefb_driver.c | 8 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 77 +- + drivers/video/fbdev/sh_mobile_lcdcfb.h | 1 - + drivers/video/fbdev/sh_mobile_meram.c | 758 ------------- + drivers/video/fbdev/sm501fb.c | 3 +- + drivers/video/fbdev/via/global.h | 6 + + drivers/video/fbdev/via/hw.c | 1 - + drivers/video/fbdev/via/via-core.c | 1 - + drivers/video/fbdev/via/via_clock.c | 2 +- + drivers/video/fbdev/via/viafbdev.c | 1 - + include/linux/platform_data/shmob_drm.h | 4 - + include/video/auo_k190xfb.h | 107 -- + include/video/sh_mobile_lcdc.h | 3 - + include/video/sh_mobile_meram.h | 95 -- + 50 files changed, 87 insertions(+), 2986 deletions(-) + delete mode 100644 drivers/video/fbdev/auo_k1900fb.c + delete mode 100644 drivers/video/fbdev/auo_k1901fb.c + delete mode 100644 drivers/video/fbdev/auo_k190x.c + delete mode 100644 drivers/video/fbdev/auo_k190x.h + delete mode 100644 drivers/video/fbdev/sh_mobile_meram.c + delete mode 100644 include/video/auo_k190xfb.h + delete mode 100644 include/video/sh_mobile_meram.h +Merging pm/linux-next (3d1509808ee4 Merge branch 'pm-core' into linux-next) +$ git merge pm/linux-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cpupower/cpupower (f9652d5cae04 cpupower : Fix header name to read idle state name) +$ git merge cpupower/cpupower +Already up to date. +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (8a352fd8787c OPP: Allow same OPP table to be used for multiple genpd) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (e9ed3ee61aa6 Merge branches 'thermal-core' and 'thermal-intel' into next) +$ git merge thermal/next +Already up to date. +Merging thermal-soc/next (6d7c70d1cd65 thermal: qcom: tsens: Allow number of sensors to come from DT) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (c1191a19feca RDMA/mlx5: Update SPDX tags to show proper license) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (f03329627b46 Merge branch 'hns3-next') +$ git merge ipsec-next/master +Already up to date. +Merging netfilter-next/master (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (7579d009c4a1 NFC: fdp: Remove __func__ from dev_dbg()) +$ git merge nfc-next/master +Auto-merging drivers/nfc/fdp/i2c.c +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 22 +++++----------------- + 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/hci/core.c | 10 ++++++++++ + net/nfc/netlink.c | 6 ++++-- + 7 files changed, 39 insertions(+), 40 deletions(-) +Merging ipvs-next/master (e523452ac0e0 netfilter: nf_tables: remove unused variables) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (76606886c9f4 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 (3a979e8c07e3 Merge tag 'mailbox-v4.18' of git://git.linaro.org/landing-teams/working/fujitsu/integration) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (7d840a606515 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (f0dc7f9c6dd9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (b771327a4530 Merge tag 'spi-nor/for-4.18' of git://git.infradead.org/linux-mtd into mtd/next) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (f567c71f4f91 mtd: nand: Pass mode information to nand_page_io_req) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (771ff17e82fa mtd: spi-nor: Add support for EN25QH32) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (33ce21d6a249 Merge tag 'drm-intel-next-fixes-2018-06-08-2' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (807cba6559cf Merge tag 'gvt-fixes-2018-04-19' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (069035c5db34 drm: Fix possible race conditions while unplugging DRM device) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/drm_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_drv.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) +Merging drm-msm/msm-next (ef2e83fb8fee drm/msm/gpu: Increase the pm runtime autosuspend for 5xx) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/adreno/adreno_device.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/adreno/adreno_device.c | 14 +++++++++++++- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 ++- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 1 + + drivers/gpu/drm/msm/msm_drv.c | 9 +++++++++ + drivers/gpu/drm/msm/msm_drv.h | 1 + + 5 files changed, 26 insertions(+), 2 deletions(-) +Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (518665524272 gpu: ipu-csi: Check for field type alternate) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/imx/imx-ldb.c | 9 ++++++--- + drivers/gpu/drm/imx/ipuv3-crtc.c | 1 - + drivers/gpu/ipu-v3/ipu-csi.c | 37 ++++++++++++++++++++++++++++++------- + 4 files changed, 36 insertions(+), 12 deletions(-) +Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license text with SPDX tags) +$ 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 (66431563e0d9 Merge branch 'regmap-4.18' into regmap-next) +$ git merge regmap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (d9d5ed1ad5d8 ALSA: usb-audio: Remove explicitly listed Mytek devices) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (5544717d416d Merge branch 'asoc-4.18' into asoc-next) +$ git merge sound-asoc/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging input/next (5aff29efbec0 Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/keyboard/cros_ec_keyb.c | 66 +++++------- + drivers/input/misc/xen-kbdfront.c | 183 ++++++++++++++++++++-------------- + drivers/input/serio/i8042.c | 3 + + include/xen/interface/io/displif.h | 8 ++ + include/xen/interface/io/kbdif.h | 78 +++++++++++---- + include/xen/interface/io/sndif.h | 10 +- + 6 files changed, 207 insertions(+), 141 deletions(-) +Merging block/for-next (28313cee1d4f Merge branch 'for-4.18/block' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up to date. +Merging device-mapper/for-next (48debafe4f2f dm: add writecache target) +$ git merge device-mapper/for-next +Already up to date. +Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/scsi/pcmcia/aha152x_stub.c | 14 +------------- + drivers/scsi/pcmcia/nsp_cs.c | 15 +-------------- + drivers/scsi/pcmcia/nsp_cs.h | 4 ---- + drivers/scsi/pcmcia/qlogic_stub.c | 13 +------------ + drivers/scsi/pcmcia/sym53c500_cs.c | 16 +--------------- + 6 files changed, 5 insertions(+), 59 deletions(-) +Merging mmc/next (ef5332c10d4f mmc: renesas_sdhi: really fix WP logic regressions) +$ git merge mmc/next +Already up to date. +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Already up to date. +Merging md/for-next (07ecb3a36765 MD: cleanup resources in failure) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging mfd/for-mfd-next (556c242045f0 mfd: cros_ec: Remove unused __remove function) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (d5318d302e7c backlight: as3711_bl: Fix Device Tree node leaks) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (c42812da1395 MAINTAINERS: add entry for LEGO MINDSTORMS EV3) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (13ed4964057e Merge branch 'regulator-4.17' into regulator-4.18 merge window) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (d19289133b1d Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging apparmor/apparmor-next (338d0be437ef apparmor: fix ptrace read check) +$ git merge apparmor/apparmor-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/apparmor.rst | 6 +- + security/apparmor/audit.c | 90 ++++++++++++++++- + security/apparmor/domain.c | 2 +- + security/apparmor/include/audit.h | 6 ++ + security/apparmor/include/label.h | 2 +- + security/apparmor/include/path.h | 33 +++---- + security/apparmor/include/secid.h | 17 +++- + security/apparmor/label.c | 15 ++- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 50 +++++++--- + security/apparmor/match.c | 2 +- + security/apparmor/mount.c | 2 +- + security/apparmor/policy.c | 7 +- + security/apparmor/resource.c | 2 +- + security/apparmor/secid.c | 151 +++++++++++++++++++++++++---- + 15 files changed, 313 insertions(+), 74 deletions(-) +Merging integrity/next-integrity (b5c90a7526fe EVM: unlock on error path in evm_read_xattrs()) +$ git merge integrity/next-integrity +Already up to date. +Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (d141136f523a audit: normalize MAC_POLICY_LOAD record) +$ git merge selinux/next +Already up to date. +Merging tpmdd/next (3ac7e6225c0b tpm: migrate tpm2_get_random() to use struct tpm_buf) +$ git merge tpmdd/next +Auto-merging drivers/char/tpm/tpm2-cmd.c +Auto-merging drivers/char/tpm/tpm.h +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm.h | 19 ++-- + drivers/char/tpm/tpm2-cmd.c | 258 ++++++++++++++++++-------------------------- + 2 files changed, 116 insertions(+), 161 deletions(-) +Merging watchdog/master (16a7eec2fcd0 watchdog: da9063: remove duplicated timeout_to_sel calls) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (1f568357117c Merge branches 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Already up to date. +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (c1abca96b252 samples: mbochs: add DMA_SHARED_BUFFER dependency) +$ 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 (5b71388663c0 audit: Fix wrong task in comparison of session ID) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (44acf1058790 dt-bindings: submitting-patches: add guidance on patch content and subject) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (39202ebf0939 Merge branch 'spi-4.18' into spi-next) +$ git merge spi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (cc82cbbdd454 Merge branch 'x86/apic') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/kernel/apic/vector.c | 17 ++++------------- + arch/x86/kernel/cpu/mcheck/mce-severity.c | 5 +++++ + arch/x86/kernel/quirks.c | 11 +++++++++-- + 3 files changed, 18 insertions(+), 15 deletions(-) +Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up to date. +Merging edac-amd/for-next (eaa3a1d46cfd EDAC, ghes: Make platform-based whitelisting x86-only) +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (443da8397d9f rcu: Make rcu_seq_diff() more exact) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Auto-merging kernel/rcu/rcutorture.c +Auto-merging kernel/locking/locktorture.c +Auto-merging include/linux/rcupdate.h +Auto-merging drivers/iommu/amd_iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu.c +Auto-merging Documentation/core-api/atomic_ops.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'drivers/iommu/amd_iommu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2f3043aed106] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../Design/Data-Structures/Data-Structures.html | 118 +-- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 22 +- + .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 123 +-- + .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 16 +- + .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 56 +- + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 237 ++--- + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 12 +- + Documentation/RCU/stallwarn.txt | 24 +- + Documentation/RCU/whatisRCU.txt | 16 +- + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/core-api/atomic_ops.rst | 2 +- + drivers/iommu/amd_iommu.c | 6 + + include/linux/rcupdate.h | 20 +- + include/linux/rcutiny.h | 2 +- + include/linux/srcu.h | 17 + + include/linux/torture.h | 4 +- + include/trace/events/rcu.h | 112 ++- + kernel/locking/locktorture.c | 5 +- + kernel/rcu/rcu.h | 124 ++- + kernel/rcu/rcuperf.c | 57 +- + kernel/rcu/rcutorture.c | 341 ++++--- + kernel/rcu/srcutree.c | 36 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 1004 ++++++++++---------- + kernel/rcu/tree.h | 71 +- + kernel/rcu/tree_exp.h | 5 +- + kernel/rcu/tree_plugin.h | 174 ++-- + kernel/rcu/update.c | 45 +- + kernel/torture.c | 15 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 26 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 1 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 1 + + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 5 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 7 + + .../selftests/rcutorture/configs/rcu/TREE03.boot | 4 +- + .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 - + .../rcutorture/configs/rcu/ver_functions.sh | 2 +- + 39 files changed, 1545 insertions(+), 1187 deletions(-) + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Merging kvm/linux-next (766d3571d8e5 kvm: fix typo in flag name) +$ git merge kvm/linux-next +Already up to date. +Merging kvm-arm/next (e25028c8ded0 KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (f61e0d3cc4ae KVM: PPC: Book3S PR: Fix failure status setting in tabort. emulation) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/asm-prototypes.h +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/asm-prototypes.h | 6 + + arch/powerpc/include/asm/kvm_book3s.h | 37 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 20 +- + arch/powerpc/include/asm/kvm_booke.h | 20 +- + arch/powerpc/include/asm/kvm_host.h | 21 +- + arch/powerpc/include/asm/kvm_ppc.h | 17 +- + arch/powerpc/include/asm/reg.h | 1 + + arch/powerpc/include/uapi/asm/kvm.h | 1 + + arch/powerpc/kernel/asm-offsets.c | 18 +- + arch/powerpc/kvm/Makefile | 3 + + arch/powerpc/kvm/book3s.c | 23 +- + arch/powerpc/kvm/book3s.h | 6 + + arch/powerpc/kvm/book3s_32_mmu.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu.c | 11 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 + + arch/powerpc/kvm/book3s_64_mmu_radix.c | 348 +++++++++----- + arch/powerpc/kvm/book3s_64_vio.c | 71 ++- + arch/powerpc/kvm/book3s_64_vio_hv.c | 54 ++- + arch/powerpc/kvm/book3s_emulate.c | 371 ++++++++++++++- + arch/powerpc/kvm/book3s_hv.c | 97 +++- + arch/powerpc/kvm/book3s_hv_builtin.c | 21 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 2 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 36 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 318 +++---------- + arch/powerpc/kvm/book3s_hv_tm.c | 10 +- + arch/powerpc/kvm/book3s_hv_tm_builtin.c | 10 +- + arch/powerpc/kvm/book3s_pr.c | 482 +++++++++++++++---- + arch/powerpc/kvm/book3s_segment.S | 13 + + arch/powerpc/kvm/book3s_xive_template.c | 4 +- + arch/powerpc/kvm/booke.c | 41 +- + arch/powerpc/kvm/booke_emulate.c | 6 +- + arch/powerpc/kvm/e500_emulate.c | 6 +- + arch/powerpc/kvm/e500_mmu.c | 2 +- + arch/powerpc/kvm/e500_mmu_host.c | 8 +- + arch/powerpc/kvm/emulate_loadstore.c | 752 +++++++++--------------------- + arch/powerpc/kvm/powerpc.c | 311 +++++++++--- + arch/powerpc/kvm/tm.S | 384 +++++++++++++++ + 38 files changed, 2310 insertions(+), 1228 deletions(-) + create mode 100644 arch/powerpc/kvm/tm.S +Merging kvms390/next (2c8180e885c1 KVM: s390: vsie: simplify < 8k address checks) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (7f47e1c52d0c xen/PVH: Make GDT selectors PVH-specific) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (66448bc274ca workqueue: move function definitions within CONFIG_SMP block) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (26ed9d1c07ef platform/x86: silead_dmi: Add entry for Chuwi Hi8 tablet touchscreen) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/asus-wireless.c +Auto-merging drivers/platform/mellanox/mlxreg-hotplug.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-ideapad-laptop | 13 + + Documentation/laptops/thinkpad-acpi.txt | 2 + + drivers/platform/mellanox/mlxreg-hotplug.c | 54 ++-- + drivers/platform/x86/acer-wmi.c | 1 + + drivers/platform/x86/apple-gmux.c | 2 +- + drivers/platform/x86/asus-laptop.c | 3 +- + drivers/platform/x86/asus-wireless.c | 2 +- + drivers/platform/x86/asus-wmi.c | 3 +- + drivers/platform/x86/dell-laptop.c | 17 +- + drivers/platform/x86/dell-smbios-base.c | 5 +- + drivers/platform/x86/dell-wmi.c | 16 +- + drivers/platform/x86/fujitsu-laptop.c | 47 ++-- + drivers/platform/x86/ideapad-laptop.c | 66 ++++- + drivers/platform/x86/intel_scu_ipc.c | 4 +- + drivers/platform/x86/mlx-platform.c | 289 ++++++++++++++++++++- + drivers/platform/x86/samsung-laptop.c | 3 +- + drivers/platform/x86/silead_dmi.c | 101 ++++++- + drivers/platform/x86/thinkpad_acpi.c | 30 ++- + include/linux/platform_data/mlxreg.h | 3 +- + include/linux/string_helpers.h | 1 + + 20 files changed, 585 insertions(+), 77 deletions(-) +Merging chrome-platform/for-next (5cd7e690bdc1 platform/chrome: chromeos_tbmc - fix SPDX identifier) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_tbmc.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) +Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (6d71021ab3b0 leds: class: ensure workqueue is initialized before setting brightness) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (048f7c3e352e ipmi: Properly release srcu locks on error conditions) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (7041d9c3f01b USB: serial: pl2303: add support for tx xon/xoff flow control) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (8bcf4c0bd7fb usb: chipidea: properly handle host or gadget initialization failure) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. +Merging phy-next/next (c1eb8f83845b phy: mediatek: add XS-PHY driver) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (1da1063a16b4 extcon: usbc-cros-ec: Switch to SPDX identifier.) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-intel-int3496.c | 2 +- + drivers/extcon/extcon-usbc-cros-ec.c | 22 ++++++---------------- + 2 files changed, 7 insertions(+), 17 deletions(-) +Merging staging/staging-next (3ca24ce9ff76 Merge branch 'proc-cmdline') +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 1 + + drivers/mux/core.c | 104 +++++++++++++++++++++++++++------- + include/linux/mux/consumer.h | 4 ++ + 3 files changed, 89 insertions(+), 20 deletions(-) +Merging slave-dma/next (c79c2212f7c9 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/pl330.c +Merge made by the 'recursive' strategy. + drivers/dma/pl330.c | 28 ---------------------------- + 1 file changed, 28 deletions(-) +Merging cgroup/for-next (d8742e229021 cgroup: css_set_lock should nest inside tasklist_lock) +$ git merge cgroup/for-next +Already up to date. +Merging scsi/for-next (3cedc8797b9c scsi: qla2xxx: Mask off Scope bits in retry delay) +$ git merge scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (1b5c2cb19668 scsi: lpfc: update driver version to 12.0.0.4) +$ 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 libata/for-next (ed058253618e Merge branch 'for-4.17-fixes' into for-next) +$ git merge libata/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for transport features) +$ git merge vhost/linux-next +Auto-merging drivers/virtio/virtio_pci_common.c +Auto-merging drivers/vhost/vhost.c +Merge made by the 'recursive' strategy. + drivers/vhost/vhost.c | 3 +++ + drivers/virtio/virtio_pci_common.c | 30 ++++++++++++++++++++++++++++++ + drivers/virtio/virtio_pci_modern.c | 14 ++++++++++++++ + include/linux/virtio_ring.h | 4 ++-- + include/uapi/linux/virtio_config.h | 16 ++++++++++++---- + 5 files changed, 61 insertions(+), 6 deletions(-) +Merging rpmsg/for-next (1601c6923d66 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (6310b930ccbb gpio: davinci: fix build warning when !CONFIG_OF) +$ git merge gpio/for-next +Already up to date. +Merging pinctrl/for-next (86c5dd6860a6 pinctrl: cherryview: limit Strago DMI workarounds to version 1.0) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (7c24e71c8a64 pinctrl: samsung: Fix suspend/resume for Exynos5433 GPF1..5 banks) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (414c52b7899a pwm: stm32: Fix build warning with CONFIG_DMA_ENGINE disabled) +$ git merge pwm/for-next +Auto-merging drivers/pwm/pwm-stm32.c +Auto-merging drivers/acpi/acpi_lpss.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/stm32-timers.txt | 20 +++++++++++++++ + drivers/acpi/acpi_lpss.c | 2 ++ + drivers/pwm/Kconfig | 2 +- + drivers/pwm/pwm-atmel-tcb.c | 6 ++--- + drivers/pwm/pwm-lpss-platform.c | 5 ++++ + drivers/pwm/pwm-lpss.c | 30 ++++++++++++++++++++++ + drivers/pwm/pwm-lpss.h | 2 ++ + drivers/pwm/pwm-meson.c | 4 +-- + drivers/pwm/pwm-rcar.c | 3 +-- + drivers/pwm/pwm-stm32.c | 4 +-- + 10 files changed, 66 insertions(+), 12 deletions(-) +Merging userns/for-next (4b245b90065b Merge of my siginfo-next and userns-next trees for testing in linux-next) +$ git merge userns/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (bfe80ed3d7c7 vsprintf: add command line option debug_boot_weak_hash) +$ git merge random/dev +Auto-merging lib/vsprintf.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 9 ++++++++ + drivers/char/random.c | 23 +++++++++++-------- + include/linux/random.h | 2 +- + lib/vsprintf.c | 30 ++++++++++++++++++++++++- + 4 files changed, 53 insertions(+), 11 deletions(-) +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (53c3daf8cfea kselftest/cgroup: fix a signedness bug) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + tools/testing/selftests/cgroup/cgroup_util.c | 4 ++-- + .../testing/selftests/ftrace/test.d/kprobe/kprobe_args_string.tc | 8 ++++++++ + .../testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc | 7 +++++++ + 3 files changed, 17 insertions(+), 2 deletions(-) +Merging y2038/y2038 (e0ffebf0f3f3 pstore: Remove bogus format string definition) +$ git merge y2038/y2038 +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_trans_inode.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_inode.c +Auto-merging fs/udf/udfdecl.h +Auto-merging fs/udf/super.c +Auto-merging fs/ubifs/ubifs.h +Auto-merging fs/ubifs/file.c +Auto-merging fs/ubifs/dir.c +Auto-merging fs/proc/uptime.c +Auto-merging fs/orangefs/orangefs-kernel.h +Auto-merging fs/orangefs/inode.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/blocklayout.c +Auto-merging fs/nfs/callback_proc.c +Auto-merging fs/locks.c +Auto-merging fs/hfs/inode.c +Auto-merging fs/gfs2/dir.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/fat/namei_msdos.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/cramfs/inode.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/caps.c +Auto-merging fs/ceph/addr.c +CONFLICT (content): Merge conflict in fs/ceph/addr.c +Auto-merging fs/btrfs/transaction.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/attr.c +Auto-merging fs/afs/fsclient.c +Auto-merging drivers/usb/gadget/function/f_fs.c +CONFLICT (modify/delete): drivers/staging/lustre/lustre/obdclass/obdo.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/obdclass/obdo.c left in tree. +CONFLICT (modify/delete): drivers/staging/lustre/lustre/mdc/mdc_reint.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/mdc/mdc_reint.c left in tree. +CONFLICT (modify/delete): drivers/staging/lustre/lustre/lmv/lmv_obd.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/lmv/lmv_obd.c left in tree. +CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/namei.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/llite/namei.c left in tree. +CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/llite_lib.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/lustre/lustre/llite/llite_lib.c left in tree. +Resolved 'fs/ceph/addr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/lustre/lustre/llite/llite_lib.c drivers/staging/lustre/lustre/llite/namei.c drivers/staging/lustre/lustre/lmv/lmv_obd.c drivers/staging/lustre/lustre/mdc/mdc_reint.c drivers/staging/lustre/lustre/obdclass/obdo.c +drivers/staging/lustre/lustre/llite/llite_lib.c: needs merge +drivers/staging/lustre/lustre/llite/namei.c: needs merge +drivers/staging/lustre/lustre/lmv/lmv_obd.c: needs merge +drivers/staging/lustre/lustre/mdc/mdc_reint.c: needs merge +drivers/staging/lustre/lustre/obdclass/obdo.c: needs merge +rm 'drivers/staging/lustre/lustre/llite/llite_lib.c' +rm 'drivers/staging/lustre/lustre/llite/namei.c' +rm 'drivers/staging/lustre/lustre/lmv/lmv_obd.c' +rm 'drivers/staging/lustre/lustre/mdc/mdc_reint.c' +rm 'drivers/staging/lustre/lustre/obdclass/obdo.c' +$ git commit -v -a +[master 10f8db84c2d7] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + drivers/firmware/efi/efi-pstore.c | 27 ++++++------ + drivers/tty/tty_io.c | 15 +++++-- + drivers/usb/gadget/function/f_fs.c | 2 +- + fs/adfs/inode.c | 7 +++- + fs/afs/fsclient.c | 2 +- + fs/attr.c | 14 +++---- + fs/bad_inode.c | 2 +- + fs/btrfs/file.c | 6 +-- + fs/btrfs/inode.c | 8 ++-- + fs/btrfs/ioctl.c | 4 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/transaction.c | 2 +- + fs/ceph/addr.c | 12 +++--- + fs/ceph/cache.c | 4 +- + fs/ceph/caps.c | 6 +-- + fs/ceph/file.c | 6 +-- + fs/ceph/inode.c | 86 ++++++++++++++++++++------------------ + fs/ceph/mds_client.c | 7 +++- + fs/ceph/snap.c | 6 +-- + fs/cifs/cache.c | 4 +- + fs/cifs/fscache.c | 8 ++-- + fs/cifs/inode.c | 26 ++++++------ + fs/coda/coda_linux.c | 12 +++--- + fs/configfs/inode.c | 12 +++--- + fs/cramfs/inode.c | 2 +- + fs/ext4/ext4.h | 34 ++++++++------- + fs/ext4/ialloc.c | 4 +- + fs/ext4/namei.c | 2 +- + fs/f2fs/f2fs.h | 10 +++-- + fs/f2fs/file.c | 12 +++--- + fs/f2fs/inode.c | 12 +++--- + fs/f2fs/namei.c | 4 +- + fs/fat/inode.c | 20 ++++++--- + fs/fat/namei_msdos.c | 21 ++++++---- + fs/fat/namei_vfat.c | 22 ++++++---- + fs/fuse/inode.c | 2 +- + fs/gfs2/dir.c | 6 +-- + fs/gfs2/glops.c | 4 +- + fs/hfs/inode.c | 4 +- + fs/hfsplus/inode.c | 12 +++--- + fs/hostfs/hostfs_kern.c | 12 +++--- + fs/inode.c | 54 +++++++++++++++++------- + fs/jffs2/dir.c | 18 ++++---- + fs/jffs2/file.c | 2 +- + fs/jffs2/fs.c | 12 +++--- + fs/kernfs/dir.c | 4 +- + fs/kernfs/inode.c | 8 ++-- + fs/locks.c | 2 +- + fs/nfs/callback_proc.c | 4 +- + fs/nfs/fscache-index.c | 4 +- + fs/nfs/fscache.c | 12 +++--- + fs/nfs/inode.c | 49 ++++++++++++---------- + fs/nfs/nfs2xdr.c | 25 ++++++----- + fs/nfs/nfs3xdr.c | 8 +++- + fs/nfs/nfs4xdr.c | 7 +++- + fs/nfsd/blocklayout.c | 8 ++-- + fs/nfsd/nfs3xdr.c | 14 ++++--- + fs/nfsd/nfs4xdr.c | 7 +++- + fs/nfsd/nfsxdr.c | 2 +- + fs/ntfs/inode.c | 30 ++++++------- + fs/ocfs2/dlmglue.c | 20 ++++++--- + fs/ocfs2/file.c | 6 +-- + fs/orangefs/inode.c | 2 +- + fs/orangefs/orangefs-kernel.h | 2 +- + fs/overlayfs/file.c | 4 +- + fs/overlayfs/inode.c | 16 +++---- + fs/overlayfs/overlayfs.h | 2 +- + fs/proc/uptime.c | 2 +- + fs/pstore/platform.c | 2 +- + fs/pstore/ram.c | 18 ++++---- + fs/reiserfs/namei.c | 2 +- + fs/reiserfs/xattr.c | 4 +- + fs/ubifs/dir.c | 4 +- + fs/ubifs/file.c | 23 +++++----- + fs/ubifs/ubifs.h | 2 +- + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 59 +++++++++++++------------- + fs/udf/super.c | 17 ++++---- + fs/udf/udfdecl.h | 4 +- + fs/udf/udftime.c | 9 +--- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_iops.c | 2 +- + fs/xfs/xfs_trans_inode.c | 2 +- + include/linux/fs.h | 24 ++++++----- + include/linux/pstore.h | 2 +- + include/linux/stat.h | 8 ++-- + 86 files changed, 546 insertions(+), 431 deletions(-) +Merging livepatching/for-next (d7ab8e67aa52 Merge branch 'for-4.18/upstream' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (b66e01615a29 coresight: tmc: Add configuration support for trace buffer size) +$ git merge coresight/next +Auto-merging include/linux/coresight.h +Auto-merging drivers/hwtracing/coresight/coresight.c +Auto-merging drivers/hwtracing/coresight/coresight-tmc.h +Auto-merging drivers/hwtracing/coresight/coresight-tmc.c +Auto-merging drivers/hwtracing/coresight/coresight-tmc-etr.c +CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-tmc-etr.c +Auto-merging drivers/hwtracing/coresight/coresight-tmc-etf.c +Auto-merging drivers/hwtracing/coresight/coresight-priv.h +Auto-merging drivers/hwtracing/coresight/coresight-etm4x.h +Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c +Auto-merging drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c +Auto-merging drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +Auto-merging drivers/hwtracing/coresight/coresight-etm.h +Auto-merging drivers/hwtracing/coresight/coresight-etb10.c +Resolved 'drivers/hwtracing/coresight/coresight-tmc-etr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c83d64dcfbc1] Merge remote-tracking branch 'coresight/next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 8 + + .../devicetree/bindings/arm/coresight.txt | 5 +- + drivers/hwtracing/coresight/coresight-etb10.c | 12 +- + drivers/hwtracing/coresight/coresight-etm.h | 3 - + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 43 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 4 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 47 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 31 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 3 - + drivers/hwtracing/coresight/coresight-priv.h | 10 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 45 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 1010 ++++++++++++++++++-- + drivers/hwtracing/coresight/coresight-tmc.c | 83 +- + drivers/hwtracing/coresight/coresight-tmc.h | 110 ++- + drivers/hwtracing/coresight/coresight.c | 3 +- + include/linux/coresight.h | 20 - + 16 files changed, 1219 insertions(+), 218 deletions(-) +Merging rtc/rtc-next (e4302aec8a06 rtc: pxa: fix probe function) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (d95363c95705 Merge branch 'for-4.18/dax-memory-failure' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging mm/huge_memory.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/dax.h +Auto-merging fs/dax.c +Auto-merging drivers/dax/device.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/set_memory.h | 42 +++++++++ + arch/x86/kernel/cpu/mcheck/mce-internal.h | 15 ---- + arch/x86/kernel/cpu/mcheck/mce.c | 38 +------- + arch/x86/mm/pat.c | 16 ++++ + drivers/dax/device.c | 97 ++++++++++++-------- + drivers/nvdimm/pmem.c | 26 ++++++ + drivers/nvdimm/pmem.h | 13 +++ + fs/dax.c | 92 ++++++++++++++++++- + include/linux/dax.h | 16 +++- + include/linux/huge_mm.h | 5 +- + include/linux/mm.h | 1 + + include/linux/set_memory.h | 14 +++ + mm/huge_memory.c | 4 +- + mm/madvise.c | 18 +++- + mm/memory-failure.c | 143 ++++++++++++++++++++++++++++-- + 15 files changed, 434 insertions(+), 106 deletions(-) +Merging at24/at24/for-next (73b0d922cd5b eeprom: at24: provide a separate routine for creating dummy i2c clients) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (c9160b69258e ntb: ntb_transport: Replace GFP_ATOMIC with GFP_KERNEL in ntb_transport_create_queue) +$ git merge ntb/ntb-next +Already up to date. +Merging kspp/for-next/kspp (45888b40d2a6 rslib: Allocate decoder buffers to avoid VLAs) +$ 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 (5997aab0a11e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge cisco/for-next +Already up to date. +Merging akpm-current/current (8a85411459a4 ipc: use new return type vm_fault_t) +$ git merge --no-ff akpm-current/current +Auto-merging security/apparmor/lsm.c +Auto-merging mm/swapfile.c +Auto-merging mm/swap_state.c +Auto-merging mm/memory.c +Auto-merging mm/hmm.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/relay.c +Auto-merging kernel/memremap.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging ipc/sem.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/fs.h +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/journal.c +CONFLICT (content): Merge conflict in fs/ocfs2/journal.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/namei.c +Auto-merging fs/fat/inode.c +Auto-merging fs/exec.c +Auto-merging fs/binfmt_elf.c +CONFLICT (content): Merge conflict in fs/binfmt_elf.c +Auto-merging arch/arm/Kconfig +Recorded preimage for 'fs/binfmt_elf.c' +Recorded preimage for 'fs/ocfs2/journal.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/binfmt_elf.c'. +Recorded resolution for 'fs/ocfs2/journal.c'. +[master f26d6b1d9a51] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/admin-guide/cgroup-v2.rst | 74 ++++++++ + Documentation/sysctl/fs.txt | 36 ++++ + Documentation/vm/hmm.rst | 1 - + arch/arm/Kconfig | 3 +- + arch/arm/boot/compressed/Makefile | 3 + + arch/arm/include/asm/page.h | 2 + + arch/arm/kvm/hyp/Makefile | 8 + + arch/arm/vdso/Makefile | 3 + + block/genhd.c | 2 +- + fs/bfs/inode.c | 9 +- + fs/binfmt_elf.c | 16 +- + fs/dcache.c | 3 +- + fs/exec.c | 1 + + fs/exofs/ore.c | 84 +++++---- + fs/exofs/ore_raid.c | 75 ++++++-- + fs/exofs/super.c | 23 ++- + fs/fat/inode.c | 7 +- + fs/namei.c | 53 +++++- + fs/ocfs2/buffer_head_io.c | 77 ++++++-- + fs/ocfs2/dir.c | 3 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/file.c | 4 +- + fs/ocfs2/journal.c | 51 +++-- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/proc/base.c | 9 +- + include/linux/cgroup-defs.h | 5 + + include/linux/fs.h | 2 + + include/linux/hmm.h | 4 +- + include/linux/kcov.h | 14 ++ + include/linux/memcontrol.h | 34 ++++ + include/linux/memremap.h | 1 + + include/linux/oom.h | 12 +- + include/linux/sched.h | 2 +- + include/linux/sched/signal.h | 3 + + include/linux/slab.h | 1 + + include/linux/swap.h | 13 +- + include/uapi/linux/prctl.h | 4 + + ipc/sem.c | 18 +- + ipc/shm.c | 2 +- + kernel/cgroup/cgroup.c | 13 +- + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 10 + + kernel/kcov.c | 21 ++- + kernel/memremap.c | 39 +++- + kernel/relay.c | 2 +- + kernel/sched/core.c | 4 + + kernel/sys.c | 11 ++ + kernel/sysctl.c | 18 ++ + lib/Kconfig.debug | 36 ++-- + mm/backing-dev.c | 35 ++++ + mm/hmm.c | 297 +++++------------------------- + mm/ksm.c | 14 +- + mm/list_lru.c | 7 + + mm/memcontrol.c | 279 +++++++++++++++++++++++++++- + mm/memory.c | 4 +- + mm/mincore.c | 12 +- + mm/oom_kill.c | 210 ++++++++++++++------- + mm/page_owner.c | 4 +- + mm/slab_common.c | 21 ++- + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 29 ++- + mm/swap_state.c | 16 +- + mm/swapfile.c | 156 ++++++++++++---- + scripts/checkpatch.pl | 7 + + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 1 + + 69 files changed, 1364 insertions(+), 570 deletions(-) +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: mm: use octal not symbolic permissions +Applying: treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX +Applying: mm: fix oom_kill event handling +Applying: mm-fix-oom_kill-event-handling-fix +Applying: hexagon: fix printk format warning in setup.c +Applying: hexagon: drop the unused variable zero_page_mask +Applying: mm, memcg: propagate memory effective protection on setting memory.min/low +Applying: mm, memcg: don't skip memory guarantee calculations +Applying: selftests: cgroup: add test for memory.low corner cases +Applying: lib/test_printf.c: call wait_for_random_bytes() before plain %p tests +Applying: kernel/kexec_file.c: add walk_system_ram_res_rev() +Applying: kernel/kexec_file.c: load kernel at top of system RAM if required +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +Applying: sparc64: NG4 memset 32 bits overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + de56ebf83715...4ef6a05c5d57 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4ef6a05c5d57 sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm64/mm/init.c | 6 +- + arch/hexagon/include/asm/pgtable.h | 1 - + arch/hexagon/kernel/setup.c | 2 +- + arch/hexagon/mm/init.c | 3 - + arch/mips/kernel/setup.c | 4 +- + arch/powerpc/mm/mem.c | 2 +- + arch/sparc/lib/NG4memset.S | 26 ++--- + arch/sparc/mm/init_64.c | 2 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + drivers/firmware/efi/arm-init.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/remoteproc/qcom_q6v5_pil.c | 2 +- + drivers/soc/qcom/mdt_loader.c | 4 +- + include/linux/ioport.h | 3 + + include/linux/memcontrol.h | 26 ++++- + kernel/kexec_file.c | 2 + + kernel/resource.c | 63 +++++++++++++ + lib/test_printf.c | 7 ++ + mm/cleancache.c | 10 +- + mm/cma_debug.c | 25 ++--- + mm/compaction.c | 2 +- + mm/dmapool.c | 2 +- + mm/failslab.c | 2 +- + mm/frontswap.c | 11 +-- + mm/memblock.c | 9 +- + mm/memcontrol.c | 35 ++++--- + mm/oom_kill.c | 2 +- + mm/page_alloc.c | 2 +- + mm/page_idle.c | 2 +- + mm/page_owner.c | 4 +- + mm/shmem.c | 9 +- + mm/slab_common.c | 4 +- + mm/vmalloc.c | 4 +- + mm/zsmalloc.c | 5 +- + mm/zswap.c | 38 ++++---- + tools/testing/selftests/cgroup/test_memcontrol.c | 115 +++++++++++++++++++++++ + 37 files changed, 329 insertions(+), 115 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5a4e5a9ccdce --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.17-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c71168f8d5ff --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180614 |