diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-10-13 13:28:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-10-13 13:28:51 +1100 |
| commit | d3e8d3349fb32d415208c063192cc731a7f6c45e (patch) | |
| tree | 9e27e7dfaf71e5f26ef4f64ff3140dbce280ee6d | |
| parent | 55c123fcb77b12c42d72f4598b20f9f8b98d80ca (diff) | |
Add linux-next specific files for 20161013next-20161013
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 245 | ||||
| -rw-r--r-- | Next/Trees | 247 | ||||
| -rw-r--r-- | Next/merge.log | 4093 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4590 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..77896498fb90 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,245 @@ +Name SHA1 +---- ---- +origin b67be92feb486f800d80d72c67fd87b47b79b18e +fixes 30066ce675d3af350bc5a53858991c0b518dda00 +kbuild-current d3e2773c4ede5c62d2a92dae20e3a09b1ca55b6e +arc-current 8df0cc75f530bd814d4a185fb4042a0fd0186c98 +arm-current fb833b1fbb68461772dbf5e91bddea5e839187e9 +m68k-current 6736e65effc3a5a866cf8a03cda9ad277b712d3f +metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218 +powerpc-fixes b79331a5eb9f96e4dfd216974581168ec4c8a4d4 +sparc 4c1fad64eff481982349f5795b9c198c532b0f13 +net 6d3a4c404648e415e7d96e285d723936d4df7ed0 +ipsec 7f92083eb58f85ea114d97f65fcbe22be5b0468d +netfilter 6d3a4c404648e415e7d96e285d723936d4df7ed0 +ipvs ea43f860d984b00c3e3fa02049412ce94ce9ed5e +wireless-drivers 29d5e6fbd65be89dcd32f070fc45ee0e3b2f82b6 +mac80211 1d4de2e222b41006007d7dbfce2abfe448217e49 +sound-current fdd8218d7d1bd0ccb9a3f4c58bf77773691a56cc +pci-current 035ee288ae7ade4152f1c3cf23a587b04fdc526c +driver-core.current b66484cd74706fa8681d051840fe4b18a3da40ff +tty.current b66484cd74706fa8681d051840fe4b18a3da40ff +usb.current b66484cd74706fa8681d051840fe4b18a3da40ff +usb-gadget-fixes d8a4100ddc75df3566db022e659e216ac267ebdb +usb-serial-fixes f190fd92458da3e869b4e2c6289e2c617490ae53 +usb-chipidea-fixes 6b7f456e67a1723354f3ccbd10e4e47a56bc7b06 +staging.current 1573d2caf713874cfe0d1336c823d0fb548d8bed +char-misc.current b66484cd74706fa8681d051840fe4b18a3da40ff +input-current c758f96a8c346ac5a6822b521ec92308c5774381 +crypto-current c3afafa47898e34eb49828ec4ac92bcdc81c8f0c +ide 797cee982eef9195736afc5e7f3b8f613c41d19a +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes c8952a707556e04374d7b2fdb3a079d63ddf6f2f +kselftest-fixes 29b4817d4018df78086157ea3a55c1d9424a7cfc +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 5baaf3b9efe127d239038de9219d381f4d882b26 +drm-intel-fixes c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 +kbuild fbcbee25745d38610f327260589875e53944d837 +asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c +arc 8df0cc75f530bd814d4a185fb4042a0fd0186c98 +arm 70fe0fd28524cdb4f835cc46e486d1fc6581e1bc +arm-perf 694d0d0bb2030d2e36df73e2d23d5770511dbc8d +arm-soc bcaf9dcf55fdac747f04a79e976c4543da3a4ab2 +pinctrl 6d475e0b39801a000f6e0f174f2b816c70ff869d +amlogic 8148ca0d95ec984cb1bc360d9d0b89026c136285 +at91 0f59c948faed3715331c2648b46d6d0033d86f5c +bcm2835 9336be5db24db7d1f55d57a8baf47032c2b18f8a +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 70da51e698c7e1e9b8afbe241ae35bb65a32ebc8 +keystone fb2a68db621a3710307363809b3d5929beed372f +mvebu a9c51ff3121fe64c59699e9604ee764f6529f0de +omap 624018387bcfd66cfbdcfb2ada45e5f50710f89d +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 4feeec0c6e6daf601e250d7e1cf2ac210730d8cc +renesas a64ca8158b213343b46cc8c220db564b6505df04 +rockchip e80be333a38fdb017ccd9965fa7912e30ce08b48 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1a695a905c18548062509178b98bc91e67510864 +samsung-krzk ea24fc2674ef8cf4277008f899335f48d808b4e0 +tegra 74e8115883f585eb6607e4dec9241f7b2cdab018 +arm64 db68f3e7594aca77632d56c449bd36c6c931d59a +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris 2dc024e94578c53e2c579a48725c8fe2527f9d5e +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k 6736e65effc3a5a866cf8a03cda9ad277b712d3f +m68knommu 742859adc721da65ff4e8b59412d73bd3d2a57fe +metag f5d163aad31e4ec30f7258e655503824a2b03d45 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 74f1077b5b783e7bf4fa3007cefdc8dbd6c07518 +nios2 476080a79367b950cb860ccf8a3a53fd24f6cccc +parisc-hd c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 +powerpc 08bf75ba852ef8304a84b6a030466b4b4850382e +fsl e0b80f00bb96b925995d53980e0c764430bedb42 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 67bfcfe52529843100d3883e9185a497be6198be +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile bf55d575234bcb6eb20d4eb8b21270a1e36eec85 +uml dad2232844073295c64e9cc2d734a0ade043e0f6 +unicore32 1ace5d1e3d4b4368acbc08a55b3ca9a6c0a2aee3 +xtensa a4c6be5ad1d0c7af0c5421b68a00b6406b28a325 +befs 58d08821eaa76ab54bab2da1808d0947980364f6 +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave 54ce19f684302ec4d9dfaa00bb411ced95fadf71 +ceph 64f77566e1c84990d6c448bb3960f899521c0b7d +cifs ba4561542b9efae6089f89cdaec65492fbfda905 +configfs 42857cf512cb34c2c8cb50f1e766689d979d64e0 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 6ed47823005fc75245357fe39e190008a9892202 +ext4 18017479cabaeb5c659d789f04ecf7939f8ee28f +f2fs 4c1fad64eff481982349f5795b9c198c532b0f13 +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 63401ccdb2ca08ae76909f6588a3f3348bc3555d +gfs2 a3443cda5588985a2724d6d0f4a5f04e625be6eb +jfs 240c5185c52d00725ae7da7d1ee82ad8b8306d52 +nfs 4d2899d73c4734cd04edb9409a72d0ef637cfb06 +nfsd 29ae7f9dc21a7dda41d78b27bbda7d427ece8ad4 +orangefs f60fbdbf41c802e45c03e02ef824772c539ac965 +overlayfs b6495a35e1890f6524200375c86b18fea8ac4124 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs ec037dfcc064f5f81982c78e95bab783568ae35f +xfs feac470e3642e8956ac9b7f14224e6b301b9219d +file-locks d67fd44f697dff293d7cdc29af929241b669affe +vfs 77e5eb5fdcc1484eb91418458d7ed61f917647d7 +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 +pci 217c6d21e9245e590971905fd4501fd53730c800 +pstore f88baf68ebe5b2efced64725fd98548af9b8f510 +hid 419c103f083396791d23ee46e5ccbc5c1180c26c +i2c b2edcdae3d9a29b25f6c161a8711caa74ce49991 +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 +hwmon-staging 7ce4190c4ca466ccd609845b97dce665317aee2a +jc_docs 8c67e73f1884f1fdee8700c2e1925d1b0e50be32 +v4l-dvb 02a628e5c024cf67bf10bc822fb9169713f8ea74 +pm 935b29e0799588b097ca13b4bf94034c7834e442 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 43720df96023b762843e7ddcc319fc99989ba3c2 +thermal-soc c6935931c1894ff857616ff8549b61236a19148f +ieee1394 6449e31ddebdce68508cfaf0915d31aad3835f4f +dlm 5c93f56f770e69c4cf2dbaebecd6bcca205949f9 +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +net-next 1b830996c1603225a96e233c3b09bf2b12607d78 +ipsec-next 2258d927a691ddd2ab585adb17ea9f96e89d0638 +netfilter-next 1b830996c1603225a96e233c3b09bf2b12607d78 +ipvs-next ae9442f688c3e6efe1f39cc9e0b906f0a7cd0421 +wireless-drivers-next 15b95a15950238eff4d7f24be1716086eea67835 +bluetooth 2326243d6b25ffb8f14bd5300f8fd8572d5c72cd +mac80211-next 32910bb951a2a0332d70b23f6b3f83fa988dfcde +rdma 2937f375751922ffce9ef1d5fa84491840b0c8e0 +rdma-leon c6935931c1894ff857616ff8549b61236a19148f +rdma-leon-test c6935931c1894ff857616ff8549b61236a19148f +mtd 69db4aa44fdd8befc2eccd1313d841c5128c385c +l2-mtd 69db4aa44fdd8befc2eccd1313d841c5128c385c +nand d44154f969a44269a9288c274c1c2fd9e85df8a5 +crypto f97581cfa6e7db9818520597b8a44f8268d75013 +drm 69405d3da98b48633b78a49403e4f9cdb7c6a0f5 +drm-panel c96f566273bf086fe18a294ac37edf2d451ff024 +drm-intel 105f1a65b04a8f4f7abec11b200b1fb54f3d4b46 +drm-tegra 08ee01789eebf433c27e8b3eecc3ddbb5f7c4d51 +drm-misc b68d8379c28ddfe74b78be9414082f281332d86c +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 7a3bcc0a8e2ad5fa7fe6d627e01c66b3488149b7 +hdlcd 523d939ef98fd712632d93a5a2b588e477a7565e +mali-dp 59ba2422b4308b02438506d35d5042df5d42c249 +sunxi d035f120401787c780efae4bc525d1746c01a2d6 +kspp 09dd109d8241cd570391d4488337b77a4525f24e +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 96d87581df9320ebf56c75093260d8f0bf82c3e5 +sound fdd8218d7d1bd0ccb9a3f4c58bf77773691a56cc +sound-asoc 5c78e1a117c61eb4ecd6309e17212f2dcbd8256c +modules 49aadcf1b6f4240751921dad52e86c760d70a5f1 +input 930e19248e9b61da36c967687ca79c4d5f977919 +block 25d09398f1c4279e18f5eecfb4c8f976a128884d +lightnvm 1a6fe74dfd1bb10afb41cbbbdc14890604be42a6 +device-mapper 26e2a95e0d75f1e28528e96b1350c1ea3920fef0 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh fee686b74a9c115d3c4c851eb6613d1378ad0e0c +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md 5a5a36351abeacfbe0ae39a4d32f22f4d86e0491 +mfd b8d336ed90f541097a2ce583be430bb3e895dfbd +backlight 0c9501f823a40a061f755d3789c4705c9fe85f14 +battery 1d72706f0485b58e151b5a7584c4c65d66670587 +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator 80f473833abab8e640383d98514c7f202bce5bb5 +security 1306d8e1c09fdc8ecb9ef235e2116352f810f9c5 +integrity 56078b570983d6365cbe0ba7eed2cf4c00bffa0a +keys ed51e44e914c634bfd8435037474ebb0b47db956 +selinux 1306d8e1c09fdc8ecb9ef235e2116352f810f9c5 +tpmdd 213ebc81ac3fa7269be43a145b6908248e621bc7 +watchdog 39487f6688a557ebfc69816d7e02f210bf8fb2a3 +iommu 13a08259187c5cd3f63d98efa159ab42976d85a4 +dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108 +vfio 61771468e0a567f007fc450725063bb9cf7eb199 +trivial 380cc42d5a6c98f3ac7ec196b32d79168293501f +audit 7ff89ac608d9e856cae6fa651553fa0709bf9c50 +devicetree 87e5fc99b0280b492724cc7f2d8d9ad37b980087 +mailbox a649244de727b87d38fe46d86ef98c8d1fc49551 +spi ed34b9560902bcb61a1a2c7cd5eed9a8277479d1 +tip 1e1a4b0f5412eacebf6a71f086a99ccd42cc1d1c +clockevents 1d661bf5327a2c059ec967f850e89362e637f4e6 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd a29d64a45eed1ee0d4ac90335da79ad1a9a0990d +irqchip 0ccb54a7dba0d73101e52b1631d1071119875205 +ftrace f971cc9aabc287120bbe7f3f1abe70c13e61ee94 +rcu e53e0b3e7b3c783962f9461bcb9aa8bc3e3a8688 +kvm 6218590bcb452c3da7517d02b588d4d0a8628f73 +kvm-arm 0099b7701f5296a758d9e6b945ec96f96847cc2f +kvm-mips bf18db4e7bd99f3a65bcc43225790b16af733321 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus fa73c3b25bd8d0d393dc6109a1dba3c2aef0451e +kvms390 b0eb91ae630a4f2771790e306bb4df323127a397 +xen-tip a6a198bc60e6c980a56eca24d33dc7f29139f8ea +percpu 9b7396624a7b503220d85428654634b60762f2b0 +workqueues 863b710b664bdcb90c0c682ee24adb368f497a5b +drivers-x86 127595ed21c1bb24e20d488914b70ca7a643f7a4 +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382 +leds 6f3bad9670729ea3a7c78b3752a89c94ffa2397a +ipmi bd85f4b37ddf2da22ccf5b29d264b2459b6722df +driver-core b66484cd74706fa8681d051840fe4b18a3da40ff +tty b66484cd74706fa8681d051840fe4b18a3da40ff +usb b66484cd74706fa8681d051840fe4b18a3da40ff +usb-gadget e6be244a83211f3a9daaf5e29ee97fe0bf1efe5a +usb-serial 61fc51366b395f1441c7cd3615fb18837a4fa2f8 +usb-chipidea-next c6900310b6cc7d5a97e550849419c200c8786562 +staging 1573d2caf713874cfe0d1336c823d0fb548d8bed +char-misc b66484cd74706fa8681d051840fe4b18a3da40ff +extcon 38085c987f52674c2cc84fa0c0788eb71137cb2b +slave-dma 8df33b00f57defea07f3d377128abeb4eea257d9 +cgroup 4221d2ce6e57dbcb58015ec3495d9cd675e05d3c +scsi 51ff5072f43158aee5ab4d1f439105557534c322 +target-updates 291e3e51a34d2f546608bfd31f185151621135b7 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata df073d9e6a7d886c210d89a0ccba02dd422a3e85 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost 789ffaecf80b4aca4c5bcc983dc406e075daf979 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg 2fdd6c32d6a5fac18ddca49bb3d7b65d866c596f +gpio a5ea9f982d2b70de3bd73a666bc8d57e4d93cae3 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm dc8e6e1e8f2d2719dd396708b0f56d8b73c9ea52 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns 069d5ac9ae0d271903cc4607890616418118379a +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk b4626a7f489238a59f08f0b216e883bac07260d7 +random 59b8d4f1f5d26e4ca92172ff6dcd1492cdb39613 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest fecf861e765b2f9ce1a0487c3940afaed80ef7a8 +y2038 549eb7b22e245064dcdc17380538718492f4ca9c +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 2992ef29ae01af998399d55ed7c692a2505fb8af +coresight 27dbe886867aab96e208a460e539442789996190 +rtc 1cd713762e4cd5378a488fd6eaa7507bf030a832 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm e476f94482fc20a23b7b33b3d8e50f1953f71828 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current 000cf9328226c4de9bc6d87a3c0ccd70e33c46cb +akpm 2652bf614ed69d2a47d26c4c3a730b324a574f13 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..7fb710c09323 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,247 @@ +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/mmarek/kbuild.git#rc-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 +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +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 +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.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 +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.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 +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 +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +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 +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.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 +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/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 +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 +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-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 +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 +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#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 +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +befs git git://github.com/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 +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +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 +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-jk git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#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 +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +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/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#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 +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-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 +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 +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next +rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.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-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-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 git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +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/rusty/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/pcmcia.git#master +mmc-uh git git://git.linaro.org/people/ulf.hansson/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 +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.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 +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#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.infradead.org/users/pcmoore/audit#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.infradead.org/users/jcooper/linux.git#irqchip/for-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://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvm-ppc-paulus 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/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/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://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-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 +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 +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-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 +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-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 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +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 +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +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..cfee5ec7d495 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4093 @@ +$ date -R +Thu, 13 Oct 2016 09:27:42 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at de34f4da7f62 Merge tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media +Merging origin/master (b67be92feb48 Merge tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) +$ git merge origin/master +Updating de34f4da7f62..b67be92feb48 +Fast-forward + Documentation/DMA-attributes.txt | 17 + + Documentation/DocBook/kernel-hacking.tmpl | 2 +- + Documentation/RCU/lockdep-splat.txt | 2 +- + Documentation/dev-tools/kmemleak.rst | 9 + + .../bindings/display/bridge/dumb-vga-dac.txt | 48 + + .../devicetree/bindings/display/bridge/tda998x.txt | 18 + + .../devicetree/bindings/display/msm/hdmi.txt | 9 +- + .../bindings/display/panel/innolux,g101ice-l01.txt | 7 + + .../bindings/display/panel/jdi,lt070me05000.txt | 31 + + .../bindings/display/rockchip/rockchip-vop.txt | 4 +- + .../bindings/display/sunxi/sun4i-drm.txt | 43 +- + .../devicetree/bindings/display/tilcdc/tilcdc.txt | 26 + + .../devicetree/bindings/pwm/pwm-meson.txt | 23 + + .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 3 +- + Documentation/devicetree/bindings/pwm/pwm-st.txt | 8 +- + .../devicetree/bindings/pwm/pwm-sun4i.txt | 1 + + .../bindings/thermal/max77620_thermal.txt | 70 + + .../bindings/thermal/mediatek-thermal.txt | 4 +- + .../bindings/thermal/nvidia,tegra124-soctherm.txt | 121 +- + .../devicetree/bindings/thermal/qcom-tsens.txt | 21 + + .../filesystems/autofs4-mount-control.txt | 71 +- + Documentation/filesystems/autofs4.txt | 8 +- + Documentation/gpu/drm-internals.rst | 9 +- + Documentation/gpu/drm-kms-helpers.rst | 221 +- + Documentation/gpu/drm-kms.rst | 503 +- + Documentation/gpu/drm-mm.rst | 58 +- + Documentation/gpu/drm-uapi.rst | 107 + + Documentation/gpu/i915.rst | 3 + + Documentation/gpu/index.rst | 1 + + Documentation/gpu/kms-properties.csv | 21 - + .../{vgaarbiter.txt => gpu/vgaarbiter.rst} | 161 +- + Documentation/kernel-parameters.txt | 50 +- + Documentation/sync_file.txt | 14 + + Documentation/thermal/sysfs-api.txt | 19 + + MAINTAINERS | 20 +- + Makefile | 1 + + arch/arm/boot/dts/am335x-boneblack.dts | 71 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 18 +- + arch/arm/boot/dts/tegra124.dtsi | 83 +- + arch/arm/configs/exynos_defconfig | 2 - + arch/arm/include/asm/trusted_foundations.h | 1 - + arch/arm/kernel/process.c | 3 +- + arch/arm/mm/fault.h | 1 - + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 119 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 127 + + arch/arm64/include/asm/alternative.h | 1 - + arch/arm64/kernel/process.c | 8 +- + arch/frv/include/asm/pgtable.h | 1 + + arch/frv/include/asm/segment.h | 1 - + arch/frv/include/asm/uaccess.h | 2 - + arch/m68k/include/asm/uaccess_no.h | 3 - + arch/microblaze/include/asm/uaccess.h | 3 - + arch/mips/cavium-octeon/setup.c | 14 + + arch/mips/include/asm/extable.h | 13 + + arch/mips/include/asm/kexec.h | 1 + + arch/mips/include/asm/mach-loongson64/loongson.h | 1 - + arch/mips/include/asm/module.h | 2 +- + arch/mips/include/asm/uaccess.h | 9 +- + arch/mips/kernel/crash.c | 18 +- + arch/mips/kernel/machine_kexec.c | 1 + + arch/mips/lasat/picvue_proc.c | 1 + + arch/mips/math-emu/cp1emu.c | 1 - + arch/mips/net/bpf_jit.c | 1 - + arch/mn10300/include/asm/processor.h | 1 - + arch/mn10300/include/asm/uaccess.h | 7 - + arch/mn10300/kernel/signal.c | 6 +- + arch/openrisc/include/asm/uaccess.h | 4 - + arch/parisc/include/asm/pgtable.h | 6 +- + arch/parisc/include/asm/traps.h | 1 + + arch/parisc/kernel/traps.c | 4 +- + arch/parisc/kernel/vmlinux.lds.S | 14 +- + arch/parisc/mm/fault.c | 19 +- + arch/parisc/mm/init.c | 2 + + arch/powerpc/kernel/iommu.c | 6 +- + arch/score/include/asm/extable.h | 11 + + arch/score/include/asm/module.h | 2 +- + arch/score/include/asm/uaccess.h | 8 +- + arch/sh/include/asm/uaccess.h | 2 - + arch/sparc/include/asm/elf_64.h | 2 +- + arch/sparc/include/asm/extable_64.h | 20 + + arch/sparc/include/asm/uaccess_64.h | 18 +- + arch/tile/mm/mmap.c | 3 +- + arch/unicore32/kernel/process.c | 3 +- + arch/x86/include/asm/cacheflush.h | 1 - + arch/x86/include/asm/extable.h | 35 + + arch/x86/include/asm/kexec.h | 1 + + arch/x86/include/asm/sections.h | 2 +- + arch/x86/include/asm/smp.h | 1 + + arch/x86/include/asm/uaccess.h | 32 +- + arch/x86/kernel/crash.c | 22 +- + arch/x86/kernel/early-quirks.c | 18 +- + arch/x86/kernel/machine_kexec_64.c | 3 + + arch/x86/kernel/process.c | 3 +- + arch/x86/kernel/smp.c | 5 + + arch/x86/kernel/sys_x86_64.c | 5 +- + arch/x86/kvm/i8254.c | 14 +- + arch/x86/mm/fault.c | 2 +- + arch/xtensa/include/asm/asm-uaccess.h | 160 + + arch/xtensa/include/asm/uaccess.h | 153 - + arch/xtensa/kernel/coprocessor.S | 2 +- + arch/xtensa/kernel/entry.S | 2 +- + block/blk-lib.c | 15 + + block/ioctl.c | 18 +- + crypto/crypto_engine.c | 20 +- + drivers/acpi/thermal.c | 3 +- + drivers/block/loop.c | 8 +- + drivers/char/agp/intel-gtt.c | 2 + + drivers/char/random.c | 36 +- + drivers/char/tb0219.c | 1 + + drivers/char/virtio_console.c | 1 - + drivers/dma-buf/dma-buf.c | 23 + + drivers/dma-buf/fence-array.c | 7 +- + drivers/dma-buf/reservation.c | 2 +- + drivers/dma-buf/sync_debug.c | 12 +- + drivers/dma-buf/sync_file.c | 204 +- + drivers/gpu/drm/Kconfig | 146 +- + drivers/gpu/drm/Makefile | 9 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 8 + + drivers/gpu/drm/amd/amdgpu/Makefile | 17 +- + drivers/gpu/drm/amd/amdgpu/ObjectID.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 188 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 185 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 101 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 340 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 477 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 143 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 156 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 8 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 239 + + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 479 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 120 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 261 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 90 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 85 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 + + .../amdgpu_virt.h} | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 502 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 8 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 22 +- + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 1 + + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 11 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 431 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 131 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 36 + + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 94 +- + drivers/gpu/drm/amd/amdgpu/cz_smc.c | 13 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 141 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 125 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3176 ++++++++ + .../drm/amd/amdgpu/{tonga_smum.h => dce_v6_0.h} | 21 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 183 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 802 ++ + .../amd/amdgpu/{iceland_smum.h => dce_virtual.h} | 20 +- + drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 186 - + drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 863 --- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 3362 ++++++++ + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 257 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 993 ++- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 2 - + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1071 +++ + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 80 +- + drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 200 - + drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 677 -- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/r600_dpm.h | 127 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 137 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 244 +- + drivers/gpu/drm/amd/amdgpu/si.c | 1965 +++++ + drivers/gpu/drm/amd/amdgpu/{fiji_smum.h => si.h} | 23 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 915 +++ + drivers/gpu/drm/amd/amdgpu/si_dma.h | 29 + + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 8006 ++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/si_dpm.h | 1015 +++ + drivers/gpu/drm/amd/amdgpu/si_ih.c | 299 + + drivers/gpu/drm/amd/amdgpu/si_ih.h | 29 + + drivers/gpu/drm/amd/amdgpu/si_smc.c | 273 + + drivers/gpu/drm/amd/amdgpu/sislands_smc.h | 423 ++ + drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 186 - + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 49 +- + drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 862 --- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 18 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 150 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 240 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 442 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 535 +- + drivers/gpu/drm/amd/amdgpu/vid.h | 41 + + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 61 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 8 +- + drivers/gpu/drm/amd/include/amd_shared.h | 13 +- + .../drm/amd/include/asic_reg/si/clearstate_si.h | 941 +++ + drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h | 105 + + drivers/gpu/drm/amd/include/asic_reg/si/sid.h | 2461 ++++++ + .../gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h | 1 + + .../gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h | 1 + + .../gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 1 + + drivers/gpu/drm/amd/include/atombios.h | 2 + + drivers/gpu/drm/amd/include/cgs_common.h | 3 + + drivers/gpu/drm/amd/powerplay/Kconfig | 6 - + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 135 +- + .../drm/amd/powerplay/eventmgr/eventactionchains.c | 2 + + drivers/gpu/drm/amd/powerplay/eventmgr/psm.c | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 14 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 233 +- + .../amd/powerplay/hwmgr/fiji_clockpowergating.c | 121 - + .../drm/amd/powerplay/hwmgr/fiji_dyn_defaults.h | 105 - + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 5599 -------------- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h | 350 - + .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 613 -- + .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.h | 81 - + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.h | 62 - + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 34 - + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 314 +- + .../amd/powerplay/hwmgr/polaris10_dyn_defaults.h | 62 - + .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 5290 ------------- + .../drm/amd/powerplay/hwmgr/polaris10_thermal.c | 716 -- + .../drm/amd/powerplay/hwmgr/polaris10_thermal.h | 62 - + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 1 - + .../hwmgr/{tonga_pptable.h => pptable_v1_0.h} | 2 +- + ...a_processpptables.c => process_pptables_v1_0.c} | 281 +- + ...a_processpptables.h => process_pptables_v1_0.h} | 10 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 2 +- + ..._clockpowergating.c => smu7_clockpowergating.c} | 160 +- + ..._clockpowergating.h => smu7_clockpowergating.h} | 25 +- + .../drm/amd/powerplay/hwmgr/smu7_dyn_defaults.h | 55 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4359 +++++++++++ + .../hwmgr/{polaris10_hwmgr.h => smu7_hwmgr.h} | 244 +- + .../{polaris10_powertune.c => smu7_powertune.c} | 985 +-- + .../{polaris10_powertune.h => smu7_powertune.h} | 56 +- + .../hwmgr/{fiji_thermal.c => smu7_thermal.c} | 258 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 58 + + .../amd/powerplay/hwmgr/tonga_clockpowergating.c | 350 - + .../drm/amd/powerplay/hwmgr/tonga_dyn_defaults.h | 107 - + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 6276 --------------- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 397 - + .../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c | 590 -- + .../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.h | 61 - + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 22 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 - + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 175 +- + .../gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/power_state.h | 22 +- + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 3 + + drivers/gpu/drm/amd/powerplay/inc/smu71.h | 510 ++ + drivers/gpu/drm/amd/powerplay/inc/smu71_discrete.h | 631 ++ + drivers/gpu/drm/amd/powerplay/inc/smu7_common.h | 58 + + drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h | 412 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 77 +- + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 4 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 46 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 2374 ++++++ + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h | 51 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 612 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 32 +- + drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 2576 +++++++ + .../iceland_smc.h} | 26 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 250 + + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h | 71 + + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 2287 ++++++ + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.h | 42 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 708 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 59 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 589 ++ + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 87 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 110 +- + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 3206 ++++++++ + .../tonga_powertune.h => smumgr/tonga_smc.h} | 44 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 672 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h | 46 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 2 - + drivers/gpu/drm/arc/arcpgu_drv.c | 4 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 4 +- + drivers/gpu/drm/arm/malidp_drv.c | 7 +- + drivers/gpu/drm/arm/malidp_drv.h | 2 +- + drivers/gpu/drm/arm/malidp_planes.c | 20 +- + drivers/gpu/drm/armada/armada_drv.c | 2 +- + drivers/gpu/drm/armada/armada_fbdev.c | 1 - + drivers/gpu/drm/armada/armada_gem.c | 2 +- + drivers/gpu/drm/armada/armada_overlay.c | 2 +- + drivers/gpu/drm/ast/ast_fb.c | 1 - + drivers/gpu/drm/ast/ast_ttm.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 26 +- + drivers/gpu/drm/bochs/bochs.h | 1 - + drivers/gpu/drm/bochs/bochs_drv.c | 10 +- + drivers/gpu/drm/bochs/bochs_kms.c | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 3 +- + drivers/gpu/drm/bridge/Kconfig | 7 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 5 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 7 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 436 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 48 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 522 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 34 + + drivers/gpu/drm/bridge/dumb-vga-dac.c | 223 + + drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c | 1 - + drivers/gpu/drm/bridge/dw-hdmi.c | 18 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 7 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 8 +- + drivers/gpu/drm/bridge/tc358767.c | 8 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 - + drivers/gpu/drm/cirrus/cirrus_ttm.c | 3 +- + drivers/gpu/drm/drm_agpsupport.c | 6 +- + drivers/gpu/drm/drm_atomic.c | 7 +- + drivers/gpu/drm/drm_atomic_helper.c | 126 +- + drivers/gpu/drm/drm_auth.c | 2 +- + drivers/gpu/drm/drm_blend.c | 207 +- + drivers/gpu/drm/drm_bridge.c | 34 +- + drivers/gpu/drm/drm_bufs.c | 36 +- + drivers/gpu/drm/drm_color_mgmt.c | 296 + + drivers/gpu/drm/drm_connector.c | 1123 +++ + drivers/gpu/drm/drm_context.c | 24 +- + drivers/gpu/drm/drm_crtc.c | 5675 ++------------ + drivers/gpu/drm/drm_crtc_helper.c | 56 - + .../gpu/drm/drm_crtc_helper_internal.h | 43 +- + drivers/gpu/drm/drm_crtc_internal.h | 169 +- + drivers/gpu/drm/drm_dma.c | 6 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 19 +- + drivers/gpu/drm/drm_dp_helper.c | 191 +- + drivers/gpu/drm/drm_drv.c | 110 +- + drivers/gpu/drm/drm_edid.c | 271 +- + drivers/gpu/drm/drm_encoder.c | 233 + + drivers/gpu/drm/drm_fb_helper.c | 77 +- + drivers/gpu/drm/drm_fops.c | 7 +- + drivers/gpu/drm/drm_fourcc.c | 62 +- + drivers/gpu/drm/drm_framebuffer.c | 857 +++ + drivers/gpu/drm/drm_gem.c | 8 +- + drivers/gpu/drm/drm_global.c | 24 +- + drivers/gpu/drm/drm_hashtab.c | 2 +- + drivers/gpu/drm/drm_info.c | 4 +- + drivers/gpu/drm/drm_internal.h | 3 + + drivers/gpu/drm/drm_ioc32.c | 2 +- + drivers/gpu/drm/drm_ioctl.c | 18 +- + drivers/gpu/drm/drm_irq.c | 61 +- + drivers/gpu/drm/drm_kms_helper_common.c | 3 +- + drivers/gpu/drm/drm_lock.c | 4 +- + drivers/gpu/drm/drm_mipi_dsi.c | 63 +- + drivers/gpu/drm/drm_mm.c | 142 +- + drivers/gpu/drm/drm_mode_object.c | 438 ++ + drivers/gpu/drm/drm_modes.c | 30 +- + drivers/gpu/drm/drm_modeset_helper.c | 153 + + drivers/gpu/drm/drm_pci.c | 12 +- + drivers/gpu/drm/drm_plane.c | 906 +++ + drivers/gpu/drm/drm_plane_helper.c | 207 +- + drivers/gpu/drm/drm_platform.c | 4 +- + drivers/gpu/drm/drm_prime.c | 133 +- + drivers/gpu/drm/drm_probe_helper.c | 8 +- + drivers/gpu/drm/drm_property.c | 912 +++ + drivers/gpu/drm/drm_rect.c | 30 +- + drivers/gpu/drm/drm_scatter.c | 6 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 113 +- + drivers/gpu/drm/drm_sysfs.c | 8 +- + drivers/gpu/drm/drm_vma_manager.c | 83 +- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 81 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 9 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 233 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 + + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu.h | 10 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 261 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.h | 25 - + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 149 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 9 +- + drivers/gpu/drm/etnaviv/state_hi.xml.h | 9 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 11 - + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 9 - + drivers/gpu/drm/exynos/exynos_dp.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 58 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 46 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 4 - + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 54 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 239 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 76 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 112 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 68 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 16 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 15 - + drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 5 +- + drivers/gpu/drm/gma500/accel_2d.c | 1 - + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 8 - + drivers/gpu/drm/gma500/framebuffer.c | 1 - + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 - + drivers/gpu/drm/gma500/opregion.c | 5 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 - + drivers/gpu/drm/gma500/psb_intel_modes.c | 1 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 21 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 6 +- + drivers/gpu/drm/i2c/Kconfig | 1 + + drivers/gpu/drm/i2c/tda998x_drv.c | 297 +- + drivers/gpu/drm/i810/i810_drv.c | 4 +- + drivers/gpu/drm/i915/Makefile | 10 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 381 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1531 ++-- + drivers/gpu/drm/i915/i915_drv.c | 398 +- + drivers/gpu/drm/i915/i915_drv.h | 1239 ++- + drivers/gpu/drm/i915/i915_gem.c | 3541 ++++----- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 34 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 6 +- + drivers/gpu/drm/i915/i915_gem_context.c | 255 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 70 - + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 73 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 196 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 905 ++- + drivers/gpu/drm/i915/i915_gem_fence.c | 477 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 881 ++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 244 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 132 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 20 +- + drivers/gpu/drm/i915/i915_gem_request.c | 947 +++ + drivers/gpu/drm/i915/i915_gem_request.h | 689 ++ + drivers/gpu/drm/i915/i915_gem_shrinker.c | 78 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 63 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 112 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 74 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 871 ++- + drivers/gpu/drm/i915/i915_guc_reg.h | 3 - + drivers/gpu/drm/i915/i915_guc_submission.c | 382 +- + drivers/gpu/drm/i915/i915_irq.c | 217 +- + drivers/gpu/drm/i915/i915_memcpy.c | 101 + + drivers/gpu/drm/i915/i915_mm.c | 84 + + drivers/gpu/drm/i915/i915_params.c | 6 + + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 289 +- + drivers/gpu/drm/i915/i915_reg.h | 173 +- + drivers/gpu/drm/i915/i915_suspend.c | 47 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 362 + + drivers/gpu/drm/i915/i915_sw_fence.h | 65 + + drivers/gpu/drm/i915/i915_sysfs.c | 239 +- + drivers/gpu/drm/i915/i915_trace.h | 35 +- + drivers/gpu/drm/i915/i915_vgpu.c | 45 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 26 +- + drivers/gpu/drm/i915/intel_audio.c | 63 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 142 +- + drivers/gpu/drm/i915/intel_color.c | 24 +- + drivers/gpu/drm/i915/intel_crt.c | 48 +- + drivers/gpu/drm/i915/intel_csr.c | 7 - + drivers/gpu/drm/i915/intel_ddi.c | 432 +- + drivers/gpu/drm/i915/intel_device_info.c | 140 +- + drivers/gpu/drm/i915/intel_display.c | 2025 +++-- + drivers/gpu/drm/i915/intel_dp.c | 678 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 139 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 99 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 469 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 15 + + drivers/gpu/drm/i915/intel_drv.h | 188 +- + drivers/gpu/drm/i915/intel_dsi.c | 40 +- + drivers/gpu/drm/i915/intel_dvo.c | 27 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 321 + + drivers/gpu/drm/i915/intel_fbc.c | 87 +- + drivers/gpu/drm/i915/intel_fbdev.c | 36 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 128 +- + drivers/gpu/drm/i915/intel_frontbuffer.h | 91 + + drivers/gpu/drm/i915/intel_guc.h | 24 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 5 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 157 +- + drivers/gpu/drm/i915/intel_hdmi.c | 127 +- + drivers/gpu/drm/i915/intel_hotplug.c | 4 +- + drivers/gpu/drm/i915/intel_i2c.c | 134 +- + drivers/gpu/drm/i915/intel_lrc.c | 1596 ++-- + drivers/gpu/drm/i915/intel_lrc.h | 57 +- + drivers/gpu/drm/i915/intel_lvds.c | 214 +- + drivers/gpu/drm/i915/intel_mocs.c | 61 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 +- + drivers/gpu/drm/i915/intel_modes.c | 1 - + drivers/gpu/drm/i915/intel_overlay.c | 235 +- + drivers/gpu/drm/i915/intel_panel.c | 72 +- + drivers/gpu/drm/i915/intel_pm.c | 882 +-- + drivers/gpu/drm/i915/intel_psr.c | 26 +- + drivers/gpu/drm/i915/intel_renderstate.h | 16 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1578 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 326 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 65 +- + drivers/gpu/drm/i915/intel_sdvo.c | 56 +- + drivers/gpu/drm/i915/intel_sprite.c | 220 +- + drivers/gpu/drm/i915/intel_tv.c | 15 +- + drivers/gpu/drm/i915/intel_uncore.c | 39 +- + drivers/gpu/drm/imx/imx-drm-core.c | 332 +- + drivers/gpu/drm/imx/imx-drm.h | 6 - + drivers/gpu/drm/imx/imx-ldb.c | 160 +- + drivers/gpu/drm/imx/imx-tve.c | 3 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 20 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 26 +- + drivers/gpu/drm/imx/parallel-display.c | 16 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 3 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 49 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 151 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 18 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 23 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 120 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 15 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 +- + drivers/gpu/drm/mga/mga_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 3 +- + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/hdmi/hdmi.c | 21 +- + drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 5 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 23 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 6 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 16 +- + drivers/gpu/drm/msm/msm_atomic.c | 4 +- + drivers/gpu/drm/msm/msm_drv.c | 7 +- + drivers/gpu/drm/msm/msm_gem.c | 22 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 72 +- + drivers/gpu/drm/msm/msm_gpu.c | 13 +- + drivers/gpu/drm/msm/msm_gpu.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 - + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 1 - + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 1 - + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 1 - + drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 8 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 14 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 14 +- + drivers/gpu/drm/panel/Kconfig | 11 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 532 ++ + drivers/gpu/drm/panel/panel-simple.c | 44 +- + drivers/gpu/drm/qxl/qxl_display.c | 56 +- + drivers/gpu/drm/qxl/qxl_draw.c | 7 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 + + drivers/gpu/drm/qxl/qxl_fb.c | 1 - + drivers/gpu/drm/qxl/qxl_object.c | 8 +- + drivers/gpu/drm/qxl/qxl_release.c | 7 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 19 +- + drivers/gpu/drm/r128/r128_drv.c | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 16 +- + drivers/gpu/drm/radeon/atombios_dp.c | 21 +- + drivers/gpu/drm/radeon/cik.c | 18 +- + drivers/gpu/drm/radeon/cikd.h | 1 + + drivers/gpu/drm/radeon/evergreen.c | 5 +- + drivers/gpu/drm/radeon/evergreend.h | 1 + + drivers/gpu/drm/radeon/ni.c | 2 +- + drivers/gpu/drm/radeon/nid.h | 1 + + drivers/gpu/drm/radeon/r100.c | 6 +- + drivers/gpu/drm/radeon/r600.c | 8 +- + drivers/gpu/drm/radeon/r600d.h | 1 + + drivers/gpu/drm/radeon/radeon.h | 1 + + drivers/gpu/drm/radeon/radeon_acpi.c | 17 + + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 5 + + drivers/gpu/drm/radeon/radeon_connectors.c | 4 +- + drivers/gpu/drm/radeon/radeon_device.c | 18 +- + drivers/gpu/drm/radeon/radeon_display.c | 122 +- + drivers/gpu/drm/radeon/radeon_dp_auxch.c | 1 - + drivers/gpu/drm/radeon/radeon_drv.c | 37 +- + drivers/gpu/drm/radeon/radeon_fb.c | 31 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 8 +- + drivers/gpu/drm/radeon/radeon_kms.c | 17 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 10 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 7 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/radeon/rv770d.h | 1 + + drivers/gpu/drm/radeon/si.c | 12 +- + drivers/gpu/drm/radeon/si_dpm.c | 2 +- + drivers/gpu/drm/radeon/sid.h | 1 + + drivers/gpu/drm/radeon/sislands_smc.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 3 +- + drivers/gpu/drm/rockchip/Makefile | 2 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 74 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 11 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 7 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 79 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 275 + + drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 28 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 507 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 243 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 193 + + drivers/gpu/drm/savage/savage_drv.c | 2 +- + drivers/gpu/drm/savage/savage_state.c | 12 +- + drivers/gpu/drm/sis/sis_drv.c | 2 +- + drivers/gpu/drm/sti/Kconfig | 6 +- + drivers/gpu/drm/sti/Makefile | 1 - + drivers/gpu/drm/sti/sti_compositor.c | 51 +- + drivers/gpu/drm/sti/sti_compositor.h | 14 +- + drivers/gpu/drm/sti/sti_crtc.c | 26 +- + drivers/gpu/drm/sti/sti_cursor.c | 8 +- + drivers/gpu/drm/sti/sti_drv.c | 10 +- + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 35 +- + drivers/gpu/drm/sti/sti_hda.c | 39 +- + drivers/gpu/drm/sti/sti_hdmi.c | 31 +- + drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.c | 336 - + drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.h | 14 - + drivers/gpu/drm/sti/sti_hqvdp.c | 25 +- + drivers/gpu/drm/sti/sti_mixer.c | 19 - + drivers/gpu/drm/sti/sti_tvout.c | 41 +- + drivers/gpu/drm/sti/sti_vid.c | 4 +- + drivers/gpu/drm/sti/sti_vtac.c | 2 + + drivers/gpu/drm/sti/sti_vtg.c | 3 +- + drivers/gpu/drm/sun4i/Makefile | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 74 +- + drivers/gpu/drm/sun4i/sun4i_backend.h | 7 +- + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 8 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 19 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 56 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 71 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 98 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 6 + + drivers/gpu/drm/sun4i/sun4i_tv.c | 46 +- + drivers/gpu/drm/sun4i/sun6i_drc.c | 118 + + drivers/gpu/drm/tdfx/tdfx_drv.c | 1 + + drivers/gpu/drm/tegra/dc.c | 26 +- + drivers/gpu/drm/tegra/drm.c | 7 +- + drivers/gpu/drm/tegra/gem.c | 2 +- + drivers/gpu/drm/tilcdc/Makefile | 1 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 464 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 276 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 18 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 22 +- + drivers/gpu/drm/tilcdc/tilcdc_external.h | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 14 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 129 + + drivers/gpu/drm/tilcdc/tilcdc_regs.h | 14 + + drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c | 8 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 11 +- + drivers/gpu/drm/ttm/ttm_bo.c | 20 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +- + drivers/gpu/drm/ttm/ttm_memory.c | 6 + + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 - + drivers/gpu/drm/ttm/ttm_tt.c | 7 +- + drivers/gpu/drm/udl/udl_connector.c | 3 - + drivers/gpu/drm/udl/udl_dmabuf.c | 2 +- + drivers/gpu/drm/udl/udl_drv.c | 20 +- + drivers/gpu/drm/udl/udl_drv.h | 2 + + drivers/gpu/drm/udl/udl_main.c | 25 + + drivers/gpu/drm/udl/udl_modeset.c | 16 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 96 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 11 + + drivers/gpu/drm/vc4/vc4_drv.c | 7 +- + drivers/gpu/drm/vc4/vc4_drv.h | 30 +- + drivers/gpu/drm/vc4/vc4_gem.c | 17 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 206 +- + drivers/gpu/drm/vc4/vc4_kms.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 2 - + drivers/gpu/drm/vc4/vc4_regs.h | 19 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 21 +- + drivers/gpu/drm/vc4/vc4_validate.c | 17 +- + drivers/gpu/drm/vgem/vgem_drv.c | 4 +- + drivers/gpu/drm/via/via_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 17 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 + + drivers/gpu/drm/virtio/virtgpu_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 37 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + + drivers/gpu/drm/virtio/virtgpu_plane.c | 6 +- + drivers/gpu/drm/vmwgfx/Kconfig | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 9 - + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 11 - + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 7 - + drivers/gpu/ipu-v3/Makefile | 3 +- + drivers/gpu/ipu-v3/ipu-common.c | 169 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 13 + + drivers/gpu/ipu-v3/ipu-csi.c | 26 +- + drivers/gpu/ipu-v3/ipu-dmfc.c | 18 +- + drivers/gpu/ipu-v3/ipu-ic.c | 42 +- + drivers/gpu/ipu-v3/ipu-image-convert.c | 1709 +++++ + drivers/gpu/ipu-v3/ipu-prv.h | 39 + + drivers/gpu/ipu-v3/ipu-vdi.c | 243 + + drivers/gpu/vga/vgaarb.c | 110 +- + drivers/infiniband/sw/rdmavt/cq.c | 10 +- + drivers/input/rmi4/rmi_bus.c | 1 - + drivers/input/rmi4/rmi_driver.c | 1 - + drivers/input/rmi4/rmi_f01.c | 1 - + drivers/input/rmi4/rmi_f11.c | 1 - + drivers/irqchip/irq-bcm6345-l1.c | 1 - + drivers/irqchip/irq-bcm7038-l1.c | 1 - + drivers/irqchip/irq-bcm7120-l2.c | 1 - + drivers/irqchip/irq-brcmstb-l2.c | 1 - + drivers/md/dm-rq.c | 6 +- + drivers/md/dm.c | 4 +- + drivers/media/dvb-frontends/af9013.h | 1 - + drivers/media/dvb-frontends/af9033.h | 2 - + drivers/media/dvb-frontends/ascot2e.h | 1 - + drivers/media/dvb-frontends/atbm8830.h | 1 - + drivers/media/dvb-frontends/au8522.h | 1 - + drivers/media/dvb-frontends/cx22702.h | 1 - + drivers/media/dvb-frontends/cx24113.h | 2 - + drivers/media/dvb-frontends/cx24116.h | 1 - + drivers/media/dvb-frontends/cx24117.h | 1 - + drivers/media/dvb-frontends/cx24120.h | 1 - + drivers/media/dvb-frontends/cx24123.h | 1 - + drivers/media/dvb-frontends/cxd2820r.h | 1 - + drivers/media/dvb-frontends/cxd2841er.h | 1 - + drivers/media/dvb-frontends/dib3000mc.h | 2 - + drivers/media/dvb-frontends/dib7000m.h | 2 - + drivers/media/dvb-frontends/dib7000p.h | 2 - + drivers/media/dvb-frontends/drxd.h | 1 - + drivers/media/dvb-frontends/drxk.h | 1 - + drivers/media/dvb-frontends/ds3000.h | 1 - + drivers/media/dvb-frontends/dvb_dummy_fe.h | 1 - + drivers/media/dvb-frontends/ec100.h | 1 - + drivers/media/dvb-frontends/hd29l2.h | 1 - + drivers/media/dvb-frontends/helene.h | 1 - + drivers/media/dvb-frontends/horus3a.h | 1 - + drivers/media/dvb-frontends/ix2505v.h | 1 - + drivers/media/dvb-frontends/lg2160.h | 1 - + drivers/media/dvb-frontends/lgdt3305.h | 1 - + drivers/media/dvb-frontends/lgs8gl5.h | 1 - + drivers/media/dvb-frontends/lgs8gxx.h | 1 - + drivers/media/dvb-frontends/lnbh24.h | 2 - + drivers/media/dvb-frontends/lnbh25.h | 1 - + drivers/media/dvb-frontends/lnbp21.h | 2 - + drivers/media/dvb-frontends/lnbp22.h | 2 - + drivers/media/dvb-frontends/m88rs2000.h | 1 - + drivers/media/dvb-frontends/mb86a20s.h | 1 - + drivers/media/dvb-frontends/s5h1409.h | 1 - + drivers/media/dvb-frontends/s5h1411.h | 1 - + drivers/media/dvb-frontends/s5h1432.h | 1 - + drivers/media/dvb-frontends/s921.h | 1 - + drivers/media/dvb-frontends/si21xx.h | 1 - + drivers/media/dvb-frontends/sp2.h | 1 - + drivers/media/dvb-frontends/stb6000.h | 1 - + drivers/media/dvb-frontends/stv0288.h | 1 - + drivers/media/dvb-frontends/stv0367.h | 1 - + drivers/media/dvb-frontends/stv0900.h | 1 - + drivers/media/dvb-frontends/stv6110.h | 1 - + drivers/media/dvb-frontends/tda10048.h | 1 - + drivers/media/dvb-frontends/tda18271c2dd.h | 2 - + drivers/media/dvb-frontends/ts2020.h | 1 - + drivers/media/dvb-frontends/zl10036.h | 1 - + drivers/media/dvb-frontends/zl10039.h | 2 - + drivers/media/pci/cx23885/altera-ci.h | 2 - + drivers/media/pci/ivtv/ivtv-driver.c | 6 +- + drivers/media/pci/ivtv/ivtv-irq.c | 2 +- + drivers/media/tuners/fc0011.h | 1 - + drivers/media/tuners/fc0012.h | 1 - + drivers/media/tuners/fc0013.h | 1 - + drivers/media/tuners/max2165.h | 2 - + drivers/media/tuners/mc44s803.h | 2 - + drivers/media/tuners/mxl5005s.h | 2 - + drivers/media/tuners/r820t.h | 1 - + drivers/media/tuners/si2157.h | 1 - + drivers/media/tuners/tda18212.h | 1 - + drivers/media/tuners/tda18218.h | 1 - + drivers/media/tuners/xc5000.h | 1 - + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 1 - + drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 1 - + drivers/media/usb/dvb-usb/dibusb-common.c | 1 - + drivers/media/usb/hdpvr/hdpvr-video.c | 1 - + drivers/mtd/mtdcore.c | 1 - + drivers/mtd/mtdpart.c | 1 - + drivers/net/bonding/bond_main.c | 4 +- + drivers/net/dsa/b53/b53_mmap.c | 1 - + drivers/net/ethernet/microchip/encx24j600.c | 10 +- + drivers/net/ethernet/sun/ldmvsw.c | 1 - + drivers/net/ethernet/wiznet/w5100.c | 1 - + drivers/net/ethernet/wiznet/w5300.c | 1 - + drivers/nvme/host/pci.c | 3 +- + drivers/platform/x86/acerhdf.c | 2 +- + drivers/platform/x86/dell-smo8800.c | 1 + + drivers/pps/Kconfig | 2 +- + drivers/pwm/Kconfig | 9 + + drivers/pwm/Makefile | 1 + + drivers/pwm/core.c | 2 + + drivers/pwm/pwm-berlin.c | 84 + + drivers/pwm/pwm-cros-ec.c | 4 +- + drivers/pwm/pwm-lpc18xx-sct.c | 12 +- + drivers/pwm/pwm-meson.c | 529 ++ + drivers/pwm/pwm-mtk-disp.c | 87 +- + drivers/pwm/pwm-samsung.c | 15 +- + drivers/pwm/pwm-sti.c | 483 +- + drivers/pwm/pwm-sun4i.c | 9 + + drivers/pwm/pwm-tipwmss.c | 19 - + drivers/pwm/pwm-twl.c | 16 + + drivers/pwm/sysfs.c | 18 + + drivers/rapidio/rio_cm.c | 15 +- + drivers/regulator/max8973-regulator.c | 3 +- + drivers/spi/spi.c | 18 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 5 +- + drivers/thermal/Kconfig | 37 +- + drivers/thermal/Makefile | 4 + + drivers/thermal/cpu_cooling.c | 2 +- + drivers/thermal/db8500_thermal.c | 2 +- + drivers/thermal/devfreq_cooling.c | 2 +- + drivers/thermal/gov_bang_bang.c | 2 +- + drivers/thermal/hisi_thermal.c | 3 +- + drivers/thermal/imx_thermal.c | 4 +- + drivers/thermal/int340x_thermal/int3402_thermal.c | 3 +- + drivers/thermal/int340x_thermal/int3403_thermal.c | 9 +- + .../thermal/int340x_thermal/int340x_thermal_zone.c | 60 +- + .../thermal/int340x_thermal/int340x_thermal_zone.h | 6 +- + .../int340x_thermal/processor_thermal_device.c | 3 +- + drivers/thermal/intel_bxt_pmic_thermal.c | 300 + + drivers/thermal/intel_soc_dts_iosf.c | 3 +- + drivers/thermal/max77620_thermal.c | 166 + + drivers/thermal/mtk_thermal.c | 226 +- + drivers/thermal/of-thermal.c | 46 +- + drivers/thermal/qcom-spmi-temp-alarm.c | 2 +- + drivers/thermal/qcom/Kconfig | 11 + + drivers/thermal/qcom/Makefile | 2 + + drivers/thermal/qcom/tsens-8916.c | 113 + + drivers/thermal/qcom/tsens-8960.c | 292 + + drivers/thermal/qcom/tsens-8974.c | 244 + + drivers/thermal/qcom/tsens-8996.c | 84 + + drivers/thermal/qcom/tsens-common.c | 141 + + drivers/thermal/qcom/tsens.c | 200 + + drivers/thermal/qcom/tsens.h | 94 + + drivers/thermal/qoriq_thermal.c | 328 + + drivers/thermal/rcar_thermal.c | 26 +- + drivers/thermal/rockchip_thermal.c | 107 +- + drivers/thermal/samsung/exynos_tmu.c | 2 +- + drivers/thermal/st/st_thermal_memmap.c | 3 +- + drivers/thermal/tango_thermal.c | 19 +- + drivers/thermal/tegra/soctherm.c | 842 +- + drivers/thermal/tegra/soctherm.h | 10 + + drivers/thermal/tegra/tegra124-soctherm.c | 18 + + drivers/thermal/tegra/tegra132-soctherm.c | 18 + + drivers/thermal/tegra/tegra210-soctherm.c | 18 + + drivers/thermal/thermal_core.c | 106 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 29 +- + drivers/thermal/user_space.c | 15 +- + drivers/thermal/x86_pkg_temp_thermal.c | 3 +- + drivers/tty/serial/sc16is7xx.c | 22 +- + drivers/usb/early/ehci-dbgp.c | 1 - + drivers/usb/gadget/udc/bcm63xx_udc.c | 1 - + drivers/usb/host/pci-quirks.c | 1 - + drivers/video/fbdev/Kconfig | 7 +- + drivers/video/fbdev/Makefile | 3 +- + drivers/video/fbdev/amba-clcd-nomadik.c | 259 + + drivers/video/fbdev/amba-clcd-nomadik.h | 24 + + drivers/video/fbdev/amba-clcd-versatile.c | 395 + + drivers/video/fbdev/amba-clcd-versatile.h | 17 + + drivers/video/fbdev/amba-clcd.c | 190 +- + drivers/video/fbdev/arcfb.c | 4 +- + drivers/video/fbdev/asiliantfb.c | 4 +- + drivers/video/fbdev/aty/aty128fb.c | 6 +- + drivers/video/fbdev/aty/atyfb_base.c | 2 +- + drivers/video/fbdev/aty/radeon_monitor.c | 2 +- + drivers/video/fbdev/au1200fb.c | 1 + + drivers/video/fbdev/bfin_adv7393fb.c | 5 +- + drivers/video/fbdev/efifb.c | 6 +- + drivers/video/fbdev/exynos/Kconfig | 32 - + drivers/video/fbdev/exynos/Makefile | 9 - + drivers/video/fbdev/exynos/exynos_mipi_dsi.c | 574 -- + .../video/fbdev/exynos/exynos_mipi_dsi_common.c | 880 --- + .../video/fbdev/exynos/exynos_mipi_dsi_common.h | 46 - + .../video/fbdev/exynos/exynos_mipi_dsi_lowlevel.c | 618 -- + .../video/fbdev/exynos/exynos_mipi_dsi_lowlevel.h | 112 - + drivers/video/fbdev/exynos/exynos_mipi_dsi_regs.h | 149 - + drivers/video/fbdev/exynos/s6e8ax0.c | 887 --- + drivers/video/fbdev/hecubafb.c | 4 +- + drivers/video/fbdev/hgafb.c | 2 +- + drivers/video/fbdev/i740fb.c | 2 +- + drivers/video/fbdev/i810/i810_main.c | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 5 - + drivers/video/fbdev/kyro/fbdev.c | 2 +- + drivers/video/fbdev/matrox/matroxfb_Ti3026.c | 2 +- + drivers/video/fbdev/matrox/matroxfb_g450.c | 2 +- + drivers/video/fbdev/mb862xx/mb862xx-i2c.c | 9 +- + drivers/video/fbdev/mx3fb.c | 2 +- + drivers/video/fbdev/mxsfb.c | 9 +- + drivers/video/fbdev/offb.c | 15 + + drivers/video/fbdev/omap/lcd_mipid.c | 9 +- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 14 +- + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 7 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 12 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 8 - + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 8 - + drivers/video/fbdev/pm2fb.c | 2 +- + drivers/video/fbdev/pxafb.c | 3 +- + drivers/video/fbdev/s1d13xxxfb.c | 4 +- + drivers/video/fbdev/s3c2410fb.c | 2 +- + drivers/video/fbdev/s3c2410fb.h | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 2 +- + drivers/video/fbdev/simplefb.c | 13 +- + drivers/video/fbdev/sm712fb.c | 2 +- + drivers/video/fbdev/smscufx.c | 2 - + drivers/video/fbdev/ssd1307fb.c | 9 +- + drivers/video/fbdev/tdfxfb.c | 4 +- + drivers/video/fbdev/uvesafb.c | 2 +- + drivers/video/fbdev/vfb.c | 129 +- + drivers/video/fbdev/vga16fb.c | 2 +- + drivers/watchdog/ath79_wdt.c | 1 + + fs/afs/write.c | 5 +- + fs/autofs4/autofs_i.h | 9 +- + fs/autofs4/dev-ioctl.c | 77 +- + fs/autofs4/inode.c | 45 +- + fs/autofs4/root.c | 4 +- + fs/block_dev.c | 77 + + fs/buffer.c | 4 +- + fs/exofs/inode.c | 2 +- + fs/ext4/page-io.c | 2 +- + fs/f2fs/data.c | 2 +- + fs/jbd2/commit.c | 3 +- + fs/lockd/procfs.h | 2 - + fs/ocfs2/dlm/dlmmaster.c | 3 + + fs/open.c | 3 +- + fs/pipe.c | 166 +- + fs/select.c | 14 +- + include/asm-generic/uaccess.h | 4 - + include/drm/bridge/analogix_dp.h | 4 + + include/drm/drmP.h | 177 +- + include/drm/drm_atomic.h | 154 + + include/drm/drm_atomic_helper.h | 18 +- + include/drm/drm_blend.h | 62 + + include/drm/drm_bridge.h | 218 + + include/drm/drm_color_mgmt.h | 61 + + include/drm/drm_connector.h | 778 ++ + include/drm/drm_core.h | 34 - + include/drm/drm_crtc.h | 2129 +----- + include/drm/drm_crtc_helper.h | 6 +- + include/drm/drm_dp_helper.h | 22 +- + include/drm/drm_edid.h | 30 + + include/drm/drm_encoder.h | 249 + + include/drm/drm_fb_helper.h | 46 +- + include/drm/drm_fourcc.h | 3 +- + include/drm/drm_framebuffer.h | 267 + + include/drm/drm_gem.h | 4 +- + include/drm/drm_mipi_dsi.h | 6 +- + include/drm/drm_mm.h | 12 + + include/drm/drm_mode_object.h | 125 + + include/drm/drm_modes.h | 27 +- + include/drm/drm_modeset_helper.h | 36 + + include/drm/drm_modeset_helper_vtables.h | 57 +- + include/drm/drm_plane.h | 526 ++ + include/drm/drm_plane_helper.h | 9 +- + include/drm/drm_property.h | 295 + + include/drm/drm_simple_kms_helper.h | 31 + + include/drm/drm_vma_manager.h | 22 +- + include/drm/i2c/tda998x.h | 29 +- + include/drm/i915_drm.h | 2 +- + include/drm/i915_pciids.h | 38 +- + include/drm/ttm/ttm_bo_api.h | 32 +- + include/drm/ttm/ttm_bo_driver.h | 9 +- + include/drm/ttm/ttm_memory.h | 1 + + include/drm/ttm/ttm_placement.h | 56 +- + include/dt-bindings/display/tda998x.h | 7 + + include/dt-bindings/thermal/tegra124-soctherm.h | 5 + + include/linux/amba/clcd.h | 63 +- + include/linux/auto_dev-ioctl.h | 211 +- + include/linux/auto_fs.h | 1 - + include/linux/ctype.h | 5 +- + include/linux/dma-mapping.h | 5 + + include/linux/export.h | 1 - + include/linux/fence-array.h | 10 + + include/linux/fence.h | 2 +- + include/linux/fs.h | 3 +- + include/linux/gpio/driver.h | 1 - + include/linux/io-mapping.h | 98 +- + include/linux/kexec.h | 6 + + include/linux/kmemleak.h | 18 + + include/linux/kthread.h | 88 +- + include/linux/pagemap.h | 20 +- + include/linux/pwm.h | 5 + + include/linux/radix-tree.h | 8 + + include/linux/random.h | 2 +- + include/linux/relay.h | 3 +- + include/linux/sem.h | 1 + + include/linux/sync_file.h | 20 +- + include/linux/thermal.h | 43 +- + include/linux/vgaarb.h | 128 +- + include/net/bonding.h | 12 - + include/uapi/drm/amdgpu_drm.h | 7 + + include/uapi/drm/drm.h | 1 + + include/uapi/drm/drm_mode.h | 39 +- + include/uapi/drm/i915_drm.h | 59 +- + include/uapi/drm/msm_drm.h | 22 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/auto_dev-ioctl.h | 221 + + include/uapi/linux/auto_fs.h | 1 + + include/uapi/linux/sync_file.h | 13 +- + include/video/exynos_mipi_dsim.h | 358 - + include/video/imx-ipu-image-convert.h | 207 + + include/video/imx-ipu-v3.h | 76 +- + init/Kconfig | 1 + + ipc/msg.c | 204 +- + ipc/sem.c | 140 +- + kernel/configs/android-base.config | 7 +- + kernel/configs/android-recommended.config | 4 + + kernel/hung_task.c | 28 +- + kernel/kprobes.c | 2 +- + kernel/kthread.c | 577 +- + kernel/panic.c | 47 +- + kernel/ptrace.c | 3 +- + kernel/relay.c | 24 +- + kernel/smpboot.c | 5 + + kernel/trace/Makefile | 4 - + kernel/workqueue.c | 2 +- + lib/Makefile | 1 + + lib/bitmap.c | 50 +- + lib/kstrtox.c | 6 +- + lib/strncpy_from_user.c | 2 + + mm/Makefile | 3 - + mm/bootmem.c | 6 +- + mm/cma.c | 2 +- + mm/kmemleak.c | 47 + + mm/memblock.c | 8 +- + mm/nobootmem.c | 2 +- + net/batman-adv/debugfs.h | 2 - + scripts/checkpatch.pl | 338 +- + scripts/const_structs.checkpatch | 64 + + scripts/tags.sh | 3 +- + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 2 +- + sound/soc/intel/common/sst-acpi.h | 1 - + sound/soc/intel/common/sst-ipc.c | 6 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 2 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 2 +- + tools/testing/nvdimm/config_check.c | 1 - + tools/testing/radix-tree/Makefile | 3 +- + tools/testing/radix-tree/iteration_check.c | 180 + + tools/testing/radix-tree/main.c | 1 + + tools/testing/radix-tree/regression1.c | 2 +- + tools/testing/radix-tree/test.h | 1 + + 1063 files changed, 94473 insertions(+), 60363 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g101ice-l01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/jdi,lt070me05000.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt + create mode 100644 Documentation/devicetree/bindings/thermal/max77620_thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt + rename Documentation/{vgaarbiter.txt => gpu/vgaarbiter.rst} (65%) + create mode 100644 arch/mips/include/asm/extable.h + create mode 100644 arch/score/include/asm/extable.h + create mode 100644 arch/sparc/include/asm/extable_64.h + create mode 100644 arch/x86/include/asm/extable.h + create mode 100644 arch/xtensa/include/asm/asm-uaccess.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h + rename drivers/gpu/drm/amd/{powerplay/hwmgr/polaris10_clockpowergating.h => amdgpu/amdgpu_virt.h} (52%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c + rename drivers/gpu/drm/amd/amdgpu/{tonga_smum.h => dce_v6_0.h} (71%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.c + rename drivers/gpu/drm/amd/amdgpu/{iceland_smum.h => dce_virtual.h} (75%) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_dpm.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_smc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h + delete mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_dpm.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_smc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/r600_dpm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/si.c + rename drivers/gpu/drm/amd/amdgpu/{fiji_smum.h => si.h} (72%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/si_dma.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/si_dma.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/si_dpm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/si_dpm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/si_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/si_ih.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/si_smc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sislands_smc.h + delete mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_dpm.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_smc.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/si/clearstate_si.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/si/sid.h + mode change 100644 => 100755 drivers/gpu/drm/amd/include/cgs_common.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/Kconfig + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_clockpowergating.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_dyn_defaults.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_dyn_defaults.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.h + rename drivers/gpu/drm/amd/powerplay/hwmgr/{tonga_pptable.h => pptable_v1_0.h} (99%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{tonga_processpptables.c => process_pptables_v1_0.c} (81%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{tonga_processpptables.h => process_pptables_v1_0.h} (81%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_clockpowergating.c => smu7_clockpowergating.c} (76%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{fiji_clockpowergating.h => smu7_clockpowergating.h} (62%) + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_dyn_defaults.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c + rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_hwmgr.h => smu7_hwmgr.h} (59%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_powertune.c => smu7_powertune.c} (62%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{polaris10_powertune.h => smu7_powertune.h} (57%) + rename drivers/gpu/drm/amd/powerplay/hwmgr/{fiji_thermal.c => smu7_thermal.c} (65%) + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_clockpowergating.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_dyn_defaults.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c + delete mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu71.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu71_discrete.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu7_common.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h + mode change 100644 => 100755 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c + rename drivers/gpu/drm/amd/powerplay/{hwmgr/tonga_clockpowergating.h => smumgr/iceland_smc.h} (63%) + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c + rename drivers/gpu/drm/amd/powerplay/{hwmgr/tonga_powertune.h => smumgr/tonga_smc.h} (62%) + create mode 100644 drivers/gpu/drm/bridge/dumb-vga-dac.c + create mode 100644 drivers/gpu/drm/drm_color_mgmt.c + create mode 100644 drivers/gpu/drm/drm_connector.c + rename include/drm/drm_dp_aux_dev.h => drivers/gpu/drm/drm_crtc_helper_internal.h (60%) + create mode 100644 drivers/gpu/drm/drm_encoder.c + create mode 100644 drivers/gpu/drm/drm_framebuffer.c + create mode 100644 drivers/gpu/drm/drm_mode_object.c + create mode 100644 drivers/gpu/drm/drm_modeset_helper.c + create mode 100644 drivers/gpu/drm/drm_plane.c + create mode 100644 drivers/gpu/drm/drm_property.c + delete mode 100644 drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.h + delete mode 100644 drivers/gpu/drm/i915/i915_gem_debug.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_request.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_request.h + create mode 100644 drivers/gpu/drm/i915/i915_memcpy.c + create mode 100644 drivers/gpu/drm/i915/i915_mm.c + create mode 100644 drivers/gpu/drm/i915/i915_sw_fence.c + create mode 100644 drivers/gpu/drm/i915/i915_sw_fence.h + create mode 100644 drivers/gpu/drm/i915/intel_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/intel_frontbuffer.h + create mode 100644 drivers/gpu/drm/panel/panel-jdi-lt070me05000.c + create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.c + create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_psr.h + delete mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.c + delete mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.h + create mode 100644 drivers/gpu/drm/sun4i/sun6i_drc.c + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_plane.c + create mode 100644 drivers/gpu/ipu-v3/ipu-image-convert.c + create mode 100644 drivers/gpu/ipu-v3/ipu-vdi.c + create mode 100644 drivers/pwm/pwm-meson.c + create mode 100644 drivers/thermal/intel_bxt_pmic_thermal.c + create mode 100644 drivers/thermal/max77620_thermal.c + create mode 100644 drivers/thermal/qcom/Kconfig + create mode 100644 drivers/thermal/qcom/Makefile + create mode 100644 drivers/thermal/qcom/tsens-8916.c + create mode 100644 drivers/thermal/qcom/tsens-8960.c + create mode 100644 drivers/thermal/qcom/tsens-8974.c + create mode 100644 drivers/thermal/qcom/tsens-8996.c + create mode 100644 drivers/thermal/qcom/tsens-common.c + create mode 100644 drivers/thermal/qcom/tsens.c + create mode 100644 drivers/thermal/qcom/tsens.h + create mode 100644 drivers/thermal/qoriq_thermal.c + create mode 100644 drivers/video/fbdev/amba-clcd-nomadik.c + create mode 100644 drivers/video/fbdev/amba-clcd-nomadik.h + create mode 100644 drivers/video/fbdev/amba-clcd-versatile.h + delete mode 100644 drivers/video/fbdev/exynos/Kconfig + delete mode 100644 drivers/video/fbdev/exynos/Makefile + delete mode 100644 drivers/video/fbdev/exynos/exynos_mipi_dsi.c + delete mode 100644 drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c + delete mode 100644 drivers/video/fbdev/exynos/exynos_mipi_dsi_common.h + delete mode 100644 drivers/video/fbdev/exynos/exynos_mipi_dsi_lowlevel.c + delete mode 100644 drivers/video/fbdev/exynos/exynos_mipi_dsi_lowlevel.h + delete mode 100644 drivers/video/fbdev/exynos/exynos_mipi_dsi_regs.h + delete mode 100644 drivers/video/fbdev/exynos/s6e8ax0.c + create mode 100644 include/drm/drm_blend.h + create mode 100644 include/drm/drm_bridge.h + create mode 100644 include/drm/drm_color_mgmt.h + create mode 100644 include/drm/drm_connector.h + delete mode 100644 include/drm/drm_core.h + create mode 100644 include/drm/drm_encoder.h + create mode 100644 include/drm/drm_framebuffer.h + create mode 100644 include/drm/drm_mode_object.h + create mode 100644 include/drm/drm_modeset_helper.h + create mode 100644 include/drm/drm_plane.h + create mode 100644 include/drm/drm_property.h + create mode 100644 include/dt-bindings/display/tda998x.h + create mode 100644 include/uapi/linux/auto_dev-ioctl.h + delete mode 100644 include/video/exynos_mipi_dsim.h + create mode 100644 include/video/imx-ipu-image-convert.h + create mode 100644 scripts/const_structs.checkpatch + create mode 100644 tools/testing/radix-tree/iteration_check.c +Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (8df0cc75f530 ARC: [build] Support gz, lzma compressed uImage) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 19 +++++++++++-------- + arch/arc/boot/Makefile | 16 ++++++++++++++-- + arch/arc/include/asm/mcip.h | 16 ++++++++++++++++ + arch/arc/kernel/mcip.c | 31 +++++++++++-------------------- + 4 files changed, 52 insertions(+), 30 deletions(-) +Merging arm-current/fixes (fb833b1fbb68 ARM: fix delays) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) +$ git merge metag-fixes/fixes +Merge made by the 'recursive' strategy. + arch/metag/include/asm/atomic.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging powerpc-fixes/fixes (b79331a5eb9f powerpc/powernv/pci: Fix m64 checks for SR-IOV and window alignment) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge sparc/master +Already up-to-date. +Merging net/master (6d3a4c404648 strparser: Propagate correct error code in strp_recv()) +$ git merge net/master +Merge made by the 'recursive' strategy. + net/strparser/strparser.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ipsec/master (7f92083eb58f vti6: flush x-netns xfrm cache when vti interface is removed) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv6/ip6_vti.c | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) +Merging netfilter/master (6d3a4c404648 strparser: Propagate correct error code in strp_recv()) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes') +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (29d5e6fbd65b rtl8xxxu: Fix rtl8192eu driver reload issue) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 4 ++-- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 8 +++++++- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 ++++ + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 11 ++++++++--- + drivers/net/wireless/ti/wlcore/sdio.c | 1 - + 5 files changed, 21 insertions(+), 7 deletions(-) +Merging mac80211/master (1d4de2e222b4 mac80211: fix CMD_FRAME for AP_VLAN) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 2 +- + include/net/cfg80211.h | 32 ++++++++++---- + net/mac80211/offchannel.c | 2 +- + net/mac80211/rx.c | 51 +++++++++++++++++----- + net/wireless/util.c | 34 +++++++-------- + 5 files changed, 82 insertions(+), 39 deletions(-) +Merging sound-current/for-linus (fdd8218d7d1b ALSA: line6: fix a crash in line6_hwdep_write()) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/seq/seq_compat.c | 2 +- + sound/pci/hda/dell_wmi_helper.c | 2 +- + sound/pci/hda/thinkpad_helper.c | 2 +- + sound/usb/line6/driver.c | 4 ++-- + sound/usb/line6/podhd.c | 3 ++- + 5 files changed, 7 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device removal) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (d8a4100ddc75 usb: gadget: udc: atmel: fix endpoint name) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (6b7f456e67a1 usb: chipidea: host: fix NULL ptr dereference during shutdown) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/host.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/host.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging staging.current/staging-linus (1573d2caf713 Merge branch 'parisc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (c758f96a8c34 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (c3afafa47898 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) +$ git merge ide/master +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (c8d2bc9bc39e Linux 4.8) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging kbuild/for-next (fbcbee25745d Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Resolved 'arch/Kconfig' using previous resolution. +Resolved 'arch/powerpc/kernel/misc_32.S' using previous resolution. +Resolved 'arch/powerpc/kernel/misc_64.S' using previous resolution. +Resolved 'arch/x86/lib/memcpy_64.S' using previous resolution. +Auto-merging include/linux/init.h +Auto-merging include/linux/export.h +Auto-merging include/linux/compiler.h +Auto-merging include/asm-generic/vmlinux.lds.h +Removing arch/x86/um/ksyms.c +Auto-merging arch/x86/lib/memcpy_64.S +CONFLICT (content): Merge conflict in arch/x86/lib/memcpy_64.S +Auto-merging arch/x86/lib/hweight.S +CONFLICT (modify/delete): arch/x86/kernel/x8664_ksyms_64.c deleted in kbuild/for-next and modified in HEAD. Version HEAD of arch/x86/kernel/x8664_ksyms_64.c left in tree. +Removing arch/x86/kernel/i386_ksyms_32.c +Auto-merging arch/x86/kernel/head_64.S +Auto-merging arch/x86/kernel/head_32.S +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/entry/entry_32.S +Removing arch/sparc/lib/ksyms.c +Removing arch/sparc/kernel/sparc_ksyms_64.c +Removing arch/sparc/kernel/sparc_ksyms_32.c +Removing arch/s390/kernel/s390_ksyms.c +Auto-merging arch/s390/kernel/Makefile +Removing arch/powerpc/lib/ppc_ksyms.c +Auto-merging arch/powerpc/lib/mem_64.S +Auto-merging arch/powerpc/lib/checksum_32.S +Auto-merging arch/powerpc/lib/Makefile +Auto-merging arch/powerpc/kernel/vector.S +Auto-merging arch/powerpc/kernel/time.c +Auto-merging arch/powerpc/kernel/setup_32.c +Removing arch/powerpc/kernel/ppc_ksyms_32.c +Removing arch/powerpc/kernel/ppc_ksyms.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/powerpc/kernel/misc_64.S +CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_64.S +Auto-merging arch/powerpc/kernel/misc_32.S +CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_32.S +Auto-merging arch/powerpc/kernel/head_8xx.S +Auto-merging arch/powerpc/kernel/head_64.S +Auto-merging arch/powerpc/kernel/head_32.S +Auto-merging arch/powerpc/kernel/fpu.S +Auto-merging arch/powerpc/kernel/entry_64.S +Auto-merging arch/powerpc/kernel/entry_32.S +Auto-merging arch/powerpc/kernel/Makefile +Removing arch/m68k/kernel/m68k_ksyms.c +Auto-merging arch/m68k/kernel/Makefile +Removing arch/arm/mach-imx/ssi-fiq-ksym.c +Auto-merging arch/arm/mach-imx/Makefile +Auto-merging arch/arm/lib/delay.c +Removing arch/arm/kernel/armksyms.c +Removing arch/alpha/kernel/alpha_ksyms.c +Auto-merging arch/Kconfig +CONFLICT (content): Merge conflict in arch/Kconfig +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/x86/kernel/x8664_ksyms_64.c +arch/x86/kernel/x8664_ksyms_64.c: needs merge +rm 'arch/x86/kernel/x8664_ksyms_64.c' +$ git commit -v -a +[master 521f15e7c9ae] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kbuild/makefiles.txt | 16 +++ + Makefile | 19 ++- + arch/Kconfig | 21 +++ + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/kernel/Makefile | 2 +- + arch/alpha/kernel/alpha_ksyms.c | 102 --------------- + arch/alpha/kernel/machvec_impl.h | 6 +- + arch/alpha/kernel/setup.c | 1 + + arch/alpha/lib/callback_srm.S | 5 + + arch/alpha/lib/checksum.c | 3 + + arch/alpha/lib/clear_page.S | 3 +- + arch/alpha/lib/clear_user.S | 2 + + arch/alpha/lib/copy_page.S | 3 +- + arch/alpha/lib/copy_user.S | 3 + + arch/alpha/lib/csum_ipv6_magic.S | 2 + + arch/alpha/lib/csum_partial_copy.c | 2 + + arch/alpha/lib/dec_and_lock.c | 2 + + arch/alpha/lib/divide.S | 3 + + arch/alpha/lib/ev6-clear_page.S | 3 +- + arch/alpha/lib/ev6-clear_user.S | 3 +- + arch/alpha/lib/ev6-copy_page.S | 3 +- + arch/alpha/lib/ev6-copy_user.S | 3 +- + arch/alpha/lib/ev6-csum_ipv6_magic.S | 2 + + arch/alpha/lib/ev6-divide.S | 3 + + arch/alpha/lib/ev6-memchr.S | 3 +- + arch/alpha/lib/ev6-memcpy.S | 3 +- + arch/alpha/lib/ev6-memset.S | 7 +- + arch/alpha/lib/ev67-strcat.S | 3 +- + arch/alpha/lib/ev67-strchr.S | 3 +- + arch/alpha/lib/ev67-strlen.S | 3 +- + arch/alpha/lib/ev67-strncat.S | 3 +- + arch/alpha/lib/ev67-strrchr.S | 3 +- + arch/alpha/lib/fpreg.c | 7 + + arch/alpha/lib/memchr.S | 3 +- + arch/alpha/lib/memcpy.c | 5 +- + arch/alpha/lib/memmove.S | 3 +- + arch/alpha/lib/memset.S | 7 +- + arch/alpha/lib/strcat.S | 2 + + arch/alpha/lib/strchr.S | 3 +- + arch/alpha/lib/strcpy.S | 3 +- + arch/alpha/lib/strlen.S | 3 +- + arch/alpha/lib/strncat.S | 3 +- + arch/alpha/lib/strncpy.S | 3 +- + arch/alpha/lib/strrchr.S | 3 +- + arch/arm/include/asm/Kbuild | 1 + + arch/arm/kernel/Makefile | 2 +- + arch/arm/kernel/armksyms.c | 183 --------------------------- + arch/arm/kernel/entry-ftrace.S | 3 + + arch/arm/kernel/head.S | 3 + + arch/arm/kernel/smccc-call.S | 3 + + arch/arm/lib/ashldi3.S | 3 + + arch/arm/lib/ashrdi3.S | 3 + + arch/arm/lib/bitops.h | 5 + + arch/arm/lib/bswapsdi2.S | 3 + + arch/arm/lib/clear_user.S | 4 + + arch/arm/lib/copy_from_user.S | 2 + + arch/arm/lib/copy_page.S | 2 + + arch/arm/lib/copy_to_user.S | 4 + + arch/arm/lib/csumipv6.S | 3 +- + arch/arm/lib/csumpartial.S | 2 + + arch/arm/lib/csumpartialcopy.S | 1 + + arch/arm/lib/csumpartialcopygeneric.S | 2 + + arch/arm/lib/csumpartialcopyuser.S | 1 + + arch/arm/lib/delay.c | 2 + + arch/arm/lib/div64.S | 2 + + arch/arm/lib/findbit.S | 9 ++ + arch/arm/lib/getuser.S | 9 ++ + arch/arm/lib/io-readsb.S | 2 + + arch/arm/lib/io-readsl.S | 2 + + arch/arm/lib/io-readsw-armv3.S | 3 +- + arch/arm/lib/io-readsw-armv4.S | 2 + + arch/arm/lib/io-writesb.S | 2 + + arch/arm/lib/io-writesl.S | 2 + + arch/arm/lib/io-writesw-armv3.S | 2 + + arch/arm/lib/io-writesw-armv4.S | 2 + + arch/arm/lib/lib1funcs.S | 9 ++ + arch/arm/lib/lshrdi3.S | 3 + + arch/arm/lib/memchr.S | 2 + + arch/arm/lib/memcpy.S | 3 + + arch/arm/lib/memmove.S | 2 + + arch/arm/lib/memset.S | 3 + + arch/arm/lib/memzero.S | 2 + + arch/arm/lib/muldi3.S | 3 + + arch/arm/lib/putuser.S | 5 + + arch/arm/lib/strchr.S | 2 + + arch/arm/lib/strrchr.S | 2 + + arch/arm/lib/uaccess_with_memcpy.c | 3 + + arch/arm/lib/ucmpdi2.S | 3 + + arch/arm/mach-imx/Makefile | 1 - + arch/arm/mach-imx/ssi-fiq-ksym.c | 20 --- + arch/arm/mach-imx/ssi-fiq.S | 7 +- + arch/ia64/hp/sim/boot/Makefile | 2 +- + arch/ia64/include/asm/export.h | 3 + + arch/ia64/kernel/entry.S | 3 + + arch/ia64/kernel/esi_stub.S | 2 + + arch/ia64/kernel/head.S | 2 + + arch/ia64/kernel/ia64_ksyms.c | 94 +------------- + arch/ia64/kernel/ivt.S | 2 + + arch/ia64/kernel/pal.S | 7 + + arch/ia64/kernel/setup.c | 4 + + arch/ia64/lib/Makefile | 8 +- + arch/ia64/lib/clear_page.S | 2 + + arch/ia64/lib/clear_user.S | 2 + + arch/ia64/lib/copy_page.S | 2 + + arch/ia64/lib/copy_page_mck.S | 2 + + arch/ia64/lib/copy_user.S | 2 + + arch/ia64/lib/flush.S | 2 + + arch/ia64/lib/idiv32.S | 2 + + arch/ia64/lib/idiv64.S | 2 + + arch/ia64/lib/ip_fast_csum.S | 3 + + arch/ia64/lib/memcpy.S | 2 + + arch/ia64/lib/memcpy_mck.S | 3 + + arch/ia64/lib/memset.S | 2 + + arch/ia64/lib/strlen.S | 2 + + arch/ia64/lib/strlen_user.S | 2 + + arch/ia64/lib/strncpy_from_user.S | 2 + + arch/ia64/lib/strnlen_user.S | 2 + + arch/ia64/lib/xor.S | 5 + + arch/m68k/include/asm/export.h | 3 + + arch/m68k/kernel/Makefile | 2 +- + arch/m68k/kernel/m68k_ksyms.c | 32 ----- + arch/m68k/lib/ashldi3.c | 4 + + arch/m68k/lib/ashrdi3.c | 4 + + arch/m68k/lib/divsi3.S | 3 + + arch/m68k/lib/lshrdi3.c | 4 + + arch/m68k/lib/modsi3.S | 3 + + arch/m68k/lib/muldi3.c | 4 + + arch/m68k/lib/mulsi3.S | 4 +- + arch/m68k/lib/udivsi3.S | 4 +- + arch/m68k/lib/umodsi3.S | 4 +- + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/kernel/Makefile | 4 - + arch/powerpc/kernel/entry_32.S | 2 + + arch/powerpc/kernel/entry_64.S | 3 + + arch/powerpc/kernel/epapr_hcalls.S | 2 + + arch/powerpc/kernel/fpu.S | 3 + + arch/powerpc/kernel/head_32.S | 5 + + arch/powerpc/kernel/head_40x.S | 2 + + arch/powerpc/kernel/head_44x.S | 2 + + arch/powerpc/kernel/head_64.S | 2 + + arch/powerpc/kernel/head_8xx.S | 2 + + arch/powerpc/kernel/head_fsl_booke.S | 2 + + arch/powerpc/kernel/misc.S | 2 + + arch/powerpc/kernel/misc_32.S | 10 ++ + arch/powerpc/kernel/misc_64.S | 4 + + arch/powerpc/kernel/pci-common.c | 1 + + arch/powerpc/kernel/pci_32.c | 2 + + arch/powerpc/kernel/ppc_ksyms.c | 37 ------ + arch/powerpc/kernel/ppc_ksyms_32.c | 60 --------- + arch/powerpc/kernel/setup_32.c | 6 + + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kernel/vector.S | 3 + + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/checksum_32.S | 3 + + arch/powerpc/lib/checksum_64.S | 3 + + arch/powerpc/lib/copy_32.S | 5 + + arch/powerpc/lib/copypage_64.S | 2 + + arch/powerpc/lib/copyuser_64.S | 2 + + arch/powerpc/lib/hweight_64.S | 5 + + arch/powerpc/lib/mem_64.S | 3 + + arch/powerpc/lib/memcmp_64.S | 2 + + arch/powerpc/lib/memcpy_64.S | 2 + + arch/powerpc/lib/ppc_ksyms.c | 29 ----- + arch/powerpc/lib/string.S | 6 + + arch/powerpc/lib/string_64.S | 2 + + arch/powerpc/mm/hash_low_32.S | 3 + + arch/powerpc/relocs_check.sh | 4 +- + arch/powerpc/sysdev/dcr-low.S | 3 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/entry.S | 6 + + arch/s390/kernel/mcount.S | 3 + + arch/s390/kernel/s390_ksyms.c | 15 --- + arch/s390/lib/mem.S | 3 + + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/string.h | 34 +++++ + arch/sparc/include/asm/string_32.h | 56 -------- + arch/sparc/include/asm/string_64.h | 44 ------- + arch/sparc/kernel/Makefile | 2 +- + arch/sparc/kernel/entry.S | 3 + + arch/sparc/kernel/head_32.S | 3 + + arch/sparc/kernel/head_64.S | 7 +- + arch/sparc/kernel/helpers.S | 2 + + arch/sparc/kernel/hvcalls.S | 5 + + arch/sparc/kernel/sparc_ksyms.c | 12 ++ + arch/sparc/kernel/sparc_ksyms_32.c | 31 ----- + arch/sparc/kernel/sparc_ksyms_64.c | 53 -------- + arch/sparc/lib/Makefile | 1 - + arch/sparc/lib/U1memcpy.S | 2 + + arch/sparc/lib/VISsave.S | 2 + + arch/sparc/lib/ashldi3.S | 2 + + arch/sparc/lib/ashrdi3.S | 2 + + arch/sparc/lib/atomic_64.S | 16 ++- + arch/sparc/lib/bitops.S | 7 + + arch/sparc/lib/blockops.S | 3 + + arch/sparc/lib/bzero.S | 4 + + arch/sparc/lib/checksum_32.S | 3 + + arch/sparc/lib/checksum_64.S | 2 + + arch/sparc/lib/clear_page.S | 3 + + arch/sparc/lib/copy_in_user.S | 2 + + arch/sparc/lib/copy_page.S | 2 + + arch/sparc/lib/copy_user.S | 2 + + arch/sparc/lib/csum_copy.S | 3 + + arch/sparc/lib/divdi3.S | 2 + + arch/sparc/lib/ffs.S | 3 + + arch/sparc/lib/hweight.S | 5 + + arch/sparc/lib/ipcsum.S | 2 + + arch/sparc/lib/ksyms.c | 174 ------------------------- + arch/sparc/lib/locks.S | 5 + + arch/sparc/lib/lshrdi3.S | 2 + + arch/sparc/lib/mcount.S | 2 + + arch/sparc/lib/memcmp.S | 2 + + arch/sparc/lib/memcpy.S | 86 +------------ + arch/sparc/lib/memmove.S | 2 + + arch/sparc/lib/memscan_32.S | 4 + + arch/sparc/lib/memscan_64.S | 4 + + arch/sparc/lib/memset.S | 3 + + arch/sparc/lib/muldi3.S | 2 + + arch/sparc/lib/strlen.S | 2 + + arch/sparc/lib/strncmp_32.S | 2 + + arch/sparc/lib/strncmp_64.S | 2 + + arch/sparc/lib/xor.S | 9 ++ + arch/x86/entry/entry_32.S | 2 + + arch/x86/entry/entry_64.S | 2 + + arch/x86/entry/thunk_32.S | 3 + + arch/x86/entry/thunk_64.S | 3 + + arch/x86/include/asm/export.h | 4 + + arch/x86/kernel/Makefile | 4 +- + arch/x86/kernel/head_32.S | 2 + + arch/x86/kernel/head_64.S | 3 + + arch/x86/kernel/i386_ksyms_32.c | 47 ------- + arch/x86/kernel/mcount_64.S | 2 + + arch/x86/kernel/x8664_ksyms_64.c | 85 ------------- + arch/x86/lib/checksum_32.S | 3 + + arch/x86/lib/clear_page_64.S | 2 + + arch/x86/lib/cmpxchg8b_emu.S | 2 + + arch/x86/lib/copy_page_64.S | 2 + + arch/x86/lib/copy_user_64.S | 8 ++ + arch/x86/lib/csum-partial_64.c | 1 + + arch/x86/lib/getuser.S | 5 + + arch/x86/lib/hweight.S | 3 + + arch/x86/lib/memcpy_64.S | 4 + + arch/x86/lib/memmove_64.S | 3 + + arch/x86/lib/memset_64.S | 3 + + arch/x86/lib/putuser.S | 5 + + arch/x86/lib/strstr_32.c | 3 +- + arch/x86/um/Makefile | 2 +- + arch/x86/um/checksum_32.S | 2 + + arch/x86/um/ksyms.c | 13 -- + include/asm-generic/export.h | 94 ++++++++++++++ + include/asm-generic/vmlinux.lds.h | 57 +++++---- + include/linux/compiler.h | 23 ++++ + include/linux/export.h | 30 ++--- + include/linux/init.h | 38 ++---- + init/Makefile | 2 + + scripts/Makefile.build | 43 ++++++- + scripts/Makefile.modpost | 14 +- + scripts/basic/fixdep.c | 86 ++++--------- + scripts/coccicheck | 2 +- + scripts/coccinelle/api/memdup_user.cocci | 8 +- + scripts/coccinelle/api/pm_runtime.cocci | 18 ++- + scripts/coccinelle/misc/cond_no_effect.cocci | 64 ++++++++++ + scripts/gen_initramfs_list.sh | 5 +- + scripts/genksyms/lex.l | 35 +++-- + scripts/genksyms/lex.lex.c_shipped | 35 +++-- + scripts/link-vmlinux.sh | 71 +++++++++-- + 266 files changed, 1174 insertions(+), 1415 deletions(-) + delete mode 100644 arch/alpha/kernel/alpha_ksyms.c + delete mode 100644 arch/arm/kernel/armksyms.c + delete mode 100644 arch/arm/mach-imx/ssi-fiq-ksym.c + create mode 100644 arch/ia64/include/asm/export.h + create mode 100644 arch/m68k/include/asm/export.h + delete mode 100644 arch/m68k/kernel/m68k_ksyms.c + delete mode 100644 arch/powerpc/kernel/ppc_ksyms.c + delete mode 100644 arch/powerpc/kernel/ppc_ksyms_32.c + delete mode 100644 arch/powerpc/lib/ppc_ksyms.c + delete mode 100644 arch/s390/kernel/s390_ksyms.c + create mode 100644 arch/sparc/kernel/sparc_ksyms.c + delete mode 100644 arch/sparc/kernel/sparc_ksyms_32.c + delete mode 100644 arch/sparc/kernel/sparc_ksyms_64.c + delete mode 100644 arch/sparc/lib/ksyms.c + create mode 100644 arch/x86/include/asm/export.h + delete mode 100644 arch/x86/kernel/i386_ksyms_32.c + delete mode 100644 arch/x86/kernel/x8664_ksyms_64.c + delete mode 100644 arch/x86/um/ksyms.c + create mode 100644 include/asm-generic/export.h + create mode 100644 scripts/coccinelle/misc/cond_no_effect.cocci +Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) +$ git merge asm-generic/master +Merge made by the 'recursive' strategy. + include/asm-generic/page.h | 2 +- + include/asm-generic/percpu.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging arc/for-next (8df0cc75f530 ARC: [build] Support gz, lzma compressed uImage) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (70fe0fd28524 Merge branch 'fixes' into for-next) +$ git merge arm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (bcaf9dcf55fd ARM: SoC: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 246 +++++++++++++++++++++ + arch/arm/mach-mvebu/Kconfig | 4 +- + .../boot/dts/marvell/armada-cp110-master.dtsi | 2 +- + 3 files changed, 248 insertions(+), 4 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging pinctrl/for-next (6d475e0b3980 pinctrl: baytrail: Fix lockdep) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 4 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 100 +++++++++++++++++---- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 12 +-- + drivers/pinctrl/berlin/berlin.c | 12 ++- + drivers/pinctrl/intel/pinctrl-baytrail.c | 3 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 12 ++- + 6 files changed, 115 insertions(+), 28 deletions(-) +Merging amlogic/for-next (8148ca0d95ec Merge branch 'v4.8/dt64-2' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. +Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next) +$ git merge bcm2835/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (70da51e698c7 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 (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (a9c51ff3121f Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Removing arch/arm/mach-orion5x/wnr854t-setup.c +Merge made by the 'recursive' strategy. + arch/arm/configs/multi_v5_defconfig | 2 +- + arch/arm/configs/mvebu_v5_defconfig | 2 +- + arch/arm/configs/orion5x_defconfig | 2 +- + arch/arm/mach-orion5x/Kconfig | 4 +- + arch/arm/mach-orion5x/Makefile | 2 +- + arch/arm/mach-orion5x/board-wnr854t.c | 78 ++++++++++++++ + arch/arm/mach-orion5x/wnr854t-setup.c | 185 ---------------------------------- + 7 files changed, 84 insertions(+), 191 deletions(-) + create mode 100644 arch/arm/mach-orion5x/board-wnr854t.c + delete mode 100644 arch/arm/mach-orion5x/wnr854t-setup.c +Merging omap/for-next (624018387bcf Merge branch 'omap-for-v4.9/dt-v2' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8) +$ git merge qcom/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/configs/shmobile_defconfig | 1 + + 1 file changed, 1 insertion(+) +Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3368.dtsi +Auto-merging arch/arm/boot/dts/rk3xxx.dtsi +Auto-merging arch/arm/boot/dts/rk3288.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3036-evb.dts | 2 +- + arch/arm/boot/dts/rk3036-kylin.dts | 2 +- + arch/arm/boot/dts/rk3036.dtsi | 4 +++- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 2 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 2 +- + arch/arm/boot/dts/rk3228-evb.dts | 2 +- + arch/arm/boot/dts/rk3229-evb.dts | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 4 +++- + arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- + arch/arm/boot/dts/rk3288-fennec.dts | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +- + arch/arm/boot/dts/rk3288-miqi.dts | 2 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 2 +- + arch/arm/boot/dts/rk3288-r89.dts | 2 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +- + arch/arm/boot/dts/rk3288.dtsi | 4 +++- + arch/arm/boot/dts/rk3xxx.dtsi | 4 +++- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 12 ++++++------ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 ++ + 23 files changed, 37 insertions(+), 27 deletions(-) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (ea24fc2674ef Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4x12.dtsi | 2 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 69 +++++++++++++++++++++++++++++++ + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 9 ++++ + arch/arm/boot/dts/exynos5410.dtsi | 59 ++++++++++++++++++++++++++ + 4 files changed, 138 insertions(+), 1 deletion(-) +Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-tegra-pmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arm64/for-next/core (db68f3e7594a arm64: tlbflush.h: add __tlbi() macro) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5d7f749d844b] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (2dc024e94578 cris: return of class_create should be considered) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (742859adc721 m68k: let clk_disable() return immediately if clk is NULL) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (74f1077b5b78 MIPS: ptrace: Fix regs_return_value for kernel context) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/video/fbdev/Kconfig +Removing drivers/usb/host/ehci-sead3.c +Auto-merging drivers/of/platform.c +Removing arch/mips/mti-sead3/sead3-time.c +Removing arch/mips/mti-sead3/sead3-setup.c +Removing arch/mips/mti-sead3/sead3-reset.c +Removing arch/mips/mti-sead3/sead3-platform.c +Removing arch/mips/mti-sead3/sead3-lcd.c +Removing arch/mips/mti-sead3/sead3-int.c +Removing arch/mips/mti-sead3/sead3-init.c +Removing arch/mips/mti-sead3/sead3-display.c +Removing arch/mips/mti-sead3/sead3-console.c +Removing arch/mips/mti-sead3/Platform +Removing arch/mips/mti-sead3/Makefile +Auto-merging arch/mips/kvm/trap_emul.c +Auto-merging arch/mips/kvm/emulate.c +Removing arch/mips/kernel/smp-gic.c +Auto-merging arch/mips/include/asm/uaccess.h +Removing arch/mips/include/asm/octeon/cvmx-mdio.h +Removing arch/mips/include/asm/mips-boards/sead3int.h +Removing arch/mips/include/asm/mach-sead3/war.h +Removing arch/mips/include/asm/mach-sead3/kernel-entry-init.h +Removing arch/mips/include/asm/mach-sead3/irq.h +Removing arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h +Removing arch/mips/configs/sead3micro_defconfig +Removing arch/mips/configs/sead3_defconfig +Auto-merging arch/mips/cavium-octeon/setup.c +Auto-merging arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 1 + + .../bindings/auxdisplay/img-ascii-lcd.txt | 17 + + .../devicetree/bindings/mips/brcm/soc.txt | 4 +- + MAINTAINERS | 6 + + arch/mips/Kbuild.platforms | 2 +- + arch/mips/Kconfig | 121 +++-- + arch/mips/Makefile | 77 +++- + arch/mips/alchemy/common/setup.c | 6 +- + arch/mips/bcm47xx/serial.c | 11 +- + arch/mips/bcm63xx/clk.c | 3 + + arch/mips/bmips/Kconfig | 20 +- + arch/mips/bmips/setup.c | 12 +- + arch/mips/boot/Makefile | 66 +++ + arch/mips/boot/dts/brcm/Makefile | 36 +- + .../mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts | 22 + + arch/mips/boot/dts/brcm/bcm3368.dtsi | 101 ++++ + .../boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts | 108 +++++ + arch/mips/boot/dts/brcm/bcm63268.dtsi | 134 ++++++ + ...6358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} | 1 + + .../boot/dts/brcm/bcm6362-neufbox6-sercomm.dts | 22 + + arch/mips/boot/dts/brcm/bcm6362.dtsi | 134 ++++++ + arch/mips/boot/dts/brcm/bcm7125.dtsi | 34 +- + arch/mips/boot/dts/brcm/bcm7346.dtsi | 97 +++- + arch/mips/boot/dts/brcm/bcm7358.dtsi | 89 +++- + arch/mips/boot/dts/brcm/bcm7360.dtsi | 89 +++- + arch/mips/boot/dts/brcm/bcm7362.dtsi | 89 +++- + arch/mips/boot/dts/brcm/bcm7420.dtsi | 42 +- + arch/mips/boot/dts/brcm/bcm7425.dtsi | 109 ++++- + arch/mips/boot/dts/brcm/bcm7435.dtsi | 109 ++++- + arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 4 + + arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 17 + + arch/mips/boot/dts/brcm/bcm97358svmb.dts | 13 + + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97362svmb.dts | 13 + + arch/mips/boot/dts/brcm/bcm97420c.dts | 8 + + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 21 + + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 21 + + .../boot/dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi | 25 + + .../mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi | 25 + + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 45 +- + .../dts/cavium-octeon/dlink_dsr-500n-1000n.dtsi | 58 +++ + .../mips/boot/dts/cavium-octeon/dlink_dsr-500n.dts | 40 ++ + arch/mips/boot/dts/mti/Makefile | 2 +- + arch/mips/boot/dts/mti/malta.dts | 99 ++++ + arch/mips/boot/dts/mti/sead3.dts | 238 ++++++++++ + .../cavium-octeon/executive/cvmx-helper-board.c | 337 +------------- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 5 +- + .../cavium-octeon/executive/cvmx-helper-sgmii.c | 1 - + .../cavium-octeon/executive/cvmx-helper-xaui.c | 2 - + arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 - + arch/mips/cavium-octeon/setup.c | 38 +- + arch/mips/configs/generic/32r1.config | 2 + + arch/mips/configs/generic/32r2.config | 3 + + arch/mips/configs/generic/32r6.config | 2 + + arch/mips/configs/generic/64r1.config | 4 + + arch/mips/configs/generic/64r2.config | 5 + + arch/mips/configs/generic/64r6.config | 4 + + arch/mips/configs/generic/board-sead-3.config | 32 ++ + arch/mips/configs/generic/eb.config | 1 + + arch/mips/configs/generic/el.config | 1 + + arch/mips/configs/generic/micro32r2.config | 4 + + arch/mips/configs/generic_defconfig | 96 ++++ + arch/mips/configs/loongson1c_defconfig | 126 +++++ + arch/mips/configs/malta_defconfig | 4 +- + arch/mips/configs/malta_kvm_defconfig | 4 +- + arch/mips/configs/malta_kvm_guest_defconfig | 4 +- + arch/mips/configs/malta_qemu_32r6_defconfig | 2 + + arch/mips/configs/maltaaprp_defconfig | 2 + + arch/mips/configs/maltasmvp_defconfig | 2 + + arch/mips/configs/maltasmvp_eva_defconfig | 2 + + arch/mips/configs/maltaup_defconfig | 2 + + arch/mips/configs/maltaup_xpa_defconfig | 4 +- + arch/mips/configs/pistachio_defconfig | 2 - + arch/mips/configs/sead3_defconfig | 121 ----- + arch/mips/configs/sead3micro_defconfig | 122 ----- + arch/mips/generic/Kconfig | 19 + + arch/mips/generic/Makefile | 15 + + arch/mips/generic/Platform | 14 + + arch/mips/generic/board-sead3.c | 376 +++++++++++++++ + arch/mips/generic/init.c | 176 +++++++ + arch/mips/generic/irq.c | 64 +++ + arch/mips/generic/proc.c | 29 ++ + arch/mips/generic/vmlinux.its.S | 31 ++ + arch/mips/include/asm/addrspace.h | 3 +- + arch/mips/include/asm/barrier.h | 96 ++++ + arch/mips/include/asm/cacheflush.h | 5 + + arch/mips/include/asm/cpu-type.h | 3 +- + arch/mips/include/asm/cpu.h | 1 + + arch/mips/include/asm/device.h | 5 + + arch/mips/include/asm/dma-coherence.h | 16 +- + arch/mips/include/asm/dma-mapping.h | 10 + + arch/mips/include/asm/i8259.h | 12 +- + arch/mips/include/asm/mach-generic/dma-coherence.h | 14 +- + arch/mips/include/asm/mach-generic/floppy.h | 6 +- + arch/mips/include/asm/mach-generic/spaces.h | 8 +- + arch/mips/include/asm/mach-ip27/spaces.h | 1 + + arch/mips/include/asm/mach-loongson32/irq.h | 41 +- + arch/mips/include/asm/mach-loongson32/loongson1.h | 5 + + arch/mips/include/asm/mach-loongson32/platform.h | 1 + + arch/mips/include/asm/mach-loongson32/regs-clk.h | 34 ++ + arch/mips/include/asm/mach-loongson32/regs-mux.h | 61 +++ + .../include/asm/mach-sead3/cpu-feature-overrides.h | 72 --- + arch/mips/include/asm/mach-sead3/irq.h | 9 - + .../include/asm/mach-sead3/kernel-entry-init.h | 21 - + arch/mips/include/asm/mach-sead3/war.h | 24 - + arch/mips/include/asm/machine.h | 63 +++ + arch/mips/include/asm/mips-boards/sead3int.h | 32 -- + arch/mips/include/asm/mips-cm.h | 1 + + arch/mips/include/asm/octeon/cvmx-helper-board.h | 30 -- + arch/mips/include/asm/octeon/cvmx-mdio.h | 506 --------------------- + arch/mips/include/asm/pci.h | 60 ++- + arch/mips/include/asm/pgalloc.h | 6 +- + arch/mips/include/asm/pm-cps.h | 6 +- + arch/mips/include/asm/ptrace.h | 2 +- + arch/mips/include/asm/smp.h | 14 + + arch/mips/include/asm/uaccess.h | 18 + + arch/mips/kernel/binfmt_elfn32.c | 8 +- + arch/mips/kernel/binfmt_elfo32.c | 8 +- + arch/mips/kernel/branch.c | 36 +- + arch/mips/kernel/kprobes.c | 67 +-- + arch/mips/kernel/linux32.c | 1 - + arch/mips/kernel/mips-cpc.c | 17 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 1 - + arch/mips/kernel/module.c | 1 + + arch/mips/kernel/pm-cps.c | 160 +++---- + arch/mips/kernel/probes-common.h | 83 ++++ + arch/mips/kernel/proc.c | 7 + + arch/mips/kernel/smp-gic.c | 66 --- + arch/mips/kernel/smp-mt.c | 23 - + arch/mips/kernel/smp.c | 65 ++- + arch/mips/kernel/traps.c | 53 ++- + arch/mips/kernel/uprobes.c | 88 +--- + arch/mips/kvm/commpage.c | 1 - + arch/mips/kvm/dyntrans.c | 5 +- + arch/mips/kvm/emulate.c | 1 - + arch/mips/kvm/interrupt.c | 1 - + arch/mips/kvm/trap_emul.c | 1 - + arch/mips/lantiq/xway/vmmc.c | 6 +- + arch/mips/lantiq/xway/xrx200_phy_fw.c | 12 +- + arch/mips/lib/ashldi3.c | 2 +- + arch/mips/lib/ashrdi3.c | 2 +- + arch/mips/lib/bswapdi.c | 3 +- + arch/mips/lib/bswapsi.c | 3 +- + arch/mips/lib/cmpdi2.c | 2 +- + arch/mips/lib/delay.c | 2 +- + arch/mips/lib/iomap-pci.c | 6 +- + arch/mips/lib/iomap.c | 2 +- + arch/mips/lib/lshrdi3.c | 2 +- + arch/mips/lib/ucmpdi2.c | 2 +- + arch/mips/loongson32/Kconfig | 15 + + arch/mips/loongson32/Makefile | 6 + + arch/mips/loongson32/Platform | 1 + + arch/mips/loongson32/common/irq.c | 55 ++- + arch/mips/loongson32/common/platform.c | 32 ++ + arch/mips/loongson32/common/setup.c | 4 + + arch/mips/loongson32/ls1c/Makefile | 5 + + arch/mips/loongson32/ls1c/board.c | 27 ++ + arch/mips/mm/c-octeon.c | 2 + + arch/mips/mm/c-r3k.c | 2 + + arch/mips/mm/c-r4k.c | 61 ++- + arch/mips/mm/c-tx39.c | 3 + + arch/mips/mm/cache.c | 8 +- + arch/mips/mm/dma-default.c | 18 +- + arch/mips/mm/extable.c | 2 +- + arch/mips/mm/fault.c | 1 - + arch/mips/mm/highmem.c | 3 +- + arch/mips/mm/init.c | 2 +- + arch/mips/mm/ioremap.c | 2 +- + arch/mips/mm/mmap.c | 2 +- + arch/mips/mm/page.c | 1 - + arch/mips/mm/tlb-r4k.c | 9 +- + arch/mips/mti-malta/malta-dt.c | 15 - + arch/mips/mti-malta/malta-dtshim.c | 187 +++++++- + arch/mips/mti-malta/malta-init.c | 17 +- + arch/mips/mti-malta/malta-int.c | 111 +---- + arch/mips/mti-malta/malta-platform.c | 73 +-- + arch/mips/mti-malta/malta-reset.c | 21 +- + arch/mips/mti-malta/malta-setup.c | 10 +- + arch/mips/mti-sead3/Makefile | 15 - + arch/mips/mti-sead3/Platform | 7 - + arch/mips/mti-sead3/sead3-console.c | 46 -- + arch/mips/mti-sead3/sead3-display.c | 77 ---- + arch/mips/mti-sead3/sead3-init.c | 152 ------- + arch/mips/mti-sead3/sead3-int.c | 42 -- + arch/mips/mti-sead3/sead3-lcd.c | 43 -- + arch/mips/mti-sead3/sead3-platform.c | 223 --------- + arch/mips/mti-sead3/sead3-reset.c | 40 -- + arch/mips/mti-sead3/sead3-setup.c | 108 ----- + arch/mips/mti-sead3/sead3-time.c | 99 ---- + arch/mips/pci/Makefile | 2 + + arch/mips/pci/pci-alchemy.c | 3 +- + arch/mips/pci/pci-ar71xx.c | 2 +- + arch/mips/pci/pci-ar724x.c | 2 +- + arch/mips/pci/pci-generic.c | 52 +++ + arch/mips/pci/pci-lantiq.c | 2 - + arch/mips/pci/pci-legacy.c | 302 ++++++++++++ + arch/mips/pci/pci-mt7620.c | 3 - + arch/mips/pci/pci-octeon.c | 2 + + arch/mips/pci/pci-rt2880.c | 2 - + arch/mips/pci/pci-rt3883.c | 2 - + arch/mips/pci/pci.c | 297 +----------- + arch/mips/pci/pcie-octeon.c | 2 +- + arch/mips/pnx833x/common/platform.c | 8 +- + arch/mips/ralink/timer.c | 28 +- + arch/mips/txx9/Kconfig | 2 +- + arch/mips/txx9/generic/pci.c | 6 +- + arch/mips/txx9/generic/setup.c | 70 +-- + arch/mips/txx9/generic/setup_tx3927.c | 1 - + arch/mips/txx9/generic/setup_tx4927.c | 1 - + arch/mips/txx9/generic/setup_tx4938.c | 1 - + arch/mips/txx9/jmr3927/setup.c | 11 +- + arch/mips/txx9/rbtx4927/setup.c | 32 +- + arch/mips/txx9/rbtx4938/setup.c | 1 + + arch/mips/vdso/Makefile | 4 +- + drivers/auxdisplay/Kconfig | 9 + + drivers/auxdisplay/Makefile | 1 + + drivers/auxdisplay/img-ascii-lcd.c | 443 ++++++++++++++++++ + drivers/cpuidle/Kconfig.mips | 2 +- + drivers/cpuidle/cpuidle-cps.c | 2 +- + drivers/irqchip/irq-i8259.c | 30 +- + drivers/of/platform.c | 1 + + drivers/usb/host/ehci-hcd.c | 5 - + drivers/usb/host/ehci-sead3.c | 185 -------- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/cobalt_lcdfb.c | 42 -- + drivers/watchdog/txx9wdt.c | 6 +- + 226 files changed, 5244 insertions(+), 3659 deletions(-) + create mode 100644 Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt + create mode 100644 arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts + create mode 100644 arch/mips/boot/dts/brcm/bcm3368.dtsi + create mode 100644 arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts + create mode 100644 arch/mips/boot/dts/brcm/bcm63268.dtsi + rename arch/mips/boot/dts/brcm/{bcm96358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} (94%) + create mode 100644 arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts + create mode 100644 arch/mips/boot/dts/brcm/bcm6362.dtsi + create mode 100644 arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi + create mode 100644 arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi + create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-500n-1000n.dtsi + create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-500n.dts + create mode 100644 arch/mips/configs/generic/32r1.config + create mode 100644 arch/mips/configs/generic/32r2.config + create mode 100644 arch/mips/configs/generic/32r6.config + create mode 100644 arch/mips/configs/generic/64r1.config + create mode 100644 arch/mips/configs/generic/64r2.config + create mode 100644 arch/mips/configs/generic/64r6.config + create mode 100644 arch/mips/configs/generic/board-sead-3.config + create mode 100644 arch/mips/configs/generic/eb.config + create mode 100644 arch/mips/configs/generic/el.config + create mode 100644 arch/mips/configs/generic/micro32r2.config + create mode 100644 arch/mips/configs/generic_defconfig + create mode 100644 arch/mips/configs/loongson1c_defconfig + delete mode 100644 arch/mips/configs/sead3_defconfig + delete mode 100644 arch/mips/configs/sead3micro_defconfig + create mode 100644 arch/mips/generic/Kconfig + create mode 100644 arch/mips/generic/Makefile + create mode 100644 arch/mips/generic/Platform + create mode 100644 arch/mips/generic/board-sead3.c + create mode 100644 arch/mips/generic/init.c + create mode 100644 arch/mips/generic/irq.c + create mode 100644 arch/mips/generic/proc.c + create mode 100644 arch/mips/generic/vmlinux.its.S + delete mode 100644 arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h + delete mode 100644 arch/mips/include/asm/mach-sead3/irq.h + delete mode 100644 arch/mips/include/asm/mach-sead3/kernel-entry-init.h + delete mode 100644 arch/mips/include/asm/mach-sead3/war.h + create mode 100644 arch/mips/include/asm/machine.h + delete mode 100644 arch/mips/include/asm/mips-boards/sead3int.h + delete mode 100644 arch/mips/include/asm/octeon/cvmx-mdio.h + create mode 100644 arch/mips/kernel/probes-common.h + delete mode 100644 arch/mips/kernel/smp-gic.c + create mode 100644 arch/mips/loongson32/ls1c/Makefile + create mode 100644 arch/mips/loongson32/ls1c/board.c + delete mode 100644 arch/mips/mti-sead3/Makefile + delete mode 100644 arch/mips/mti-sead3/Platform + delete mode 100644 arch/mips/mti-sead3/sead3-console.c + delete mode 100644 arch/mips/mti-sead3/sead3-display.c + delete mode 100644 arch/mips/mti-sead3/sead3-init.c + delete mode 100644 arch/mips/mti-sead3/sead3-int.c + delete mode 100644 arch/mips/mti-sead3/sead3-lcd.c + delete mode 100644 arch/mips/mti-sead3/sead3-platform.c + delete mode 100644 arch/mips/mti-sead3/sead3-reset.c + delete mode 100644 arch/mips/mti-sead3/sead3-setup.c + delete mode 100644 arch/mips/mti-sead3/sead3-time.c + create mode 100644 arch/mips/pci/pci-generic.c + create mode 100644 arch/mips/pci/pci-legacy.c + create mode 100644 drivers/auxdisplay/img-ascii-lcd.c + delete mode 100644 drivers/usb/host/ehci-sead3.c +Merging nios2/for-next (476080a79367 nios2: use of_property_read_bool) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (c8d2bc9bc39e Linux 4.8) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (08bf75ba852e powerpc/mm/hash64: Fix might_have_hea() check) +$ git merge powerpc/next +Auto-merging arch/powerpc/mm/hash_utils_64.c +Auto-merging arch/powerpc/lib/copyuser_64.S +Auto-merging arch/powerpc/kernel/head_8xx.S +Auto-merging arch/powerpc/include/asm/reg.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 18 +- + arch/powerpc/Makefile | 4 +- + arch/powerpc/configs/dpaa.config | 1 + + arch/powerpc/include/asm/cputable.h | 1 + + arch/powerpc/include/asm/hw_irq.h | 6 + + arch/powerpc/include/asm/ppc-opcode.h | 1 + + arch/powerpc/include/asm/reg.h | 2 + + arch/powerpc/include/asm/reg_8xx.h | 4 + + arch/powerpc/kernel/cputable.c | 1 + + arch/powerpc/kernel/exceptions-64s.S | 2 +- + arch/powerpc/kernel/head_8xx.S | 136 +- + arch/powerpc/kernel/setup-common.c | 27 +- + arch/powerpc/kernel/traps.c | 45 +- + arch/powerpc/lib/copyuser_64.S | 2 +- + arch/powerpc/mm/hash_utils_64.c | 2 +- + arch/powerpc/platforms/82xx/Kconfig | 4 +- + arch/powerpc/platforms/82xx/ep8248e.c | 4 +- + arch/powerpc/platforms/83xx/asp834x.c | 4 +- + arch/powerpc/platforms/83xx/km83xx.c | 5 +- + arch/powerpc/platforms/83xx/misc.c | 8 + + arch/powerpc/platforms/83xx/mpc830x_rdb.c | 5 +- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 5 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 5 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 5 +- + arch/powerpc/platforms/83xx/mpc834x_itx.c | 5 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 5 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 5 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 5 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 5 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 5 +- + arch/powerpc/platforms/83xx/mpc83xx.h | 1 + + arch/powerpc/platforms/83xx/sbc834x.c | 5 +- + arch/powerpc/platforms/85xx/Kconfig | 2 +- + arch/powerpc/platforms/85xx/bsc913x_qds.c | 1 - + arch/powerpc/platforms/85xx/bsc913x_rdb.c | 1 - + arch/powerpc/platforms/85xx/c293pcie.c | 1 - + arch/powerpc/platforms/85xx/corenet_generic.c | 1 - + arch/powerpc/platforms/85xx/ge_imp3a.c | 1 - + arch/powerpc/platforms/85xx/mpc8536_ds.c | 1 - + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 1 - + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 25 +- + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 3 - + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 12 +- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 10 - + arch/powerpc/platforms/85xx/mvme2500.c | 1 - + arch/powerpc/platforms/85xx/p1010rdb.c | 1 - + arch/powerpc/platforms/85xx/p1022_ds.c | 1 - + arch/powerpc/platforms/85xx/p1022_rdk.c | 1 - + arch/powerpc/platforms/85xx/p1023_rdb.c | 1 - + arch/powerpc/platforms/85xx/ppa8548.c | 1 - + arch/powerpc/platforms/85xx/qemu_e500.c | 1 - + arch/powerpc/platforms/85xx/sbc8548.c | 1 - + arch/powerpc/platforms/85xx/sgy_cts1000.c | 8 +- + arch/powerpc/platforms/85xx/socrates.c | 1 - + arch/powerpc/platforms/85xx/stx_gp3.c | 1 - + arch/powerpc/platforms/85xx/tqm85xx.c | 1 - + arch/powerpc/platforms/85xx/twr_p102x.c | 1 - + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 3 - + arch/powerpc/platforms/86xx/gef_ppc9a.c | 1 - + arch/powerpc/platforms/86xx/gef_sbc310.c | 1 - + arch/powerpc/platforms/86xx/gef_sbc610.c | 1 - + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 1 - + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 1 - + arch/powerpc/platforms/86xx/mvme7100.c | 1 - + arch/powerpc/platforms/86xx/sbc8641d.c | 1 - + arch/powerpc/platforms/pseries/lpar.c | 4 +- + arch/powerpc/sysdev/cpm1.c | 2 - + arch/powerpc/sysdev/cpm2.c | 4 - + arch/powerpc/sysdev/cpm_common.c | 15 + + arch/powerpc/sysdev/fsl_pci.c | 12 +- + arch/powerpc/sysdev/fsl_soc.c | 33 +- + arch/powerpc/sysdev/fsl_soc.h | 2 - + arch/powerpc/sysdev/mpic.c | 2 +- + drivers/soc/Kconfig | 1 + + drivers/soc/fsl/Makefile | 1 + + drivers/soc/fsl/qbman/Kconfig | 67 + + drivers/soc/fsl/qbman/Makefile | 12 + + drivers/soc/fsl/qbman/bman.c | 797 ++++++ + drivers/soc/fsl/qbman/bman_ccsr.c | 263 ++ + drivers/soc/fsl/qbman/bman_portal.c | 219 ++ + drivers/soc/fsl/qbman/bman_priv.h | 80 + + drivers/soc/fsl/qbman/bman_test.c | 53 + + drivers/soc/fsl/qbman/bman_test.h | 35 + + drivers/soc/fsl/qbman/bman_test_api.c | 151 + + drivers/soc/fsl/qbman/dpaa_sys.h | 103 + + drivers/soc/fsl/qbman/qman.c | 2881 ++++++++++++++++++++ + drivers/soc/fsl/qbman/qman_ccsr.c | 808 ++++++ + drivers/soc/fsl/qbman/qman_portal.c | 355 +++ + drivers/soc/fsl/qbman/qman_priv.h | 371 +++ + drivers/soc/fsl/qbman/qman_test.c | 62 + + drivers/soc/fsl/qbman/qman_test.h | 36 + + drivers/soc/fsl/qbman/qman_test_api.c | 252 ++ + drivers/soc/fsl/qbman/qman_test_stash.c | 617 +++++ + drivers/soc/fsl/qe/gpio.c | 3 +- + drivers/soc/fsl/qe/qe.c | 10 +- + drivers/soc/fsl/qe/qe_common.c | 8 + + drivers/soc/fsl/qe/qe_tdm.c | 4 +- + include/soc/fsl/bman.h | 129 + + include/soc/fsl/qman.h | 1074 ++++++++ + .../selftests/powerpc/copyloops/asm/export.h | 1 + + tools/testing/selftests/powerpc/math/.gitignore | 1 + + tools/testing/selftests/powerpc/signal/.gitignore | 2 + + .../selftests/powerpc/stringloops/asm/export.h | 1 + + tools/testing/selftests/powerpc/tm/.gitignore | 4 + + 104 files changed, 8631 insertions(+), 266 deletions(-) + create mode 100644 arch/powerpc/configs/dpaa.config + create mode 100644 drivers/soc/fsl/qbman/Kconfig + create mode 100644 drivers/soc/fsl/qbman/Makefile + create mode 100644 drivers/soc/fsl/qbman/bman.c + create mode 100644 drivers/soc/fsl/qbman/bman_ccsr.c + create mode 100644 drivers/soc/fsl/qbman/bman_portal.c + create mode 100644 drivers/soc/fsl/qbman/bman_priv.h + create mode 100644 drivers/soc/fsl/qbman/bman_test.c + create mode 100644 drivers/soc/fsl/qbman/bman_test.h + create mode 100644 drivers/soc/fsl/qbman/bman_test_api.c + create mode 100644 drivers/soc/fsl/qbman/dpaa_sys.h + create mode 100644 drivers/soc/fsl/qbman/qman.c + create mode 100644 drivers/soc/fsl/qbman/qman_ccsr.c + create mode 100644 drivers/soc/fsl/qbman/qman_portal.c + create mode 100644 drivers/soc/fsl/qbman/qman_priv.h + create mode 100644 drivers/soc/fsl/qbman/qman_test.c + create mode 100644 drivers/soc/fsl/qbman/qman_test.h + create mode 100644 drivers/soc/fsl/qbman/qman_test_api.c + create mode 100644 drivers/soc/fsl/qbman/qman_test_stash.c + create mode 100644 include/soc/fsl/bman.h + create mode 100644 include/soc/fsl/qman.h + create mode 100644 tools/testing/selftests/powerpc/copyloops/asm/export.h + create mode 100644 tools/testing/selftests/powerpc/signal/.gitignore + create mode 100644 tools/testing/selftests/powerpc/stringloops/asm/export.h +Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (67bfcfe52529 s390/dasd: avoid undefined behaviour) +$ git merge s390/features +Merge made by the 'recursive' strategy. + drivers/s390/block/dasd.c | 16 ++++++++-------- + drivers/s390/block/dasd_eckd.c | 4 ++-- + 2 files changed, 10 insertions(+), 10 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/kernel/module.c | 11 +++++------ + arch/tile/kernel/pci_gx.c | 2 +- + arch/tile/kernel/unaligned.c | 2 +- + arch/tile/lib/cacheflush.c | 8 +------- + arch/tile/mm/extable.c | 2 +- + arch/tile/mm/fault.c | 2 +- + 6 files changed, 10 insertions(+), 17 deletions(-) +Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (1ace5d1e3d4b unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 3 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 3 deletions(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (a4c6be5ad1d0 xtensa: disable MMU initialization option on MMUv2 cores) +$ git merge xtensa/xtensa-for-next +Already up-to-date. +Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c) +$ git merge befs/for-next +Auto-merging fs/befs/linuxvfs.c +Merge made by the 'recursive' strategy. + fs/befs/befs.h | 19 +--- + fs/befs/btree.c | 60 ++++++------ + fs/befs/datastream.c | 253 +++++++++++++++++++++++++-------------------------- + fs/befs/debug.c | 1 + + fs/befs/io.c | 26 +----- + fs/befs/io.h | 2 - + fs/befs/linuxvfs.c | 130 +++++++++++++------------- + fs/befs/super.c | 36 +++++--- + 8 files changed, 244 insertions(+), 283 deletions(-) +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (54ce19f68430 Merge branch 'for-next-next-4.9-20161012' into for-next-20161012) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.h | 5 +- + fs/btrfs/disk-io.c | 46 ++++---- + fs/btrfs/extent-tree.c | 75 +++++++++---- + fs/btrfs/extent_io.c | 64 +++++++---- + fs/btrfs/extent_io.h | 22 ++++ + fs/btrfs/file.c | 1 - + fs/btrfs/free-space-tree.c | 19 ++-- + fs/btrfs/inode.c | 11 +- + fs/btrfs/ioctl.c | 1 - + fs/btrfs/relocation.c | 9 +- + fs/btrfs/super.c | 4 - + fs/btrfs/tests/extent-io-tests.c | 87 ++++++++------- + fs/btrfs/tests/free-space-tree-tests.c | 189 +++++++++++++++++++-------------- + fs/btrfs/uuid-tree.c | 8 +- + fs/btrfs/volumes.c | 42 ++++---- + include/uapi/linux/btrfs.h | 12 ++- + 16 files changed, 376 insertions(+), 219 deletions(-) +Merging ceph/master (64f77566e1c8 crush: remove redundant local variable) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (ba4561542b9e CIFS: Reset read oplock to NONE if we have mandatory locks after reopen) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 1 + + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/cifs_ioctl.h | 8 + + fs/cifs/cifsfs.c | 11 +- + fs/cifs/cifsglob.h | 51 +++-- + fs/cifs/cifsproto.h | 2 + + fs/cifs/cifssmb.c | 4 +- + fs/cifs/connect.c | 47 ++++- + fs/cifs/file.c | 105 ++++++--- + fs/cifs/ioctl.c | 16 +- + fs/cifs/misc.c | 15 +- + fs/cifs/readdir.c | 6 +- + fs/cifs/smb2inode.c | 6 + + fs/cifs/smb2misc.c | 16 +- + fs/cifs/smb2ops.c | 62 +++++- + fs/cifs/smb2pdu.c | 587 +++++++++++++++++++++++++++++++++------------------ + fs/cifs/smb2pdu.h | 2 +- + fs/cifs/xattr.c | 62 +++++- + 18 files changed, 706 insertions(+), 296 deletions(-) +Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (6ed47823005f isofs: Do not return EACCES for unknown filesystems) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/isofs/inode.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging ext4/dev (18017479caba ext4: remove unused variable) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge f2fs/dev +Already up-to-date. +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (63401ccdb2ca fuse: limit xattr returned size) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge gfs2/for-next +Already up-to-date. +Merging jfs/jfs-next (240c5185c52d jfs: Simplify code) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (4d2899d73c47 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (29ae7f9dc21a NFSD: Implement the COPY call) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'recursive' strategy. + fs/exportfs/expfs.c | 10 +- + fs/nfsd/flexfilelayout.c | 1 + + fs/nfsd/netns.h | 1 + + fs/nfsd/nfs4callback.c | 64 +++++++- + fs/nfsd/nfs4layouts.c | 6 +- + fs/nfsd/nfs4proc.c | 90 +++++++++-- + fs/nfsd/nfs4state.c | 237 ++++++++++++++++++++++++++--- + fs/nfsd/nfs4xdr.c | 65 +++++++- + fs/nfsd/nfsctl.c | 2 + + fs/nfsd/nfsproc.c | 3 +- + fs/nfsd/nfssvc.c | 18 ++- + fs/nfsd/pnfs.h | 1 + + fs/nfsd/state.h | 22 ++- + fs/nfsd/vfs.c | 16 ++ + fs/nfsd/vfs.h | 2 + + fs/nfsd/xdr4.h | 23 +++ + fs/nfsd/xdr4cb.h | 9 ++ + include/linux/exportfs.h | 13 +- + include/linux/sunrpc/rpc_rdma.h | 35 +++++ + include/linux/sunrpc/svc_rdma.h | 10 ++ + include/uapi/linux/nfs4.h | 5 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 82 +++++++--- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 60 ++++++-- + 25 files changed, 683 insertions(+), 96 deletions(-) +Merging orangefs/for-next (f60fbdbf41c8 Revert "orangefs: bump minimum userspace version") +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (b6495a35e189 ovl: use vfs_get_link()) +$ git merge overlayfs/overlayfs-next +Resolved 'fs/overlayfs/super.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging fs/xattr.c +Auto-merging fs/overlayfs/super.c +CONFLICT (content): Merge conflict in fs/overlayfs/super.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/overlayfs/dir.c +Auto-merging fs/overlayfs/copy_up.c +Auto-merging fs/open.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/ioctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d0cbec740a64] Merge remote-tracking branch 'overlayfs/overlayfs-next' +$ git diff -M --stat --summary HEAD^.. + fs/ioctl.c | 5 +++- + fs/namei.c | 25 +++++++++++++++++ + fs/namespace.c | 7 +++-- + fs/nfsd/vfs.c | 3 +- + fs/open.c | 15 +++++----- + fs/overlayfs/copy_up.c | 75 +++++++++++++++++++------------------------------- + fs/overlayfs/dir.c | 32 +++++++++++++++++++-- + fs/overlayfs/inode.c | 44 +++++++---------------------- + fs/overlayfs/super.c | 33 ++++++++++++++-------- + fs/read_write.c | 13 ++++----- + fs/xattr.c | 13 ++++++--- + include/linux/fs.h | 14 ++++++++++ + 12 files changed, 160 insertions(+), 119 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (ec037dfcc064 UBIFS: improve function-level documentation) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (feac470e3642 xfs: convert COW blocks to real blocks before unwritten extent conversion) +$ git merge xfs/for-next +Auto-merging include/uapi/linux/fs.h +Auto-merging fs/xfs/xfs_trace.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_ioctl.c +Auto-merging fs/xfs/xfs_inode.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/open.c +Merge made by the 'recursive' strategy. + fs/open.c | 5 + + fs/xfs/Makefile | 7 + + fs/xfs/libxfs/xfs_ag_resv.c | 15 +- + fs/xfs/libxfs/xfs_alloc.c | 23 + + fs/xfs/libxfs/xfs_bmap.c | 575 +++++++++++- + fs/xfs/libxfs/xfs_bmap.h | 67 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 18 + + fs/xfs/libxfs/xfs_btree.c | 8 +- + fs/xfs/libxfs/xfs_btree.h | 16 + + fs/xfs/libxfs/xfs_defer.h | 2 + + fs/xfs/libxfs/xfs_format.h | 97 +- + fs/xfs/libxfs/xfs_fs.h | 10 +- + fs/xfs/libxfs/xfs_inode_buf.c | 24 +- + fs/xfs/libxfs/xfs_inode_buf.h | 1 + + fs/xfs/libxfs/xfs_inode_fork.c | 70 +- + fs/xfs/libxfs/xfs_inode_fork.h | 28 +- + fs/xfs/libxfs/xfs_log_format.h | 118 ++- + fs/xfs/libxfs/xfs_refcount.c | 1698 ++++++++++++++++++++++++++++++++++++ + fs/xfs/libxfs/xfs_refcount.h | 70 ++ + fs/xfs/libxfs/xfs_refcount_btree.c | 451 ++++++++++ + fs/xfs/libxfs/xfs_refcount_btree.h | 74 ++ + fs/xfs/libxfs/xfs_rmap.c | 1120 +++++++++++++++++++++--- + fs/xfs/libxfs/xfs_rmap.h | 7 + + fs/xfs/libxfs/xfs_rmap_btree.c | 82 +- + fs/xfs/libxfs/xfs_rmap_btree.h | 7 + + fs/xfs/libxfs/xfs_sb.c | 9 + + fs/xfs/libxfs/xfs_shared.h | 2 + + fs/xfs/libxfs/xfs_trans_resv.c | 23 +- + fs/xfs/libxfs/xfs_trans_resv.h | 3 + + fs/xfs/libxfs/xfs_trans_space.h | 9 + + fs/xfs/libxfs/xfs_types.h | 3 +- + fs/xfs/xfs_aops.c | 222 ++++- + fs/xfs/xfs_aops.h | 4 +- + fs/xfs/xfs_bmap_item.c | 508 +++++++++++ + fs/xfs/xfs_bmap_item.h | 98 +++ + fs/xfs/xfs_bmap_util.c | 589 ++++++++++--- + fs/xfs/xfs_dir2_readdir.c | 3 +- + fs/xfs/xfs_error.h | 10 +- + fs/xfs/xfs_file.c | 221 ++++- + fs/xfs/xfs_fsops.c | 107 ++- + fs/xfs/xfs_fsops.h | 3 + + fs/xfs/xfs_globals.c | 5 +- + fs/xfs/xfs_icache.c | 243 +++++- + fs/xfs/xfs_icache.h | 7 + + fs/xfs/xfs_inode.c | 51 ++ + fs/xfs/xfs_inode.h | 19 + + fs/xfs/xfs_inode_item.c | 2 +- + fs/xfs/xfs_ioctl.c | 75 +- + fs/xfs/xfs_iomap.c | 35 +- + fs/xfs/xfs_iomap.h | 3 +- + fs/xfs/xfs_iops.c | 1 + + fs/xfs/xfs_itable.c | 8 +- + fs/xfs/xfs_linux.h | 1 + + fs/xfs/xfs_log_recover.c | 357 ++++++++ + fs/xfs/xfs_mount.c | 32 + + fs/xfs/xfs_mount.h | 8 + + fs/xfs/xfs_ondisk.h | 3 + + fs/xfs/xfs_pnfs.c | 7 + + fs/xfs/xfs_refcount_item.c | 539 ++++++++++++ + fs/xfs/xfs_refcount_item.h | 101 +++ + fs/xfs/xfs_reflink.c | 1688 +++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_reflink.h | 58 ++ + fs/xfs/xfs_rmap_item.c | 12 + + fs/xfs/xfs_stats.c | 1 + + fs/xfs/xfs_stats.h | 18 +- + fs/xfs/xfs_super.c | 87 ++ + fs/xfs/xfs_sysctl.c | 9 + + fs/xfs/xfs_sysctl.h | 1 + + fs/xfs/xfs_trace.h | 742 +++++++++++++++- + fs/xfs/xfs_trans.h | 29 + + fs/xfs/xfs_trans_bmap.c | 249 ++++++ + fs/xfs/xfs_trans_refcount.c | 264 ++++++ + fs/xfs/xfs_trans_rmap.c | 9 + + include/linux/falloc.h | 3 +- + include/uapi/linux/falloc.h | 18 + + include/uapi/linux/fs.h | 4 +- + 76 files changed, 10683 insertions(+), 413 deletions(-) + create mode 100644 fs/xfs/libxfs/xfs_refcount.c + create mode 100644 fs/xfs/libxfs/xfs_refcount.h + create mode 100644 fs/xfs/libxfs/xfs_refcount_btree.c + create mode 100644 fs/xfs/libxfs/xfs_refcount_btree.h + create mode 100644 fs/xfs/xfs_bmap_item.c + create mode 100644 fs/xfs/xfs_bmap_item.h + create mode 100644 fs/xfs/xfs_refcount_item.c + create mode 100644 fs/xfs/xfs_refcount_item.h + create mode 100644 fs/xfs/xfs_reflink.c + create mode 100644 fs/xfs/xfs_reflink.h + create mode 100644 fs/xfs/xfs_trans_bmap.c + create mode 100644 fs/xfs/xfs_trans_refcount.c +Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (77e5eb5fdcc1 Merge branch 'work.uaccess' into for-next) +$ git merge vfs/for-next +Auto-merging arch/arm/lib/copy_from_user.S +Auto-merging arch/alpha/lib/ev6-copy_user.S +Auto-merging arch/alpha/lib/copy_user.S +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/uaccess.h | 9 +++++---- + arch/alpha/lib/copy_user.S | 16 +--------------- + arch/alpha/lib/ev6-copy_user.S | 23 +---------------------- + arch/arc/kernel/signal.c | 8 ++++---- + arch/arm/include/asm/uaccess.h | 11 ++++++----- + arch/arm/lib/copy_from_user.S | 9 +++------ + arch/arm64/include/asm/uaccess.h | 10 ++++++---- + arch/arm64/lib/copy_from_user.S | 7 +------ + arch/blackfin/include/asm/uaccess.h | 32 ++++++++++++++++++++------------ + 9 files changed, 47 insertions(+), 78 deletions(-) +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (c8d2bc9bc39e Linux 4.8) +$ git merge vfs-miklos/next +Already up-to-date. +Merging pci/next (217c6d21e924 Merge branches 'pci/host-armada', 'pci/host-artpec', 'pci/host-dra7xx', 'pci/host-exynos', 'pci/host-hisi', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-qcom' and 'pci/host-spear' into next) +$ git merge pci/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 ++ + drivers/pci/host/pci-aardvark.c | 39 ++--- + drivers/pci/host/pci-dra7xx.c | 103 ++++++------- + drivers/pci/host/pci-exynos.c | 220 +++++++++++++--------------- + drivers/pci/host/pci-imx6.c | 250 ++++++++++++++++---------------- + drivers/pci/host/pci-keystone-dw.c | 123 +++++++++------- + drivers/pci/host/pci-keystone.c | 28 ++-- + drivers/pci/host/pci-keystone.h | 9 +- + drivers/pci/host/pci-layerscape.c | 65 +++++---- + drivers/pci/host/pci-mvebu.c | 21 ++- + drivers/pci/host/pci-rcar-gen2.c | 46 +++--- + drivers/pci/host/pci-tegra.c | 237 +++++++++++++++--------------- + drivers/pci/host/pci-xgene.c | 151 ++++++++++--------- + drivers/pci/host/pcie-altera.c | 77 +++++----- + drivers/pci/host/pcie-armada8k.c | 78 +++++----- + drivers/pci/host/pcie-artpec6.c | 115 ++++++++------- + drivers/pci/host/pcie-designware-plat.c | 25 ++-- + drivers/pci/host/pcie-designware.c | 102 ++++++------- + drivers/pci/host/pcie-designware.h | 7 +- + drivers/pci/host/pcie-hisi.c | 86 +++++------ + drivers/pci/host/pcie-iproc-bcma.c | 14 +- + drivers/pci/host/pcie-iproc-platform.c | 27 ++-- + drivers/pci/host/pcie-iproc.c | 52 +++---- + drivers/pci/host/pcie-qcom.c | 30 ++-- + drivers/pci/host/pcie-rcar.c | 98 +++++++------ + drivers/pci/host/pcie-rockchip.c | 4 +- + drivers/pci/host/pcie-spear13xx.c | 108 +++----------- + drivers/pci/host/pcie-xilinx-nwl.c | 109 +++++++------- + drivers/pci/host/pcie-xilinx.c | 62 ++++---- + 29 files changed, 1108 insertions(+), 1187 deletions(-) +Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (419c103f0833 Merge branch 'for-4.9/upstream' into for-next) +$ git merge hid/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (b2edcdae3d9a Merge tag 'tegra-for-4.8-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c.txt | 8 ++++++++ + drivers/gpio/gpio-pca953x.c | 16 ++++++++++++++++ + drivers/i2c/i2c-core.c | 10 ++++++++-- + 3 files changed, 32 insertions(+), 2 deletions(-) +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (c8d2bc9bc39e Linux 4.8) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (7ce4190c4ca4 hwmon: (nct6775) Add support for multiple virtual temperature sources) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging jc_docs/docs-next (8c67e73f1884 Merge branch 'doc/4.9' into docs-next) +$ git merge jc_docs/docs-next +Resolved 'Documentation/sphinx-static/theme_overrides.css' using previous resolution. +Auto-merging include/net/cfg80211.h +Auto-merging Documentation/sphinx-static/theme_overrides.css +CONFLICT (content): Merge conflict in Documentation/sphinx-static/theme_overrides.css +Removing Documentation/DocBook/80211.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8bf449d476b1] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/80211/cfg80211.rst | 345 ++++++++++++++++++ + Documentation/80211/conf.py | 5 + + Documentation/80211/index.rst | 17 + + Documentation/80211/introduction.rst | 17 + + Documentation/80211/mac80211-advanced.rst | 295 +++++++++++++++ + Documentation/80211/mac80211.rst | 216 +++++++++++ + Documentation/DocBook/80211.tmpl | 584 ------------------------------ + Documentation/DocBook/Makefile | 2 +- + Documentation/index.rst | 1 + + include/net/cfg80211.h | 77 ++-- + 10 files changed, 939 insertions(+), 620 deletions(-) + create mode 100644 Documentation/80211/cfg80211.rst + create mode 100644 Documentation/80211/conf.py + create mode 100644 Documentation/80211/index.rst + create mode 100644 Documentation/80211/introduction.rst + create mode 100644 Documentation/80211/mac80211-advanced.rst + create mode 100644 Documentation/80211/mac80211.rst + delete mode 100644 Documentation/DocBook/80211.tmpl +Merging v4l-dvb/master (02a628e5c024 Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. +Merging pm/linux-next (935b29e07995 Merge branch 'device-properties' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/acpi.h +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +++ + arch/x86/kernel/acpi/boot.c | 1 + + drivers/acpi/ec.c | 2 + + drivers/acpi/fan.c | 12 +++- + drivers/acpi/pci_link.c | 71 +++++++++++----------- + drivers/acpi/property.c | 117 +++++++++++++++++++++--------------- + drivers/cpufreq/intel_pstate.c | 43 +++++++++---- + drivers/devfreq/devfreq.c | 8 ++- + drivers/devfreq/event/Kconfig | 1 + + drivers/devfreq/event/exynos-nocp.c | 3 - + include/linux/acpi.h | 23 ++++++- + 11 files changed, 185 insertions(+), 104 deletions(-) +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (43720df96023 thermal: int3403: Process trip change notification) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5) +$ git merge thermal-soc/next +Already up-to-date. +Merging ieee1394/for-next (6449e31ddebd firewire: nosy: do not ignore errors in ioremap_nocache()) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/nosy.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (1b830996c160 Merge branch 's390-net') +$ git merge net-next/master +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 6 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 19 ++- + drivers/net/ethernet/marvell/mv643xx_eth.c | 164 ++++++++++++--------- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 - + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 115 ++++++++------- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 40 +++-- + drivers/net/ethernet/ti/cpsw.c | 17 ++- + drivers/net/ethernet/ti/netcp_ethss.c | 42 +++--- + drivers/net/usb/lan78xx.c | 70 +++++---- + net/dsa/slave.c | 14 +- + net/iucv/af_iucv.c | 34 ++++- + net/openvswitch/actions.c | 24 ++- + 15 files changed, 331 insertions(+), 221 deletions(-) +Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_state.c | 8 -------- + 1 file changed, 8 deletions(-) +Merging netfilter-next/master (1b830996c160 Merge branch 's390-net') +$ git merge netfilter-next/master +Already up-to-date. +Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wireless-drivers-next/master (15b95a159502 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 (2326243d6b25 Bluetooth: hci_bcm: Fix autosuspend PM for Lenovo ThinkPad 8) +$ git merge bluetooth/master +Resolved 'net/bluetooth/hci_request.c' using previous resolution. +Auto-merging net/bluetooth/hci_request.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_request.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3fd6e0f203d6] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/hci_bcm.c | 8 ++++++++ + include/net/bluetooth/bluetooth.h | 25 +++++++++++++------------ + 2 files changed, 21 insertions(+), 12 deletions(-) +Merging mac80211-next/master (32910bb951a2 mac80211: preserve more bits when building QoS header) +$ git merge mac80211-next/master +Auto-merging net/mac80211/rx.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 79 ++++++++++++++++++----------------- + net/mac80211/cfg.c | 32 ++++---------- + net/mac80211/debugfs_netdev.c | 11 +++++ + net/mac80211/ieee80211_i.h | 18 ++++++++ + net/mac80211/iface.c | 16 +++++++ + net/mac80211/rx.c | 5 ++- + net/mac80211/sta_info.c | 10 +---- + net/mac80211/tx.c | 5 +-- + net/mac80211/wme.c | 23 ++++++---- + 9 files changed, 115 insertions(+), 84 deletions(-) +Merging rdma/for-next (2937f3757519 staging/lustre: Disable InfiniBand support) +$ git merge rdma/for-next +Already up-to-date. +Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +Merging mtd/master (69db4aa44fdd Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (69db4aa44fdd Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (d44154f969a4 mtd: nand: Provide nand_cleanup() function to free NAND related resources) +$ git merge nand/nand/next +Already up-to-date. +Merging crypto/master (f97581cfa6e7 crypto: caam - treat SGT address pointer as u64) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (69405d3da98b Merge tag 'topic/drm-misc-2016-10-11' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (105f1a65b04a drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (b68d8379c28d dma-buf: Restart reservation_object_test_signaled_rcu() after writes) +$ git merge drm-misc/topic/drm-misc +Merge made by the 'recursive' strategy. + drivers/dma-buf/reservation.c | 112 +++++++++++++------------------ + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 24 +++---- + drivers/gpu/drm/nouveau/nouveau_gem.c | 21 +++--- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- + include/linux/fence.h | 56 ++++++++++++++-- + 6 files changed, 120 insertions(+), 105 deletions(-) +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy) +$ git merge kspp/for-next/kspp +Auto-merging net/core/dev.c +Auto-merging mm/page_alloc.c +Auto-merging lib/random32.c +Auto-merging lib/irq_poll.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/softirq.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/fork.c +Auto-merging include/linux/random.h +Auto-merging include/linux/init.h +Auto-merging include/linux/fdtable.h +Auto-merging include/linux/compiler.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/namespace.c +Auto-merging drivers/char/random.c +Auto-merging block/blk-softirq.c +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 5 + + arch/Kconfig | 18 + + arch/powerpc/kernel/Makefile | 5 + + block/blk-softirq.c | 2 +- + drivers/char/random.c | 4 +- + fs/namespace.c | 1 + + include/linux/compiler-gcc.h | 7 + + include/linux/compiler.h | 4 + + include/linux/fdtable.h | 2 +- + include/linux/genhd.h | 2 +- + include/linux/init.h | 5 +- + include/linux/random.h | 15 +- + init/main.c | 1 + + kernel/fork.c | 7 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/softirq.c | 4 +- + kernel/time/timer.c | 2 +- + lib/irq_poll.c | 2 +- + lib/random32.c | 2 +- + mm/page_alloc.c | 26 ++ + net/core/dev.c | 4 +- + scripts/Makefile.gcc-plugins | 9 +- + scripts/gcc-plugins/latent_entropy_plugin.c | 639 ++++++++++++++++++++++++++++ + 25 files changed, 750 insertions(+), 22 deletions(-) + create mode 100644 scripts/gcc-plugins/latent_entropy_plugin.c +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (96d87581df93 Merge tag 'regmap-v4.9' into regmap-linus) +$ git merge regmap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (fdd8218d7d1b ALSA: line6: fix a crash in line6_hwdep_write()) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (5c78e1a117c6 Merge remote-tracking branches 'asoc/fix/da7219-pops', 'asoc/fix/tas571x' and 'asoc/fix/topology-abi' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + include/uapi/sound/asoc.h | 6 -- + sound/soc/codecs/da7219-aad.c | 18 +++- + sound/soc/codecs/da7219.c | 139 ++++++++++++++++++++++---- + sound/soc/codecs/da7219.h | 5 + + sound/soc/codecs/tas571x.c | 37 +++---- + sound/soc/intel/Kconfig | 3 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 4 +- + 7 files changed, 155 insertions(+), 57 deletions(-) +Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (930e19248e9b Input: i8042 - skip selftest on ASUS laptops) +$ git merge input/next +Auto-merging drivers/input/serio/i8042.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/melfas_mip4.txt | 21 +++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/input/alps.txt | 57 +++++++++++++ + Documentation/kernel-parameters.txt | 9 +- + MAINTAINERS | 7 ++ + drivers/input/mouse/alps.c | 87 +++++++++++++++++--- + drivers/input/mouse/alps.h | 2 + + drivers/input/mouse/elantech.c | 27 +++++- + drivers/input/rmi4/rmi_i2c.c | 38 ++++++--- + drivers/input/rmi4/rmi_spi.c | 22 ++--- + drivers/input/serio/i8042-io.h | 2 +- + drivers/input/serio/i8042-ip22io.h | 2 +- + drivers/input/serio/i8042-ppcio.h | 2 +- + drivers/input/serio/i8042-sparcio.h | 2 +- + drivers/input/serio/i8042-unicore32io.h | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 96 +++++++++++++++++++++- + drivers/input/serio/i8042.c | 55 ++++++++++--- + drivers/input/touchscreen/melfas_mip4.c | 38 ++++++++- + 18 files changed, 411 insertions(+), 59 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt +Merging block/for-next (25d09398f1c4 Merge branch 'for-4.9/block' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (1a6fe74dfd1b nvme: Pass pointers, not dma addresses, to nvme_get/set_features()) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (26e2a95e0d75 dm mirror: use all available legs on multiple failures) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-raid.c | 3 ++- + drivers/md/dm-raid1.c | 22 +++------------------- + 2 files changed, 5 insertions(+), 20 deletions(-) +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (fee686b74a9c mmc: sdhci-pci: Fix bus power failing to enable for some Intel controllers) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + drivers/mmc/card/block.c | 3 ++- + drivers/mmc/card/queue.h | 2 +- + drivers/mmc/core/mmc.c | 12 +++++++++ + drivers/mmc/host/sdhci-of-arasan.c | 26 +++++++++++++++++- + drivers/mmc/host/sdhci-pci-core.c | 54 +++++++++++++++++++++++++++++++++++++- + drivers/mmc/host/sdhci-pci.h | 2 ++ + drivers/mmc/host/sdhci-pxav3.c | 2 +- + drivers/mmc/host/sdhci.c | 40 ++++++++++++++-------------- + drivers/mmc/host/sdhci.h | 2 ++ + 9 files changed, 117 insertions(+), 26 deletions(-) +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (5a5a36351abe lib/raid6: Add AVX2 optimized xor_syndrome functions) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + lib/raid6/avx2.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 229 insertions(+), 3 deletions(-) +Merging mfd/for-mfd-next (b8d336ed90f5 mfd: arizona: Handle probe deferral for reset GPIO) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/for-next (1d72706f0485 power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update) +$ git merge battery/for-next +Already up-to-date. +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (80f473833aba Merge tag 'regulator-v4.9' into regulator-linus) +$ git merge regulator/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging security/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook) +$ git merge integrity/next +Merge made by the 'recursive' strategy. +Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + 33 files changed, 1584 insertions(+), 52 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (213ebc81ac3f tmp/tpm_crb: implement runtime pm for tpm_crb) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-interface.c | 8 +- + drivers/char/tpm/tpm_crb.c | 176 +++++++++++++++++++++++++++++++++------ + 2 files changed, 157 insertions(+), 27 deletions(-) +Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support) +$ git merge watchdog/master +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/of-xilinx-wdt.txt | 3 + + .../devicetree/bindings/watchdog/st_lpc_wdt.txt | 3 +- + Documentation/watchdog/watchdog-kernel-api.txt | 33 ++ + drivers/watchdog/Kconfig | 49 +++ + drivers/watchdog/Makefile | 8 +- + drivers/watchdog/asm9260_wdt.c | 1 - + drivers/watchdog/bcm7038_wdt.c | 2 +- + drivers/watchdog/cadence_wdt.c | 20 +- + drivers/watchdog/dw_wdt.c | 11 +- + drivers/watchdog/hpwdt.c | 8 +- + drivers/watchdog/iTCO_wdt.c | 2 +- + drivers/watchdog/imx2_wdt.c | 60 ++- + drivers/watchdog/kempld_wdt.c | 2 +- + drivers/watchdog/mt7621_wdt.c | 1 - + drivers/watchdog/of_xilinx_wdt.c | 25 +- + drivers/watchdog/pretimeout_noop.c | 47 +++ + drivers/watchdog/pretimeout_panic.c | 47 +++ + drivers/watchdog/rn5t618_wdt.c | 2 +- + drivers/watchdog/rt2880_wdt.c | 1 - + drivers/watchdog/softdog.c | 24 +- + drivers/watchdog/st_lpc_wdt.c | 33 -- + drivers/watchdog/tegra_wdt.c | 2 +- + drivers/watchdog/w83627hf_wdt.c | 2 +- + drivers/watchdog/watchdog_core.c | 2 +- + drivers/watchdog/watchdog_dev.c | 101 ++++- + drivers/watchdog/watchdog_pretimeout.c | 220 +++++++++++ + drivers/watchdog/watchdog_pretimeout.h | 60 +++ + drivers/watchdog/ziirave_wdt.c | 409 ++++++++++++++++++++- + fs/compat_ioctl.c | 2 + + include/linux/watchdog.h | 24 ++ + 30 files changed, 1128 insertions(+), 76 deletions(-) + create mode 100644 drivers/watchdog/pretimeout_noop.c + create mode 100644 drivers/watchdog/pretimeout_panic.c + create mode 100644 drivers/watchdog/watchdog_pretimeout.c + create mode 100644 drivers/watchdog/watchdog_pretimeout.h +Merging iommu/next (13a08259187c Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/renesas' and 'arm/smmu' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (61771468e0a5 vfio_pci: use pci_alloc_irq_vectors) +$ git merge vfio/next +Already up-to-date. +Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message) +$ git merge trivial/for-next +Auto-merging net/netfilter/core.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/lightnvm.c +Merge made by the 'recursive' strategy. + drivers/char/agp/intel-agp.c | 2 +- + drivers/nvme/host/lightnvm.c | 2 +- + drivers/nvme/host/pci.c | 2 +- + net/netfilter/core.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging audit/next (7ff89ac608d9 audit: add exclude filter extension to feature bitmap) +$ git merge audit/next +Already up-to-date. +Merging devicetree/for-next (87e5fc99b028 DT: irqchip: renesas-irqc: document R8A7743/5 support) +$ git merge devicetree/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (ed34b9560902 Merge tag 'spi-v4.9' into spi-linus) +$ git merge spi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (1e1a4b0f5412 Merge branch 'perf/urgent') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/Makefile +Auto-merging include/linux/ftrace.h +Merge made by the 'recursive' strategy. + include/linux/ftrace.h | 2 ++ + kernel/Makefile | 7 +++++++ + kernel/trace/Kconfig | 1 + + lib/Kconfig.debug | 10 ++++++++++ + 4 files changed, 20 insertions(+) +Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (a29d64a45eed EDAC, altera: Add IRQ Flags to disable IRQ while handling) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. + arch/sh/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (e53e0b3e7b3c rcu: Make expedited grace periods recheck dyntick idle state) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/tree.c +Auto-merging include/linux/bug.h +Merge made by the 'recursive' strategy. + .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++ + .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++ + .../Expedited-Grace-Periods.html | 476 ++++++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++ + .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++ + .../RCU/Design/Requirements/Requirements.html | 25 +- + drivers/misc/lkdtm.h | 2 + + drivers/misc/lkdtm_bugs.c | 68 ++ + drivers/misc/lkdtm_core.c | 2 + + include/linux/bug.h | 17 + + include/linux/list.h | 37 +- + include/linux/rculist.h | 8 +- + include/trace/events/rcu.h | 5 +- + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcutorture.c | 11 +- + kernel/rcu/tree.c | 17 +- + kernel/rcu/tree.h | 1 + + kernel/rcu/tree_exp.h | 12 +- + kernel/rcu/waketorture.c | 537 +++++++++++++ + lib/Kconfig.debug | 35 +- + lib/list_debug.c | 99 +-- + tools/testing/selftests/rcutorture/.gitignore | 2 - + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 7 +- + .../selftests/rcutorture/configs/wake/CFLIST | 1 + + .../selftests/rcutorture/configs/wake/CFcommon | 2 + + tools/testing/selftests/rcutorture/configs/wake/SH | 19 + + .../selftests/rcutorture/configs/wake/SH.boot | 1 + + .../testing/selftests/rcutorture/configs/wake/STI | 19 + + .../selftests/rcutorture/configs/wake/STI.boot | 1 + + .../rcutorture/configs/wake/ver_functions.sh | 43 ++ + 39 files changed, 5849 insertions(+), 109 deletions(-) + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg + create mode 100644 kernel/rcu/waketorture.c + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh +Merging kvm/linux-next (6218590bcb45 Merge tag 'kvm-4.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (0099b7701f52 KVM: arm/arm64: vgic: Don't flush/sync without a working vgic) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-mips/next (bf18db4e7bd9 KVM: MIPS: Drop dubious EntryHi optimisation) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (fa73c3b25bd8 KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (a6a198bc60e6 xen/x86: Update topology map for PV VCPUs) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (9b7396624a7b mm/percpu.c: fix potential memory leakage for pcpu_embed_first_chunk()) +$ git merge percpu/for-next +Resolved 'include/asm-generic/percpu.h' using previous resolution. +Auto-merging include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 080f757a5c6f] Merge remote-tracking branch 'percpu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/percpu.h | 5 +- + include/asm-generic/percpu.h | 53 +++++++------ + lib/percpu-refcount.c | 169 ++++++++++++++++++++++++------------------ + mm/percpu.c | 38 +++++----- + 4 files changed, 148 insertions(+), 117 deletions(-) +Merging workqueues/for-next (863b710b664b workqueue: remove keventd_up()) +$ git merge workqueues/for-next +Auto-merging mm/slab.c +Auto-merging kernel/workqueue.c +Auto-merging init/main.c +Auto-merging include/linux/workqueue.h +Auto-merging drivers/tty/vt/vt.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/cpu/mcheck/mce.c | 2 +- + drivers/tty/vt/vt.c | 4 --- + include/linux/workqueue.h | 11 ++---- + init/main.c | 10 ++++++ + kernel/power/qos.c | 11 +----- + kernel/workqueue.c | 78 +++++++++++++++++++++++++++++++--------- + lib/debugobjects.c | 2 +- + mm/slab.c | 7 +--- + 8 files changed, 79 insertions(+), 46 deletions(-) +Merging drivers-x86/for-next (127595ed21c1 platform/x86: intel_pmc_core: avoid boot time warning for !CONFIG_DEBUGFS_FS) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/intel_pmc_ipc.c +Merge made by the 'recursive' strategy. + drivers/platform/x86/asus-laptop.c | 77 +++++---- + drivers/platform/x86/asus-nb-wmi.c | 58 +++++++ + drivers/platform/x86/asus-wmi.c | 3 + + drivers/platform/x86/asus-wmi.h | 5 + + drivers/platform/x86/intel_pmc_core.c | 2 +- + drivers/platform/x86/intel_pmc_ipc.c | 110 ++++--------- + drivers/platform/x86/toshiba_acpi.c | 257 ++++++++++++++++++------------- + drivers/platform/x86/toshiba_bluetooth.c | 4 +- + drivers/platform/x86/toshiba_haps.c | 14 +- + 9 files changed, 300 insertions(+), 230 deletions(-) +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (6f3bad967072 leds: triggers: Check return value of kobject_uevent_env()) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (bd85f4b37ddf ipmi: fix crash on reading version from proc after unregisted bmc) +$ git merge ipmi/for-next +Auto-merging include/uapi/linux/Kbuild +Auto-merging drivers/Makefile +Merge made by the 'recursive' strategy. + .../bindings/ipmi/aspeed,ast2400-bt-bmc.txt | 23 + + .../bindings/{ipmi.txt => ipmi/ipmi-smic.txt} | 0 + drivers/Makefile | 2 +- + drivers/char/ipmi/Kconfig | 8 + + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/bt-bmc.c | 505 +++++++++++++++++++++ + drivers/char/ipmi/ipmi_msghandler.c | 7 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/bt-bmc.h | 18 + + 9 files changed, 560 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt + rename Documentation/devicetree/bindings/{ipmi.txt => ipmi/ipmi-smic.txt} (100%) + create mode 100644 drivers/char/ipmi/bt-bmc.c + create mode 100644 include/uapi/linux/bt-bmc.h +Merging driver-core/driver-core-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (e6be244a8321 usb: gadget: uvc: add V4L2 dependency) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (c6900310b6cc usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 4 ++ + drivers/usb/chipidea/ci_hdrc_imx.h | 1 + + drivers/usb/chipidea/udc.c | 6 +-- + drivers/usb/chipidea/udc.h | 12 +++--- + drivers/usb/chipidea/usbmisc_imx.c | 86 +++++++++++++++++++++++++++++++------- + 5 files changed, 86 insertions(+), 23 deletions(-) +Merging staging/staging-next (1573d2caf713 Merge branch 'parisc-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware) +$ git merge extcon/extcon-next +Already up-to-date. +Merging slave-dma/next (8df33b00f57d Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. +Merging cgroup/for-next (4221d2ce6e57 Merge branch 'for-4.9' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/sched/debug.c +Auto-merging kernel/cgroup.c +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/blk-cgroup.h +Auto-merging fs/kernfs/dir.c +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 4 +- + fs/kernfs/dir.c | 84 +++++----------------- + fs/sysfs/dir.c | 6 +- + include/linux/blk-cgroup.h | 11 +-- + include/linux/cgroup.h | 9 ++- + include/linux/kernfs.h | 28 +++++--- + include/trace/events/cgroup.h | 163 ++++++++++++++++++++++++++++++++++++++++++ + kernel/cgroup.c | 75 ++++++++++++------- + kernel/cpuset.c | 13 ++-- + kernel/sched/debug.c | 3 +- + 10 files changed, 266 insertions(+), 130 deletions(-) + create mode 100644 include/trace/events/cgroup.h +Merging scsi/for-next (51ff5072f431 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/scsi/g_NCR5380.txt | 34 +- + MAINTAINERS | 6 +- + drivers/scsi/be2iscsi/be_main.c | 12 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 5 + + drivers/scsi/g_NCR5380.c | 699 ++++++++++++++++--------------------- + drivers/scsi/g_NCR5380.h | 8 - + drivers/scsi/ufs/Kconfig | 2 +- + drivers/scsi/ufs/ufs_quirks.h | 2 + + drivers/scsi/ufs/ufshcd.c | 10 +- + 9 files changed, 345 insertions(+), 433 deletions(-) +Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation") +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging libata/for-next (df073d9e6a7d Merge branch 'for-4.9' into for-next) +$ git merge libata/for-next +Removing include/asm-generic/libata-portmap.h +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 + + arch/ia64/include/asm/libata-portmap.h | 4 - + arch/powerpc/include/asm/libata-portmap.h | 4 - + drivers/ata/ahci.c | 149 +++---------- + drivers/ata/ahci.h | 24 +-- + drivers/ata/ahci_qoriq.c | 20 +- + drivers/ata/ahci_st.c | 4 + + drivers/ata/libahci.c | 9 +- + drivers/ata/libata-scsi.c | 288 ++++++++++++++++++++++--- + drivers/ata/pata_at91.c | 4 +- + drivers/ata/pata_octeon_cf.c | 3 +- + drivers/ata/sata_mv.c | 6 +- + include/asm-generic/libata-portmap.h | 7 - + include/linux/ata.h | 69 +++--- + include/linux/libata.h | 3 +- + 16 files changed, 361 insertions(+), 238 deletions(-) + delete mode 100644 include/asm-generic/libata-portmap.h +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_pci_legacy.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Resolved 'drivers/remoteproc/remoteproc_core.c' using previous resolution. +Auto-merging drivers/remoteproc/remoteproc_core.c +CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f409ed21bb1e] Merge remote-tracking branch 'remoteproc/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging rpmsg/for-next (2fdd6c32d6a5 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 (a5ea9f982d2b gpio: mxs: Unmap region obtained by of_iomap) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + Documentation/gpio/board.txt | 11 +++++++---- + drivers/gpio/gpio-mxs.c | 8 ++++++-- + 2 files changed, 13 insertions(+), 6 deletions(-) +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master db7105f43dcc] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging userns/for-next (069d5ac9ae0d autofs: Fix automounts by using current_real_cred()->uid) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (b4626a7f4892 CLK: Add Loongson1C clock support) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes) +$ git merge random/dev +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (fecf861e765b selftests/futex: Check ANSI terminal color support) +$ git merge kselftest/next +Auto-merging samples/watchdog/.gitignore +Auto-merging lib/Kconfig.debug +Auto-merging Makefile +Auto-merging MAINTAINERS +Removing Documentation/watchdog/src/Makefile +Removing Documentation/watchdog/Makefile +Removing Documentation/vDSO/Makefile +Removing Documentation/timers/Makefile +Removing Documentation/ptp/Makefile +Removing Documentation/prctl/Makefile +Removing Documentation/pcmcia/Makefile +Removing Documentation/networking/timestamping/Makefile +Removing Documentation/networking/Makefile +Auto-merging Documentation/networking/00-INDEX +Removing Documentation/misc-devices/mei/Makefile +Removing Documentation/misc-devices/Makefile +Removing Documentation/mic/mpssd/Makefile +Removing Documentation/mic/Makefile +Removing Documentation/laptops/Makefile +Removing Documentation/ia64/Makefile +Removing Documentation/filesystems/Makefile +Removing Documentation/blackfin/Makefile +Removing Documentation/auxdisplay/Makefile +Removing Documentation/accounting/Makefile +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 3 ++- + Documentation/Makefile | 4 +--- + Documentation/accounting/Makefile | 7 ------ + Documentation/accounting/delay-accounting.txt | 6 ++--- + Documentation/arm/00-INDEX | 2 -- + Documentation/auxdisplay/Makefile | 7 ------ + Documentation/auxdisplay/cfag12864b | 2 +- + Documentation/blackfin/00-INDEX | 4 ---- + Documentation/blackfin/Makefile | 5 ---- + Documentation/filesystems/00-INDEX | 2 -- + Documentation/filesystems/Makefile | 5 ---- + Documentation/ia64/Makefile | 5 ---- + Documentation/kselftest.txt | 5 ++-- + Documentation/laptops/00-INDEX | 4 ---- + Documentation/laptops/Makefile | 5 ---- + Documentation/laptops/laptop-mode.txt | 2 +- + Documentation/mic/Makefile | 1 - + Documentation/mic/mpssd/Makefile | 21 ----------------- + Documentation/misc-devices/Makefile | 1 - + Documentation/misc-devices/mei/Makefile | 5 ---- + Documentation/networking/00-INDEX | 2 -- + Documentation/networking/Makefile | 1 - + Documentation/networking/timestamping/Makefile | 14 ----------- + Documentation/pcmcia/Makefile | 7 ------ + Documentation/pcmcia/devicetable.txt | 4 ++-- + Documentation/prctl/Makefile | 10 -------- + Documentation/ptp/Makefile | 8 ------- + Documentation/spi/00-INDEX | 2 -- + Documentation/timers/00-INDEX | 4 ---- + Documentation/timers/Makefile | 5 ---- + Documentation/timers/hpet.txt | 2 +- + Documentation/vDSO/Makefile | 17 -------------- + Documentation/watchdog/Makefile | 1 - + Documentation/watchdog/src/Makefile | 5 ---- + Documentation/watchdog/watchdog-api.txt | 2 +- + Documentation/watchdog/wdt.txt | 2 +- + MAINTAINERS | 2 ++ + Makefile | 3 --- + drivers/media/v4l2-core/Kconfig | 2 +- + lib/Kconfig.debug | 9 -------- + samples/Kconfig | 6 +++++ + samples/Makefile | 2 +- + {Documentation => samples}/auxdisplay/.gitignore | 0 + samples/auxdisplay/Makefile | 9 ++++++++ + .../auxdisplay/cfag12864b-example.c | 0 + samples/blackfin/Makefile | 1 + + .../blackfin/gptimers-example.c | 0 + .../misc-devices => samples}/mei/.gitignore | 0 + samples/mei/Makefile | 9 ++++++++ + {Documentation/misc-devices => samples}/mei/TODO | 0 + .../misc-devices => samples}/mei/mei-amt-version.c | 0 + {Documentation => samples}/mic/mpssd/.gitignore | 0 + samples/mic/mpssd/Makefile | 27 ++++++++++++++++++++++ + {Documentation => samples}/mic/mpssd/micctrl | 0 + {Documentation => samples}/mic/mpssd/mpss | 0 + {Documentation => samples}/mic/mpssd/mpssd.c | 0 + {Documentation => samples}/mic/mpssd/mpssd.h | 0 + {Documentation => samples}/mic/mpssd/sysfs.c | 0 + {Documentation => samples}/timers/.gitignore | 0 + samples/timers/Makefile | 15 ++++++++++++ + {Documentation => samples}/timers/hpet_example.c | 0 + .../watchdog/src => samples/watchdog}/.gitignore | 1 - + samples/watchdog/Makefile | 8 +++++++ + .../src => samples/watchdog}/watchdog-simple.c | 0 + {Documentation => tools}/accounting/.gitignore | 0 + tools/accounting/Makefile | 9 ++++++++ + {Documentation => tools}/accounting/getdelays.c | 0 + .../laptops => tools/laptop/dslm}/.gitignore | 0 + tools/laptop/dslm/Makefile | 9 ++++++++ + .../laptops => tools/laptop/dslm}/dslm.c | 0 + {Documentation => tools}/pcmcia/.gitignore | 0 + tools/pcmcia/Makefile | 9 ++++++++ + {Documentation => tools}/pcmcia/crc32hash.c | 0 + .../testing/selftests}/filesystems/.gitignore | 0 + tools/testing/selftests/filesystems/Makefile | 7 ++++++ + .../testing/selftests}/filesystems/dnotify_test.c | 0 + tools/testing/selftests/futex/functional/run.sh | 2 +- + tools/testing/selftests/futex/run.sh | 2 +- + .../testing/selftests}/ia64/.gitignore | 0 + tools/testing/selftests/ia64/Makefile | 8 +++++++ + .../testing/selftests}/ia64/aliasing-test.c | 0 + .../selftests}/networking/timestamping/.gitignore | 0 + .../selftests/networking/timestamping/Makefile | 8 +++++++ + .../networking/timestamping/hwtstamp_config.c | 0 + .../networking/timestamping/timestamping.c | 0 + .../networking/timestamping/txtimestamp.c | 0 + .../testing/selftests}/prctl/.gitignore | 0 + tools/testing/selftests/prctl/Makefile | 15 ++++++++++++ + .../prctl/disable-tsc-ctxt-sw-stress-test.c | 0 + .../prctl/disable-tsc-on-off-stress-test.c | 0 + .../testing/selftests}/prctl/disable-tsc-test.c | 0 + .../testing/selftests}/ptp/.gitignore | 0 + tools/testing/selftests/ptp/Makefile | 8 +++++++ + .../testing/selftests}/ptp/testptp.c | 0 + .../testing/selftests}/ptp/testptp.mk | 0 + tools/testing/selftests/timers/posix_timers.c | 4 ++-- + .../testing/selftests}/vDSO/.gitignore | 0 + tools/testing/selftests/vDSO/Makefile | 20 ++++++++++++++++ + .../testing/selftests}/vDSO/parse_vdso.c | 0 + .../selftests}/vDSO/vdso_standalone_test_x86.c | 0 + .../testing/selftests}/vDSO/vdso_test.c | 0 + tools/testing/selftests/watchdog/.gitignore | 1 + + tools/testing/selftests/watchdog/Makefile | 8 +++++++ + .../testing/selftests/watchdog}/watchdog-test.c | 0 + tools/testing/selftests/zram/README | 2 +- + 105 files changed, 202 insertions(+), 186 deletions(-) + delete mode 100644 Documentation/accounting/Makefile + delete mode 100644 Documentation/auxdisplay/Makefile + delete mode 100644 Documentation/blackfin/Makefile + delete mode 100644 Documentation/filesystems/Makefile + delete mode 100644 Documentation/ia64/Makefile + delete mode 100644 Documentation/laptops/Makefile + delete mode 100644 Documentation/mic/Makefile + delete mode 100644 Documentation/mic/mpssd/Makefile + delete mode 100644 Documentation/misc-devices/Makefile + delete mode 100644 Documentation/misc-devices/mei/Makefile + delete mode 100644 Documentation/networking/Makefile + delete mode 100644 Documentation/networking/timestamping/Makefile + delete mode 100644 Documentation/pcmcia/Makefile + delete mode 100644 Documentation/prctl/Makefile + delete mode 100644 Documentation/ptp/Makefile + delete mode 100644 Documentation/timers/Makefile + delete mode 100644 Documentation/vDSO/Makefile + delete mode 100644 Documentation/watchdog/Makefile + delete mode 100644 Documentation/watchdog/src/Makefile + rename {Documentation => samples}/auxdisplay/.gitignore (100%) + create mode 100644 samples/auxdisplay/Makefile + rename {Documentation => samples}/auxdisplay/cfag12864b-example.c (100%) + create mode 100644 samples/blackfin/Makefile + rename {Documentation => samples}/blackfin/gptimers-example.c (100%) + rename {Documentation/misc-devices => samples}/mei/.gitignore (100%) + create mode 100644 samples/mei/Makefile + rename {Documentation/misc-devices => samples}/mei/TODO (100%) + rename {Documentation/misc-devices => samples}/mei/mei-amt-version.c (100%) + rename {Documentation => samples}/mic/mpssd/.gitignore (100%) + create mode 100644 samples/mic/mpssd/Makefile + rename {Documentation => samples}/mic/mpssd/micctrl (100%) + rename {Documentation => samples}/mic/mpssd/mpss (100%) + rename {Documentation => samples}/mic/mpssd/mpssd.c (100%) + rename {Documentation => samples}/mic/mpssd/mpssd.h (100%) + rename {Documentation => samples}/mic/mpssd/sysfs.c (100%) + rename {Documentation => samples}/timers/.gitignore (100%) + create mode 100644 samples/timers/Makefile + rename {Documentation => samples}/timers/hpet_example.c (100%) + rename {Documentation/watchdog/src => samples/watchdog}/.gitignore (53%) + create mode 100644 samples/watchdog/Makefile + rename {Documentation/watchdog/src => samples/watchdog}/watchdog-simple.c (100%) + rename {Documentation => tools}/accounting/.gitignore (100%) + create mode 100644 tools/accounting/Makefile + rename {Documentation => tools}/accounting/getdelays.c (100%) + rename {Documentation/laptops => tools/laptop/dslm}/.gitignore (100%) + create mode 100644 tools/laptop/dslm/Makefile + rename {Documentation/laptops => tools/laptop/dslm}/dslm.c (100%) + rename {Documentation => tools}/pcmcia/.gitignore (100%) + create mode 100644 tools/pcmcia/Makefile + rename {Documentation => tools}/pcmcia/crc32hash.c (100%) + rename {Documentation => tools/testing/selftests}/filesystems/.gitignore (100%) + create mode 100644 tools/testing/selftests/filesystems/Makefile + rename {Documentation => tools/testing/selftests}/filesystems/dnotify_test.c (100%) + rename {Documentation => tools/testing/selftests}/ia64/.gitignore (100%) + create mode 100644 tools/testing/selftests/ia64/Makefile + rename {Documentation => tools/testing/selftests}/ia64/aliasing-test.c (100%) + rename {Documentation => tools/testing/selftests}/networking/timestamping/.gitignore (100%) + create mode 100644 tools/testing/selftests/networking/timestamping/Makefile + rename {Documentation => tools/testing/selftests}/networking/timestamping/hwtstamp_config.c (100%) + rename {Documentation => tools/testing/selftests}/networking/timestamping/timestamping.c (100%) + rename {Documentation => tools/testing/selftests}/networking/timestamping/txtimestamp.c (100%) + rename {Documentation => tools/testing/selftests}/prctl/.gitignore (100%) + create mode 100644 tools/testing/selftests/prctl/Makefile + rename {Documentation => tools/testing/selftests}/prctl/disable-tsc-ctxt-sw-stress-test.c (100%) + rename {Documentation => tools/testing/selftests}/prctl/disable-tsc-on-off-stress-test.c (100%) + rename {Documentation => tools/testing/selftests}/prctl/disable-tsc-test.c (100%) + rename {Documentation => tools/testing/selftests}/ptp/.gitignore (100%) + create mode 100644 tools/testing/selftests/ptp/Makefile + rename {Documentation => tools/testing/selftests}/ptp/testptp.c (100%) + rename {Documentation => tools/testing/selftests}/ptp/testptp.mk (100%) + rename {Documentation => tools/testing/selftests}/vDSO/.gitignore (100%) + create mode 100644 tools/testing/selftests/vDSO/Makefile + rename {Documentation => tools/testing/selftests}/vDSO/parse_vdso.c (100%) + rename {Documentation => tools/testing/selftests}/vDSO/vdso_standalone_test_x86.c (100%) + rename {Documentation => tools/testing/selftests}/vDSO/vdso_test.c (100%) + create mode 100644 tools/testing/selftests/watchdog/.gitignore + create mode 100644 tools/testing/selftests/watchdog/Makefile + rename {Documentation/watchdog/src => tools/testing/selftests/watchdog}/watchdog-test.c (100%) +Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID) +$ git merge y2038/y2038 +Resolved 'fs/afs/main.c' using previous resolution. +Auto-merging fs/afs/main.c +CONFLICT (content): Merge conflict in fs/afs/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 091046dfc57b] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + fs/afs/main.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (b562e44f507e Linux 4.5) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific) +$ git merge livepatching/for-next +Already up-to-date. +Merging coresight/next (27dbe886867a coresight: etm3x: Adding missing features of Coresight PTM components) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-stm.c +Auto-merging drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +Auto-merging drivers/hwtracing/coresight/coresight-etm.h +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm.h | 5 +++++ + drivers/hwtracing/coresight/coresight-etm3x-sysfs.c | 12 +++++++++++- + drivers/hwtracing/coresight/coresight-stm.c | 4 ++-- + 3 files changed, 18 insertions(+), 3 deletions(-) +Merging rtc/rtc-next (1cd713762e4c rtc: rv8803: set VDETOFF and SWOFF via device tree) +$ git merge rtc/rtc-next +Removing drivers/rtc/rtc-isl12057.c +Auto-merging drivers/rtc/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/trivial-devices.txt | 1 - + .../devicetree/bindings/rtc/dallas,ds1390.txt | 2 +- + .../devicetree/bindings/rtc/epson,rx8900.txt | 22 + + Documentation/devicetree/bindings/rtc/rtc-omap.txt | 21 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/rtc/Kconfig | 38 +- + drivers/rtc/Makefile | 1 - + drivers/rtc/rtc-ac100.c | 5 + + drivers/rtc/rtc-asm9260.c | 20 +- + drivers/rtc/rtc-at32ap700x.c | 2 +- + drivers/rtc/rtc-bq32k.c | 16 +- + drivers/rtc/rtc-cmos.c | 93 ++- + drivers/rtc/rtc-coh901331.c | 2 +- + drivers/rtc/rtc-davinci.c | 2 +- + drivers/rtc/rtc-digicolor.c | 2 +- + drivers/rtc/rtc-ds1302.c | 2 +- + drivers/rtc/rtc-ds1307.c | 54 +- + drivers/rtc/rtc-ds1347.c | 96 +-- + drivers/rtc/rtc-gemini.c | 2 +- + drivers/rtc/rtc-isl12057.c | 643 --------------------- + drivers/rtc/rtc-jz4740.c | 2 +- + drivers/rtc/rtc-mcp795.c | 2 +- + drivers/rtc/rtc-mt6397.c | 2 +- + drivers/rtc/rtc-nuc900.c | 2 +- + drivers/rtc/rtc-omap.c | 170 +++++- + drivers/rtc/rtc-palmas.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 5 +- + drivers/rtc/rtc-pcf50633.c | 2 +- + drivers/rtc/rtc-pic32.c | 1 - + drivers/rtc/rtc-rv8803.c | 50 +- + drivers/rtc/rtc-rx6110.c | 3 +- + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/rtc/rtc-spear.c | 2 +- + drivers/rtc/rtc-stmp3xxx.c | 2 +- + drivers/rtc/rtc-sysfs.c | 4 +- + drivers/rtc/rtc-tegra.c | 2 +- + drivers/rtc/rtc-twl.c | 2 +- + 37 files changed, 498 insertions(+), 782 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/epson,rx8900.txt + delete mode 100644 drivers/rtc/rtc-isl12057.c +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (e476f94482fc Merge branch 'for-4.9/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging akpm-current/current (000cf9328226 kdump, vmcoreinfo: report actual value of phys_base) +$ git merge --no-ff akpm-current/current +Auto-merging mm/slab.c +Auto-merging arch/powerpc/platforms/85xx/corenet_generic.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/misc_64.S +Auto-merging arch/powerpc/kernel/misc_32.S +Auto-merging arch/powerpc/kernel/head_64.S +Auto-merging arch/powerpc/kernel/Makefile +Auto-merging arch/powerpc/Makefile +Auto-merging arch/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 4 + + Kbuild | 12 +- + arch/Kconfig | 3 + + arch/arm/include/asm/page.h | 2 + + arch/ia64/kernel/Makefile | 8 +- + arch/powerpc/Kconfig | 16 +- + arch/powerpc/Makefile | 1 + + arch/powerpc/boot/string.S | 67 ++-- + arch/powerpc/configs/powernv_defconfig | 2 + + arch/powerpc/configs/ppc64_defconfig | 2 + + arch/powerpc/configs/pseries_defconfig | 2 + + arch/powerpc/include/asm/debug.h | 2 +- + arch/powerpc/include/asm/elf_util.h | 92 +++++ + arch/powerpc/include/asm/ima.h | 29 ++ + arch/powerpc/include/asm/kexec.h | 28 +- + arch/powerpc/include/asm/kexec_elf_64.h | 10 + + arch/powerpc/include/asm/machdep.h | 4 +- + arch/powerpc/include/asm/module.h | 14 +- + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/uapi/asm/unistd.h | 1 + + arch/powerpc/kernel/Makefile | 8 +- + arch/powerpc/kernel/elf_util.c | 476 ++++++++++++++++++++++++++ + arch/powerpc/kernel/elf_util_64.c | 376 ++++++++++++++++++++ + arch/powerpc/kernel/head_64.S | 2 +- + arch/powerpc/kernel/ima_kexec.c | 223 ++++++++++++ + arch/powerpc/kernel/kexec_elf_64.c | 282 +++++++++++++++ + arch/powerpc/kernel/machine_kexec_64.c | 474 +++++++++++++++++++++++++ + arch/powerpc/kernel/misc_32.S | 2 +- + arch/powerpc/kernel/misc_64.S | 6 +- + arch/powerpc/kernel/module_64.c | 329 +++--------------- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/smp.c | 6 +- + arch/powerpc/kernel/traps.c | 2 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 8 +- + arch/powerpc/platforms/cell/spu_base.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 6 +- + arch/powerpc/platforms/ps3/setup.c | 4 +- + arch/powerpc/platforms/pseries/Makefile | 2 +- + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/purgatory/.gitignore | 2 + + arch/powerpc/purgatory/Makefile | 48 +++ + arch/powerpc/purgatory/console-ppc64.c | 38 ++ + arch/powerpc/purgatory/crashdump-ppc64.h | 42 +++ + arch/powerpc/purgatory/crashdump_backup.c | 36 ++ + arch/powerpc/purgatory/crtsavres.S | 5 + + arch/powerpc/purgatory/hvCall.S | 27 ++ + arch/powerpc/purgatory/hvCall.h | 8 + + arch/powerpc/purgatory/kexec-sha256.h | 11 + + arch/powerpc/purgatory/ppc64_asm.h | 20 ++ + arch/powerpc/purgatory/printf.c | 164 +++++++++ + arch/powerpc/purgatory/purgatory-ppc64.c | 41 +++ + arch/powerpc/purgatory/purgatory-ppc64.h | 6 + + arch/powerpc/purgatory/purgatory.c | 62 ++++ + arch/powerpc/purgatory/purgatory.h | 11 + + arch/powerpc/purgatory/sha256.c | 6 + + arch/powerpc/purgatory/sha256.h | 1 + + arch/powerpc/purgatory/string.S | 2 + + arch/powerpc/purgatory/v2wrap.S | 134 ++++++++ + arch/um/Makefile | 2 +- + arch/x86/kernel/crash.c | 37 +- + arch/x86/kernel/kexec-bzimage64.c | 48 +-- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +- + arch/x86/um/user-offsets.c | 4 +- + block/genhd.c | 2 +- + include/linux/crc64_ecma.h | 56 +++ + include/linux/ima.h | 12 + + include/linux/kbuild.h | 2 +- + include/linux/kernel.h | 15 + + include/linux/kexec.h | 38 +- + include/linux/llist.h | 26 +- + include/trace/events/zsmalloc.h | 76 ++++ + kernel/kcov.c | 9 +- + kernel/kexec_file.c | 145 ++++---- + kernel/kexec_internal.h | 16 - + kernel/watchdog.c | 1 - + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++++++++++++ + mm/page_owner.c | 4 +- + mm/slab.c | 2 +- + mm/zsmalloc.c | 27 +- + scripts/mod/Makefile | 11 +- + security/integrity/ima/Kconfig | 12 + + security/integrity/ima/Makefile | 1 + + security/integrity/ima/ima.h | 31 ++ + security/integrity/ima/ima_crypto.c | 6 +- + security/integrity/ima/ima_fs.c | 30 +- + security/integrity/ima/ima_init.c | 2 + + security/integrity/ima/ima_kexec.c | 168 +++++++++ + security/integrity/ima/ima_main.c | 1 + + security/integrity/ima/ima_queue.c | 76 +++- + security/integrity/ima/ima_template.c | 293 +++++++++++++++- + security/integrity/ima/ima_template_lib.c | 7 +- + 98 files changed, 4147 insertions(+), 553 deletions(-) + create mode 100644 arch/powerpc/include/asm/elf_util.h + create mode 100644 arch/powerpc/include/asm/ima.h + create mode 100644 arch/powerpc/include/asm/kexec_elf_64.h + create mode 100644 arch/powerpc/kernel/elf_util.c + create mode 100644 arch/powerpc/kernel/elf_util_64.c + create mode 100644 arch/powerpc/kernel/ima_kexec.c + create mode 100644 arch/powerpc/kernel/kexec_elf_64.c + create mode 100644 arch/powerpc/purgatory/.gitignore + create mode 100644 arch/powerpc/purgatory/Makefile + create mode 100644 arch/powerpc/purgatory/console-ppc64.c + create mode 100644 arch/powerpc/purgatory/crashdump-ppc64.h + create mode 100644 arch/powerpc/purgatory/crashdump_backup.c + create mode 100644 arch/powerpc/purgatory/crtsavres.S + create mode 100644 arch/powerpc/purgatory/hvCall.S + create mode 100644 arch/powerpc/purgatory/hvCall.h + create mode 100644 arch/powerpc/purgatory/kexec-sha256.h + create mode 100644 arch/powerpc/purgatory/ppc64_asm.h + create mode 100644 arch/powerpc/purgatory/printf.c + create mode 100644 arch/powerpc/purgatory/purgatory-ppc64.c + create mode 100644 arch/powerpc/purgatory/purgatory-ppc64.h + create mode 100644 arch/powerpc/purgatory/purgatory.c + create mode 100644 arch/powerpc/purgatory/purgatory.h + create mode 100644 arch/powerpc/purgatory/sha256.c + create mode 100644 arch/powerpc/purgatory/sha256.h + create mode 100644 arch/powerpc/purgatory/string.S + create mode 100644 arch/powerpc/purgatory/v2wrap.S + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/trace/events/zsmalloc.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 security/integrity/ima/ima_kexec.c +$ git am -3 ../patches/0001-powerpc-merge-fix-for-CONFIG_WORD_SIZE-BITS-rename.patch +Applying: powerpc: merge fix for CONFIG_WORD_SIZE -> BITS rename +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/kernel/Makefile +M arch/powerpc/purgatory/Makefile +$ git add -A . +$ git commit -v -a --amend +[master 0a7d59d0c059] Merge branch 'akpm-current/current' + Date: Thu Oct 13 13:00:30 2016 +1100 +$ git am -3 ../patches/0001-powerpc-include-asm-ima.h-for-setup_ima_buffer.patch +Applying: powerpc: include asm/ima.h for setup_ima_buffer +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/kernel/machine_kexec_64.c +$ git add -A . +$ git commit -v -a --amend +[master 1d90e9813b75] Merge branch 'akpm-current/current' + Date: Thu Oct 13 13:00:30 2016 +1100 +$ git am -3 ../patches/0001-powerpc-disable-KEXEC_FILE-for-now.patch +Applying: powerpc: disable KEXEC_FILE for now +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 7cc8559d847c] Merge branch 'akpm-current/current' + Date: Thu Oct 13 13:00:30 2016 +1100 +$ 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: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8c0d703ab680...2652bf614ed6 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (2652bf614ed6 include/linux/mlx5/device.h: kill BUILD_BUG_ON()s) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + include/linux/mlx5/device.h | 2 -- + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..11e7573849f4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.8 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..bb0a59acbb34 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20161013 |