diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-20 14:41:01 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-20 14:41:01 +1000 |
| commit | 89949abc7f491fb3de3b083c26a0b00febe6471e (patch) | |
| tree | 1e32123fc021a2629f74674c30d6cd6bc50afae8 | |
| parent | a4cf9aa30741e0f318e9ce2529cb699f9c296a86 (diff) | |
Add linux-next specific files for 20160520next-20160520
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 238 | ||||
| -rw-r--r-- | Next/Trees | 240 | ||||
| -rw-r--r-- | Next/merge.log | 7300 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7783 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..7329a1cd0a49 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,238 @@ +Name SHA1 +---- ---- +origin f4c80d5a16eb4b08a0d9ade154af1ebdc63f5752 +fixes b507146bb6b9ac0c0197100ba3e299825a21fed3 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current 44549e8f5eea4e0a41b487b63e616cb089922b99 +arm-current ec953b70f368330e806a94df6fe2dd1d72176b2d +m68k-current 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes b4c112114aab9aff5ed4568ca5e662bb02cdfe74 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 33656a1f2ee5346c742d63ddd0e0970c95a56b70 +net e22cb5e787623a98e22a2660041b455a2c138b02 +ipsec d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a +ipvs f28f20da704d399fb1e4d8838ffd697a357d9cc8 +wireless-drivers cbbba30f1ac95a04aae9c61a55aebe5e6fdf29f0 +mac80211 e6436be21e77e3659b4ff7e357ab5a8342d132d2 +sound-current 17e1717c11a34f9b0956e33e0c4a4e4ae8c51a57 +pci-current 9a2a5a638f8eb9c612a7a9af0afab93f506f6ba4 +driver-core.current c3b46c73264b03000d1e18b22f5caf63332547c9 +tty.current 44549e8f5eea4e0a41b487b63e616cb089922b99 +usb.current 44549e8f5eea4e0a41b487b63e616cb089922b99 +usb-gadget-fixes 38740a5b87d53ceb89eb2c970150f6e94e00373a +usb-serial-fixes 74d2a91aec97ab832790c9398d320413ad185321 +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current 44549e8f5eea4e0a41b487b63e616cb089922b99 +char-misc.current 44549e8f5eea4e0a41b487b63e616cb089922b99 +input-current 23ea5967d6bd30ed59480edbc5fe21eec81682a3 +crypto-current bad6a185b4d6f81d0ed2b6e4c16307969f160b95 +ide 1993b176a8224e371e0732ffada7ab9eb3b0912b +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes 8160c4e455820d5008a1116d2dca35f0363bb062 +kselftest-fixes 505ce68c6da3432454c62e43c24a22ea5b1d754b +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes 2dcd0af568b0cf583645c8a317dd12e344b1c72a +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc 776d7f1694a7d678291354a05f0243965708306a +arm b6810489fa29e6fbd131051892c6e521aa712463 +arm-perf 4ba2578fa7b557012b8f59ad7a9284ff15394338 +arm-soc 475848b27103423b4ca8af686e4faef8a3890888 +at91 5a0d7c6a48ae60c41304858c6e885e3daeb8a083 +bcm2835-dt 896ad420db8d5ec4cc4727b786d15e28eb59b366 +bcm2835-soc 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-drivers 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-defconfig 3652bb35abf6ee11333cbec1d2855c1c0f9f6b27 +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 63b44471754bc0c7a1fbb6b430d0c7cdd091ee7a +keystone 02e15d23400608a9843a66c0b5fc4f3d6dd80b50 +mvebu 01316cded75be7e2ec0976179e027a3cc8c61a08 +omap 5c66191b5c76526317b70177cc09f84f8f96c066 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 2dd0d1733417a52c44474e25077b6f18a81ad7d9 +renesas e5c640c6f9cc42174510a1e5a8cd573f3fcddac1 +rockchip a108aca0c77fa96b2561da9bc31ff2bb124b9b66 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 35e691cf516588c4bebe1a0175b3d9368987b397 +tegra 5c282bc9d0a37e247d203b515a90909c45e82547 +arm64 e6d9a52543338603e25e71e0e4942f05dae0dd8a +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 8cad489261c564d4ee1db4de4ac365af56807d8a +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 787ca32dc704bde981760de01a3a7e6ce9835fdb +m68k 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +m68knommu 44156affd1844bdfd90cc791cf5fdb6f9a04e238 +metag 096a8b6d5e7ab9f8ca3d2474b3ca6a1fe79e0371 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 2c93cd0d5d69c40f28bb7be703cd35083fb5c799 +nios2 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f +parisc-hd 695499920489eba7e610bc938921c989a1fd2435 +powerpc 138a076496e61c68ebc1dcccc088705826bbe26d +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 1eef33bec12d7e46a58f12b3604556a80c362a0d +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 6edf0aa4f8bbdfbb4d6d786892fa02728d05dc36 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 4ef00aa30a3f382de9530df8f4083da316d95fb6 +uml ad32a1f3c36b046b2e7b0361b88c18e3af61419e +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs c315ef8d9db7f1a0ebd023a395ebdfde1c68057e +btrfs-kdave a3a7fdf24a89df4e83fc1081e50c815a1ec09227 +ceph d3767f0faeda5abdf205f947ae912d48dc70fa06 +cifs 56c1d814aadf1bafb57c705b7965a8bbabea4758 +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 7888824b0b1c9c3753d2aedf1d00e7a1c20c18af +ext4 12735f881952c32b31bc4e433768f18489f79ec9 +f2fs cb8be9a053f8da6576a4fe6a0193055f79b8f638 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 4441f63ab7e581ae460c9f7e06fba8a2be192e81 +gfs2 68cd4ce2caf22a81833eb1abfa075eb1cc39bfe2 +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs 1b3c6d07e29515064aca8a9f86efaea7da4da027 +nfsd d9e4084f6c9746e51a78a4d7ebf4983023289b32 +orangefs e56f49814250f4ca4b66ec7d3a71152846761d1b +overlayfs 41523ff335f44bde380af00c9735ab847441a671 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs c27cb97218b3e72417ffc5e73dce488844017b39 +xfs d8bdd04e309b1b56939f44f9ad14038b9a6dd2e8 +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 51085a1f913ab844c5a460ce8503f71c3d79cf8f +pci e257ef55ce51d7ec399193ee85acda8b8759d930 +hid 185a9cac5b1e3914ca48848339fc4431ab3e77c7 +i2c 0b008267ec1b116188e92b057c20e8aea97f2f82 +jdelvare-hwmon f02de116250d4ac6137cd3255be7d1f5678ac460 +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging d6a442df63b2f0043c0b4fc05504ac4ded96ae80 +v4l-dvb 73dfb701d254a270984dd8658b9e008fa3ce7b0b +pm 16490980e396fac079248b23b1dd81e7d48bebf3 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal f1ba9eb85b5e2ad79a3fcd594c6fe4d6956fd163 +thermal-soc ddc8fdc6e2f06aabdbb9dc4a5e01ca793cd2e285 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 82c7d823cc31cf56d964eebe1f91aaf1691cddce +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 628b5139c906e1b875bc2a275288362a8e01791a +net-next 07b75260ebc2c789724c594d7eaf0194fa47b3be +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 698e2a8dca98e4de32f3f630e6d9cd93753c52e1 +wireless-drivers-next 52776a700b53969345a3cc5daed1c797d016a188 +bluetooth 0b7962a6c4a37ef3cbb25d976af7b9ec4ce8ad01 +mac80211-next 4f45bb3e8a8f26b683a814cb9523d5a0775de81f +rdma c16d2750a08c8ccaf98d65f287a8aec91bb9610d +rdma-leon 2dcd0af568b0cf583645c8a317dd12e344b1c72a +rdma-leon-test 2dcd0af568b0cf583645c8a317dd12e344b1c72a +mtd 20c07a5bf094198ff2382aa5e7c930b3c9807792 +l2-mtd e5366a266a8cd4cd6b0fe66876462cca2e1c6a89 +nand 666b65683dad9aa90efaa4aad24ef3710101e3aa +crypto 256b1cfb9a346bb4808cd27b7b8f9b120f96491e +drm 7c10ddf87472c07eabc206e273dc59f77c700858 +drm-panel 227e4f4079e198695b9b5df344aa0e29676a5a29 +drm-intel 5b4fd5b1111b1230cd037df3b314e7b36d45d483 +drm-tegra 057eab2013ecbba2e772293acc177e2e3210f05d +drm-misc c6740c9c9e914742fd2ec159142c40701f7df966 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 2b669875332fbdff0a7ad559e8662e875e7a1526 +hdlcd 69c2565a3cca3d79572941d62165af7805d72762 +drm-vc4 efea172891fc32928291a633c17a146338a73ba9 +sunxi ed490b3ebfa4717e0c39f83efee069815ad9d0e6 +kbuild 0c644e04ad1b55fe5328b898c2d3a8f291a55909 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap d4ab78d7076d2a58a2d690b2f4a03a24d978ac1c +sound 17e1717c11a34f9b0956e33e0c4a4e4ae8c51a57 +sound-asoc 349982487e267b4b7154a21a63b9f5cbefda62b5 +modules e2d1248432c4bc8b3e4cdfc13074acbce3a749cd +input 4feacbc24eea0c5f36728017575cc0ad28d8758b +block 661806a319890962aaa839dc1dbf7ea356aa6b92 +lightnvm 2a65aee4011bd3a372ce23681ceb3a6960a96c8c +device-mapper 202bae52934d4eb79ffaebf49f49b1cc64d8e40b +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh 57da0c042f4af52614f4bd1a148155a299ae5cd8 +md 1fa9a1ad0a9db3c745fe0c1bfa73fd87901fd7f3 +mfd b52207ef4ea56f8c22288ec3387399aac72c26cf +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 4a99fa06a8ca27a5187636e630568658000af575 +omap_dss2 ffe1b6c453ef49e6fcf31c23636333aa4e65aa47 +regulator 6b3f657e5e3eb83a06a5808d69b705e7fdf0b98a +security b937190c40de0f6f07f592042e3097b16c6b0130 +integrity 05d1a717ec0430c916a749b94eb90ab74bbfa356 +keys 75aeddd12f205d07b36ed76db3426e974b8f2a21 +selinux b937190c40de0f6f07f592042e3097b16c6b0130 +tpmdd e8f2f45a4402deb715220b750d892f7a70b0f868 +watchdog ae67643edc6edcab41d8d5d35cb796416b253a01 +iommu 6c0b43df74f900e7f31a49d1844f166df0f8afc6 +dwmw2-iommu 22e2f9fa63b092923873fc8a52955151f4d83274 +vfio f70552809419cd2abc0cc6469a07c9792a3aaa6c +jc_docs 9f8036643dd9609b329aa1b89c9a95981e9ba62f +trivial 52bbe141f37f093e2c612e97c40d27422e5a1fdf +audit 188e3c5cd2b672620291e64a21f1598fe91e40b6 +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh f2c27767af0a91cbdc3d832231f953110473e853 +mailbox c430cf376fee0b03d9c9293615f9737649de1b12 +spi 2dcd0af568b0cf583645c8a317dd12e344b1c72a +tip 139f278f8e96885cb571ca57e93f89a4f16deb09 +clockevents cee77c2c5b5764f4a2a8eb14a7343e0d0376f723 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 3f37a36b6282621d7c5a99b6911275f989766996 +irqchip a66ce4b7d9d20b59afe0a898fa0b4faf0651fbcd +ftrace 0fc1b09ff1ff404ddf753f5ffa5cd0adc8fdcdc9 +rcu 0e7e2457e4e4204c2ccf040ad2511a257b444918 +kvm 9842df62004f366b9fed2423e24df10542ee0dc5 +kvm-arm 06485053244480f5f403d8f89b8617bd7d549113 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus b1a4286b8f3393857a205ec89607683161b75f90 +kvms390 60a37709ce603da62d0b60699b713558b4cfd513 +xen-tip 51c2a7526e5443b37a0ee902171797c14d509c08 +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues f1e89a8f335824eeb720701e17fdc933a40fa605 +drivers-x86 f831153ac9d32037b7f57a3e8759589bfa299039 +chrome-platform 9e96aa70e9acd03eee61c2094b4755b80a386c47 +hsi c2f90a465df75254fb41bf6e7975464929c21e26 +leds 80d6737b27bbdf645a815c136606836b435f0268 +ipmi a1b4e31bfabb3172c78890b0a03a050fad082b1c +driver-core c6e360a0d9d282e9c8688dcdabdc3669912b66ef +tty d20bb59af64667a16f2468b54fc0adb2f824a3b6 +usb 60d5794fe5a50d02f4a0df84b45910a4dfa8b487 +usb-gadget 2a58f9c12bb360f38fb39e470bb5ff94014356e6 +usb-serial b923c6c62981cec5e2d2187fd700c2fc4386fc45 +usb-chipidea-next 764763f0a0c81cbed4d2c7dc2b05e7173ff85b5b +staging ffc83a79b44e02995ab5e93af07e26f6c7243c53 +char-misc 725d0123dfff3d7b666cf57f5d29c50addfc99d3 +extcon 453fc627c7b58b9fde0e50739f6b40bf5af20f46 +cgroup a6b18f07bc86141f6a4bf1cdf4825d80408c78c9 +scsi 02714f2c73a6113c78dee31645db6bffa2196dfb +target-updates 8f0dfb3d8b1120c61f6e2cc3729290db10772b2d +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata a857423325111e6c9d089e87d6c05d8152e0c5e0 +pinctrl 58d73d264a025fda557128dfc6ad526b97b4e836 +vhost 21ba4174ef408fb0f648bbc163a99e66a9d03986 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg 0259cd1b6496a8b54cc588ec0fc416eda6034262 +gpio d30a2b47d4c2b75573d93f60655d48ba8e3ed2b3 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 18c588786c08458f5d965d8735ab48f9e51e0b4b +dma-buf 12566cc35d0e68308bde7aad615743d560cb097b +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk ef56b79b66faeeb0dc14213d3cc9e0534a960dee +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 6eab37daf0ec1077fd612ff27ab513db20f33767 +y2038 4b277763c5b3ce6d60168797e6f38260416d9b13 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 6d9122078097233dbfc4ad3a45512393cddf8540 +coresight f85f84cd36afd949150227bf5957a2755eed7dd8 +rtc 854ec813cc23df88cee39dc2295aa5d3aaa53489 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm e897b3cc7a5a50a5f2a571e1a9a7a88f63b63450 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current db264f60346a062b1c94d90d43e1c11eff41d251 +akpm 259a35d944affb4a42dca30c105777d008281b8e diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..46698321ba58 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,240 @@ +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 +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/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 +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 +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +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 +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 +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835-dt git git://github.com/anholt/linux.git#bcm2835-dt-next +bcm2835-soc git git://github.com/anholt/linux.git#bcm2835-soc-next +bcm2835-drivers git git://github.com/anholt/linux.git#bcm2835-drivers-next +bcm2835-defconfig git git://github.com/anholt/linux.git#bcm2835-defconfig-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 +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/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 +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/czankel/xtensa-linux.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 +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 +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +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 +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 +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#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 +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 +drm-vc4 git git://github.com/anholt/linux.git#drm-vc4-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/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 +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.infradead.org/battery-2.6.git#master +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 +jc_docs git git://git.lwn.net/linux.git#docs-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/glikely/linux.git#devicetree/next +dt-rh 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-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 +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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.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 +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..62e1f6e67dda --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7300 @@ +$ date -R +Fri, 20 May 2016 08:01:23 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4a5219edcdae Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc +Merging origin/master (f4c80d5a16eb Merge tag 'sound-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge origin/master +Updating 4a5219edcdae..f4c80d5a16eb +Fast-forward + Documentation/ABI/testing/sysfs-ibft | 10 + + Documentation/ABI/testing/sysfs-platform-hidma | 9 + + Documentation/DocBook/device-drivers.tmpl | 1 + + Documentation/DocBook/media/dvb/net.xml | 2 +- + Documentation/DocBook/media/v4l/compat.xml | 38 - + Documentation/DocBook/media/v4l/controls.xml | 31 - + Documentation/DocBook/media/v4l/dev-sdr.xml | 6 - + Documentation/DocBook/media/v4l/dev-subdev.xml | 6 - + Documentation/DocBook/media/v4l/io.xml | 6 - + Documentation/DocBook/media/v4l/selection-api.xml | 9 +- + Documentation/DocBook/media/v4l/subdev-formats.xml | 6 - + .../DocBook/media/v4l/vidioc-create-bufs.xml | 6 - + .../DocBook/media/v4l/vidioc-dv-timings-cap.xml | 18 +- + .../DocBook/media/v4l/vidioc-enum-dv-timings.xml | 11 +- + .../DocBook/media/v4l/vidioc-enum-freq-bands.xml | 6 - + Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 6 - + Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 10 +- + .../DocBook/media/v4l/vidioc-g-selection.xml | 6 - + .../DocBook/media/v4l/vidioc-prepare-buf.xml | 6 - + .../DocBook/media/v4l/vidioc-query-dv-timings.xml | 6 - + .../DocBook/media/v4l/vidioc-streamon.xml | 8 + + .../v4l/vidioc-subdev-enum-frame-interval.xml | 6 - + .../media/v4l/vidioc-subdev-enum-frame-size.xml | 6 - + .../media/v4l/vidioc-subdev-enum-mbus-code.xml | 6 - + .../DocBook/media/v4l/vidioc-subdev-g-fmt.xml | 6 - + .../media/v4l/vidioc-subdev-g-frame-interval.xml | 6 - + .../media/v4l/vidioc-subdev-g-selection.xml | 6 - + Documentation/Makefile | 3 +- + Documentation/devicetree/bindings/arc/eznps.txt | 7 + + .../devicetree/bindings/clock/microchip,pic32.txt | 39 + + .../devicetree/bindings/dma/brcm,bcm2835-dma.txt | 26 + + Documentation/devicetree/bindings/dma/mv-xor.txt | 5 +- + .../bindings/dma/nvidia,tegra210-adma.txt | 55 + + .../devicetree/bindings/dma/qcom_bam_dma.txt | 2 + + Documentation/devicetree/bindings/dma/snps-dma.txt | 11 +- + .../devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 36 +- + .../devicetree/bindings/input/gpio-keys.txt | 10 +- + .../input/touchscreen/brcm,iproc-touchscreen.txt | 23 +- + .../interrupt-controller/brcm,bcm6345-l1-intc.txt | 57 + + .../interrupt-controller/ezchip,nps400-ic.txt | 17 + + .../devicetree/bindings/media/i2c/adv7180.txt | 29 + + .../devicetree/bindings/media/rcar_vin.txt | 12 +- + .../devicetree/bindings/media/xilinx/video.txt | 2 +- + .../devicetree/bindings/mips/brcm/soc.txt | 3 +- + .../devicetree/bindings/mips/cavium/ciu3.txt | 27 + + .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 18 +- + .../devicetree/bindings/pci/pci-armada8k.txt | 38 + + .../devicetree/bindings/pci/pci-keystone.txt | 1 + + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 4 +- + .../bindings/serial/microchip,pic32-uart.txt | 29 + + .../devicetree/bindings/sound/davinci-mcbsp.txt | 51 + + .../devicetree/bindings/sound/fsl-sai.txt | 9 +- + .../devicetree/bindings/sound/pcm5102a.txt | 13 + + .../bindings/timer/ezchip,nps400-timer.txt | 15 + + .../devicetree/bindings/timer/snps,arc-timer.txt | 31 + + .../devicetree/bindings/timer/snps,archs-gfrc.txt | 14 + + .../devicetree/bindings/timer/snps,archs-rtc.txt | 14 + + .../devicetree/bindings/vendor-prefixes.txt | 4 + + .../bindings/watchdog/microchip,pic32-dmt.txt | 19 + + .../bindings/watchdog/microchip,pic32-wdt.txt | 18 + + Documentation/driver-model/devres.txt | 2 + + Documentation/rpmsg.txt | 14 +- + Documentation/scsi/g_NCR5380.txt | 17 +- + Documentation/scsi/scsi-parameters.txt | 11 +- + Documentation/security/LoadPin.txt | 17 + + Documentation/security/keys.txt | 52 + + Documentation/sound/alsa/HD-Audio.txt | 26 +- + Documentation/sound/alsa/compress_offload.txt | 4 +- + Documentation/sound/alsa/soc/dapm.txt | 2 +- + Documentation/sound/alsa/soc/overview.txt | 2 +- + Documentation/sound/alsa/timestamping.txt | 2 +- + Documentation/trace/events.txt | 1555 +++++++++++ + Documentation/trace/ftrace.txt | 34 +- + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.em28xx | 12 +- + Documentation/video4linux/v4l2-framework.txt | 2 +- + Documentation/video4linux/vivid.txt | 6 +- + Documentation/virtual/kvm/api.txt | 18 +- + Documentation/virtual/kvm/devices/s390_flic.txt | 14 +- + MAINTAINERS | 41 +- + arch/alpha/kernel/pci-sysfs.c | 4 +- + arch/arc/Kconfig | 16 +- + arch/arc/Makefile | 5 + + arch/arc/boot/dts/abilis_tb10x.dtsi | 16 +- + arch/arc/boot/dts/axc001.dtsi | 14 +- + arch/arc/boot/dts/axc003.dtsi | 16 +- + arch/arc/boot/dts/axc003_idu.dtsi | 14 +- + arch/arc/boot/dts/axs10x_mb.dtsi | 13 + + arch/arc/boot/dts/eznps.dts | 96 + + arch/arc/boot/dts/nsim_700.dts | 10 +- + arch/arc/boot/dts/nsim_hs.dts | 8 +- + arch/arc/boot/dts/nsim_hs_idu.dts | 8 +- + arch/arc/boot/dts/nsimosci.dts | 10 +- + arch/arc/boot/dts/nsimosci_hs.dts | 8 +- + arch/arc/boot/dts/nsimosci_hs_idu.dts | 8 +- + arch/arc/boot/dts/skeleton.dtsi | 14 + + arch/arc/boot/dts/skeleton_hs.dtsi | 52 + + arch/arc/boot/dts/skeleton_hs_idu.dtsi | 46 + + arch/arc/boot/dts/vdk_axc003.dtsi | 14 +- + arch/arc/boot/dts/vdk_axc003_idu.dtsi | 12 +- + arch/arc/configs/nps_defconfig | 84 + + arch/arc/include/asm/atomic.h | 83 +- + arch/arc/include/asm/barrier.h | 12 +- + arch/arc/include/asm/bitops.h | 60 +- + arch/arc/include/asm/clk.h | 22 - + arch/arc/include/asm/cmpxchg.h | 76 +- + arch/arc/include/asm/entry-compact.h | 6 + + arch/arc/include/asm/irq.h | 13 +- + arch/arc/include/asm/page.h | 4 + + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/include/asm/processor.h | 51 +- + arch/arc/include/asm/setup.h | 4 + + arch/arc/include/asm/spinlock.h | 14 + + arch/arc/include/uapi/asm/byteorder.h | 2 +- + arch/arc/kernel/Makefile | 2 +- + arch/arc/kernel/clk.c | 21 - + arch/arc/kernel/ctx_sw.c | 13 + + arch/arc/kernel/devtree.c | 13 +- + arch/arc/kernel/intc-arcv2.c | 17 +- + arch/arc/kernel/intc-compact.c | 17 +- + arch/arc/kernel/irq.c | 50 +- + arch/arc/kernel/mcip.c | 7 +- + arch/arc/kernel/setup.c | 17 +- + arch/arc/kernel/smp.c | 25 +- + arch/arc/kernel/time.c | 238 +- + arch/arc/mm/tlb.c | 11 + + arch/arc/plat-axs10x/axs10x.c | 27 +- + arch/arc/plat-eznps/Kconfig | 35 + + arch/arc/plat-eznps/Makefile | 7 + + arch/arc/plat-eznps/entry.S | 70 + + arch/arc/plat-eznps/include/plat/ctop.h | 209 ++ + arch/arc/plat-eznps/include/plat/mtm.h | 60 + + arch/arc/plat-eznps/include/plat/smp.h | 26 + + arch/arc/plat-eznps/mtm.c | 133 + + arch/arc/plat-eznps/platform.c | 102 + + arch/arc/plat-eznps/smp.c | 155 ++ + arch/arm/boot/dts/bcm-cygnus.dtsi | 11 +- + arch/arm/boot/dts/bcm283x.dtsi | 22 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 5 +- + arch/arm/boot/dts/imx6qp.dtsi | 3 + + arch/arm/boot/dts/spear13xx.dtsi | 4 +- + arch/arm/include/asm/kvm_host.h | 2 + + arch/arm/include/asm/kvm_mmu.h | 43 +- + arch/arm/include/asm/stage2_pgtable.h | 61 + + arch/arm/kvm/arm.c | 2 +- + arch/arm/kvm/mmu.c | 408 +-- + arch/arm64/include/asm/kvm_arm.h | 85 +- + arch/arm64/include/asm/kvm_host.h | 2 + + arch/arm64/include/asm/kvm_mmu.h | 111 +- + arch/arm64/include/asm/pgtable-hwdef.h | 80 +- + arch/arm64/include/asm/pgtable.h | 15 +- + arch/arm64/include/asm/stage2_pgtable-nopmd.h | 42 + + arch/arm64/include/asm/stage2_pgtable-nopud.h | 39 + + arch/arm64/include/asm/stage2_pgtable.h | 142 + + arch/arm64/kvm/Kconfig | 1 - + arch/arm64/kvm/hyp/s2-setup.c | 8 + + arch/avr32/mach-at32ap/at32ap700x.c | 16 +- + arch/mips/Kconfig | 139 +- + arch/mips/Makefile | 22 + + arch/mips/alchemy/common/clock.c | 3 +- + arch/mips/ath79/Kconfig | 12 - + arch/mips/ath79/clock.c | 213 +- + arch/mips/ath79/common.c | 24 +- + arch/mips/ath79/setup.c | 61 +- + arch/mips/bcm47xx/Makefile | 2 +- + arch/mips/bcm47xx/bcm47xx_private.h | 3 - + arch/mips/bcm47xx/setup.c | 2 +- + arch/mips/bmips/Kconfig | 4 + + arch/mips/bmips/setup.c | 12 + + arch/mips/boot/compressed/Makefile | 5 + + arch/mips/boot/dts/brcm/Makefile | 2 + + arch/mips/boot/dts/brcm/bcm6328.dtsi | 50 +- + arch/mips/boot/dts/brcm/bcm6358.dtsi | 130 + + arch/mips/boot/dts/brcm/bcm6368.dtsi | 32 +- + arch/mips/boot/dts/brcm/bcm7125.dtsi | 69 +- + arch/mips/boot/dts/brcm/bcm7346.dtsi | 6 +- + arch/mips/boot/dts/brcm/bcm7358.dtsi | 2 - + arch/mips/boot/dts/brcm/bcm7360.dtsi | 42 +- + arch/mips/boot/dts/brcm/bcm7362.dtsi | 6 +- + arch/mips/boot/dts/brcm/bcm7420.dtsi | 77 +- + arch/mips/boot/dts/brcm/bcm7425.dtsi | 100 +- + arch/mips/boot/dts/brcm/bcm7435.dtsi | 141 +- + arch/mips/boot/dts/brcm/bcm96358nb4ser.dts | 46 + + arch/mips/boot/dts/brcm/bcm96368mvwg.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 24 + + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97420c.dts | 28 + + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 28 + + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 38 +- + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 78 + + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 205 +- + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi | 231 ++ + arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts | 59 + + arch/mips/boot/dts/ingenic/jz4740.dtsi | 14 + + arch/mips/boot/dts/lantiq/easy50712.dts | 2 +- + arch/mips/boot/dts/pic32/pic32mzda-clk.dtsi | 236 -- + arch/mips/boot/dts/pic32/pic32mzda.dtsi | 63 +- + arch/mips/boot/dts/pic32/pic32mzda_sk.dts | 5 +- + arch/mips/boot/dts/qca/Makefile | 7 +- + arch/mips/boot/dts/qca/ar9132.dtsi | 17 +- + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 98 +- + arch/mips/boot/dts/qca/ar9331.dtsi | 155 ++ + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 78 + + arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 102 + + arch/mips/boot/dts/qca/ar9331_omega.dts | 78 + + arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 118 + + arch/mips/boot/tools/.gitignore | 1 + + arch/mips/boot/tools/Makefile | 8 + + arch/mips/boot/tools/relocs.c | 680 +++++ + arch/mips/boot/tools/relocs.h | 45 + + arch/mips/boot/tools/relocs_32.c | 17 + + arch/mips/boot/tools/relocs_64.c | 27 + + arch/mips/boot/tools/relocs_main.c | 84 + + arch/mips/cavium-octeon/csrc-octeon.c | 13 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 43 + + arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 72 +- + arch/mips/cavium-octeon/executive/octeon-model.c | 82 +- + arch/mips/cavium-octeon/octeon-irq.c | 679 ++++- + arch/mips/cavium-octeon/octeon-platform.c | 94 +- + arch/mips/cavium-octeon/setup.c | 86 +- + arch/mips/cavium-octeon/smp.c | 155 +- + arch/mips/configs/bcm47xx_defconfig | 1 - + arch/mips/configs/bcm63xx_defconfig | 1 + + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/bmips_be_defconfig | 1 + + arch/mips/configs/cavium_octeon_defconfig | 15 +- + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 1 - + .../{ls1b_defconfig => loongson1b_defconfig} | 35 +- + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/nlm_xlp_defconfig | 1 - + arch/mips/configs/nlm_xlr_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/dec/setup.c | 1 + + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/asmmacro.h | 195 +- + arch/mips/include/asm/bitops.h | 17 +- + arch/mips/include/asm/bitrev.h | 30 + + arch/mips/include/asm/bmips.h | 1 + + arch/mips/include/asm/bootinfo.h | 18 + + arch/mips/include/asm/cacheflush.h | 7 +- + arch/mips/include/asm/cacheops.h | 6 + + arch/mips/include/asm/clkdev.h | 27 - + arch/mips/include/asm/cpu-features.h | 137 +- + arch/mips/include/asm/cpu-info.h | 43 +- + arch/mips/include/asm/cpu-type.h | 5 + + arch/mips/include/asm/cpu.h | 113 +- + arch/mips/include/asm/elf.h | 149 +- + arch/mips/include/asm/hazards.h | 7 +- + arch/mips/include/asm/highmem.h | 4 +- + arch/mips/include/asm/io.h | 10 +- + arch/mips/include/asm/irq_regs.h | 10 + + arch/mips/include/asm/irqflags.h | 5 + + arch/mips/include/asm/kvm_host.h | 9 +- + arch/mips/include/asm/llsc.h | 28 + + .../include/asm/mach-bmips/cpu-feature-overrides.h | 14 + + arch/mips/include/asm/mach-bmips/ioremap.h | 33 + + arch/mips/include/asm/mach-jz4740/platform.h | 1 - + .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 2 +- + arch/mips/include/asm/mach-lantiq/lantiq.h | 2 +- + .../mips/include/asm/mach-lantiq/lantiq_platform.h | 2 +- + arch/mips/include/asm/mach-lantiq/xway/irq.h | 2 +- + .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 2 +- + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 2 +- + arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 2 +- + arch/mips/include/asm/mach-loongson32/cpufreq.h | 1 - + arch/mips/include/asm/mach-loongson32/dma.h | 25 + + arch/mips/include/asm/mach-loongson32/irq.h | 1 - + arch/mips/include/asm/mach-loongson32/loongson1.h | 4 +- + arch/mips/include/asm/mach-loongson32/nand.h | 30 + + arch/mips/include/asm/mach-loongson32/platform.h | 14 +- + arch/mips/include/asm/mach-loongson32/regs-clk.h | 24 +- + arch/mips/include/asm/mach-loongson32/regs-mux.h | 84 +- + arch/mips/include/asm/mach-loongson32/regs-pwm.h | 12 +- + .../asm/mach-loongson64/cpu-feature-overrides.h | 18 +- + .../asm/mach-loongson64/kernel-entry-init.h | 18 +- + arch/mips/include/asm/mach-ralink/mt7620.h | 3 +- + arch/mips/include/asm/mach-ralink/mt7621.h | 2 +- + arch/mips/include/asm/mach-ralink/pinmux.h | 2 +- + arch/mips/include/asm/mach-ralink/ralink_regs.h | 2 +- + arch/mips/include/asm/mach-ralink/rt288x.h | 2 +- + arch/mips/include/asm/mach-ralink/rt305x.h | 2 +- + arch/mips/include/asm/mips-cm.h | 12 +- + arch/mips/include/asm/mips-cpc.h | 3 + + arch/mips/include/asm/mipsregs.h | 636 ++++- + arch/mips/include/asm/mmu_context.h | 41 +- + arch/mips/include/asm/msa.h | 13 + + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 16 +- + arch/mips/include/asm/octeon/cvmx-ciu3-defs.h | 353 +++ + arch/mips/include/asm/octeon/cvmx-coremask.h | 89 + + arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1 + + arch/mips/include/asm/octeon/cvmx-mio-defs.h | 410 ++- + arch/mips/include/asm/octeon/cvmx-sysinfo.h | 37 +- + arch/mips/include/asm/octeon/cvmx.h | 27 +- + arch/mips/include/asm/octeon/octeon-feature.h | 19 +- + arch/mips/include/asm/octeon/octeon-model.h | 5 + + arch/mips/include/asm/octeon/octeon.h | 25 + + arch/mips/include/asm/pci.h | 10 +- + arch/mips/include/asm/pgtable-32.h | 33 +- + arch/mips/include/asm/pgtable-64.h | 18 +- + arch/mips/include/asm/pgtable-bits.h | 213 +- + arch/mips/include/asm/pgtable.h | 156 +- + arch/mips/include/asm/processor.h | 10 +- + arch/mips/include/asm/seccomp.h | 47 +- + arch/mips/include/asm/sibyte/bcm1480_regs.h | 4 +- + arch/mips/include/asm/signal.h | 12 +- + arch/mips/include/asm/smp-cps.h | 2 +- + arch/mips/include/asm/switch_to.h | 2 +- + arch/mips/include/asm/uasm.h | 3 +- + arch/mips/include/asm/watch.h | 10 +- + arch/mips/include/uapi/asm/inst.h | 11 + + arch/mips/include/uapi/asm/siginfo.h | 22 +- + arch/mips/jz4740/board-qi_lb60.c | 52 +- + arch/mips/jz4740/platform.c | 25 - + arch/mips/kernel/Makefile | 4 +- + arch/mips/kernel/asm-offsets.c | 10 + + arch/mips/kernel/binfmt_elfn32.c | 16 +- + arch/mips/kernel/binfmt_elfo32.c | 32 +- + arch/mips/kernel/bmips_5xxx_init.S | 753 ++++++ + arch/mips/kernel/bmips_vec.S | 50 +- + arch/mips/kernel/branch.c | 18 +- + arch/mips/kernel/cevt-r4k.c | 82 +- + arch/mips/kernel/cps-vec.S | 296 ++- + arch/mips/kernel/cpu-probe.c | 380 ++- + arch/mips/kernel/crash.c | 16 +- + arch/mips/kernel/genex.S | 58 +- + arch/mips/kernel/head.S | 21 +- + arch/mips/kernel/idle.c | 5 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 105 +- + arch/mips/kernel/module-rela.c | 58 +- + arch/mips/kernel/module.c | 60 +- + arch/mips/kernel/perf_event_mipsxx.c | 64 +- + arch/mips/kernel/pm-cps.c | 15 +- + arch/mips/kernel/pm.c | 2 +- + arch/mips/kernel/proc.c | 1 + + arch/mips/kernel/process.c | 50 +- + arch/mips/kernel/ptrace.c | 34 +- + arch/mips/kernel/r4k_fpu.S | 10 +- + arch/mips/kernel/r4k_switch.S | 1 - + arch/mips/kernel/relocate.c | 386 +++ + arch/mips/kernel/scall32-o32.S | 11 +- + arch/mips/kernel/scall64-64.S | 3 +- + arch/mips/kernel/scall64-n32.S | 14 +- + arch/mips/kernel/scall64-o32.S | 14 +- + arch/mips/kernel/setup.c | 79 +- + arch/mips/kernel/signal.c | 9 +- + arch/mips/kernel/signal32.c | 6 + + arch/mips/kernel/smp-bmips.c | 88 + + arch/mips/kernel/smp-cps.c | 64 +- + arch/mips/kernel/smp.c | 24 +- + arch/mips/kernel/spram.c | 1 + + arch/mips/kernel/traps.c | 32 +- + arch/mips/kernel/unaligned.c | 1 + + arch/mips/kernel/vmlinux.lds.S | 21 + + arch/mips/kernel/watch.c | 79 +- + arch/mips/kvm/emulate.c | 114 +- + arch/mips/kvm/locore.S | 94 +- + arch/mips/kvm/mips.c | 9 +- + arch/mips/kvm/tlb.c | 59 +- + arch/mips/kvm/trap_emul.c | 5 +- + arch/mips/lantiq/Kconfig | 12 +- + arch/mips/lantiq/Makefile | 2 +- + arch/mips/lantiq/clk.c | 2 +- + arch/mips/lantiq/clk.h | 2 +- + arch/mips/lantiq/early_printk.c | 2 +- + arch/mips/lantiq/falcon/prom.c | 2 +- + arch/mips/lantiq/falcon/reset.c | 2 +- + arch/mips/lantiq/falcon/sysctrl.c | 2 +- + arch/mips/lantiq/irq.c | 2 +- + arch/mips/lantiq/prom.c | 15 +- + arch/mips/lantiq/prom.h | 2 +- + arch/mips/lantiq/xway/clk.c | 2 +- + arch/mips/lantiq/xway/dcdc.c | 2 +- + arch/mips/lantiq/xway/dma.c | 2 +- + arch/mips/lantiq/xway/gptu.c | 2 +- + arch/mips/lantiq/xway/prom.c | 2 +- + arch/mips/lantiq/xway/reset.c | 4 +- + arch/mips/lantiq/xway/sysctrl.c | 2 +- + arch/mips/lantiq/xway/vmmc.c | 2 +- + arch/mips/lantiq/xway/xrx200_phy_fw.c | 4 +- + arch/mips/lib/dump_tlb.c | 27 +- + arch/mips/lib/memset.S | 2 + + arch/mips/lib/r3k_dump_tlb.c | 9 +- + arch/mips/loongson32/common/platform.c | 105 +- + arch/mips/loongson32/common/reset.c | 13 +- + arch/mips/loongson32/common/time.c | 27 +- + arch/mips/loongson32/ls1b/board.c | 67 +- + arch/mips/loongson64/Platform | 2 +- + arch/mips/loongson64/common/env.c | 7 +- + arch/mips/loongson64/loongson-3/Makefile | 2 +- + .../mips/loongson64/loongson-3}/acpi_init.c | 0 + arch/mips/loongson64/loongson-3/irq.c | 10 +- + arch/mips/loongson64/loongson-3/numa.c | 6 +- + arch/mips/loongson64/loongson-3/smp.c | 107 +- + arch/mips/math-emu/Makefile | 4 +- + arch/mips/math-emu/cp1emu.c | 45 +- + arch/mips/math-emu/dp_maddf.c | 35 +- + arch/mips/math-emu/dp_msubf.c | 269 -- + arch/mips/math-emu/dp_mul.c | 4 +- + arch/mips/math-emu/dsemul.c | 2 +- + arch/mips/math-emu/ieee754dp.c | 9 +- + arch/mips/math-emu/ieee754dp.h | 1 + + arch/mips/math-emu/ieee754int.h | 10 + + arch/mips/math-emu/ieee754sp.c | 12 +- + arch/mips/math-emu/ieee754sp.h | 17 +- + arch/mips/math-emu/sp_add.c | 6 +- + arch/mips/math-emu/sp_maddf.c | 43 +- + arch/mips/math-emu/sp_msubf.c | 258 -- + arch/mips/math-emu/sp_sub.c | 6 +- + arch/mips/mm/c-r4k.c | 72 +- + arch/mips/mm/cache.c | 41 +- + arch/mips/mm/dma-default.c | 7 +- + arch/mips/mm/init.c | 14 +- + arch/mips/mm/page.c | 9 + + arch/mips/mm/sc-mips.c | 1 + + arch/mips/mm/tlb-r3k.c | 24 +- + arch/mips/mm/tlb-r4k.c | 35 +- + arch/mips/mm/tlb-r8k.c | 2 +- + arch/mips/mm/tlbex.c | 240 +- + arch/mips/mm/uasm-mips.c | 2 + + arch/mips/mm/uasm.c | 3 + + arch/mips/mti-malta/malta-setup.c | 7 +- + arch/mips/mti-malta/malta-time.c | 40 +- + arch/mips/mti-sead3/sead3-setup.c | 5 + + arch/mips/netlogic/common/reset.S | 11 +- + arch/mips/netlogic/common/smpboot.S | 4 +- + arch/mips/netlogic/xlp/nlm_hal.c | 2 +- + arch/mips/netlogic/xlr/setup.c | 2 +- + arch/mips/oprofile/common.c | 2 +- + arch/mips/oprofile/op_model_mipsxx.c | 4 +- + arch/mips/pci/fixup-lantiq.c | 2 +- + arch/mips/pci/ops-lantiq.c | 2 +- + arch/mips/pci/pci-alchemy.c | 2 +- + arch/mips/pci/pci-ip32.c | 1 - + arch/mips/pci/pci-lantiq.c | 2 +- + arch/mips/pci/pci-lantiq.h | 2 +- + arch/mips/pci/pci-mt7620.c | 2 +- + arch/mips/pci/pci-rt2880.c | 2 +- + arch/mips/pci/pci.c | 3 - + arch/mips/pic32/pic32mzda/time.c | 13 +- + arch/mips/pistachio/init.c | 35 +- + arch/mips/pmcs-msp71xx/msp_setup.c | 2 +- + arch/mips/pnx833x/common/setup.c | 3 - + arch/mips/ralink/Makefile | 2 +- + arch/mips/ralink/bootrom.c | 2 +- + arch/mips/ralink/cevt-rt3352.c | 2 +- + arch/mips/ralink/clk.c | 2 +- + arch/mips/ralink/common.h | 2 +- + arch/mips/ralink/ill_acc.c | 2 +- + arch/mips/ralink/irq-gic.c | 2 +- + arch/mips/ralink/irq.c | 2 +- + arch/mips/ralink/mt7620.c | 9 +- + arch/mips/ralink/mt7621.c | 2 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/ralink/prom.c | 2 +- + arch/mips/ralink/reset.c | 4 +- + arch/mips/ralink/rt288x.c | 2 +- + arch/mips/ralink/rt305x.c | 2 +- + arch/mips/ralink/rt3883.c | 2 +- + arch/mips/ralink/timer-gic.c | 2 +- + arch/mips/ralink/timer.c | 4 +- + arch/mips/sibyte/Kconfig | 3 +- + arch/mips/vdso/Makefile | 40 +- + arch/mips/vr41xx/common/pmu.c | 2 +- + arch/powerpc/include/asm/kvm_host.h | 5 + + arch/powerpc/kvm/book3s.c | 1 + + arch/powerpc/kvm/book3s_hv.c | 1 + + arch/powerpc/kvm/book3s_pr.c | 32 +- + arch/powerpc/kvm/book3s_xics.c | 29 +- + arch/powerpc/kvm/book3s_xics.h | 1 + + arch/powerpc/kvm/booke.c | 1 + + arch/powerpc/kvm/powerpc.c | 22 +- + arch/s390/include/asm/kvm_host.h | 11 +- + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/asm/sigp.h | 1 + + arch/s390/include/uapi/asm/kvm.h | 1 + + arch/s390/include/uapi/asm/sie.h | 7 +- + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/interrupt.c | 47 + + arch/s390/kvm/kvm-s390.c | 61 +- + arch/s390/kvm/priv.c | 21 +- + arch/s390/kvm/sigp.c | 6 + + arch/x86/include/asm/kvm_host.h | 32 +- + arch/x86/include/asm/svm.h | 12 +- + arch/x86/include/uapi/asm/kvm.h | 6 +- + arch/x86/include/uapi/asm/svm.h | 9 +- + arch/x86/kernel/kexec-bzimage64.c | 18 +- + arch/x86/kvm/ioapic.c | 2 +- + arch/x86/kvm/irq_comm.c | 3 - + arch/x86/kvm/lapic.c | 193 +- + arch/x86/kvm/lapic.h | 38 +- + arch/x86/kvm/mmu.c | 28 +- + arch/x86/kvm/mtrr.c | 2 - + arch/x86/kvm/svm.c | 670 ++++- + arch/x86/kvm/trace.h | 57 + + arch/x86/kvm/vmx.c | 12 +- + arch/x86/kvm/x86.c | 64 +- + arch/x86/pci/common.c | 2 +- + arch/x86/pci/fixup.c | 7 + + certs/Kconfig | 9 + + certs/system_keyring.c | 139 +- + crypto/asymmetric_keys/Kconfig | 6 +- + crypto/asymmetric_keys/Makefile | 5 +- + crypto/asymmetric_keys/asymmetric_keys.h | 2 + + crypto/asymmetric_keys/asymmetric_type.c | 96 +- + crypto/asymmetric_keys/mscode_parser.c | 21 +- + crypto/asymmetric_keys/pkcs7_key_type.c | 72 +- + crypto/asymmetric_keys/pkcs7_parser.c | 58 +- + crypto/asymmetric_keys/pkcs7_parser.h | 11 +- + crypto/asymmetric_keys/pkcs7_trust.c | 43 +- + crypto/asymmetric_keys/pkcs7_verify.c | 107 +- + crypto/asymmetric_keys/public_key.c | 20 +- + crypto/asymmetric_keys/restrict.c | 108 + + crypto/asymmetric_keys/signature.c | 18 + + crypto/asymmetric_keys/verify_pefile.c | 40 +- + crypto/asymmetric_keys/verify_pefile.h | 5 +- + crypto/asymmetric_keys/x509_cert_parser.c | 52 +- + crypto/asymmetric_keys/x509_parser.h | 12 +- + crypto/asymmetric_keys/x509_public_key.c | 297 +-- + drivers/ata/pata_icside.c | 2 +- + drivers/ata/sata_dwc_460ex.c | 6 +- + drivers/bus/brcmstb_gisb.c | 30 + + drivers/bus/mips_cdmm.c | 12 +- + drivers/clk/Kconfig | 3 + + drivers/clk/Makefile | 1 + + drivers/clk/microchip/Makefile | 2 + + drivers/clk/microchip/clk-core.c | 1031 +++++++ + drivers/clk/microchip/clk-core.h | 84 + + drivers/clk/microchip/clk-pic32mzda.c | 275 ++ + drivers/clocksource/Kconfig | 10 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/arm_arch_timer.c | 11 +- + drivers/clocksource/timer-nps.c | 98 + + drivers/cpufreq/Makefile | 2 +- + .../{ls1x-cpufreq.c => loongson1-cpufreq.c} | 114 +- + drivers/dma/Kconfig | 18 +- + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 86 +- + drivers/dma/bcm2835-dma.c | 604 ++++- + drivers/dma/dmaengine.c | 37 +- + drivers/dma/dw/core.c | 495 ++-- + drivers/dma/dw/pci.c | 5 +- + drivers/dma/dw/platform.c | 40 +- + drivers/dma/dw/regs.h | 56 +- + drivers/dma/edma.c | 11 +- + drivers/dma/fsldma.c | 3 +- + drivers/dma/hsu/hsu.c | 8 +- + drivers/dma/hsu/hsu.h | 4 + + drivers/dma/ioat/init.c | 17 +- + drivers/dma/ioat/registers.h | 7 + + drivers/dma/mmp_pdma.c | 3 +- + drivers/dma/mpc512x_dma.c | 174 +- + drivers/dma/mv_xor.c | 98 +- + drivers/dma/mv_xor.h | 1 + + drivers/dma/of-dma.c | 12 +- + drivers/dma/pxa_dma.c | 16 +- + drivers/dma/qcom/Makefile | 2 + + drivers/dma/qcom/bam_dma.c | 38 +- + drivers/dma/qcom/hidma.c | 52 +- + drivers/dma/qcom/hidma.h | 40 +- + drivers/dma/qcom/hidma_dbg.c | 217 ++ + drivers/dma/qcom/hidma_ll.c | 872 ++++++ + drivers/dma/qcom/hidma_mgmt.c | 113 +- + drivers/dma/sun6i-dma.c | 254 +- + drivers/dma/tegra20-apb-dma.c | 16 +- + drivers/dma/tegra210-adma.c | 840 ++++++ + drivers/dma/xilinx/xilinx_vdma.c | 1663 +++++++++--- + drivers/firmware/broadcom/Kconfig | 11 + + drivers/firmware/broadcom/Makefile | 1 + + .../firmware/broadcom/bcm47xx_sprom.c | 27 +- + drivers/firmware/iscsi_ibft.c | 66 +- + drivers/infiniband/ulp/srp/ib_srp.c | 6 +- + drivers/input/keyboard/omap-keypad.c | 52 +- + drivers/input/keyboard/twl4030_keypad.c | 28 +- + drivers/input/misc/cm109.c | 47 +- + drivers/input/misc/rotary_encoder.c | 8 +- + drivers/input/misc/twl6040-vibra.c | 15 +- + drivers/input/mouse/byd.c | 1 - + drivers/input/tablet/acecad.c | 12 +- + drivers/input/tablet/aiptek.c | 20 +- + drivers/input/tablet/gtco.c | 24 +- + drivers/input/tablet/kbtab.c | 8 +- + drivers/input/touchscreen/bcm_iproc_tsc.c | 77 +- + drivers/input/touchscreen/ti_am335x_tsc.c | 16 +- + drivers/iommu/amd_iommu.c | 3 +- + drivers/iommu/iommu.c | 10 +- + drivers/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-eznps.c | 165 ++ + drivers/irqchip/irq-gic-common.c | 13 + + drivers/irqchip/irq-gic-common.h | 3 + + drivers/irqchip/irq-gic-v3.c | 175 +- + drivers/irqchip/irq-gic.c | 89 +- + drivers/irqchip/irq-mips-gic.c | 22 +- + drivers/media/common/Kconfig | 1 + + drivers/media/common/Makefile | 2 +- + drivers/media/common/v4l2-tpg/Kconfig | 2 + + drivers/media/common/v4l2-tpg/Makefile | 3 + + .../v4l2-tpg/v4l2-tpg-colors.c} | 7 +- + .../v4l2-tpg/v4l2-tpg-core.c} | 25 +- + drivers/media/dvb-core/dvb-usb-ids.h | 14 + + drivers/media/dvb-core/dvbdev.c | 4 +- + drivers/media/dvb-frontends/dib0090.c | 2 +- + drivers/media/dvb-frontends/ds3000.c | 14 +- + drivers/media/dvb-frontends/m88ds3103_priv.h | 2 +- + drivers/media/dvb-frontends/zl10353.c | 6 +- + drivers/media/i2c/ad9389b.c | 8 - + drivers/media/i2c/adp1653.c | 4 +- + drivers/media/i2c/adv7180.c | 160 +- + drivers/media/i2c/adv7511.c | 6 - + drivers/media/i2c/adv7604.c | 8 - + drivers/media/i2c/adv7842.c | 6 - + drivers/media/i2c/m5mols/m5mols_controls.c | 2 +- + drivers/media/i2c/saa7115.c | 15 + + drivers/media/i2c/smiapp/smiapp-core.c | 12 + + drivers/media/i2c/smiapp/smiapp.h | 1 + + drivers/media/i2c/tc358743.c | 5 +- + drivers/media/i2c/ths7303.c | 2 +- + drivers/media/i2c/tvp5150.c | 9 +- + drivers/media/media-device.c | 50 +- + drivers/media/media-devnode.c | 6 +- + drivers/media/media-entity.c | 18 +- + drivers/media/pci/Kconfig | 1 + + drivers/media/pci/Makefile | 1 + + drivers/media/pci/cobalt/Kconfig | 1 + + drivers/media/pci/cx18/cx18-driver.h | 13 +- + drivers/media/pci/cx23885/cx23885-av.c | 2 +- + drivers/media/pci/ivtv/ivtv-driver.h | 13 +- + drivers/media/pci/smipcie/smipcie-ir.c | 2 +- + drivers/media/pci/smipcie/smipcie-main.c | 17 +- + drivers/media/pci/smipcie/smipcie.h | 2 + + drivers/media/pci/sta2x11/sta2x11_vip.c | 28 +- + drivers/media/pci/tw686x/Kconfig | 18 + + drivers/media/pci/tw686x/Makefile | 3 + + drivers/media/pci/tw686x/tw686x-audio.c | 386 +++ + drivers/media/pci/tw686x/tw686x-core.c | 415 +++ + drivers/media/pci/tw686x/tw686x-regs.h | 122 + + drivers/media/pci/tw686x/tw686x-video.c | 937 +++++++ + drivers/media/pci/tw686x/tw686x.h | 158 ++ + drivers/media/pci/zoran/videocodec.c | 5 +- + drivers/media/platform/Kconfig | 4 +- + drivers/media/platform/am437x/am437x-vpfe.c | 4 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 35 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 1 - + drivers/media/platform/exynos4-is/fimc-core.c | 50 - + drivers/media/platform/exynos4-is/media-dev.c | 8 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 6 +- + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/platform/s5p-g2d/g2d.c | 27 +- + drivers/media/platform/s5p-g2d/g2d.h | 5 - + drivers/media/platform/s5p-jpeg/jpeg-core.c | 7 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 37 +- + drivers/media/platform/s5p-tv/mixer.h | 2 +- + drivers/media/platform/s5p-tv/mixer_grp_layer.c | 2 +- + drivers/media/platform/s5p-tv/mixer_video.c | 2 +- + drivers/media/platform/s5p-tv/mixer_vp_layer.c | 2 +- + drivers/media/platform/soc_camera/Kconfig | 4 +- + drivers/media/platform/soc_camera/rcar_vin.c | 2 + + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 69 +- + drivers/media/platform/vivid/Kconfig | 1 + + drivers/media/platform/vivid/Makefile | 2 +- + drivers/media/platform/vivid/vivid-core.c | 22 +- + drivers/media/platform/vivid/vivid-core.h | 2 +- + drivers/media/platform/vivid/vivid-kthread-cap.c | 13 +- + drivers/media/platform/vivid/vivid-rds-gen.c | 19 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 101 +- + drivers/media/platform/vivid/vivid-vid-common.c | 97 - + drivers/media/platform/vivid/vivid-vid-common.h | 9 - + drivers/media/platform/vivid/vivid-vid-out.c | 103 +- + drivers/media/platform/vsp1/vsp1.h | 14 +- + drivers/media/platform/vsp1/vsp1_bru.c | 359 ++- + drivers/media/platform/vsp1/vsp1_bru.h | 3 +- + drivers/media/platform/vsp1/vsp1_dl.c | 567 +++- + drivers/media/platform/vsp1/vsp1_dl.h | 49 +- + drivers/media/platform/vsp1/vsp1_drm.c | 234 +- + drivers/media/platform/vsp1/vsp1_drm.h | 27 +- + drivers/media/platform/vsp1/vsp1_drv.c | 34 +- + drivers/media/platform/vsp1/vsp1_entity.c | 288 +- + drivers/media/platform/vsp1/vsp1_entity.h | 63 +- + drivers/media/platform/vsp1/vsp1_hsit.c | 130 +- + drivers/media/platform/vsp1/vsp1_lif.c | 179 +- + drivers/media/platform/vsp1/vsp1_lut.c | 172 +- + drivers/media/platform/vsp1/vsp1_lut.h | 6 +- + drivers/media/platform/vsp1/vsp1_pipe.c | 71 +- + drivers/media/platform/vsp1/vsp1_pipe.h | 19 +- + drivers/media/platform/vsp1/vsp1_regs.h | 10 + + drivers/media/platform/vsp1/vsp1_rpf.c | 275 +- + drivers/media/platform/vsp1/vsp1_rwpf.c | 171 +- + drivers/media/platform/vsp1/vsp1_rwpf.h | 64 +- + drivers/media/platform/vsp1/vsp1_sru.c | 214 +- + drivers/media/platform/vsp1/vsp1_sru.h | 2 + + drivers/media/platform/vsp1/vsp1_uds.c | 223 +- + drivers/media/platform/vsp1/vsp1_uds.h | 3 +- + drivers/media/platform/vsp1/vsp1_video.c | 493 ++-- + drivers/media/platform/vsp1/vsp1_video.h | 2 - + drivers/media/platform/vsp1/vsp1_wpf.c | 279 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 8 +- + drivers/media/rc/ati_remote.c | 11 +- + drivers/media/rc/mceusb.c | 6 + + drivers/media/rc/rc-main.c | 9 +- + drivers/media/tuners/qm1d1c0042.c | 38 +- + drivers/media/tuners/si2157.c | 19 +- + drivers/media/tuners/si2157_priv.h | 1 - + drivers/media/usb/au0828/au0828-core.c | 38 +- + drivers/media/usb/au0828/au0828-video.c | 4 - + drivers/media/usb/au0828/au0828.h | 1 - + drivers/media/usb/cx231xx/cx231xx-417.c | 31 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 3 +- + drivers/media/usb/dvb-usb-v2/af9035.h | 24 +- + drivers/media/usb/dvb-usb/az6027.c | 7 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 4 +- + drivers/media/usb/dvb-usb/dibusb-common.c | 4 +- + drivers/media/usb/dvb-usb/dw2102.c | 63 +- + drivers/media/usb/dvb-usb/pctv452e.c | 4 +- + drivers/media/usb/em28xx/Kconfig | 2 + + drivers/media/usb/em28xx/em28xx-cards.c | 88 + + drivers/media/usb/em28xx/em28xx-dvb.c | 185 ++ + drivers/media/usb/em28xx/em28xx-reg.h | 13 + + drivers/media/usb/em28xx/em28xx.h | 3 + + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 9 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 +- + drivers/media/v4l2-core/v4l2-dev.c | 1 + + drivers/media/v4l2-core/v4l2-ioctl.c | 73 +- + drivers/media/v4l2-core/v4l2-mc.c | 2 +- + drivers/media/v4l2-core/v4l2-subdev.c | 44 +- + drivers/message/fusion/mptsas.c | 4 +- + drivers/message/fusion/mptspi.c | 2 +- + drivers/of/address.c | 116 +- + drivers/pci/Kconfig | 3 + + drivers/pci/Makefile | 2 + + drivers/pci/ecam.c | 164 ++ + drivers/pci/ecam.h | 67 + + drivers/pci/host/Kconfig | 14 + + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-dra7xx.c | 4 +- + drivers/pci/host/pci-host-common.c | 114 +- + drivers/pci/host/pci-host-common.h | 47 - + drivers/pci/host/pci-host-generic.c | 52 +- + drivers/pci/host/pci-hyperv.c | 24 +- + drivers/pci/host/pci-imx6.c | 213 +- + drivers/pci/host/pci-keystone-dw.c | 38 + + drivers/pci/host/pci-keystone.c | 52 +- + drivers/pci/host/pci-keystone.h | 6 + + drivers/pci/host/pci-mvebu.c | 7 +- + drivers/pci/host/pci-thunder-ecam.c | 39 +- + drivers/pci/host/pci-thunder-pem.c | 134 +- + drivers/pci/host/pcie-armada8k.c | 262 ++ + drivers/pci/host/pcie-designware.c | 47 +- + drivers/pci/host/pcie-xilinx-nwl.c | 2 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 + + drivers/pci/pci-sysfs.c | 7 +- + drivers/pci/pci.c | 160 +- + drivers/pci/pcie/Kconfig | 14 + + drivers/pci/pcie/Makefile | 2 + + drivers/pci/pcie/pcie-dpc.c | 163 ++ + drivers/pci/pcie/portdrv.h | 15 +- + drivers/pci/pcie/portdrv_acpi.c | 12 +- + drivers/pci/pcie/portdrv_core.c | 36 +- + drivers/pci/probe.c | 7 +- + drivers/pci/quirks.c | 196 +- + drivers/pci/search.c | 14 +- + drivers/pinctrl/bcm/Kconfig | 13 + + drivers/pinctrl/bcm/Makefile | 1 + + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 6 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 +- + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 4 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 14 +- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 1117 ++++++++ + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 4 +- + drivers/pinctrl/berlin/berlin.c | 5 +- + drivers/pinctrl/core.c | 63 + + drivers/pinctrl/freescale/pinctrl-imx.c | 11 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 1 - + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 11 +- + drivers/pinctrl/freescale/pinctrl-imx1.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx1.h | 1 - + drivers/pinctrl/freescale/pinctrl-imx21.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx25.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx27.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx35.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx50.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx51.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx53.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6dl.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6q.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6sl.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6sx.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6ul.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx7d.c | 1 - + drivers/pinctrl/freescale/pinctrl-vf610.c | 1 - + drivers/pinctrl/intel/Kconfig | 3 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 1707 ++++++++++-- + drivers/pinctrl/intel/pinctrl-cherryview.c | 8 +- + drivers/pinctrl/intel/pinctrl-intel.c | 8 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 21 +- + drivers/pinctrl/meson/Makefile | 2 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 432 +++ + drivers/pinctrl/meson/pinctrl-meson.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson.h | 2 + + drivers/pinctrl/meson/pinctrl-meson8b.c | 2 +- + drivers/pinctrl/mvebu/pinctrl-armada-370.c | 6 - + drivers/pinctrl/mvebu/pinctrl-armada-375.c | 6 - + drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 6 - + drivers/pinctrl/mvebu/pinctrl-armada-39x.c | 6 - + drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 6 - + drivers/pinctrl/mvebu/pinctrl-dove.c | 5 +- + drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 6 - + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 9 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.h | 1 - + drivers/pinctrl/mvebu/pinctrl-orion.c | 6 - + drivers/pinctrl/nomadik/pinctrl-abx500.c | 7 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 168 +- + drivers/pinctrl/pinconf-generic.c | 2 +- + drivers/pinctrl/pinctrl-adi2.c | 13 +- + drivers/pinctrl/pinctrl-amd.c | 12 +- + drivers/pinctrl/pinctrl-as3722.c | 11 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 30 +- + drivers/pinctrl/pinctrl-at91.c | 28 +- + drivers/pinctrl/pinctrl-digicolor.c | 15 +- + drivers/pinctrl/pinctrl-lantiq.c | 2 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 5 +- + drivers/pinctrl/pinctrl-palmas.c | 14 +- + drivers/pinctrl/pinctrl-pic32.c | 5 +- + drivers/pinctrl/pinctrl-pistachio.c | 6 +- + drivers/pinctrl/pinctrl-rockchip.c | 192 +- + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/pinctrl-tb10x.c | 5 +- + drivers/pinctrl/pinctrl-tz1090-pdc.c | 13 +- + drivers/pinctrl/pinctrl-tz1090.c | 13 +- + drivers/pinctrl/pinctrl-u300.c | 12 +- + drivers/pinctrl/pinctrl-utils.c | 4 +- + drivers/pinctrl/pinctrl-utils.h | 2 +- + drivers/pinctrl/pinctrl-zynq.c | 14 +- + drivers/pinctrl/pxa/Kconfig | 10 +- + drivers/pinctrl/pxa/Makefile | 1 + + drivers/pinctrl/pxa/pinctrl-pxa25x.c | 274 ++ + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 4 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 10 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 9 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 9 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 11 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 11 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 17 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 3 +- + drivers/pinctrl/sh-pfc/core.c | 20 +- + drivers/pinctrl/sh-pfc/core.h | 5 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 54 +- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 217 ++ + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 218 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 124 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 19 +- + drivers/pinctrl/spear/pinctrl-spear.c | 11 +- + drivers/pinctrl/spear/pinctrl-spear.h | 1 - + drivers/pinctrl/spear/pinctrl-spear1310.c | 6 - + drivers/pinctrl/spear/pinctrl-spear1340.c | 6 - + drivers/pinctrl/spear/pinctrl-spear300.c | 6 - + drivers/pinctrl/spear/pinctrl-spear310.c | 6 - + drivers/pinctrl/spear/pinctrl-spear320.c | 6 - + drivers/pinctrl/stm32/pinctrl-stm32.c | 185 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 13 +- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 15 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 36 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra114.c | 3 +- + drivers/pinctrl/tegra/pinctrl-tegra124.c | 3 +- + drivers/pinctrl/tegra/pinctrl-tegra20.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 5 +- + drivers/pinctrl/tegra/pinctrl-tegra30.c | 3 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 14 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 2 - + drivers/pinctrl/vt8500/pinctrl-wmt.c | 7 +- + drivers/platform/mips/Kconfig | 4 - + drivers/platform/mips/Makefile | 1 - + drivers/platform/mips/cpu_hwmon.c | 4 +- + drivers/remoteproc/remoteproc_core.c | 39 +- + drivers/remoteproc/remoteproc_internal.h | 1 + + drivers/remoteproc/remoteproc_virtio.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 8 +- + drivers/s390/char/sclp_early.c | 6 +- + drivers/s390/scsi/zfcp_unit.c | 3 +- + drivers/scsi/Kconfig | 16 +- + drivers/scsi/NCR5380.c | 657 +++-- + drivers/scsi/NCR5380.h | 143 +- + drivers/scsi/aacraid/aachba.c | 22 - + drivers/scsi/aacraid/aacraid.h | 9 +- + drivers/scsi/aacraid/comminit.c | 43 +- + drivers/scsi/aacraid/commsup.c | 39 +- + drivers/scsi/aacraid/dpcsup.c | 7 +- + drivers/scsi/aacraid/linit.c | 4 +- + drivers/scsi/aacraid/src.c | 3 +- + drivers/scsi/arm/cumana_1.c | 25 +- + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/oak.c | 22 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/atari_NCR5380.c | 2676 ------------------- + drivers/scsi/atari_scsi.c | 144 +- + drivers/scsi/bfa/bfa_fcs.h | 4 +- + drivers/scsi/bfa/bfa_fcs_fcpim.c | 5 +- + drivers/scsi/bfa/bfad_im.c | 5 +- + drivers/scsi/bnx2fc/bnx2fc.h | 3 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 100 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 14 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 4 +- + drivers/scsi/constants.c | 859 +----- + drivers/scsi/cxlflash/superpipe.c | 15 + + drivers/scsi/device_handler/scsi_dh_alua.c | 33 +- + drivers/scsi/dmx3191d.c | 10 +- + drivers/scsi/dtc.c | 27 +- + drivers/scsi/dtc.h | 7 +- + drivers/scsi/eata_pio.c | 1 + + drivers/scsi/esas2r/esas2r_main.c | 4 +- + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 91 +- + drivers/scsi/g_NCR5380.c | 141 +- + drivers/scsi/g_NCR5380.h | 26 +- + drivers/scsi/hisi_sas/hisi_sas.h | 7 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 11 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 90 +- + drivers/scsi/hpsa.c | 187 +- + drivers/scsi/hpsa.h | 1 + + drivers/scsi/iscsi_boot_sysfs.c | 62 + + drivers/scsi/libiscsi.c | 9 +- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 26 +- + drivers/scsi/lpfc/lpfc_ct.c | 6 +- + drivers/scsi/lpfc/lpfc_els.c | 176 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +- + drivers/scsi/lpfc/lpfc_hw.h | 75 +- + drivers/scsi/lpfc/lpfc_hw4.h | 29 +- + drivers/scsi/lpfc/lpfc_init.c | 27 +- + drivers/scsi/lpfc/lpfc_mbox.c | 12 +- + drivers/scsi/lpfc/lpfc_mem.c | 6 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +- + drivers/scsi/lpfc/lpfc_sli.c | 140 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 5 +- + drivers/scsi/mac_scsi.c | 241 +- + drivers/scsi/megaraid/megaraid_sas.h | 6 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 117 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 7 +- + drivers/scsi/mpt3sas/mpi/mpi2.h | 7 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 18 +- + drivers/scsi/mpt3sas/mpi/mpi2_init.h | 15 +- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 40 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 32 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 11 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 37 +- + drivers/scsi/mvsas/mv_init.c | 19 +- + drivers/scsi/pas16.c | 27 +- + drivers/scsi/pas16.h | 5 +- + drivers/scsi/pm8001/pm8001_init.c | 2 - + drivers/scsi/qla2xxx/qla_mr.c | 5 +- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + drivers/scsi/scsi_debug.c | 2801 ++++++++++---------- + drivers/scsi/scsi_lib.c | 188 +- + drivers/scsi/scsi_priv.h | 2 +- + drivers/scsi/scsi_proc.c | 3 +- + drivers/scsi/scsi_scan.c | 45 +- + drivers/scsi/scsi_sysfs.c | 9 +- + drivers/scsi/scsi_trace.c | 161 ++ + drivers/scsi/scsi_transport_fc.c | 9 +- + drivers/scsi/scsi_transport_iscsi.c | 19 +- + drivers/scsi/scsi_transport_sas.c | 7 +- + drivers/scsi/sense_codes.h | 826 ++++++ + drivers/scsi/snic/snic.h | 5 +- + drivers/scsi/snic/snic_ctl.c | 8 +- + drivers/scsi/snic/snic_debugfs.c | 20 +- + drivers/scsi/snic/snic_disc.c | 19 +- + drivers/scsi/snic/snic_fwint.h | 4 +- + drivers/scsi/snic/snic_io.c | 62 +- + drivers/scsi/snic/snic_isr.c | 6 +- + drivers/scsi/snic/snic_main.c | 44 +- + drivers/scsi/snic/snic_scsi.c | 56 +- + drivers/scsi/snic/snic_stats.h | 12 +- + drivers/scsi/snic/vnic_dev.c | 44 +- + drivers/scsi/st.c | 9 +- + drivers/scsi/sun3_scsi.c | 47 +- + drivers/scsi/t128.c | 19 +- + drivers/scsi/t128.h | 7 +- + drivers/spi/spi-pxa2xx-pci.c | 8 +- + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 2 +- + drivers/staging/media/omap4iss/iss_video.c | 2 +- + drivers/staging/media/tw686x-kh/Kconfig | 17 + + drivers/staging/media/tw686x-kh/Makefile | 3 + + drivers/staging/media/tw686x-kh/TODO | 6 + + drivers/staging/media/tw686x-kh/tw686x-kh-core.c | 140 + + drivers/staging/media/tw686x-kh/tw686x-kh-regs.h | 103 + + drivers/staging/media/tw686x-kh/tw686x-kh-video.c | 821 ++++++ + drivers/staging/media/tw686x-kh/tw686x-kh.h | 118 + + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/eeprom.c | 8 +- + drivers/thunderbolt/nhi.c | 19 +- + drivers/thunderbolt/switch.c | 20 +- + drivers/thunderbolt/tb.c | 2 +- + drivers/thunderbolt/tb.h | 2 +- + drivers/thunderbolt/tb_regs.h | 2 +- + drivers/tty/serial/8250/8250_pci.c | 8 +- + drivers/tty/serial/Kconfig | 21 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/pic32_uart.c | 960 +++++++ + drivers/tty/serial/pic32_uart.h | 126 + + drivers/usb/host/ohci-hcd.c | 5 - + drivers/usb/host/ohci-jz4740.c | 245 -- + drivers/usb/storage/scsiglue.c | 2 +- + drivers/watchdog/Kconfig | 26 + + drivers/watchdog/Makefile | 2 + + drivers/watchdog/pic32-dmt.c | 257 ++ + drivers/watchdog/pic32-wdt.c | 263 ++ + fs/cifs/cifsacl.c | 2 +- + fs/exec.c | 29 +- + fs/namei.c | 2 + + fs/nfs/nfs4idmap.c | 2 +- + fs/proc/vmcore.c | 2 +- + include/asm-generic/seccomp.h | 14 + + include/asm-generic/siginfo.h | 15 - + include/clocksource/arm_arch_timer.h | 12 +- + include/crypto/pkcs7.h | 6 +- + include/crypto/public_key.h | 33 +- + include/dt-bindings/clock/ath79-clk.h | 19 + + include/dt-bindings/clock/microchip,pic32-clock.h | 42 + + include/dt-bindings/gpio/meson-gxbb-gpio.h | 154 ++ + include/keys/asymmetric-subtype.h | 2 +- + include/keys/asymmetric-type.h | 13 +- + include/keys/system_keyring.h | 41 +- + include/kvm/arm_vgic.h | 7 +- + include/linux/amba/pl08x.h | 2 +- + include/linux/audit.h | 24 + + include/linux/bcm47xx_sprom.h | 24 + + include/linux/crash_dump.h | 8 +- + include/linux/dma/dw.h | 5 +- + include/linux/dma/xilinx_dma.h | 14 + + include/linux/dmaengine.h | 20 +- + include/linux/fs.h | 31 +- + include/linux/ima.h | 6 + + include/linux/ioport.h | 4 + + include/linux/irqbypass.h | 4 +- + include/linux/irqchip/arm-gic-common.h | 34 + + include/linux/irqchip/mips-gic.h | 17 + + include/linux/iscsi_boot_sysfs.h | 13 + + include/linux/key-type.h | 1 - + include/linux/key.h | 44 +- + include/linux/kvm_host.h | 39 +- + include/linux/lsm_hooks.h | 6 +- + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 7 + + include/linux/of_address.h | 9 - + include/linux/pci.h | 18 +- + include/linux/pci_ids.h | 18 + + include/linux/pcieport_if.h | 2 + + include/linux/pinctrl/pinctrl.h | 6 + + include/linux/platform_data/dma-dw.h | 12 +- + include/linux/remoteproc.h | 4 + + include/linux/rpmsg.h | 18 +- + include/linux/scatterlist.h | 25 + + include/linux/signal.h | 15 + + include/linux/string_helpers.h | 6 + + include/linux/trace_events.h | 120 +- + include/linux/tty.h | 4 +- + include/linux/verification.h | 49 + + include/linux/verify_pefile.h | 22 - + include/media/media-device.h | 13 +- + include/media/media-entity.h | 81 +- + include/media/rc-core.h | 18 +- + include/media/v4l2-dev.h | 3 + + include/media/v4l2-device.h | 55 +- + include/media/v4l2-rect.h | 173 ++ + include/media/v4l2-subdev.h | 8 + + .../media/v4l2-tpg-colors.h | 6 +- + .../vivid/vivid-tpg.h => include/media/v4l2-tpg.h | 9 +- + include/media/vsp1.h | 23 +- + include/scsi/scsi.h | 19 - + include/scsi/scsi_device.h | 14 +- + include/scsi/scsi_host.h | 2 +- + include/scsi/scsi_proto.h | 9 + + include/soc/nps/common.h | 166 ++ + include/sound/dmaengine_pcm.h | 12 + + include/sound/hda_chmap.h | 2 + + include/sound/hda_i915.h | 10 +- + include/sound/hdaudio_ext.h | 13 + + include/sound/hdmi-codec.h | 100 + + include/sound/pcm_iec958.h | 2 + + include/sound/soc-dapm.h | 3 +- + include/sound/soc.h | 5 +- + include/trace/events/kvm.h | 11 +- + include/trace/events/scsi.h | 6 +- + include/uapi/linux/keyctl.h | 10 + + include/uapi/linux/kvm.h | 1 + + include/uapi/linux/pci_regs.h | 20 +- + include/uapi/linux/serial_core.h | 3 + + include/uapi/linux/videodev2.h | 38 +- + include/uapi/sound/asound.h | 2 +- + kernel/audit.c | 30 +- + kernel/audit_tree.c | 12 +- + kernel/auditsc.c | 8 +- + kernel/module_signing.c | 7 +- + kernel/seccomp.c | 15 +- + kernel/trace/Kconfig | 26 + + kernel/trace/Makefile | 2 + + kernel/trace/trace.c | 275 +- + kernel/trace/trace.h | 190 +- + kernel/trace/trace_events.c | 329 ++- + kernel/trace/trace_events_filter.c | 77 +- + kernel/trace/trace_events_hist.c | 1755 ++++++++++++ + kernel/trace/trace_events_trigger.c | 215 +- + kernel/trace/tracing_map.c | 1062 ++++++++ + kernel/trace/tracing_map.h | 283 ++ + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/sg_pool.c | 172 ++ + lib/string_helpers.c | 92 + + net/dns_resolver/dns_key.c | 2 +- + net/netlabel/netlabel_kapi.c | 2 +- + net/rxrpc/ar-key.c | 4 +- + samples/Makefile | 2 +- + samples/rpmsg/rpmsg_client_sample.c | 14 +- + .../video4linux => samples/v4l}/Makefile | 0 + .../v4l}/v4l2-pci-skeleton.c | 5 +- + scripts/kconfig/streamline_config.pl | 44 +- + scripts/ld-version.sh | 2 +- + security/Kconfig | 1 + + security/Makefile | 2 + + security/integrity/Kconfig | 1 - + security/integrity/digsig.c | 15 +- + security/integrity/ima/Kconfig | 36 +- + security/integrity/ima/Makefile | 2 +- + security/integrity/ima/ima_appraise.c | 7 +- + security/integrity/ima/ima_main.c | 25 +- + security/integrity/ima/ima_mok.c | 23 +- + security/integrity/integrity.h | 1 + + security/keys/Kconfig | 15 + + security/keys/Makefile | 1 + + security/keys/big_key.c | 198 +- + security/keys/compat.c | 4 + + security/keys/dh.c | 160 ++ + security/keys/internal.h | 12 + + security/keys/key.c | 42 +- + security/keys/keyctl.c | 5 + + security/keys/keyring.c | 46 +- + security/keys/persistent.c | 4 +- + security/keys/process_keys.c | 16 +- + security/keys/request_key.c | 4 +- + security/keys/request_key_auth.c | 2 +- + security/keys/user_defined.c | 42 +- + security/loadpin/Kconfig | 19 + + security/loadpin/Makefile | 1 + + security/loadpin/loadpin.c | 190 ++ + security/security.c | 2 +- + security/selinux/hooks.c | 144 +- + security/selinux/include/classmap.h | 30 +- + security/selinux/include/conditional.h | 2 +- + security/selinux/include/objsec.h | 5 +- + security/selinux/ss/services.c | 6 +- + security/yama/yama_lsm.c | 31 +- + sound/core/Kconfig | 29 - + sound/core/Makefile | 1 - + sound/core/compress_offload.c | 25 +- + sound/core/hrtimer.c | 56 +- + sound/core/pcm_dmaengine.c | 11 +- + sound/core/pcm_iec958.c | 65 +- + sound/core/pcm_lib.c | 4 +- + sound/core/pcm_native.c | 4 +- + sound/core/rtctimer.c | 187 -- + sound/core/seq/seq.c | 2 - + sound/core/timer.c | 5 +- + sound/firewire/Kconfig | 1 + + sound/firewire/Makefile | 3 + + sound/firewire/amdtp-stream-trace.h | 110 + + sound/firewire/amdtp-stream.c | 210 +- + sound/firewire/amdtp-stream.h | 37 +- + sound/firewire/bebob/bebob.c | 217 +- + sound/firewire/bebob/bebob.h | 6 +- + sound/firewire/bebob/bebob_stream.c | 101 +- + sound/firewire/dice/dice.c | 41 +- + sound/firewire/digi00x/amdtp-dot.c | 2 +- + sound/firewire/digi00x/digi00x-transaction.c | 7 +- + sound/firewire/digi00x/digi00x.c | 107 +- + sound/firewire/digi00x/digi00x.h | 3 + + sound/firewire/fireworks/fireworks.c | 168 +- + sound/firewire/fireworks/fireworks.h | 4 +- + sound/firewire/fireworks/fireworks_stream.c | 84 +- + sound/firewire/lib.c | 32 + + sound/firewire/lib.h | 3 + + sound/firewire/oxfw/oxfw-stream.c | 3 +- + sound/firewire/oxfw/oxfw.c | 151 +- + sound/firewire/oxfw/oxfw.h | 4 +- + sound/firewire/tascam/tascam-stream.c | 26 +- + sound/firewire/tascam/tascam.c | 118 +- + sound/firewire/tascam/tascam.h | 2 + + sound/hda/ext/hdac_ext_bus.c | 4 + + sound/hda/ext/hdac_ext_controller.c | 66 + + sound/hda/hdac_controller.c | 17 + + sound/hda/hdac_i915.c | 47 +- + sound/hda/hdmi_chmap.c | 44 +- + sound/hda/local.h | 10 + + sound/isa/wavefront/wavefront_synth.c | 9 + + sound/oss/waveartist.c | 8 +- + sound/pci/au88x0/au88x0_core.c | 14 +- + sound/pci/au88x0/au88x0_pcm.c | 5 +- + sound/pci/ctxfi/cttimer.c | 6 +- + sound/pci/ens1370.c | 2 +- + sound/pci/hda/Kconfig | 10 +- + sound/pci/hda/hda_generic.c | 2 + + sound/pci/hda/patch_hdmi.c | 386 ++- + sound/pci/hda/patch_realtek.c | 15 + + sound/pci/intel8x0.c | 20 +- + sound/pci/lx6464es/lx_core.c | 2 +- + sound/soc/atmel/atmel_ssc_dai.c | 4 +- + sound/soc/au1x/dbdma2.c | 4 +- + sound/soc/bcm/bcm2835-i2s.c | 27 +- + sound/soc/codecs/Kconfig | 10 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ak4642.c | 4 +- + sound/soc/codecs/arizona.c | 32 +- + sound/soc/codecs/cs42l56.c | 2 +- + sound/soc/codecs/cs47l24.c | 46 +- + sound/soc/codecs/da7213.c | 99 +- + sound/soc/codecs/da7213.h | 35 +- + sound/soc/codecs/da7218.c | 32 +- + sound/soc/codecs/da7218.h | 21 +- + sound/soc/codecs/da7219.c | 38 +- + sound/soc/codecs/da7219.h | 20 +- + sound/soc/codecs/es8328.c | 194 +- + sound/soc/codecs/es8328.h | 23 +- + sound/soc/codecs/hdac_hdmi.c | 194 +- + sound/soc/codecs/hdmi-codec.c | 432 +++ + sound/soc/codecs/pcm5102a.c | 69 + + sound/soc/codecs/rt298.c | 19 +- + sound/soc/codecs/rt5645.c | 16 +- + sound/soc/codecs/wm5102.c | 4 + + sound/soc/codecs/wm5110.c | 6 + + sound/soc/codecs/wm_adsp.c | 292 +- + sound/soc/codecs/wm_adsp.h | 1 + + sound/soc/davinci/Kconfig | 6 +- + sound/soc/davinci/davinci-i2s.c | 80 +- + sound/soc/davinci/davinci-mcasp.c | 92 +- + sound/soc/davinci/davinci-mcasp.h | 5 + + sound/soc/dwc/designware_i2s.c | 14 +- + sound/soc/fsl/fsl_sai.c | 24 +- + sound/soc/fsl/fsl_ssi.c | 81 +- + sound/soc/fsl/imx-pcm-fiq.c | 2 +- + sound/soc/intel/Kconfig | 16 + + sound/soc/intel/atom/sst-atom-controls.c | 2 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/bxt_rt298.c | 353 +++ + sound/soc/intel/boards/bytcr_rt5640.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 87 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 86 +- + sound/soc/intel/boards/skl_rt286.c | 59 +- + sound/soc/intel/common/sst-acpi.h | 9 + + sound/soc/intel/common/sst-firmware.c | 2 +- + sound/soc/intel/haswell/sst-haswell-pcm.c | 2 +- + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/bxt-sst.c | 328 +++ + sound/soc/intel/skylake/skl-messages.c | 122 +- + sound/soc/intel/skylake/skl-nhlt.c | 15 +- + sound/soc/intel/skylake/skl-pcm.c | 119 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 2 - + sound/soc/intel/skylake/skl-sst-dsp.h | 15 +- + sound/soc/intel/skylake/skl-sst.c | 13 +- + sound/soc/intel/skylake/skl-topology.c | 27 +- + sound/soc/intel/skylake/skl-topology.h | 2 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 2 +- + sound/soc/intel/skylake/skl.c | 39 +- + sound/soc/intel/skylake/skl.h | 6 +- + sound/soc/rockchip/rockchip_i2s.c | 87 +- + sound/soc/soc-core.c | 14 +- + sound/soc/soc-generic-dmaengine-pcm.c | 57 +- + sound/usb/card.c | 4 + + sound/usb/clock.c | 4 + + sound/usb/helper.c | 1 + + sound/usb/midi.c | 1 + + sound/usb/mixer.c | 78 +- + sound/usb/usbaudio.h | 1 + + tools/testing/selftests/ftrace/test.d/functions | 9 + + .../ftrace/test.d/trigger/trigger-eventonoff.tc | 64 + + .../ftrace/test.d/trigger/trigger-filter.tc | 59 + + .../ftrace/test.d/trigger/trigger-hist-mod.tc | 75 + + .../ftrace/test.d/trigger/trigger-hist.tc | 83 + + .../ftrace/test.d/trigger/trigger-multihist.tc | 73 + + .../ftrace/test.d/trigger/trigger-snapshot.tc | 56 + + .../ftrace/test.d/trigger/trigger-stacktrace.tc | 53 + + .../ftrace/test.d/trigger/trigger-traceonoff.tc | 58 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 30 +- + virt/kvm/Kconfig | 3 + + virt/kvm/arm/arch_timer.c | 40 +- + virt/kvm/arm/vgic-v2.c | 61 +- + virt/kvm/arm/vgic-v3.c | 47 +- + virt/kvm/arm/vgic.c | 50 +- + virt/kvm/eventfd.c | 18 +- + virt/kvm/kvm_main.c | 32 +- + virt/lib/irqbypass.c | 12 +- + 1310 files changed, 54881 insertions(+), 19595 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-hidma + create mode 100644 Documentation/devicetree/bindings/arc/eznps.txt + create mode 100644 Documentation/devicetree/bindings/clock/microchip,pic32.txt + create mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm6345-l1-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv7180.txt + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu3.txt + create mode 100644 Documentation/devicetree/bindings/pci/pci-armada8k.txt + create mode 100644 Documentation/devicetree/bindings/serial/microchip,pic32-uart.txt + create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.txt + create mode 100644 Documentation/devicetree/bindings/sound/pcm5102a.txt + create mode 100644 Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/snps,arc-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/snps,archs-gfrc.txt + create mode 100644 Documentation/devicetree/bindings/timer/snps,archs-rtc.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-dmt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-wdt.txt + create mode 100644 Documentation/security/LoadPin.txt + create mode 100644 arch/arc/boot/dts/eznps.dts + create mode 100644 arch/arc/boot/dts/skeleton_hs.dtsi + create mode 100644 arch/arc/boot/dts/skeleton_hs_idu.dtsi + create mode 100644 arch/arc/configs/nps_defconfig + delete mode 100644 arch/arc/include/asm/clk.h + delete mode 100644 arch/arc/kernel/clk.c + create mode 100644 arch/arc/plat-eznps/Kconfig + create mode 100644 arch/arc/plat-eznps/Makefile + create mode 100644 arch/arc/plat-eznps/entry.S + create mode 100644 arch/arc/plat-eznps/include/plat/ctop.h + create mode 100644 arch/arc/plat-eznps/include/plat/mtm.h + create mode 100644 arch/arc/plat-eznps/include/plat/smp.h + create mode 100644 arch/arc/plat-eznps/mtm.c + create mode 100644 arch/arc/plat-eznps/platform.c + create mode 100644 arch/arc/plat-eznps/smp.c + create mode 100644 arch/arm/include/asm/stage2_pgtable.h + create mode 100644 arch/arm64/include/asm/stage2_pgtable-nopmd.h + create mode 100644 arch/arm64/include/asm/stage2_pgtable-nopud.h + create mode 100644 arch/arm64/include/asm/stage2_pgtable.h + create mode 100644 arch/mips/boot/dts/brcm/bcm6358.dtsi + create mode 100644 arch/mips/boot/dts/brcm/bcm96358nb4ser.dts + create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts + create mode 100644 arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi + create mode 100644 arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts + delete mode 100644 arch/mips/boot/dts/pic32/pic32mzda-clk.dtsi + create mode 100644 arch/mips/boot/dts/qca/ar9331.dtsi + create mode 100644 arch/mips/boot/dts/qca/ar9331_dpt_module.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_omega.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts + create mode 100644 arch/mips/boot/tools/.gitignore + create mode 100644 arch/mips/boot/tools/Makefile + create mode 100644 arch/mips/boot/tools/relocs.c + create mode 100644 arch/mips/boot/tools/relocs.h + create mode 100644 arch/mips/boot/tools/relocs_32.c + create mode 100644 arch/mips/boot/tools/relocs_64.c + create mode 100644 arch/mips/boot/tools/relocs_main.c + rename arch/mips/configs/{ls1b_defconfig => loongson1b_defconfig} (84%) + create mode 100644 arch/mips/include/asm/bitrev.h + delete mode 100644 arch/mips/include/asm/clkdev.h + create mode 100644 arch/mips/include/asm/llsc.h + create mode 100644 arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-bmips/ioremap.h + create mode 100644 arch/mips/include/asm/mach-loongson32/dma.h + create mode 100644 arch/mips/include/asm/mach-loongson32/nand.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu3-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-coremask.h + create mode 100644 arch/mips/kernel/bmips_5xxx_init.S + create mode 100644 arch/mips/kernel/relocate.c + rename {drivers/platform/mips => arch/mips/loongson64/loongson-3}/acpi_init.c (100%) + delete mode 100644 arch/mips/math-emu/dp_msubf.c + delete mode 100644 arch/mips/math-emu/sp_msubf.c + create mode 100644 crypto/asymmetric_keys/restrict.c + create mode 100644 drivers/clk/microchip/Makefile + create mode 100644 drivers/clk/microchip/clk-core.c + create mode 100644 drivers/clk/microchip/clk-core.h + create mode 100644 drivers/clk/microchip/clk-pic32mzda.c + create mode 100644 drivers/clocksource/timer-nps.c + rename drivers/cpufreq/{ls1x-cpufreq.c => loongson1-cpufreq.c} (65%) + create mode 100644 drivers/dma/qcom/hidma_dbg.c + create mode 100644 drivers/dma/qcom/hidma_ll.c + create mode 100644 drivers/dma/tegra210-adma.c + rename arch/mips/bcm47xx/sprom.c => drivers/firmware/broadcom/bcm47xx_sprom.c (98%) + create mode 100644 drivers/irqchip/irq-eznps.c + create mode 100644 drivers/media/common/v4l2-tpg/Kconfig + create mode 100644 drivers/media/common/v4l2-tpg/Makefile + rename drivers/media/{platform/vivid/vivid-tpg-colors.c => common/v4l2-tpg/v4l2-tpg-colors.c} (99%) + rename drivers/media/{platform/vivid/vivid-tpg.c => common/v4l2-tpg/v4l2-tpg-core.c} (98%) + create mode 100644 drivers/media/pci/tw686x/Kconfig + create mode 100644 drivers/media/pci/tw686x/Makefile + create mode 100644 drivers/media/pci/tw686x/tw686x-audio.c + create mode 100644 drivers/media/pci/tw686x/tw686x-core.c + create mode 100644 drivers/media/pci/tw686x/tw686x-regs.h + create mode 100644 drivers/media/pci/tw686x/tw686x-video.c + create mode 100644 drivers/media/pci/tw686x/tw686x.h + create mode 100644 drivers/pci/ecam.c + create mode 100644 drivers/pci/ecam.h + delete mode 100644 drivers/pci/host/pci-host-common.h + create mode 100644 drivers/pci/host/pcie-armada8k.c + create mode 100644 drivers/pci/pcie/pcie-dpc.c + create mode 100644 drivers/pinctrl/bcm/pinctrl-ns2-mux.c + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-gxbb.c + create mode 100644 drivers/pinctrl/pxa/pinctrl-pxa25x.c + delete mode 100644 drivers/scsi/atari_NCR5380.c + create mode 100644 drivers/scsi/sense_codes.h + create mode 100644 drivers/staging/media/tw686x-kh/Kconfig + create mode 100644 drivers/staging/media/tw686x-kh/Makefile + create mode 100644 drivers/staging/media/tw686x-kh/TODO + create mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh-core.c + create mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh-regs.h + create mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh-video.c + create mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh.h + create mode 100644 drivers/tty/serial/pic32_uart.c + create mode 100644 drivers/tty/serial/pic32_uart.h + delete mode 100644 drivers/usb/host/ohci-jz4740.c + create mode 100644 drivers/watchdog/pic32-dmt.c + create mode 100644 drivers/watchdog/pic32-wdt.c + create mode 100644 include/dt-bindings/clock/ath79-clk.h + create mode 100644 include/dt-bindings/clock/microchip,pic32-clock.h + create mode 100644 include/dt-bindings/gpio/meson-gxbb-gpio.h + create mode 100644 include/linux/bcm47xx_sprom.h + create mode 100644 include/linux/irqchip/arm-gic-common.h + create mode 100644 include/linux/verification.h + delete mode 100644 include/linux/verify_pefile.h + create mode 100644 include/media/v4l2-rect.h + rename drivers/media/platform/vivid/vivid-tpg-colors.h => include/media/v4l2-tpg-colors.h (93%) + rename drivers/media/platform/vivid/vivid-tpg.h => include/media/v4l2-tpg.h (99%) + create mode 100644 include/soc/nps/common.h + create mode 100644 include/sound/hdmi-codec.h + create mode 100644 kernel/trace/trace_events_hist.c + create mode 100644 kernel/trace/tracing_map.c + create mode 100644 kernel/trace/tracing_map.h + create mode 100644 lib/sg_pool.c + rename {Documentation/video4linux => samples/v4l}/Makefile (100%) + rename {Documentation/video4linux => samples/v4l}/v4l2-pci-skeleton.c (99%) + create mode 100644 security/keys/dh.c + create mode 100644 security/loadpin/Kconfig + create mode 100644 security/loadpin/Makefile + create mode 100644 security/loadpin/loadpin.c + delete mode 100644 sound/core/rtctimer.c + create mode 100644 sound/firewire/amdtp-stream-trace.h + create mode 100644 sound/soc/codecs/hdmi-codec.c + create mode 100644 sound/soc/codecs/pcm5102a.c + create mode 100644 sound/soc/intel/boards/bxt_rt298.c + create mode 100644 sound/soc/intel/skylake/bxt-sst.c + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc +Merging fixes/master (b507146bb6b9 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 (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask()) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (33656a1f2ee5 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge sparc/master +Already up-to-date. +Merging net/master (e22cb5e78762 Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/Space.c | 21 ++++---- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 4 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 ++-- + drivers/net/ieee802154/adf7242.c | 1 - + drivers/net/irda/nsc-ircc.c | 3 +- + drivers/net/usb/pegasus.c | 53 ------------------ + drivers/scsi/iscsi_tcp.c | 12 ++--- + fs/ocfs2/cluster/tcp.c | 17 +++--- + net/batman-adv/bat_iv_ogm.c | 9 ++-- + net/batman-adv/bat_v.c | 66 ++++++++++++++++++++--- + net/batman-adv/bat_v_elp.c | 31 +++++++---- + net/batman-adv/bat_v_elp.h | 2 + + net/batman-adv/originator.c | 6 ++- + net/batman-adv/routing.c | 4 +- + net/kcm/kcmsock.c | 2 +- + net/rds/tcp_connect.c | 4 +- + net/rds/tcp_listen.c | 4 +- + net/rds/tcp_recv.c | 4 +- + net/rds/tcp_send.c | 4 +- + net/tipc/server.c | 8 +-- + 21 files changed, 141 insertions(+), 125 deletions(-) +Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) +$ git merge ipsec/master +Already up-to-date. +Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (17e1717c11a3 ALSA: firewire-lib: change a member of event structure to suppress sparse wanings to bool type) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (44549e8f5eea Linux 4.6-rc7) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (44549e8f5eea Linux 4.6-rc7) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 155 ++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 148 insertions(+), 7 deletions(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (44549e8f5eea Linux 4.6-rc7) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (44549e8f5eea Linux 4.6-rc7) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (23ea5967d6bd Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (bad6a185b4d6 crypto: public_key: select CRYPTO_AKCIPHER) +$ git merge crypto-current/master +Auto-merging crypto/asymmetric_keys/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/crypto/sha-mb/sha1_x8_avx2.S | 13 +++++++++++-- + crypto/asymmetric_keys/Kconfig | 1 + + drivers/crypto/omap-sham.c | 2 +- + 3 files changed, 13 insertions(+), 3 deletions(-) +Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +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 (8160c4e45582 vfio: fix ioctl error handling) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature) +$ 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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (2dcd0af568b0 Linux 4.6) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list) +$ git merge asm-generic/master +Merge made by the 'recursive' strategy. + arch/arc/include/uapi/asm/unistd.h | 1 + + arch/arm64/include/uapi/asm/unistd.h | 3 +++ + arch/c6x/include/uapi/asm/unistd.h | 1 + + arch/h8300/include/uapi/asm/unistd.h | 2 ++ + arch/hexagon/include/uapi/asm/unistd.h | 1 + + arch/metag/include/uapi/asm/unistd.h | 2 ++ + arch/nios2/include/uapi/asm/unistd.h | 2 ++ + arch/openrisc/include/uapi/asm/unistd.h | 1 + + arch/score/include/uapi/asm/unistd.h | 1 + + arch/tile/include/uapi/asm/unistd.h | 1 + + arch/unicore32/include/uapi/asm/unistd.h | 2 ++ + include/uapi/asm-generic/unistd.h | 3 +++ + 12 files changed, 20 insertions(+) +Merging arc/for-next (776d7f1694a7 arc: axs103_smp: Fix CPU frequency to 100MHz for dual-core) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/kernel/setup.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2c2x0.txt | 6 ++ + Documentation/kdump/kdump.txt | 13 +-- + Documentation/kernel-parameters.txt | 5 -- + arch/arm/boot/Makefile | 2 +- + arch/arm/include/asm/dma-mapping.h | 2 - + arch/arm/include/asm/io.h | 12 +++ + arch/arm/include/asm/memory.h | 38 +++++++-- + arch/arm/kernel/bios32.c | 3 - + arch/arm/kernel/reboot.c | 3 - + arch/arm/kernel/setup.c | 26 ++++++ + arch/arm/mach-keystone/keystone.c | 7 +- + arch/arm/mm/cache-l2x0.c | 26 ++++-- + arch/arm/mm/cache-uniphier.c | 26 +++++- + arch/arm/mm/dma-mapping.c | 16 ---- + arch/arm/mm/idmap.c | 2 +- + arch/arm/mm/ioremap.c | 16 +++- + arch/arm/mm/nommu.c | 9 ++ + arch/arm/tools/Makefile | 11 ++- + drivers/amba/bus.c | 100 ++++++++++++++++++++--- + drivers/mtd/maps/pxa2xx-flash.c | 6 +- + kernel/memremap.c | 11 ++- + scripts/kallsyms.c | 10 +-- + scripts/link-vmlinux.sh | 4 - + 23 files changed, 260 insertions(+), 94 deletions(-) +Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (475848b27103 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Removing arch/arm/mach-lpc32xx/irq.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos3250-monk.dts | 47 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 88 +-- + arch/arm/boot/dts/exynos3250.dtsi | 181 +++++ + arch/arm/boot/dts/exynos4210.dtsi | 159 +++++ + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 56 +- + arch/arm/boot/dts/exynos4412-ppmu-common.dtsi | 50 ++ + arch/arm/boot/dts/exynos4412-trats2.dts | 88 +-- + arch/arm/boot/dts/exynos4x12.dtsi | 174 +++++ + arch/arm/boot/dts/exynos5420.dtsi | 407 +++++++++++ + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 99 +++ + arch/arm/boot/dts/imx7d-nitrogen7.dts | 745 +++++++++++++++++++++ + arch/arm/boot/dts/imx7d.dtsi | 31 + + arch/arm/boot/dts/r8a7779.dtsi | 54 +- + arch/arm/boot/dts/r8a7790.dtsi | 155 +++-- + arch/arm/boot/dts/r8a7791.dtsi | 156 +++-- + arch/arm/boot/dts/r8a7793.dtsi | 111 +-- + arch/arm/boot/dts/r8a7794.dtsi | 116 ++-- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 116 +++- + arch/arm/boot/dts/tegra124-nyan.dtsi | 122 +++- + arch/arm/boot/dts/tegra124-venice2.dts | 101 ++- + arch/arm/boot/dts/tegra124.dtsi | 167 ++++- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 16 + + arch/arm/boot/dts/vf-colibri.dtsi | 33 + + arch/arm/boot/dts/vfxxx.dtsi | 19 + + arch/arm/mach-lpc32xx/Makefile | 2 +- + arch/arm/mach-lpc32xx/include/mach/irqs.h | 2 +- + arch/arm/mach-lpc32xx/irq.c | 477 ------------- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 123 ++-- + drivers/clk/imx/clk-gate2.c | 7 +- + drivers/clk/imx/clk-imx6sx.c | 10 +- + drivers/clk/imx/clk-imx7d.c | 3 +- + drivers/clk/imx/clk-vf610.c | 60 +- + drivers/clk/imx/clk.h | 13 +- + drivers/clk/samsung/clk-exynos5420.c | 77 ++- + drivers/soc/mediatek/mtk-pmic-wrap.c | 6 +- + include/dt-bindings/clock/exynos5420.h | 24 +- + include/dt-bindings/clock/imx7d-clock.h | 3 +- + include/dt-bindings/clock/vf610-clock.h | 8 +- + 39 files changed, 3082 insertions(+), 1025 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos4412-ppmu-common.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-nitrogen7.dts + delete mode 100644 arch/arm/mach-lpc32xx/irq.c +Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int) +$ git merge bcm2835-dt/bcm2835-dt-next +Already up-to-date. +Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Already up-to-date. +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' 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 (63b44471754b Merge branch 'imx/defconfig64' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/imx35-clock.txt | 1 + + drivers/clk/imx/clk-imx35.c | 4 ++-- + drivers/clk/imx/clk-imx7d.c | 2 +- + drivers/clk/imx/clk-pllv3.c | 9 ++++++++- + 4 files changed, 12 insertions(+), 4 deletions(-) +Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/dm814x-clocks.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am57xx-idk-common.dtsi | 32 ++++++++++--------- + arch/arm/boot/dts/dm8148-evm.dts | 8 +++++ + arch/arm/boot/dts/dm8148-t410.dts | 9 ++++++ + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 +-- + arch/arm/boot/dts/dra7.dtsi | 2 ++ + arch/arm/boot/dts/omap3-evm-37xx.dts | 2 +- + arch/arm/boot/dts/omap3-igep.dtsi | 1 + + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 11 +++++++ + arch/arm/boot/dts/omap3-n900.dts | 4 +-- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 6 ++-- + arch/arm/boot/dts/omap3-zoom3.dts | 6 ++-- + arch/arm/boot/dts/omap5-board-common.dtsi | 48 ++++++++++++++++++++++++++-- + arch/arm/boot/dts/omap5-igep0050.dts | 26 +++++++++++++++ + arch/arm/boot/dts/omap5-uevm.dts | 10 ++++++ + arch/arm/mach-omap2/Kconfig | 10 ++++++ + arch/arm/mach-omap2/omap-secure.h | 1 + + arch/arm/mach-omap2/omap-smp.c | 48 +++++++++++++++++++++++++--- + 17 files changed, 195 insertions(+), 33 deletions(-) +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 (2dd0d1733417 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 28 ++ + arch/arm/boot/dts/qcom-apq8084.dtsi | 8 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 8 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 8 + + drivers/firmware/qcom_scm-32.c | 360 +++++++++++---------- + drivers/firmware/qcom_scm-64.c | 291 ++++++++++++++++- + drivers/firmware/qcom_scm.c | 305 ++++++++++++++++- + drivers/firmware/qcom_scm.h | 45 ++- + include/linux/qcom_scm.h | 8 + + 9 files changed, 868 insertions(+), 193 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt +Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (a108aca0c77f Merge branch 'v4.7-clk/fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3399-cru.txt | 62 + + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-cpu.c | 29 +- + drivers/clk/rockchip/clk-mmc-phase.c | 15 +- + drivers/clk/rockchip/clk-pll.c | 336 ++++- + drivers/clk/rockchip/clk-rk3036.c | 21 +- + drivers/clk/rockchip/clk-rk3188.c | 51 +- + drivers/clk/rockchip/clk-rk3228.c | 21 +- + drivers/clk/rockchip/clk-rk3288.c | 23 +- + drivers/clk/rockchip/clk-rk3368.c | 28 +- + drivers/clk/rockchip/clk-rk3399.c | 1575 ++++++++++++++++++++ + drivers/clk/rockchip/clk.c | 151 +- + drivers/clk/rockchip/clk.h | 104 +- + 13 files changed, 2235 insertions(+), 182 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt + create mode 100644 drivers/clk/rockchip/clk-rk3399.c +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (35e691cf5165 Merge branch 'fixes-v4.7' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/plat-samsung/devs.c | 2 +- + 4 files changed, 3 insertions(+), 2 deletions(-) +Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/clk/tegra/clk.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra30-beaver.dts | 39 ++++++---- + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-dfll.c | 11 +-- + drivers/clk/tegra/clk-dfll.h | 22 +++--- + drivers/clk/tegra/clk-id.h | 2 + + drivers/clk/tegra/clk-periph-fixed.c | 120 +++++++++++++++++++++++++++++ + drivers/clk/tegra/clk-periph-gate.c | 2 +- + drivers/clk/tegra/clk-periph.c | 2 +- + drivers/clk/tegra/clk-pll.c | 46 +++++++++++ + drivers/clk/tegra/clk-tegra-fixed.c | 1 - + drivers/clk/tegra/clk-tegra-periph.c | 5 +- + drivers/clk/tegra/clk-tegra114.c | 6 +- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 103 ++++++++++++++----------- + drivers/clk/tegra/clk-tegra124.c | 4 + + drivers/clk/tegra/clk-tegra210.c | 29 ++++++- + drivers/clk/tegra/clk-tegra30.c | 12 +-- + drivers/clk/tegra/clk.c | 4 +- + drivers/clk/tegra/clk.h | 27 ++++++- + drivers/clk/tegra/cvb.c | 71 ++++++++++------- + drivers/clk/tegra/cvb.h | 15 ++-- + include/dt-bindings/clock/tegra210-car.h | 2 +- + 21 files changed, 394 insertions(+), 130 deletions(-) + create mode 100644 drivers/clk/tegra/clk-periph-fixed.c +Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer) +$ 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 8026b1cef3af] 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 (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON) +$ git merge h8300/h8300-next +Already up-to-date. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/kernel/mca.c | 5 +---- + arch/ia64/kernel/traps.c | 1 + + arch/ia64/kernel/unaligned.c | 1 + + arch/ia64/sn/kernel/io_acpi_init.c | 1 - + arch/ia64/sn/kernel/io_init.c | 4 ++-- + arch/ia64/sn/kernel/sn2/sn2_smp.c | 35 +++++++++++++++++++++++------------ + 6 files changed, 28 insertions(+), 19 deletions(-) +Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (44156affd184 m68k: change m68knommu maintainer email address) +$ git merge m68knommu/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging metag/for-next (096a8b6d5e7a metag: Fix atomic_*_return inline asm constraints) +$ 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 +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/uapi/asm/unistd.h | 3 +++ + arch/microblaze/kernel/syscall_table.S | 3 +++ + arch/microblaze/pci/pci-common.c | 2 ++ + 4 files changed, 9 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (2c93cd0d5d69 MIPS: Clear Status IPL field when using EIC) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/kernel/irq.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target) +$ git merge nios2/for-next +Merge made by the 'recursive' strategy. + arch/nios2/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation) +$ git merge parisc-hd/for-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging arch/parisc/kernel/syscall.S +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 3 + + arch/parisc/include/asm/cmpxchg.h | 9 +- + arch/parisc/include/asm/ftrace.h | 2 + + arch/parisc/include/asm/syscall.h | 9 + + arch/parisc/include/asm/thread_info.h | 4 +- + arch/parisc/include/asm/uaccess.h | 91 +++---- + arch/parisc/include/uapi/asm/ptrace.h | 48 ++++ + arch/parisc/kernel/ptrace.c | 368 +++++++++++++++++++++++++- + arch/parisc/kernel/syscall.S | 1 + + arch/parisc/kernel/time.c | 63 ++++- + arch/parisc/lib/bitops.c | 6 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 8 +- + 12 files changed, 542 insertions(+), 70 deletions(-) +Merging powerpc/next (138a076496e6 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next) +$ git merge powerpc/next +Resolved 'arch/powerpc/kernel/prom.c' using previous resolution. +Auto-merging tools/testing/selftests/powerpc/reg.h +Auto-merging tools/perf/config/Makefile +Auto-merging drivers/misc/cxl/native.c +Auto-merging drivers/misc/cxl/cxl.h +Auto-merging drivers/misc/cxl/context.c +Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c +Auto-merging drivers/cpufreq/pmac32-cpufreq.c +Auto-merging arch/powerpc/perf/callchain.c +Auto-merging arch/powerpc/mm/mmu_context_book3s64.c +Auto-merging arch/powerpc/kvm/book3s_pr.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/prom.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c +Auto-merging arch/powerpc/kernel/mce.c +Auto-merging arch/powerpc/include/asm/nohash/64/pgalloc.h +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3ce8af25aae5] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-cxl | 8 + + .../features/perf/perf-regs/arch-support.txt | 2 +- + .../features/perf/perf-stackdump/arch-support.txt | 2 +- + Documentation/powerpc/eeh-pci-error-recovery.txt | 2 +- + MAINTAINERS | 13 + + arch/powerpc/Kconfig | 7 +- + arch/powerpc/Kconfig.debug | 8 - + arch/powerpc/boot/Makefile | 6 +- + arch/powerpc/boot/dts/fsl/gef_ppc9a.dts | 4 + + arch/powerpc/boot/dts/fsl/gef_sbc310.dts | 22 - + arch/powerpc/boot/dts/fsl/gef_sbc610.dts | 4 + + arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts | 24 +- + arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts | 24 +- + arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi | 41 +- + arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi | 1 + + arch/powerpc/boot/dts/fsl/sbc8641d.dts | 23 - + arch/powerpc/boot/dts/fsl/t1023si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t208xrdb.dtsi | 2 +- + arch/powerpc/include/asm/book3s/32/hash.h | 3 - + arch/powerpc/include/asm/book3s/32/mmu-hash.h | 6 +- + arch/powerpc/include/asm/book3s/32/pgalloc.h | 109 +++ + arch/powerpc/include/asm/book3s/64/hash-4k.h | 136 +-- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 215 ++--- + arch/powerpc/include/asm/book3s/64/hash.h | 485 ++--------- + arch/powerpc/include/asm/book3s/64/hugetlb-radix.h | 14 + + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 79 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 137 +++ + arch/powerpc/include/asm/book3s/64/pgalloc.h | 207 +++++ + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 53 ++ + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 64 ++ + arch/powerpc/include/asm/book3s/64/pgtable.h | 816 ++++++++++++++++-- + arch/powerpc/include/asm/book3s/64/radix-4k.h | 12 + + arch/powerpc/include/asm/book3s/64/radix-64k.h | 12 + + arch/powerpc/include/asm/book3s/64/radix.h | 232 +++++ + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 41 +- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 33 + + arch/powerpc/include/asm/book3s/64/tlbflush.h | 76 ++ + arch/powerpc/include/asm/book3s/pgalloc.h | 19 + + arch/powerpc/include/asm/hugetlb.h | 14 + + arch/powerpc/include/asm/kvm_book3s_64.h | 36 +- + arch/powerpc/include/asm/machdep.h | 1 + + arch/powerpc/include/asm/mmu.h | 51 +- + arch/powerpc/include/asm/mmu_context.h | 29 +- + .../asm/{pgalloc-32.h => nohash/32/pgalloc.h} | 0 + .../asm/{pgalloc-64.h => nohash/64/pgalloc.h} | 92 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 10 +- + arch/powerpc/include/asm/nohash/pgalloc.h | 23 + + arch/powerpc/include/asm/opal-api.h | 16 +- + arch/powerpc/include/asm/page.h | 14 +- + arch/powerpc/include/asm/page_64.h | 5 +- + arch/powerpc/include/asm/pci-bridge.h | 41 +- + arch/powerpc/include/asm/pgalloc.h | 19 +- + arch/powerpc/include/asm/pgtable-be-types.h | 92 ++ + arch/powerpc/include/asm/pgtable-types.h | 58 +- + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/include/asm/ppc-pci.h | 6 +- + arch/powerpc/include/asm/ppc_asm.h | 3 + + arch/powerpc/include/asm/pte-common.h | 26 +- + arch/powerpc/include/asm/reg.h | 3 + + arch/powerpc/include/asm/tlbflush.h | 3 +- + arch/powerpc/include/uapi/asm/perf_regs.h | 50 ++ + arch/powerpc/kernel/asm-offsets.c | 4 + + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/cputable.c | 2 - + arch/powerpc/kernel/eeh.c | 9 +- + arch/powerpc/kernel/eeh_driver.c | 46 +- + arch/powerpc/kernel/eeh_event.c | 2 +- + arch/powerpc/kernel/eeh_pe.c | 2 +- + arch/powerpc/kernel/entry_64.S | 16 +- + arch/powerpc/kernel/exceptions-64s.S | 163 +--- + arch/powerpc/kernel/ftrace.c | 10 + + arch/powerpc/kernel/head_64.S | 13 +- + arch/powerpc/kernel/ibmebus.c | 2 +- + arch/powerpc/kernel/isa-bridge.c | 4 +- + arch/powerpc/kernel/machine_kexec.c | 18 +- + arch/powerpc/kernel/machine_kexec_64.c | 15 +- + arch/powerpc/kernel/mce.c | 2 +- + arch/powerpc/kernel/mce_power.c | 13 + + arch/powerpc/kernel/misc_32.S | 6 - + arch/powerpc/kernel/nvram_64.c | 12 +- + arch/powerpc/kernel/pci-hotplug.c | 47 +- + arch/powerpc/kernel/pci_64.c | 5 +- + arch/powerpc/kernel/pci_dn.c | 66 +- + arch/powerpc/kernel/process.c | 17 +- + arch/powerpc/kernel/prom.c | 2 + + arch/powerpc/kernel/rtasd.c | 2 +- + arch/powerpc/kernel/setup-common.c | 6 - + arch/powerpc/kernel/swsusp.c | 2 +- + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kernel/vio.c | 4 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 11 +- + arch/powerpc/kvm/book3s_hv.c | 6 + + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 12 +- + arch/powerpc/kvm/book3s_pr.c | 6 +- + arch/powerpc/lib/copy_32.S | 2 +- + arch/powerpc/lib/sstep.c | 5 + + arch/powerpc/lib/xor_vmx.c | 10 + + arch/powerpc/mm/Makefile | 10 +- + arch/powerpc/mm/fsl_booke_mmu.c | 2 +- + arch/powerpc/mm/hash64_4k.c | 29 +- + arch/powerpc/mm/hash64_64k.c | 71 +- + arch/powerpc/mm/hash_native_64.c | 11 +- + arch/powerpc/mm/hash_utils_64.c | 190 +++- + arch/powerpc/mm/hugepage-hash64.c | 22 +- + arch/powerpc/mm/hugetlbpage-hash64.c | 29 +- + arch/powerpc/mm/hugetlbpage-radix.c | 87 ++ + arch/powerpc/mm/hugetlbpage.c | 20 +- + arch/powerpc/mm/init_64.c | 73 +- + arch/powerpc/mm/mem.c | 40 +- + arch/powerpc/mm/mmap.c | 110 +++ + ...mmu_context_hash64.c => mmu_context_book3s64.c} | 52 +- + arch/powerpc/mm/mmu_context_nohash.c | 6 +- + arch/powerpc/mm/mmu_decl.h | 5 - + arch/powerpc/mm/pgtable-book3e.c | 122 +++ + arch/powerpc/mm/pgtable-book3s64.c | 118 +++ + arch/powerpc/mm/pgtable-hash64.c | 342 ++++++++ + arch/powerpc/mm/pgtable-radix.c | 526 ++++++++++++ + arch/powerpc/mm/pgtable.c | 24 +- + arch/powerpc/mm/pgtable_64.c | 557 ++---------- + arch/powerpc/mm/slb.c | 1 - + arch/powerpc/mm/slb_low.S | 54 +- + arch/powerpc/mm/slice.c | 20 +- + arch/powerpc/mm/tlb-radix.c | 251 ++++++ + arch/powerpc/mm/tlb_hash64.c | 6 +- + arch/powerpc/perf/Makefile | 2 +- + arch/powerpc/perf/callchain.c | 2 +- + arch/powerpc/perf/perf_regs.c | 104 +++ + arch/powerpc/perf/power8-events-list.h | 40 + + arch/powerpc/perf/power8-pmu.c | 41 +- + arch/powerpc/platforms/Kconfig.cputype | 11 +- + arch/powerpc/platforms/cell/spu_base.c | 9 +- + arch/powerpc/platforms/cell/spufs/fault.c | 4 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 69 +- + arch/powerpc/platforms/powernv/npu-dma.c | 283 +++--- + arch/powerpc/platforms/powernv/opal-hmi.c | 8 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 953 +++++++++++++-------- + arch/powerpc/platforms/powernv/pci.c | 19 +- + arch/powerpc/platforms/powernv/pci.h | 72 +- + arch/powerpc/platforms/powernv/setup.c | 5 +- + arch/powerpc/platforms/ps3/htab.c | 2 +- + arch/powerpc/platforms/ps3/spu.c | 4 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 225 ++++- + arch/powerpc/platforms/pseries/iommu.c | 24 +- + arch/powerpc/platforms/pseries/lpar.c | 20 +- + arch/powerpc/platforms/pseries/lparcfg.c | 3 +- + arch/powerpc/platforms/pseries/mobility.c | 4 +- + arch/powerpc/platforms/pseries/msi.c | 4 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 32 - + arch/powerpc/platforms/pseries/reconfig.c | 5 +- + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/sysdev/fsl_pci.c | 24 + + arch/powerpc/sysdev/mpic.c | 9 +- + arch/powerpc/xmon/Makefile | 2 +- + arch/powerpc/xmon/spr_access.S | 45 + + arch/powerpc/xmon/xmon.c | 138 +-- + drivers/cpufreq/pmac32-cpufreq.c | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 5 +- + drivers/infiniband/hw/qib/qib_pcie.c | 6 - + drivers/macintosh/rack-meter.c | 5 +- + drivers/macintosh/via-pmu.c | 4 +- + drivers/misc/cxl/api.c | 28 +- + drivers/misc/cxl/context.c | 3 +- + drivers/misc/cxl/cxl.h | 15 +- + drivers/misc/cxl/fault.c | 10 +- + drivers/misc/cxl/guest.c | 78 +- + drivers/misc/cxl/native.c | 29 +- + drivers/misc/cxl/pci.c | 64 +- + drivers/misc/cxl/sysfs.c | 10 + + drivers/of/base.c | 3 + + drivers/pci/hotplug/rpadlpar_core.c | 8 +- + drivers/pci/hotplug/rpaphp_core.c | 4 +- + drivers/pci/hotplug/rpaphp_pci.c | 4 +- + drivers/pcmcia/electra_cf.c | 2 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 3 +- + include/misc/cxl.h | 8 + + kernel/trace/ftrace.c | 12 + + tools/perf/arch/powerpc/include/perf_regs.h | 69 ++ + tools/perf/arch/powerpc/util/Build | 2 + + tools/perf/arch/powerpc/util/perf_regs.c | 49 ++ + tools/perf/arch/powerpc/util/unwind-libunwind.c | 96 +++ + tools/perf/config/Makefile | 6 + + tools/perf/util/perf_regs.c | 8 +- + tools/testing/selftests/powerpc/Makefile | 1 + + .../selftests/powerpc/context_switch/.gitignore | 1 + + .../selftests/powerpc/context_switch/Makefile | 10 + + .../selftests/powerpc/context_switch/cp_abort.c | 110 +++ + tools/testing/selftests/powerpc/mm/subpage_prot.c | 18 +- + tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 1 - + .../selftests/powerpc/pmu/ebb/reg_access_test.c | 1 - + .../testing/selftests/powerpc/{pmu/ebb => }/reg.h | 18 +- + tools/testing/selftests/powerpc/tm/.gitignore | 3 + + tools/testing/selftests/powerpc/tm/Makefile | 3 +- + tools/testing/selftests/powerpc/tm/tm-fork.c | 42 + + .../testing/selftests/powerpc/tm/tm-resched-dscr.c | 16 +- + .../testing/selftests/powerpc/tm/tm-signal-stack.c | 4 +- + tools/testing/selftests/powerpc/tm/tm-tar.c | 90 ++ + tools/testing/selftests/powerpc/tm/tm-tmspr.c | 143 ++++ + tools/testing/selftests/powerpc/utils.h | 8 + + 200 files changed, 6907 insertions(+), 3127 deletions(-) + create mode 100644 arch/powerpc/include/asm/book3s/32/pgalloc.h + create mode 100644 arch/powerpc/include/asm/book3s/64/hugetlb-radix.h + create mode 100644 arch/powerpc/include/asm/book3s/64/mmu.h + create mode 100644 arch/powerpc/include/asm/book3s/64/pgalloc.h + create mode 100644 arch/powerpc/include/asm/book3s/64/pgtable-4k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/pgtable-64k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/radix-4k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/radix-64k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/radix.h + create mode 100644 arch/powerpc/include/asm/book3s/64/tlbflush-radix.h + create mode 100644 arch/powerpc/include/asm/book3s/64/tlbflush.h + create mode 100644 arch/powerpc/include/asm/book3s/pgalloc.h + rename arch/powerpc/include/asm/{pgalloc-32.h => nohash/32/pgalloc.h} (100%) + rename arch/powerpc/include/asm/{pgalloc-64.h => nohash/64/pgalloc.h} (68%) + create mode 100644 arch/powerpc/include/asm/nohash/pgalloc.h + create mode 100644 arch/powerpc/include/asm/pgtable-be-types.h + create mode 100644 arch/powerpc/include/uapi/asm/perf_regs.h + create mode 100644 arch/powerpc/mm/hugetlbpage-radix.c + rename arch/powerpc/mm/{mmu_context_hash64.c => mmu_context_book3s64.c} (70%) + create mode 100644 arch/powerpc/mm/pgtable-book3e.c + create mode 100644 arch/powerpc/mm/pgtable-book3s64.c + create mode 100644 arch/powerpc/mm/pgtable-hash64.c + create mode 100644 arch/powerpc/mm/pgtable-radix.c + create mode 100644 arch/powerpc/mm/tlb-radix.c + create mode 100644 arch/powerpc/perf/perf_regs.c + create mode 100644 arch/powerpc/xmon/spr_access.S + create mode 100644 tools/perf/arch/powerpc/include/perf_regs.h + create mode 100644 tools/perf/arch/powerpc/util/perf_regs.c + create mode 100644 tools/perf/arch/powerpc/util/unwind-libunwind.c + create mode 100644 tools/testing/selftests/powerpc/context_switch/.gitignore + create mode 100644 tools/testing/selftests/powerpc/context_switch/Makefile + create mode 100644 tools/testing/selftests/powerpc/context_switch/cp_abort.c + rename tools/testing/selftests/powerpc/{pmu/ebb => }/reg.h (74%) + create mode 100644 tools/testing/selftests/powerpc/tm/tm-fork.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-tar.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-tmspr.c +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition) +$ 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 (6edf0aa4f8bb s390/bpf: fix recache skb->data/hlen for skb_vlan_push/pop) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/net/bpf_jit.h | 4 ++-- + arch/s390/net/bpf_jit_comp.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 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 tile/master (4ef00aa30a3f tile: sort the "select" lines in the TILE/TILEGX configs) +$ git merge tile/master +Auto-merging arch/tile/configs/tilepro_defconfig +Auto-merging arch/tile/configs/tilegx_defconfig +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 67 ++++++++++++++++--------------------- + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 1 - + arch/tile/include/asm/atomic_64.h | 17 ++++++++-- + 4 files changed, 43 insertions(+), 43 deletions(-) +Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/include/asm/mmu_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7) +$ git merge btrfs/next +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 2 +- + fs/btrfs/btrfs_inode.h | 10 + + fs/btrfs/compression.c | 85 ++- + fs/btrfs/ctree.c | 6 +- + fs/btrfs/ctree.h | 1123 +++------------------------------------ + fs/btrfs/delayed-inode.c | 2 +- + fs/btrfs/dev-replace.c | 101 ++-- + fs/btrfs/dev-replace.h | 4 +- + fs/btrfs/disk-io.c | 130 ++--- + fs/btrfs/extent-tree.c | 167 +++++- + fs/btrfs/extent_io.c | 82 +-- + fs/btrfs/extent_io.h | 1 - + fs/btrfs/file.c | 6 +- + fs/btrfs/inode-item.c | 2 +- + fs/btrfs/inode.c | 466 +++++++++++++--- + fs/btrfs/ioctl.c | 198 +++++-- + fs/btrfs/ordered-data.c | 26 +- + fs/btrfs/ordered-data.h | 6 +- + fs/btrfs/relocation.c | 13 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/scrub.c | 25 +- + fs/btrfs/send.c | 62 ++- + fs/btrfs/super.c | 60 ++- + fs/btrfs/sysfs.c | 14 +- + fs/btrfs/transaction.c | 138 ++++- + fs/btrfs/tree-log.c | 74 +-- + fs/btrfs/volumes.c | 454 +++++++++------- + fs/btrfs/volumes.h | 57 +- + include/uapi/linux/btrfs.h | 188 ++++++- + include/uapi/linux/btrfs_tree.h | 966 +++++++++++++++++++++++++++++++++ + 30 files changed, 2678 insertions(+), 1794 deletions(-) + create mode 100644 include/uapi/linux/btrfs_tree.h +Merging btrfs-kdave/for-next (a3a7fdf24a89 Merge branch 'for-next-next-4.7-20160512' into for-next-20160512) +$ git merge btrfs-kdave/for-next +Resolved 'fs/btrfs/dev-replace.c' using previous resolution. +Resolved 'fs/btrfs/inode.c' using previous resolution. +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/transaction.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/relocation.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/dev-replace.c +CONFLICT (content): Merge conflict in fs/btrfs/dev-replace.c +Auto-merging fs/btrfs/ctree.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ae23d86c28a1] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 68 ++-- + fs/btrfs/disk-io.c | 4 +- + fs/btrfs/extent-tree.c | 682 ++++++++++++++++++++++++++------------- + fs/btrfs/extent_io.c | 84 ++--- + fs/btrfs/extent_io.h | 34 +- + fs/btrfs/file-item.c | 2 +- + fs/btrfs/file.c | 48 +-- + fs/btrfs/inode.c | 12 +- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/qgroup.c | 8 +- + fs/btrfs/relocation.c | 9 +- + fs/btrfs/scrub.c | 4 +- + fs/btrfs/tests/extent-io-tests.c | 8 +- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/tree-log.c | 2 +- + include/trace/events/btrfs.h | 139 +++++++- + 17 files changed, 727 insertions(+), 396 deletions(-) +Merging ceph/master (d3767f0faeda rbd: report unsupported features to syslog) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (56c1d814aadf CIFS: Remove some obsolete comments) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_spnego.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/cifsfs.c | 11 +++------ + fs/cifs/cifsproto.h | 2 ++ + 3 files changed, 72 insertions(+), 8 deletions(-) +$ git am -3 ../patches/0001-cifs-fix-for-keyringalloc-API-change.patch +Applying: cifs: fix for keyringalloc() API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/cifs/cifs_spnego.c +$ git add -A . +$ git commit -v -a --amend +[master 48db1e34db1b] Merge remote-tracking branch 'cifs/for-next' + Date: Fri May 20 08:43:50 2016 +1000 +Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (7888824b0b1c udf: Use correct partition reference number for metadata) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/udf/partition.c | 13 +++++++++---- + fs/udf/super.c | 22 ++++++++++++---------- + fs/udf/udf_sb.h | 5 +++++ + 3 files changed, 26 insertions(+), 14 deletions(-) +Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO) +$ git merge ext4/dev +Resolved 'fs/ext4/ext4.h' using previous resolution. +Resolved 'fs/ext4/indirect.c' using previous resolution. +Resolved 'fs/ext4/inode.c' using previous resolution. +Auto-merging fs/readdir.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/inode.c +CONFLICT (content): Merge conflict in fs/ext4/inode.c +Auto-merging fs/ext4/indirect.c +CONFLICT (content): Merge conflict in fs/ext4/indirect.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/ext4.h +CONFLICT (content): Merge conflict in fs/ext4/ext4.h +Auto-merging fs/ext4/dir.c +Auto-merging fs/dax.c +Auto-merging fs/compat.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b6dfc7ac997e] Merge remote-tracking branch 'ext4/dev' +$ git diff -M --stat --summary HEAD^.. + fs/compat.c | 4 + + fs/dax.c | 2 +- + fs/ext4/balloc.c | 3 +- + fs/ext4/dir.c | 5 + + fs/ext4/ext4.h | 20 ++- + fs/ext4/ext4_jbd2.h | 15 +- + fs/ext4/extents.c | 20 ++- + fs/ext4/extents_status.c | 2 +- + fs/ext4/file.c | 6 +- + fs/ext4/ialloc.c | 59 ++++---- + fs/ext4/indirect.c | 127 ----------------- + fs/ext4/inline.c | 2 +- + fs/ext4/inode.c | 323 ++++++++++++++++++++++++++++-------------- + fs/ext4/ioctl.c | 2 +- + fs/ext4/mballoc.c | 12 +- + fs/ext4/mmp.c | 4 +- + fs/ext4/move_extent.c | 2 +- + fs/ext4/namei.c | 9 +- + fs/ext4/page-io.c | 2 - + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 4 + + fs/jbd2/commit.c | 4 + + fs/jbd2/journal.c | 3 +- + fs/jbd2/transaction.c | 22 ++- + fs/ocfs2/journal.h | 2 +- + fs/readdir.c | 4 + + include/linux/jbd2.h | 16 ++- + kernel/locking/percpu-rwsem.c | 1 + + 28 files changed, 364 insertions(+), 313 deletions(-) +Merging f2fs/dev (cb8be9a053f8 f2fs: avoid ENOSPC fault in the recovery process) +$ git merge f2fs/dev +Resolved 'fs/f2fs/data.c' using previous resolution. +Auto-merging fs/f2fs/xattr.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/dir.c +Auto-merging fs/f2fs/data.c +CONFLICT (content): Merge conflict in fs/f2fs/data.c +Auto-merging fs/f2fs/acl.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 527aa569eb36] Merge remote-tracking branch 'f2fs/dev' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + fs/crypto/keyinfo.c | 120 ++++++++++------- + fs/f2fs/Kconfig | 8 ++ + fs/f2fs/acl.c | 4 +- + fs/f2fs/checkpoint.c | 64 ++++----- + fs/f2fs/data.c | 195 +++++++++++++++++++--------- + fs/f2fs/debug.c | 25 ++-- + fs/f2fs/dir.c | 128 +++++++++--------- + fs/f2fs/extent_cache.c | 3 +- + fs/f2fs/f2fs.h | 197 ++++++++++++++++++++-------- + fs/f2fs/file.c | 301 ++++++++++++++++++++++++++++++------------ + fs/f2fs/gc.c | 27 +--- + fs/f2fs/inline.c | 111 ++++++++++++++-- + fs/f2fs/inode.c | 64 ++++----- + fs/f2fs/node.c | 309 ++++++++++++++++++++++++++++++++++---------- + fs/f2fs/recovery.c | 149 ++++++++++++--------- + fs/f2fs/segment.c | 8 +- + fs/f2fs/segment.h | 9 +- + fs/f2fs/super.c | 288 +++++++++++++++++++++++++++++++++++------ + fs/f2fs/xattr.c | 3 +- + include/linux/f2fs_fs.h | 2 + + include/linux/fscrypto.h | 1 + + include/trace/events/f2fs.h | 24 ++-- + 23 files changed, 1437 insertions(+), 605 deletions(-) +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (68cd4ce2caf2 GFS2: Refactor gfs2_remove_from_journal) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/rgrp.c +Auto-merging fs/gfs2/meta_io.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/aops.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 5 +++-- + fs/gfs2/file.c | 31 ++++++++++++++++++++++++++++--- + fs/gfs2/glock.c | 11 +++++++++-- + fs/gfs2/glops.c | 7 ------- + fs/gfs2/inode.c | 6 +++--- + fs/gfs2/meta_io.c | 7 ++++--- + fs/gfs2/meta_io.h | 8 ++++++-- + fs/gfs2/rgrp.c | 16 ++++++---------- + fs/gfs2/util.c | 1 + + 9 files changed, 60 insertions(+), 32 deletions(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (1b3c6d07e295 pnfs: make pnfs_layout_process more robust) +$ git merge nfs/linux-next +Resolved 'fs/nfs/direct.c' using previous resolution. +Auto-merging net/sunrpc/xprtsock.c +Auto-merging include/linux/nfs_xdr.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/direct.c +CONFLICT (content): Merge conflict in fs/nfs/direct.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8ccabfd8179c] Merge remote-tracking branch 'nfs/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/nfs/callback_proc.c | 9 +- + fs/nfs/callback_xdr.c | 17 +- + fs/nfs/delegation.c | 9 +- + fs/nfs/delegation.h | 2 +- + fs/nfs/direct.c | 17 +- + fs/nfs/filelayout/filelayout.c | 4 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 150 ++++++--- + fs/nfs/flexfilelayout/flexfilelayout.h | 6 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 113 ++++--- + fs/nfs/internal.h | 1 + + fs/nfs/nfs42.h | 1 + + fs/nfs/nfs42proc.c | 107 ++++++- + fs/nfs/nfs42xdr.c | 146 +++++++++ + fs/nfs/nfs4_fs.h | 12 +- + fs/nfs/nfs4file.c | 23 ++ + fs/nfs/nfs4proc.c | 185 ++++++----- + fs/nfs/nfs4state.c | 18 +- + fs/nfs/nfs4trace.h | 10 +- + fs/nfs/nfs4xdr.c | 43 ++- + fs/nfs/pagelist.c | 6 +- + fs/nfs/pnfs.c | 317 ++++++++++-------- + fs/nfs/pnfs.h | 16 +- + fs/nfs/pnfs_nfs.c | 32 +- + fs/nfs/super.c | 9 + + fs/nfs/write.c | 60 +++- + include/linux/errno.h | 1 + + include/linux/nfs4.h | 28 +- + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_xdr.h | 30 +- + include/linux/sunrpc/auth.h | 26 +- + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/msg_prot.h | 4 +- + include/linux/sunrpc/xprt.h | 1 + + include/linux/sunrpc/xprtrdma.h | 4 +- + net/sunrpc/auth.c | 9 +- + net/sunrpc/auth_generic.c | 13 +- + net/sunrpc/auth_gss/auth_gss.c | 6 +- + net/sunrpc/auth_unix.c | 6 +- + net/sunrpc/clnt.c | 17 + + net/sunrpc/xdr.c | 2 + + net/sunrpc/xprtrdma/backchannel.c | 16 + + net/sunrpc/xprtrdma/fmr_ops.c | 134 +++++--- + net/sunrpc/xprtrdma/frwr_ops.c | 214 +++++++------ + net/sunrpc/xprtrdma/physical_ops.c | 39 ++- + net/sunrpc/xprtrdma/rpc_rdma.c | 517 ++++++++++++++++++------------ + net/sunrpc/xprtrdma/transport.c | 16 +- + net/sunrpc/xprtrdma/verbs.c | 78 +---- + net/sunrpc/xprtrdma/xprt_rdma.h | 47 ++- + net/sunrpc/xprtsock.c | 6 + + 49 files changed, 1655 insertions(+), 874 deletions(-) +$ git am -3 ../patches/0001-nfs-fix-for-i_mutex-to-i_rwsem-change.patch +Applying: nfs: fix for i_mutex to i_rwsem change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/nfs/nfs42proc.c +$ git add -A . +$ git commit -v -a --amend +[master 689382f0caec] Merge remote-tracking branch 'nfs/linux-next' + Date: Fri May 20 09:22:50 2016 +1000 +Merging nfsd/nfsd-next (d9e4084f6c97 svcrdma: Generalize svc_rdma_xdr_decode_req()) +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs3xdr.c +Merge made by the 'recursive' strategy. + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4layouts.c | 2 +- + fs/nfsd/nfs4state.c | 8 +------- + fs/nfsd/state.h | 5 +++++ + include/linux/sunrpc/svc_rdma.h | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 5 ++--- + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 32 ++++++++++++++++++++---------- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 34 ++++++++------------------------ + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 28 ++++++++++++-------------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 17 ++++++++++++++-- + 10 files changed, 69 insertions(+), 66 deletions(-) +Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (41523ff335f4 ovl: override creds with the ones from the superblock mounter) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/readdir.c +Auto-merging fs/overlayfs/overlayfs.h +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 26 +------------------ + fs/overlayfs/dir.c | 67 ++++-------------------------------------------- + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/readdir.c | 14 +++------- + fs/overlayfs/super.c | 18 ++++++++++++- + 5 files changed, 27 insertions(+), 99 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 (c27cb97218b3 ubifs: Remove unused header) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_xattr.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_pnfs.c +Auto-merging fs/xfs/xfs_mount.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/xfs/libxfs/xfs_bmap.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/namei.c | 1 - + fs/xfs/kmem.c | 26 +-- + fs/xfs/kmem.h | 2 +- + fs/xfs/libxfs/xfs_attr.c | 58 ++----- + fs/xfs/libxfs/xfs_bmap.c | 22 ++- + fs/xfs/libxfs/xfs_dir2_sf.c | 9 +- + fs/xfs/libxfs/xfs_inode_fork.c | 72 ++++++--- + fs/xfs/libxfs/xfs_inode_fork.h | 1 + + fs/xfs/libxfs/xfs_log_format.h | 5 + + fs/xfs/libxfs/xfs_sb.c | 8 +- + fs/xfs/libxfs/xfs_shared.h | 102 +----------- + fs/xfs/xfs_aops.c | 354 ++++++++++++++++++++--------------------- + fs/xfs/xfs_aops.h | 15 +- + fs/xfs/xfs_attr.h | 4 +- + fs/xfs/xfs_attr_inactive.c | 16 +- + fs/xfs/xfs_attr_list.c | 85 +++------- + fs/xfs/xfs_bmap_util.c | 45 ++---- + fs/xfs/xfs_dquot.c | 9 +- + fs/xfs/xfs_file.c | 8 +- + fs/xfs/xfs_fsops.c | 14 +- + fs/xfs/xfs_inode.c | 63 +++----- + fs/xfs/xfs_inode.h | 5 +- + fs/xfs/xfs_inode_item.c | 6 +- + fs/xfs/xfs_ioctl.c | 31 +--- + fs/xfs/xfs_iomap.c | 53 ++---- + fs/xfs/xfs_iops.c | 117 +++++++++----- + fs/xfs/xfs_log.c | 62 +------- + fs/xfs/xfs_log.h | 3 +- + fs/xfs/xfs_log_cil.c | 1 - + fs/xfs/xfs_log_priv.h | 1 - + fs/xfs/xfs_log_recover.c | 12 +- + fs/xfs/xfs_mount.c | 1 - + fs/xfs/xfs_pnfs.c | 7 +- + fs/xfs/xfs_qm.c | 9 +- + fs/xfs/xfs_qm_syscalls.c | 26 +-- + fs/xfs/xfs_rtalloc.c | 21 ++- + fs/xfs/xfs_super.c | 37 ++--- + fs/xfs/xfs_symlink.c | 37 ++--- + fs/xfs/xfs_trace.h | 15 +- + fs/xfs/xfs_trans.c | 88 +++++----- + fs/xfs/xfs_trans.h | 8 +- + fs/xfs/xfs_xattr.c | 17 +- + 42 files changed, 594 insertions(+), 882 deletions(-) +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (51085a1f913a cifs: use C99 syntax for inode_operations initializer) +$ git merge vfs/for-next +Recorded preimage for 'fs/cifs/cifsfs.c' +Auto-merging fs/orangefs/orangefs-kernel.h +Auto-merging fs/orangefs/inode.c +Auto-merging fs/cifs/cifsfs.c +CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/cifs/cifsfs.c'. +[master 3643eaa68864] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/orangefs/inode.c | 2 +- + fs/orangefs/namei.c | 2 +- + fs/orangefs/orangefs-kernel.h | 6 +++--- + fs/orangefs/symlink.c | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) +Merging pci/next (e257ef55ce51 Merge branches 'pci/arm64' and 'pci/host-hv' into next) +$ git merge pci/next +Already up-to-date. +$ git am -3 ../patches/0001-iommu-amd-fix-up-for-aliases-API-change.patch +Applying: iommu/amd: fix up for aliases API change +Using index info to reconstruct a base tree... +M drivers/iommu/amd_iommu.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (0b008267ec1b Merge branch 'i2c/for-4.7' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/media/usb/cx231xx/cx231xx-core.c +Auto-merging drivers/media/dvb-frontends/m88ds3103_priv.h +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-octeon.txt | 6 + + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 3 + + Documentation/i2c/i2c-topology | 370 ++++++++ + MAINTAINERS | 1 + + drivers/i2c/algos/i2c-algo-bit.c | 2 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 2 +- + drivers/i2c/busses/i2c-bcm-kona.c | 5 +- + drivers/i2c/busses/i2c-brcmstb.c | 4 +- + drivers/i2c/busses/i2c-cpm.c | 4 +- + drivers/i2c/busses/i2c-dln2.c | 2 + + drivers/i2c/busses/i2c-exynos5.c | 10 +- + drivers/i2c/busses/i2c-i801.c | 52 +- + drivers/i2c/busses/i2c-ibm_iic.c | 2 +- + drivers/i2c/busses/i2c-img-scb.c | 4 +- + drivers/i2c/busses/i2c-imx.c | 2 +- + drivers/i2c/busses/i2c-iop3xx.c | 5 +- + drivers/i2c/busses/i2c-lpc2k.c | 4 +- + drivers/i2c/busses/i2c-mt65xx.c | 5 +- + drivers/i2c/busses/i2c-mv64xxx.c | 45 +- + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/busses/i2c-ocores.c | 5 +- + drivers/i2c/busses/i2c-octeon.c | 998 +++++++++++++++++---- + drivers/i2c/busses/i2c-omap.c | 12 +- + drivers/i2c/busses/i2c-powermac.c | 4 +- + drivers/i2c/busses/i2c-qup.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 233 ++++- + drivers/i2c/busses/i2c-rk3x.c | 87 +- + drivers/i2c/busses/i2c-s3c2410.c | 244 +++-- + drivers/i2c/busses/i2c-sh_mobile.c | 3 +- + drivers/i2c/busses/i2c-sirf.c | 4 +- + drivers/i2c/busses/i2c-st.c | 48 +- + drivers/i2c/busses/i2c-tegra.c | 81 +- + drivers/i2c/busses/i2c-uniphier-f.c | 2 +- + drivers/i2c/busses/i2c-uniphier.c | 2 +- + drivers/i2c/i2c-core.c | 72 +- + drivers/i2c/i2c-mux.c | 300 +++++-- + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 47 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 73 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 58 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 61 +- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 135 +-- + drivers/i2c/muxes/i2c-mux-reg.c | 69 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 1 - + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 79 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 3 +- + drivers/media/dvb-frontends/m88ds3103.c | 19 +- + drivers/media/dvb-frontends/m88ds3103_priv.h | 2 +- + drivers/media/dvb-frontends/rtl2830.c | 20 +- + drivers/media/dvb-frontends/rtl2830_priv.h | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 243 +---- + drivers/media/dvb-frontends/rtl2832.h | 4 +- + drivers/media/dvb-frontends/rtl2832_priv.h | 3 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 303 +++---- + drivers/media/dvb-frontends/rtl2832_sdr.h | 5 +- + drivers/media/dvb-frontends/si2168.c | 106 +-- + drivers/media/dvb-frontends/si2168_priv.h | 3 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 6 +- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 47 +- + drivers/media/usb/cx231xx/cx231xx.h | 4 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 5 +- + drivers/misc/eeprom/at24.c | 9 +- + drivers/of/unittest.c | 37 +- + include/linux/i2c-mux.h | 55 +- + include/linux/i2c.h | 50 +- + include/uapi/linux/i2c.h | 13 +- + 67 files changed, 2648 insertions(+), 1445 deletions(-) + create mode 100644 Documentation/i2c/i2c-topology +Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Auto-merging Documentation/hwmon/max34440 +Merge made by the 'recursive' strategy. + Documentation/hwmon/max34440 | 6 +++--- + drivers/hwmon/emc2103.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (d6a442df63b2 hwmon: (sch5636) trivial fix of spelling mistake on revision) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (16490980e396 Merge tag 'device-properties-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (f1ba9eb85b5e thermal: int340x: processor_thermal: support acpi notification) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../int340x_thermal/processor_thermal_device.c | 108 +++++++++++++++------ + drivers/thermal/intel_powerclamp.c | 47 ++------- + 2 files changed, 86 insertions(+), 69 deletions(-) +Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Removing drivers/thermal/tegra_soctherm.c +Auto-merging drivers/thermal/Kconfig +Auto-merging drivers/cpufreq/mt8173-cpufreq.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/rcar-thermal.txt | 1 - + .../devicetree/bindings/thermal/tango-thermal.txt | 17 + + .../devicetree/bindings/thermal/tegra-soctherm.txt | 12 + + .../bindings/thermal/thermal-generic-adc.txt | 89 +++ + Documentation/thermal/sysfs-api.txt | 44 +- + MAINTAINERS | 1 + + drivers/cpufreq/mt8173-cpufreq.c | 11 +- + drivers/hwmon/lm75.c | 10 +- + drivers/hwmon/ntc_thermistor.c | 12 +- + drivers/hwmon/scpi-hwmon.c | 48 +- + drivers/hwmon/tmp102.c | 8 +- + drivers/input/touchscreen/sun4i-ts.c | 9 +- + drivers/thermal/Kconfig | 31 +- + drivers/thermal/Makefile | 4 +- + drivers/thermal/hisi_thermal.c | 45 +- + drivers/thermal/mtk_thermal.c | 12 +- + drivers/thermal/of-thermal.c | 10 +- + drivers/thermal/qcom-spmi-temp-alarm.c | 3 +- + drivers/thermal/rcar_thermal.c | 2 +- + drivers/thermal/rockchip_thermal.c | 280 ++++++--- + drivers/thermal/tango_thermal.c | 108 ++++ + drivers/thermal/tegra/Kconfig | 13 + + drivers/thermal/tegra/Makefile | 6 + + drivers/thermal/tegra/soctherm-fuse.c | 169 +++++ + drivers/thermal/tegra/soctherm.c | 685 +++++++++++++++++++++ + drivers/thermal/tegra/soctherm.h | 127 ++++ + drivers/thermal/tegra/tegra124-soctherm.c | 196 ++++++ + drivers/thermal/tegra/tegra132-soctherm.c | 196 ++++++ + drivers/thermal/tegra/tegra210-soctherm.c | 197 ++++++ + drivers/thermal/tegra_soctherm.c | 476 -------------- + drivers/thermal/thermal-generic-adc.c | 182 ++++++ + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +- + include/dt-bindings/thermal/tegra124-soctherm.h | 1 + + include/linux/thermal.h | 1 + + 34 files changed, 2319 insertions(+), 692 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/tango-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/thermal-generic-adc.txt + create mode 100644 drivers/thermal/tango_thermal.c + create mode 100644 drivers/thermal/tegra/Kconfig + create mode 100644 drivers/thermal/tegra/Makefile + create mode 100644 drivers/thermal/tegra/soctherm-fuse.c + create mode 100644 drivers/thermal/tegra/soctherm.c + create mode 100644 drivers/thermal/tegra/soctherm.h + create mode 100644 drivers/thermal/tegra/tegra124-soctherm.c + create mode 100644 drivers/thermal/tegra/tegra132-soctherm.c + create mode 100644 drivers/thermal/tegra/tegra210-soctherm.c + delete mode 100644 drivers/thermal/tegra_soctherm.c + create mode 100644 drivers/thermal/thermal-generic-adc.c +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster()) +$ 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 slave-dma/next (628b5139c906 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. +Merging net-next/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/cisco/airo.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/net/wireless/ath/ath10k/core.c | 18 +- + drivers/net/wireless/ath/ath10k/core.h | 4 +- + drivers/net/wireless/ath/ath10k/mac.c | 40 +- + drivers/net/wireless/ath/ath10k/wmi-ops.h | 21 + + drivers/net/wireless/ath/ath10k/wmi.c | 88 +- + drivers/net/wireless/ath/ath10k/wmi.h | 26 + + drivers/net/wireless/ath/ath6kl/core.c | 3 + + drivers/net/wireless/ath/ath6kl/core.h | 1 + + drivers/net/wireless/ath/ath6kl/init.c | 9 + + drivers/net/wireless/ath/ath9k/Kconfig | 40 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 1 + + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 72 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 2 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 5 +- + drivers/net/wireless/ath/wil6210/debug.c | 22 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 137 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 93 +- + drivers/net/wireless/ath/wil6210/main.c | 95 +- + drivers/net/wireless/ath/wil6210/p2p.c | 6 + + drivers/net/wireless/ath/wil6210/txrx.c | 2 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 67 +- + drivers/net/wireless/ath/wil6210/wmi.c | 97 +- + drivers/net/wireless/ath/wil6210/wmi.h | 61 + + drivers/net/wireless/atmel/atmel.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +- + drivers/net/wireless/cisco/airo.c | 2 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 6 - + drivers/net/wireless/intel/iwlwifi/iwl-1000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-2000.c | 2 - + drivers/net/wireless/intel/iwlwifi/iwl-5000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 3 - + drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 15 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 34 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 122 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 15 + + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 39 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 16 +- + drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c | 68 +- + drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 8 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 9 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 5 + + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 60 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 22 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 74 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 106 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 26 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 356 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 410 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 59 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 45 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 31 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 3 - + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 111 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 29 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 21 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 3 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 5 +- + .../net/wireless/realtek/rtl818x/rtl8187/rtl8187.h | 99 +- + .../net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 93 + + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 3 + + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 81 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 586 +++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1525 ++++++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 397 ++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1682 ++++++ + .../rtl8xxxu/{rtl8xxxu.c => rtl8xxxu_core.c} | 5334 +++----------------- + drivers/net/wireless/realtek/rtlwifi/base.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/pci.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 +- + drivers/net/wireless/ti/wl12xx/main.c | 4 +- + drivers/net/wireless/ti/wlcore/io.c | 17 +- + drivers/net/wireless/ti/wlcore/io.h | 3 +- + include/linux/mmc/sdio_ids.h | 1 + + 95 files changed, 7274 insertions(+), 5289 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu.c => rtl8xxxu_core.c} (56%) +Merging bluetooth/master (0b7962a6c4a3 Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces) +$ git merge mac80211-next/master +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 97 +++++++++++++++++++++- + net/wireless/nl80211.c | 152 +++++++++++++++++----------------- + 2 files changed, 170 insertions(+), 79 deletions(-) +Merging rdma/for-next (c16d2750a08c IB/mlx5: Fire the CQ completion handler from tasklet) +$ git merge rdma/for-next +Resolved 'include/linux/mlx5/driver.h' using previous resolution. +Resolved 'net/sunrpc/xprtrdma/frwr_ops.c' using previous resolution. +Auto-merging net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +Auto-merging net/sunrpc/xprtrdma/frwr_ops.c +CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/frwr_ops.c +Auto-merging include/linux/mlx5/driver.h +CONFLICT (content): Merge conflict in include/linux/mlx5/driver.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_ib.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/i40iw/i40iw_main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master db5598b2a791] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/Makefile | 4 +- + drivers/infiniband/core/cma.c | 4 +- + drivers/infiniband/core/iwcm.c | 4 +- + drivers/infiniband/core/iwpm_util.c | 1 + + drivers/infiniband/core/mr_pool.c | 86 +++ + drivers/infiniband/core/netlink.c | 5 +- + drivers/infiniband/core/rw.c | 727 ++++++++++++++++++ + drivers/infiniband/core/sa_query.c | 4 +- + drivers/infiniband/core/uverbs_cmd.c | 11 +- + drivers/infiniband/core/verbs.c | 172 +++-- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 7 +- + drivers/infiniband/hw/cxgb4/cm.c | 611 ++++++++++----- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 14 +- + drivers/infiniband/hw/cxgb4/mem.c | 12 +- + drivers/infiniband/hw/i40iw/i40iw.h | 7 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 148 ++-- + drivers/infiniband/hw/i40iw/i40iw_cm.h | 10 +- + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 185 +++-- + drivers/infiniband/hw/i40iw/i40iw_d.h | 4 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 14 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 56 +- + drivers/infiniband/hw/i40iw/i40iw_osdep.h | 1 + + drivers/infiniband/hw/i40iw/i40iw_pble.c | 9 +- + drivers/infiniband/hw/i40iw/i40iw_puda.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_status.h | 1 + + drivers/infiniband/hw/i40iw/i40iw_type.h | 14 +- + drivers/infiniband/hw/i40iw/i40iw_uk.c | 106 +-- + drivers/infiniband/hw/i40iw/i40iw_user.h | 36 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 47 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 294 ++++++- + drivers/infiniband/hw/i40iw/i40iw_verbs.h | 3 + + drivers/infiniband/hw/i40iw/i40iw_vf.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_vf.h | 2 +- + drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 102 +-- + drivers/infiniband/hw/mlx4/mcg.c | 9 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 5 +- + drivers/infiniband/hw/mlx4/mr.c | 7 +- + drivers/infiniband/hw/mlx5/cq.c | 5 +- + drivers/infiniband/hw/mlx5/main.c | 102 ++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 +- + drivers/infiniband/hw/mlx5/mr.c | 25 +- + drivers/infiniband/hw/mlx5/qp.c | 20 +- + drivers/infiniband/hw/nes/nes_utils.c | 60 +- + drivers/infiniband/hw/nes/nes_verbs.c | 43 +- + drivers/infiniband/hw/nes/nes_verbs.h | 2 + + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 7 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 5 +- + drivers/infiniband/hw/qib/qib_init.c | 4 +- + drivers/infiniband/hw/qib/qib_rc.c | 2 +- + drivers/infiniband/hw/qib/qib_ruc.c | 4 +- + drivers/infiniband/hw/qib/qib_uc.c | 2 +- + drivers/infiniband/hw/qib/qib_ud.c | 10 +- + drivers/infiniband/hw/qib/qib_verbs.h | 6 +- + drivers/infiniband/sw/rdmavt/qp.c | 6 +- + drivers/infiniband/sw/rdmavt/vt.c | 13 + + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 67 ++ + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 - + drivers/infiniband/ulp/iser/iser_memory.c | 4 +- + drivers/infiniband/ulp/isert/ib_isert.c | 841 ++------------------- + drivers/infiniband/ulp/isert/ib_isert.h | 69 +- + drivers/infiniband/ulp/srp/ib_srp.c | 229 ++++-- + drivers/infiniband/ulp/srp/ib_srp.h | 2 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 729 +++++++----------- + drivers/infiniband/ulp/srpt/ib_srpt.h | 31 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 59 ++ + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 17 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 + + drivers/staging/rdma/hfi1/affinity.c | 93 +-- + drivers/staging/rdma/hfi1/affinity.h | 19 +- + drivers/staging/rdma/hfi1/chip.c | 647 +++++++++++----- + drivers/staging/rdma/hfi1/chip.h | 7 +- + drivers/staging/rdma/hfi1/chip_registers.h | 1 + + drivers/staging/rdma/hfi1/diag.c | 3 +- + drivers/staging/rdma/hfi1/driver.c | 3 +- + drivers/staging/rdma/hfi1/firmware.c | 9 +- + drivers/staging/rdma/hfi1/hfi.h | 11 +- + drivers/staging/rdma/hfi1/init.c | 25 +- + drivers/staging/rdma/hfi1/mad.c | 16 +- + drivers/staging/rdma/hfi1/mmu_rb.c | 35 +- + drivers/staging/rdma/hfi1/mmu_rb.h | 2 + + drivers/staging/rdma/hfi1/pio.c | 52 +- + drivers/staging/rdma/hfi1/pio.h | 4 +- + drivers/staging/rdma/hfi1/platform.c | 99 +-- + drivers/staging/rdma/hfi1/qp.c | 6 +- + drivers/staging/rdma/hfi1/qsfp.c | 58 +- + drivers/staging/rdma/hfi1/qsfp.h | 15 +- + drivers/staging/rdma/hfi1/rc.c | 9 +- + drivers/staging/rdma/hfi1/ruc.c | 20 +- + drivers/staging/rdma/hfi1/sysfs.c | 4 +- + drivers/staging/rdma/hfi1/ud.c | 8 +- + drivers/staging/rdma/hfi1/user_exp_rcv.c | 7 +- + drivers/staging/rdma/hfi1/user_sdma.c | 97 ++- + drivers/staging/rdma/hfi1/verbs.c | 108 ++- + drivers/staging/rdma/hfi1/verbs.h | 4 +- + drivers/target/target_core_transport.c | 32 +- + drivers/target/target_core_xcopy.c | 2 +- + include/linux/mlx5/cq.h | 5 + + include/linux/mlx5/driver.h | 10 + + include/rdma/ib_verbs.h | 61 +- + include/rdma/mr_pool.h | 25 + + include/rdma/rdma_vt.h | 1 + + include/rdma/rdmavt_qp.h | 5 +- + include/rdma/rw.h | 88 +++ + include/target/target_core_backend.h | 1 - + include/target/target_core_fabric.h | 4 + + include/uapi/rdma/ib_user_verbs.h | 1 + + net/rds/ib_frmr.c | 2 +- + net/sunrpc/xprtrdma/frwr_ops.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +- + 111 files changed, 4116 insertions(+), 2605 deletions(-) + create mode 100644 drivers/infiniband/core/mr_pool.c + create mode 100644 drivers/infiniband/core/rw.c + create mode 100644 include/rdma/mr_pool.h + create mode 100644 include/rdma/rw.h +Merging rdma-leon/rdma-next (2dcd0af568b0 Linux 4.6) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (2dcd0af568b0 Linux 4.6) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (e5366a266a8c mtd: spi-nor: support GigaDevice gd25lq64c) +$ git merge l2-mtd/master +Removing include/linux/of_mtd.h +Removing drivers/of/of_mtd.c +Auto-merging drivers/of/Makefile +Auto-merging drivers/mtd/nand/nandsim.c +Auto-merging drivers/memory/Kconfig +Auto-merging arch/mips/jz4740/board-qi_lb60.c +Auto-merging Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt +Merge made by the 'recursive' strategy. + .../omap-gpmc.txt} | 17 + + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 1 + + .../devicetree/bindings/mtd/gpmc-nand.txt | 19 +- + Documentation/devicetree/bindings/mtd/nand.txt | 45 +- + arch/arm/mach-omap2/gpmc-nand.c | 7 +- + arch/arm/mach-pxa/spitz.c | 55 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 1 + + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 1 + + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 87 +-- + drivers/bcma/driver_chipcommon_sflash.c | 1 - + drivers/memory/Kconfig | 1 + + drivers/memory/fsl_ifc.c | 36 +- + drivers/memory/omap-gpmc.c | 657 +++++++++++++-------- + drivers/mtd/chips/Kconfig | 1 + + drivers/mtd/devices/bcm47xxsflash.c | 29 +- + drivers/mtd/devices/bcm47xxsflash.h | 3 +- + drivers/mtd/devices/docg3.c | 46 +- + drivers/mtd/devices/m25p80.c | 22 + + drivers/mtd/devices/pmc551.c | 2 +- + drivers/mtd/maps/ck804xrom.c | 4 +- + drivers/mtd/maps/esb2rom.c | 4 +- + drivers/mtd/maps/ichxrom.c | 4 +- + drivers/mtd/maps/uclinux.c | 27 +- + drivers/mtd/mtdchar.c | 123 +++- + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/mtdcore.c | 360 +++++++++++ + drivers/mtd/mtdpart.c | 23 +- + drivers/mtd/nand/ams-delta.c | 1 + + drivers/mtd/nand/atmel_nand.c | 315 +++++----- + drivers/mtd/nand/au1550nd.c | 1 + + drivers/mtd/nand/bf5xx_nand.c | 52 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 290 +++++---- + drivers/mtd/nand/cafe_nand.c | 44 +- + drivers/mtd/nand/cmx270_nand.c | 1 + + drivers/mtd/nand/davinci_nand.c | 210 +++---- + drivers/mtd/nand/denali.c | 50 +- + drivers/mtd/nand/diskonchip.c | 60 +- + drivers/mtd/nand/docg4.c | 33 +- + drivers/mtd/nand/fsl_elbc_nand.c | 84 +-- + drivers/mtd/nand/fsl_ifc_nand.c | 317 ++++------ + drivers/mtd/nand/fsl_upm.c | 1 + + drivers/mtd/nand/fsmc_nand.c | 332 +++-------- + drivers/mtd/nand/gpio.c | 1 + + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 161 ++++- + drivers/mtd/nand/hisi504_nand.c | 40 +- + drivers/mtd/nand/jz4740_nand.c | 3 +- + drivers/mtd/nand/jz4780_bch.c | 1 - + drivers/mtd/nand/jz4780_nand.c | 21 +- + drivers/mtd/nand/lpc32xx_mlc.c | 51 +- + drivers/mtd/nand/lpc32xx_slc.c | 83 ++- + drivers/mtd/nand/mpc5121_nfc.c | 1 + + drivers/mtd/nand/mxc_nand.c | 257 ++++---- + drivers/mtd/nand/nand_base.c | 637 ++++++++++++-------- + drivers/mtd/nand/nand_bch.c | 48 +- + drivers/mtd/nand/nandsim.c | 10 +- + drivers/mtd/nand/nuc900_nand.c | 1 + + drivers/mtd/nand/omap2.c | 448 +++++++++----- + drivers/mtd/nand/orion_nand.c | 1 + + drivers/mtd/nand/pasemi_nand.c | 16 +- + drivers/mtd/nand/plat_nand.c | 1 + + drivers/mtd/nand/pxa3xx_nand.c | 132 +++-- + drivers/mtd/nand/qcom_nandc.c | 88 ++- + drivers/mtd/nand/s3c2410.c | 36 +- + drivers/mtd/nand/sh_flctl.c | 115 ++-- + drivers/mtd/nand/sharpsl.c | 2 +- + drivers/mtd/nand/sm_common.c | 93 ++- + drivers/mtd/nand/socrates_nand.c | 1 + + drivers/mtd/nand/sunxi_nand.c | 600 ++++++++++++------- + drivers/mtd/nand/vf610_nfc.c | 35 +- + drivers/mtd/onenand/onenand_base.c | 235 ++++---- + drivers/mtd/spi-nor/spi-nor.c | 1 + + drivers/of/Makefile | 1 - + drivers/of/of_mtd.c | 119 ---- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 49 +- + include/linux/bcma/bcma_driver_chipcommon.h | 1 - + include/linux/fsl_ifc.h | 45 +- + include/linux/mtd/fsmc.h | 18 - + include/linux/mtd/map.h | 19 +- + include/linux/mtd/mtd.h | 63 +- + include/linux/mtd/nand.h | 28 +- + include/linux/mtd/onenand.h | 2 - + include/linux/mtd/sharpsl.h | 2 +- + include/linux/mtd/spi-nor.h | 1 + + include/linux/of_mtd.h | 50 -- + include/linux/omap-gpmc.h | 172 +----- + include/linux/platform_data/gpmc-omap.h | 172 ++++++ + include/linux/platform_data/mtd-nand-omap2.h | 12 +- + include/uapi/mtd/mtd-abi.h | 2 +- + 89 files changed, 4338 insertions(+), 2908 deletions(-) + rename Documentation/devicetree/bindings/{bus/ti-gpmc.txt => memory-controllers/omap-gpmc.txt} (89%) + delete mode 100644 drivers/of/of_mtd.c + delete mode 100644 include/linux/of_mtd.h + create mode 100644 include/linux/platform_data/gpmc-omap.h +Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem) +$ git merge nand/nand/next +Already up-to-date. +Merging crypto/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (7c10ddf87472 Merge branch 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/radeon/atombios_crtc.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Removing drivers/gpu/drm/exynos/exynos_dp_reg.c +Removing drivers/gpu/drm/exynos/exynos_dp_core.h +Removing drivers/gpu/drm/exynos/exynos_dp_core.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +Auto-merging arch/arm/boot/dts/exynos5800-peach-pi.dts +Auto-merging arch/arm/boot/dts/exynos5420-smdk5420.dts +Auto-merging arch/arm/boot/dts/exynos5420-peach-pit.dts +Auto-merging arch/arm/boot/dts/exynos5250-spring.dts +Auto-merging arch/arm/boot/dts/exynos5250-snow-common.dtsi +Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts +Auto-merging arch/arm/boot/dts/exynos5250-arndale.dts +Auto-merging arch/arc/boot/dts/axs10x_mb.dtsi +Auto-merging arch/arc/boot/dts/axc003_idu.dtsi +Auto-merging arch/arc/boot/dts/axc003.dtsi +Auto-merging arch/arc/boot/dts/axc001.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 47 +- + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 36 + + .../bindings/display/bridge/analogix_dp.txt | 52 + + .../bindings/display/exynos/exynos5433-decon.txt | 5 +- + .../bindings/display/exynos/exynos_dp.txt | 93 +- + .../bindings/display/exynos/exynos_hdmi.txt | 27 +- + .../devicetree/bindings/display/fsl,dcu.txt | 15 +- + .../devicetree/bindings/display/fsl,tcon.txt | 18 + + .../bindings/display/hisilicon/dw-dsi.txt | 72 + + .../bindings/display/hisilicon/hisi-ade.txt | 64 + + .../bindings/display/mediatek/mediatek,disp.txt | 203 + + .../bindings/display/mediatek/mediatek,dpi.txt | 35 + + .../bindings/display/mediatek/mediatek,dsi.txt | 60 + + .../bindings/display/panel/innolux,at070tn92.txt | 7 + + .../display/panel/olimex,lcd-olinuxino-43-ts.txt | 7 + + .../bindings/display/panel/ontat,yx700wv03.txt | 7 + + .../bindings/display/panel/tpk,f07a-0102.txt | 8 + + .../bindings/display/panel/tpk,f10a-0102.txt | 8 + + .../display/rockchip/analogix_dp-rockchip.txt | 92 + + .../devicetree/bindings/display/snps,arcpgu.txt | 35 + + .../bindings/display/sunxi/sun4i-drm.txt | 258 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + .../devicetree/bindings/video/bridge/anx7814.txt | 40 + + MAINTAINERS | 150 +- + arch/arc/boot/dts/axc001.dtsi | 22 +- + arch/arc/boot/dts/axc003.dtsi | 14 + + arch/arc/boot/dts/axc003_idu.dtsi | 14 + + arch/arc/boot/dts/axs10x_mb.dtsi | 61 + + arch/arm/boot/dts/exynos5250-arndale.dts | 2 - + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-spring.dts | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 - + arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 - + drivers/clk/mediatek/clk-mt8173.c | 12 +- + drivers/clk/mediatek/clk-mtk.h | 15 +- + drivers/gpu/drm/Kconfig | 9 + + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/acp/acp_hw.c | 2 +- + drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 2 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 209 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 160 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 144 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 281 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 95 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 105 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 110 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 342 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 98 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.h | 2 + + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 93 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 224 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 10 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 37 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 66 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 4 +- + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 37 +- + drivers/gpu/drm/amd/amdgpu/cz_smumgr.h | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 233 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 329 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 1 - + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1624 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 114 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 154 +- + drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 35 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 68 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 64 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 246 +- + drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h | 1 + + drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 35 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 123 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 241 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 420 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 98 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 85 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 199 +- + drivers/gpu/drm/amd/amdgpu/vid.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 5 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 12 +- + drivers/gpu/drm/amd/include/amd_shared.h | 7 +- + .../gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h | 10075 ++++++++++ + .../drm/amd/include/asic_reg/dce/dce_11_2_enum.h | 6813 +++++++ + .../amd/include/asic_reg/dce/dce_11_2_sh_mask.h | 18687 +++++++++++++++++++ + .../gpu/drm/amd/include/asic_reg/gca/gfx_8_0_d.h | 2 + + .../gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 1 + + drivers/gpu/drm/amd/include/atombios.h | 663 +- + drivers/gpu/drm/amd/include/cgs_common.h | 78 +- + drivers/gpu/drm/amd/include/cgs_linux.h | 6 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 276 +- + .../drm/amd/powerplay/eventmgr/eventactionchains.c | 34 +- + .../drm/amd/powerplay/eventmgr/eventmanagement.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 4 +- + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 4 +- + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.h | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 26 +- + .../amd/powerplay/hwmgr/fiji_clockpowergating.c | 11 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 128 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h | 6 +- + .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 10 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c | 12 +- + .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 5 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h | 2 + + .../powerplay/hwmgr/polaris10_clockpowergating.c | 430 + + .../powerplay/hwmgr/polaris10_clockpowergating.h | 40 + + .../amd/powerplay/hwmgr/polaris10_dyn_defaults.h | 62 + + .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 4995 +++++ + .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h | 357 + + .../drm/amd/powerplay/hwmgr/polaris10_powertune.c | 398 + + .../drm/amd/powerplay/hwmgr/polaris10_powertune.h | 70 + + .../drm/amd/powerplay/hwmgr/polaris10_thermal.c | 712 + + .../drm/amd/powerplay/hwmgr/polaris10_thermal.h | 62 + + drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 23 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 115 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 40 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 171 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 20 +- + .../gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h | 14 + + .../amd/powerplay/hwmgr/tonga_processpptables.c | 116 +- + .../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c | 12 +- + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 5 +- + drivers/gpu/drm/amd/powerplay/inc/eventmgr.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h | 2 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 10 +- + .../gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h | 409 + + .../gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h | 10088 ++++++++++ + drivers/gpu/drm/amd/powerplay/inc/smu74.h | 774 + + drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h | 828 + + .../gpu/drm/amd/powerplay/inc/smu_ucode_xfer_cz.h | 22 + + .../gpu/drm/amd/powerplay/inc/smu_ucode_xfer_vi.h | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 6 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 984 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 68 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 121 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 42 +- + drivers/gpu/drm/amd/scheduler/sched_fence.c | 10 + + drivers/gpu/drm/arc/Kconfig | 10 + + drivers/gpu/drm/arc/Makefile | 2 + + drivers/gpu/drm/arc/arcpgu.h | 50 + + drivers/gpu/drm/arc/arcpgu_crtc.c | 257 + + drivers/gpu/drm/arc/arcpgu_drv.c | 288 + + drivers/gpu/drm/arc/arcpgu_hdmi.c | 201 + + drivers/gpu/drm/arc/arcpgu_regs.h | 40 + + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 2 - + drivers/gpu/drm/ast/ast_drv.h | 2 +- + drivers/gpu/drm/ast/ast_ttm.c | 2 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 158 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 155 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 15 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 249 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 95 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 17 +- + drivers/gpu/drm/bochs/bochs_kms.c | 11 +- + drivers/gpu/drm/bochs/bochs_mm.c | 2 + + drivers/gpu/drm/bridge/Kconfig | 12 + + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/analogix-anx78xx.c | 1514 ++ + drivers/gpu/drm/bridge/analogix-anx78xx.h | 719 + + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + + drivers/gpu/drm/bridge/analogix/Makefile | 2 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1430 ++ + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 281 + + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1320 ++ + .../analogix/analogix_dp_reg.h} | 270 +- + drivers/gpu/drm/bridge/dw-hdmi.c | 7 - + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 - + drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 + + drivers/gpu/drm/drm_agpsupport.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 51 +- + drivers/gpu/drm/drm_atomic_helper.c | 121 +- + drivers/gpu/drm/drm_bufs.c | 91 +- + drivers/gpu/drm/drm_crtc.c | 605 +- + drivers/gpu/drm/drm_crtc_helper.c | 68 +- + drivers/gpu/drm/drm_crtc_internal.h | 4 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 12 + + drivers/gpu/drm/drm_dp_helper.c | 66 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 29 +- + drivers/gpu/drm/drm_drv.c | 31 +- + drivers/gpu/drm/drm_edid.c | 51 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 176 +- + drivers/gpu/drm/drm_fb_helper.c | 147 +- + drivers/gpu/drm/drm_fops.c | 51 +- + drivers/gpu/drm/drm_gem.c | 90 +- + drivers/gpu/drm/drm_info.c | 4 +- + drivers/gpu/drm/drm_internal.h | 4 +- + drivers/gpu/drm/drm_ioctl.c | 54 +- + drivers/gpu/drm/drm_irq.c | 5 +- + drivers/gpu/drm/drm_legacy.h | 2 + + drivers/gpu/drm/drm_modes.c | 2 +- + drivers/gpu/drm/drm_panel.c | 61 + + drivers/gpu/drm/drm_pci.c | 2 +- + drivers/gpu/drm/drm_probe_helper.c | 2 - + drivers/gpu/drm/drm_sysfs.c | 167 +- + drivers/gpu/drm/drm_vm.c | 16 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 17 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +- + drivers/gpu/drm/exynos/Kconfig | 3 +- + drivers/gpu/drm/exynos/Makefile | 2 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 92 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 - + drivers/gpu/drm/exynos/exynos_dp.c | 311 + + drivers/gpu/drm/exynos/exynos_dp_core.c | 1499 -- + drivers/gpu/drm/exynos/exynos_dp_core.h | 282 - + drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 -- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 25 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 69 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 30 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 84 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 11 - + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 22 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 109 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 89 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 12 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 11 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 801 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 69 +- + drivers/gpu/drm/exynos/regs-hdmi.h | 9 +- + drivers/gpu/drm/fsl-dcu/Kconfig | 2 +- + drivers/gpu/drm/fsl-dcu/Makefile | 3 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 12 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 127 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 6 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 38 +- + drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 111 + + drivers/gpu/drm/fsl-dcu/fsl_tcon.h | 33 + + drivers/gpu/drm/gma500/framebuffer.c | 13 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 6 +- + drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 2 +- + drivers/gpu/drm/hisilicon/Kconfig | 5 + + drivers/gpu/drm/hisilicon/Makefile | 5 + + drivers/gpu/drm/hisilicon/kirin/Kconfig | 18 + + drivers/gpu/drm/hisilicon/kirin/Makefile | 6 + + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 858 + + drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h | 103 + + drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 230 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1057 ++ + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 343 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 31 + + drivers/gpu/drm/i915/Kconfig | 6 + + drivers/gpu/drm/i915/Kconfig.debug | 41 + + drivers/gpu/drm/i915/Makefile | 4 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 211 +- + drivers/gpu/drm/i915/i915_debugfs.c | 454 +- + drivers/gpu/drm/i915/i915_dma.c | 515 +- + drivers/gpu/drm/i915/i915_drv.c | 199 +- + drivers/gpu/drm/i915/i915_drv.h | 502 +- + drivers/gpu/drm/i915/i915_gem.c | 729 +- + drivers/gpu/drm/i915/i915_gem.h | 34 + + drivers/gpu/drm/i915/i915_gem_context.c | 340 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 16 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 53 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 159 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 568 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 28 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 12 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 125 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 112 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 84 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 210 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 11 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 165 +- + drivers/gpu/drm/i915/i915_irq.c | 851 +- + drivers/gpu/drm/i915/i915_params.c | 9 + + drivers/gpu/drm/i915/i915_params.h | 2 + + drivers/gpu/drm/i915/i915_reg.h | 267 +- + drivers/gpu/drm/i915/i915_sysfs.c | 10 + + drivers/gpu/drm/i915/i915_trace.h | 52 +- + drivers/gpu/drm/i915/i915_vgpu.c | 36 +- + drivers/gpu/drm/i915/intel_atomic.c | 5 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +- + drivers/gpu/drm/i915/intel_audio.c | 18 +- + drivers/gpu/drm/i915/intel_bios.c | 315 +- + drivers/gpu/drm/i915/intel_bios.h | 861 +- + drivers/gpu/drm/i915/intel_color.c | 553 + + drivers/gpu/drm/i915/intel_crt.c | 40 +- + drivers/gpu/drm/i915/intel_csr.c | 148 +- + drivers/gpu/drm/i915/intel_ddi.c | 1381 +- + drivers/gpu/drm/i915/intel_display.c | 3425 ++-- + drivers/gpu/drm/i915/intel_dp.c | 569 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 47 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 1783 ++ + drivers/gpu/drm/i915/intel_dpll_mgr.h | 164 + + drivers/gpu/drm/i915/intel_drv.h | 200 +- + drivers/gpu/drm/i915/intel_dsi.c | 327 +- + drivers/gpu/drm/i915/intel_dsi.h | 30 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 177 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 282 +- + drivers/gpu/drm/i915/intel_fbc.c | 5 +- + drivers/gpu/drm/i915/intel_fbdev.c | 20 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 10 +- + drivers/gpu/drm/i915/intel_guc.h | 29 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 73 +- + drivers/gpu/drm/i915/intel_hdmi.c | 5 +- + drivers/gpu/drm/i915/intel_i2c.c | 25 +- + drivers/gpu/drm/i915/intel_lrc.c | 1156 +- + drivers/gpu/drm/i915/intel_lrc.h | 25 +- + drivers/gpu/drm/i915/intel_lvds.c | 65 +- + drivers/gpu/drm/i915/intel_mocs.c | 157 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 + + drivers/gpu/drm/i915/intel_opregion.c | 58 +- + drivers/gpu/drm/i915/intel_overlay.c | 78 +- + drivers/gpu/drm/i915/intel_panel.c | 56 +- + drivers/gpu/drm/i915/intel_pm.c | 556 +- + drivers/gpu/drm/i915/intel_psr.c | 8 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1566 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 128 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 519 +- + drivers/gpu/drm/i915/intel_sdvo.c | 20 +- + drivers/gpu/drm/i915/intel_sprite.c | 61 +- + drivers/gpu/drm/i915/intel_tv.c | 58 +- + drivers/gpu/drm/i915/intel_uncore.c | 672 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 832 + + drivers/gpu/drm/imx/imx-drm-core.c | 2 +- + drivers/gpu/drm/mediatek/Kconfig | 16 + + drivers/gpu/drm/mediatek/Makefile | 14 + + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 302 + + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 240 + + drivers/gpu/drm/mediatek/mtk_dpi.c | 769 + + drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 228 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 582 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 32 + + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 353 + + drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 41 + + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 225 + + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 150 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 567 + + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 60 + + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 165 + + drivers/gpu/drm/mediatek/mtk_drm_fb.h | 23 + + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 269 + + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 59 + + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 240 + + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 59 + + drivers/gpu/drm/mediatek/mtk_dsi.c | 913 + + drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 463 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 - + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 + + drivers/gpu/drm/msm/Kconfig | 7 + + drivers/gpu/drm/msm/Makefile | 5 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 16 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi.h | 2 - + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 34 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 12 - + drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 13 - + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 4 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 4 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 +- + drivers/gpu/drm/msm/edp/edp_connector.c | 20 +- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 29 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 11 + + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 26 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 34 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 2 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp_format.c | 6 + + drivers/gpu/drm/msm/msm_atomic.c | 56 +- + drivers/gpu/drm/msm/msm_debugfs.c | 168 + + drivers/gpu/drm/msm/msm_debugfs.h | 26 + + drivers/gpu/drm/msm/msm_drv.c | 401 +- + drivers/gpu/drm/msm/msm_drv.h | 64 +- + drivers/gpu/drm/msm/msm_fb.c | 2 +- + drivers/gpu/drm/msm/msm_fence.c | 163 + + drivers/gpu/drm/msm/msm_fence.h | 46 + + drivers/gpu/drm/msm/msm_gem.c | 136 +- + drivers/gpu/drm/msm/msm_gem.h | 19 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 125 +- + drivers/gpu/drm/msm/msm_gpu.c | 123 +- + drivers/gpu/drm/msm/msm_gpu.h | 9 +- + drivers/gpu/drm/msm/msm_rd.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 - + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 5 - + drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 156 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 9 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 - + drivers/gpu/drm/qxl/qxl_drv.h | 7 +- + drivers/gpu/drm/qxl/qxl_fb.c | 227 +- + drivers/gpu/drm/qxl/qxl_kms.c | 4 - + drivers/gpu/drm/qxl/qxl_object.h | 6 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 2 + + drivers/gpu/drm/radeon/atombios_crtc.c | 24 +- + drivers/gpu/drm/radeon/cik.c | 252 +- + drivers/gpu/drm/radeon/cikd.h | 1 + + drivers/gpu/drm/radeon/evergreen.c | 120 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 66 + + drivers/gpu/drm/radeon/evergreend.h | 43 + + drivers/gpu/drm/radeon/ni.c | 246 +- + drivers/gpu/drm/radeon/r100.c | 10 +- + drivers/gpu/drm/radeon/r300.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 112 +- + drivers/gpu/drm/radeon/radeon.h | 26 +- + drivers/gpu/drm/radeon/radeon_asic.c | 16 +- + drivers/gpu/drm/radeon/radeon_asic.h | 25 +- + drivers/gpu/drm/radeon/radeon_device.c | 10 +- + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_drv.c | 25 +- + drivers/gpu/drm/radeon/radeon_object.c | 4 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 + + drivers/gpu/drm/radeon/radeon_uvd.c | 88 +- + drivers/gpu/drm/radeon/rs600.c | 12 +- + drivers/gpu/drm/radeon/rv770.c | 106 +- + drivers/gpu/drm/radeon/si.c | 250 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 5 +- + drivers/gpu/drm/radeon/uvd_v2_2.c | 5 +- + drivers/gpu/drm/radeon/uvd_v4_2.c | 16 +- + drivers/gpu/drm/rcar-du/Kconfig | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 15 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 5 +- + drivers/gpu/drm/rockchip/Kconfig | 9 + + drivers/gpu/drm/rockchip/Makefile | 1 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 390 + + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 38 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 17 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 66 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 95 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_cursor.c | 2 + + drivers/gpu/drm/sti/sti_drv.c | 6 +- + drivers/gpu/drm/sti/sti_gdp.c | 1 + + drivers/gpu/drm/sti/sti_hda.c | 1 + + drivers/gpu/drm/sti/sti_hqvdp.c | 1 + + drivers/gpu/drm/sti/sti_mixer.c | 1 + + drivers/gpu/drm/sti/sti_tvout.c | 1 + + drivers/gpu/drm/sti/sti_vid.c | 1 + + drivers/gpu/drm/sun4i/Kconfig | 14 + + drivers/gpu/drm/sun4i/Makefile | 13 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 364 + + drivers/gpu/drm/sun4i/sun4i_backend.h | 165 + + drivers/gpu/drm/sun4i/sun4i_crtc.c | 120 + + drivers/gpu/drm/sun4i/sun4i_crtc.h | 30 + + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 160 + + drivers/gpu/drm/sun4i/sun4i_dotclock.h | 21 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 358 + + drivers/gpu/drm/sun4i/sun4i_drv.h | 30 + + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 54 + + drivers/gpu/drm/sun4i/sun4i_framebuffer.h | 19 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 161 + + drivers/gpu/drm/sun4i/sun4i_layer.h | 30 + + drivers/gpu/drm/sun4i/sun4i_rgb.c | 250 + + drivers/gpu/drm/sun4i/sun4i_rgb.h | 18 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 561 + + drivers/gpu/drm/sun4i/sun4i_tcon.h | 186 + + drivers/gpu/drm/sun4i/sun4i_tv.c | 708 + + drivers/gpu/drm/tegra/dc.c | 1 - + drivers/gpu/drm/tegra/drm.c | 10 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- + drivers/gpu/drm/ttm/Makefile | 3 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 3 - + drivers/gpu/drm/ttm/ttm_bo.c | 86 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 3 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 8 +- + drivers/gpu/drm/udl/udl_drv.c | 2 +- + drivers/gpu/drm/udl/udl_drv.h | 2 - + drivers/gpu/drm/udl/udl_fb.c | 140 +- + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_crtc.c | 58 + + drivers/gpu/drm/vc4/vc4_debugfs.c | 1 + + drivers/gpu/drm/vc4/vc4_dpi.c | 520 + + drivers/gpu/drm/vc4/vc4_drv.c | 2 + + drivers/gpu/drm/vc4/vc4_drv.h | 5 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_kms.c | 6 +- + drivers/gpu/drm/vc4/vc4_regs.h | 6 + + drivers/gpu/drm/vgem/vgem_drv.c | 37 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 9 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 2 +- + drivers/memory/mtk-smi.c | 2 + + drivers/video/fbdev/core/fb_defio.c | 3 +- + include/drm/bridge/analogix_dp.h | 41 + + include/drm/drmP.h | 18 +- + include/drm/drm_agpsupport.h | 4 +- + include/drm/drm_atomic.h | 2 +- + include/drm/drm_atomic_helper.h | 6 +- + include/drm/drm_crtc.h | 116 +- + include/drm/drm_dp_helper.h | 1 + + include/drm/drm_edid.h | 8 + + include/drm/drm_fb_cma_helper.h | 16 + + include/drm/drm_fb_helper.h | 15 + + include/drm/drm_gem.h | 48 +- + include/drm/drm_legacy.h | 4 +- + include/drm/drm_mem_util.h | 19 + + include/drm/drm_modeset_helper_vtables.h | 2 +- + include/drm/drm_panel.h | 59 + + include/drm/drm_vma_manager.h | 15 +- + include/drm/ttm/ttm_bo_api.h | 2 +- + include/drm/ttm/ttm_bo_driver.h | 34 +- + include/dt-bindings/clock/mt8173-clk.h | 3 +- + include/linux/console.h | 2 + + include/linux/fb.h | 1 + + include/linux/reservation.h | 18 + + include/linux/timer.h | 2 + + include/linux/vmalloc.h | 4 + + include/uapi/drm/amdgpu_drm.h | 8 + + include/uapi/drm/armada_drm.h | 8 + + include/uapi/drm/drm.h | 34 +- + include/uapi/drm/drm_fourcc.h | 8 + + include/uapi/drm/drm_mode.h | 20 + + include/uapi/drm/drm_sarea.h | 8 + + include/uapi/drm/etnaviv_drm.h | 8 + + include/uapi/drm/exynos_drm.h | 8 + + include/uapi/drm/i810_drm.h | 8 + + include/uapi/drm/i915_drm.h | 8 + + include/uapi/drm/mga_drm.h | 8 + + include/uapi/drm/msm_drm.h | 8 + + include/uapi/drm/nouveau_drm.h | 10 +- + include/uapi/drm/omap_drm.h | 8 + + include/uapi/drm/qxl_drm.h | 9 +- + include/uapi/drm/r128_drm.h | 8 + + include/uapi/drm/radeon_drm.h | 8 + + include/uapi/drm/savage_drm.h | 8 + + include/uapi/drm/sis_drm.h | 10 + + include/uapi/drm/tegra_drm.h | 8 + + include/uapi/drm/vc4_drm.h | 8 + + include/uapi/drm/via_drm.h | 8 + + include/uapi/drm/virtgpu_drm.h | 8 + + include/uapi/drm/vmwgfx_drm.h | 9 + + include/video/exynos5433_decon.h | 6 +- + include/video/mipi_display.h | 8 + + mm/vmalloc.c | 27 + + 604 files changed, 100525 insertions(+), 19844 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix_dp.txt + create mode 100644 Documentation/devicetree/bindings/display/fsl,tcon.txt + create mode 100644 Documentation/devicetree/bindings/display/hisilicon/dw-dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,at070tn92.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino-43-ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ontat,yx700wv03.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tpk,f07a-0102.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tpk,f10a-0102.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt + create mode 100644 Documentation/devicetree/bindings/display/snps,arcpgu.txt + create mode 100644 Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt + create mode 100644 Documentation/devicetree/bindings/video/bridge/anx7814.txt + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_enum.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_clockpowergating.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_clockpowergating.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_dyn_defaults.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_powertune.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_powertune.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu74.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.h + create mode 100644 drivers/gpu/drm/arc/Kconfig + create mode 100644 drivers/gpu/drm/arc/Makefile + create mode 100644 drivers/gpu/drm/arc/arcpgu.h + create mode 100644 drivers/gpu/drm/arc/arcpgu_crtc.c + create mode 100644 drivers/gpu/drm/arc/arcpgu_drv.c + create mode 100644 drivers/gpu/drm/arc/arcpgu_hdmi.c + create mode 100644 drivers/gpu/drm/arc/arcpgu_regs.h + create mode 100644 drivers/gpu/drm/bridge/analogix-anx78xx.c + create mode 100644 drivers/gpu/drm/bridge/analogix-anx78xx.h + create mode 100644 drivers/gpu/drm/bridge/analogix/Kconfig + create mode 100644 drivers/gpu/drm/bridge/analogix/Makefile + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.h + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c + rename drivers/gpu/drm/{exynos/exynos_dp_reg.h => bridge/analogix/analogix_dp_reg.h} (62%) + create mode 100644 drivers/gpu/drm/exynos/exynos_dp.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.h + delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_reg.c + create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_tcon.c + create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_tcon.h + create mode 100644 drivers/gpu/drm/hisilicon/Kconfig + create mode 100644 drivers/gpu/drm/hisilicon/Makefile + create mode 100644 drivers/gpu/drm/hisilicon/kirin/Kconfig + create mode 100644 drivers/gpu/drm/hisilicon/kirin/Makefile + create mode 100644 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c + create mode 100644 drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h + create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h + create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c + create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c + create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h + create mode 100644 drivers/gpu/drm/i915/Kconfig.debug + create mode 100644 drivers/gpu/drm/i915/i915_gem.h + create mode 100644 drivers/gpu/drm/i915/intel_color.c + create mode 100644 drivers/gpu/drm/i915/intel_dpll_mgr.c + create mode 100644 drivers/gpu/drm/i915/intel_dpll_mgr.h + create mode 100644 drivers/gpu/drm/i915/intel_vbt_defs.h + create mode 100644 drivers/gpu/drm/mediatek/Kconfig + create mode 100644 drivers/gpu/drm/mediatek/Makefile + create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_rdma.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi_regs.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_dsi.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_mipi_tx.c + create mode 100644 drivers/gpu/drm/msm/msm_debugfs.c + create mode 100644 drivers/gpu/drm/msm/msm_debugfs.h + create mode 100644 drivers/gpu/drm/msm/msm_fence.c + create mode 100644 drivers/gpu/drm/msm/msm_fence.h + create mode 100644 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c + create mode 100644 drivers/gpu/drm/sun4i/Kconfig + create mode 100644 drivers/gpu/drm/sun4i/Makefile + create mode 100644 drivers/gpu/drm/sun4i/sun4i_backend.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_backend.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_crtc.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_crtc.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_dotclock.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_dotclock.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_drv.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_drv.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_framebuffer.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_framebuffer.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_layer.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_layer.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_rgb.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_rgb.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_tcon.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_tcon.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_tv.c + create mode 100644 drivers/gpu/drm/vc4/vc4_dpi.c + create mode 100644 include/drm/bridge/analogix_dp.h +Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (5b4fd5b1111b drm/i915: Update DRIVER_DATE to 20160425) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (c6740c9c9e91 drm: remove unused dev variables) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +++---- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 3 +-- + drivers/gpu/drm/armada/armada_fb.c | 2 +- + drivers/gpu/drm/armada/armada_gem.c | 6 ++--- + drivers/gpu/drm/armada/armada_gem.h | 4 +-- + drivers/gpu/drm/ast/ast_main.c | 4 +-- + drivers/gpu/drm/ast/ast_mode.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 4 +-- + drivers/gpu/drm/cirrus/cirrus_main.c | 4 +-- + drivers/gpu/drm/drm_atomic.c | 20 +++++++------- + drivers/gpu/drm/drm_atomic_helper.c | 25 +++++++---------- + drivers/gpu/drm/drm_crtc.c | 4 +-- + drivers/gpu/drm/drm_fb_cma_helper.c | 37 +++++++++++++++++++------- + drivers/gpu/drm/drm_fb_helper.c | 5 ++-- + drivers/gpu/drm/drm_gem.c | 14 +++------- + drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- + drivers/gpu/drm/drm_prime.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +++--- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 3 +-- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 10 +++---- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 +- + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 22 +++++++-------- + drivers/gpu/drm/i915/i915_gem_tiling.c | 4 +-- + drivers/gpu/drm/i915/intel_display.c | 7 +++-- + drivers/gpu/drm/i915/intel_fbdev.c | 6 ++--- + drivers/gpu/drm/i915/intel_overlay.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 4 +-- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 6 ++--- + drivers/gpu/drm/msm/msm_fb.c | 3 +-- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 4 +-- + drivers/gpu/drm/nouveau/nouveau_gem.c | 9 +++---- + drivers/gpu/drm/nouveau/nv50_display.c | 3 +-- + drivers/gpu/drm/omapdrm/omap_drv.c | 6 ++--- + drivers/gpu/drm/omapdrm/omap_drv.h | 4 +-- + drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 2 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 6 +++-- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 3 +++ + drivers/gpu/drm/qxl/qxl_ioctl.c | 11 ++++---- + drivers/gpu/drm/radeon/radeon_cs.c | 3 +-- + drivers/gpu/drm/radeon/radeon_cursor.c | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 16 +++++------ + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +-- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +-- + drivers/gpu/drm/tegra/dc.c | 8 +++--- + drivers/gpu/drm/tegra/drm.c | 20 +++++++------- + drivers/gpu/drm/tegra/dsi.c | 15 ++++++++--- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/gem.c | 2 +- + drivers/gpu/drm/udl/udl_fb.c | 2 +- + drivers/gpu/drm/udl/udl_gem.c | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- + drivers/gpu/drm/vc4/vc4_gem.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 2 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +-- + drivers/gpu/drm/virtio/virtgpu_gem.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 11 ++++---- + include/drm/drm_atomic_helper.h | 9 +++---- + include/drm/drm_fb_cma_helper.h | 5 +++- + include/drm/drm_gem.h | 4 +-- + 88 files changed, 229 insertions(+), 223 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.) +$ git merge drm-vc4/drm-vc4-next +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_crtc.c | 4 ++++ + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_kms.c | 16 ++++++++++++---- + 3 files changed, 17 insertions(+), 5 deletions(-) +Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/sunxi.txt | 4 + + drivers/clk/clk-composite.c | 15 ++ + drivers/clk/sunxi/Makefile | 2 + + drivers/clk/sunxi/clk-a10-mod1.c | 2 +- + drivers/clk/sunxi/clk-sun4i-pll3.c | 98 +++++++ + drivers/clk/sunxi/clk-sun4i-tcon-ch1.c | 300 ++++++++++++++++++++++ + drivers/clk/sunxi/clk-sun9i-mmc.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 79 +++++- + drivers/gpu/drm/sun4i/Kconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 8 +- + include/linux/clk-provider.h | 1 + + 12 files changed, 499 insertions(+), 18 deletions(-) + create mode 100644 drivers/clk/sunxi/clk-sun4i-pll3.c + create mode 100644 drivers/clk/sunxi/clk-sun4i-tcon-ch1.c +Merging kbuild/for-next (0c644e04ad1b Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Removing scripts/coccinelle/misc/compare_const_fl.cocci +Auto-merging init/Kconfig +Auto-merging arch/x86/boot/compressed/Makefile +Auto-merging arch/arm/boot/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig-language.txt | 22 ++-- + Makefile | 66 +++++++--- + arch/arm/boot/Makefile | 1 - + arch/arm/boot/bootp/Makefile | 3 +- + arch/arm/vdso/Makefile | 2 +- + arch/h8300/boot/compressed/Makefile | 1 - + arch/ia64/Makefile | 6 +- + arch/m32r/boot/compressed/Makefile | 1 - + arch/mn10300/boot/compressed/Makefile | 1 - + arch/nios2/boot/compressed/Makefile | 1 - + arch/s390/boot/compressed/Makefile | 1 - + arch/sh/boot/compressed/Makefile | 1 - + arch/sh/boot/romimage/Makefile | 1 - + arch/unicore32/boot/Makefile | 2 +- + arch/unicore32/boot/compressed/Makefile | 1 - + arch/x86/boot/compressed/Makefile | 1 - + arch/x86/entry/vdso/Makefile | 4 +- + arch/x86/purgatory/Makefile | 2 - + arch/x86/realmode/rm/Makefile | 1 - + include/linux/export.h | 33 ++++- + init/Kconfig | 29 +++++ + kernel/gcov/Kconfig | 1 + + scripts/Kbuild.include | 45 ++++++- + scripts/Makefile.build | 44 +++---- + scripts/Makefile.extrawarn | 1 + + scripts/Makefile.lib | 8 +- + scripts/adjust_autoksyms.sh | 101 +++++++++++++++ + scripts/basic/fixdep.c | 61 ++++++--- + scripts/coccicheck | 2 +- + scripts/coccinelle/api/setup_timer.cocci | 4 +- + scripts/coccinelle/misc/compare_const_fl.cocci | 171 ------------------------- + scripts/genksyms/genksyms.c | 3 + + scripts/kconfig/confdata.c | 4 +- + scripts/kconfig/symbol.c | 14 ++ + scripts/package/Makefile | 4 +- + scripts/package/builddeb | 5 +- + scripts/package/mkspec | 5 + + tools/build/Makefile.build | 8 +- + 38 files changed, 379 insertions(+), 282 deletions(-) + create mode 100755 scripts/adjust_autoksyms.sh + delete mode 100644 scripts/coccinelle/misc/compare_const_fl.cocci +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 (d4ab78d7076d Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next) +$ git merge regmap/for-next +Already up-to-date. +Merging sound/for-next (17e1717c11a3 ALSA: firewire-lib: change a member of event structure to suppress sparse wanings to bool type) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (349982487e26 Merge remote-tracking branches 'asoc/fix/ak4642' and 'asoc/fix/twl6040' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + include/linux/mfd/twl6040.h | 1 + + sound/soc/codecs/ak4642.c | 3 +++ + sound/soc/codecs/twl6040.c | 4 ++-- + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging init/Kconfig +Auto-merging include/linux/module.h +Merge made by the 'recursive' strategy. + Documentation/module-signing.txt | 6 ++++++ + include/linux/module.h | 4 ++-- + init/Kconfig | 1 + + kernel/module.c | 29 +++++++++++++++++++++-------- + 4 files changed, 30 insertions(+), 10 deletions(-) +Merging input/next (4feacbc24eea Input: add new driver for the Surface 3) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/input.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/atmel,captouch.txt | 36 +++ + drivers/input/input.c | 7 +- + drivers/input/misc/Kconfig | 14 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/atmel_captouch.c | 290 ++++++++++++++++++++ + drivers/input/rmi4/rmi_f01.c | 22 +- + drivers/input/touchscreen/Kconfig | 15 +- + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/migor_ts.c | 6 +- + drivers/input/touchscreen/surface3_spi.c | 304 +++++++++++++++++++++ + 10 files changed, 677 insertions(+), 19 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/atmel,captouch.txt + create mode 100644 drivers/input/misc/atmel_captouch.c + create mode 100644 drivers/input/touchscreen/surface3_spi.c +Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect) +$ git merge lightnvm/for-next +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (202bae52934d dm thin: unroll issue_discard() to create longer discard bio chains) +$ git merge device-mapper/for-next +Already up-to-date. +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 (57da0c042f4a mmc: block: Pause re-tuning while switched to the RPMB partition) +$ git merge mmc-uh/next +Auto-merging drivers/mmc/card/block.c +Merge made by the 'recursive' strategy. + drivers/mmc/card/block.c | 19 ++++++++++++++++++- + drivers/mmc/core/host.c | 24 ++++++++++++++++++++++++ + include/linux/mmc/host.h | 4 ++++ + 3 files changed, 46 insertions(+), 1 deletion(-) +Merging md/for-next (1fa9a1ad0a9d md-cluster: check the return value of process_recvd_msg) +$ git merge md/for-next +Auto-merging drivers/md/raid5-cache.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + Documentation/md-cluster.txt | 6 +++ + drivers/md/bitmap.c | 88 +++++++++++++++++++++++++++++++++++----- + drivers/md/bitmap.h | 3 ++ + drivers/md/md-cluster.c | 96 ++++++++++++++++++++++++++++++++++++-------- + drivers/md/md-cluster.h | 1 + + drivers/md/md.c | 86 ++++++++++++++++++++++++--------------- + drivers/md/raid1.c | 4 +- + drivers/md/raid10.c | 20 +++++---- + drivers/md/raid5-cache.c | 4 +- + drivers/md/raid5.c | 10 +++-- + include/linux/bitops.h | 16 ++++++++ + 11 files changed, 257 insertions(+), 77 deletions(-) +Merging mfd/for-mfd-next (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/mfd/core.h +Auto-merging drivers/mfd/mfd-core.c +Auto-merging drivers/mfd/intel_quark_i2c_gpio.c +Auto-merging drivers/mfd/intel-lpss.c +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-model/devres.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/axp20x.txt | 31 +- + .../devicetree/bindings/mfd/hisilicon,hi655x.txt | 27 + + Documentation/devicetree/bindings/mfd/max77620.txt | 143 +++++ + Documentation/driver-model/devres.txt | 3 + + MAINTAINERS | 6 + + drivers/mfd/Kconfig | 33 +- + drivers/mfd/Makefile | 2 + + drivers/mfd/act8945a.c | 13 +- + drivers/mfd/arizona-core.c | 10 +- + drivers/mfd/arizona-irq.c | 3 + + drivers/mfd/as3711.c | 13 +- + drivers/mfd/as3722.c | 31 +- + drivers/mfd/asic3.c | 10 +- + drivers/mfd/atmel-hlcdc.c | 14 +- + drivers/mfd/axp20x-rsb.c | 1 + + drivers/mfd/axp20x.c | 90 ++++ + drivers/mfd/bcm590xx.c | 11 +- + drivers/mfd/da9063-irq.c | 8 - + drivers/mfd/dm355evm_msp.c | 10 +- + drivers/mfd/hi6421-pmic-core.c | 12 +- + drivers/mfd/hi655x-pmic.c | 162 ++++++ + drivers/mfd/htc-egpio.c | 10 +- + drivers/mfd/htc-i2cpld.c | 15 +- + drivers/mfd/intel-lpss.c | 23 +- + drivers/mfd/intel_quark_i2c_gpio.c | 47 +- + drivers/mfd/intel_soc_pmic_core.c | 1 + + drivers/mfd/lp3943.c | 14 +- + drivers/mfd/lp8788-irq.c | 2 +- + drivers/mfd/max77620.c | 590 +++++++++++++++++++++ + drivers/mfd/max77686.c | 46 +- + drivers/mfd/max77693.c | 16 +- + drivers/mfd/menf21bmc.c | 11 +- + drivers/mfd/mfd-core.c | 40 +- + drivers/mfd/mt6397-core.c | 40 +- + drivers/mfd/omap-usb-tll.c | 13 +- + drivers/mfd/rc5t583-irq.c | 11 +- + drivers/mfd/rc5t583.c | 24 +- + drivers/mfd/rdc321x-southbridge.c | 13 +- + drivers/mfd/rk808.c | 7 +- + drivers/mfd/rn5t618.c | 5 +- + drivers/mfd/rt5033.c | 14 +- + drivers/mfd/sec-core.c | 20 +- + drivers/mfd/sec-irq.c | 14 +- + drivers/mfd/sky81452.c | 10 +- + drivers/mfd/sm501.c | 15 +- + drivers/mfd/smsc-ece1099.c | 10 - + drivers/mfd/stw481x.c | 11 +- + drivers/mfd/tc6393xb.c | 14 +- + drivers/mfd/tps6105x.c | 1 - + drivers/mfd/tps65010.c | 8 +- + drivers/mfd/tps6507x.c | 13 +- + drivers/mfd/tps65217.c | 14 +- + drivers/mfd/tps65910.c | 34 +- + drivers/mfd/twl4030-power.c | 1 - + drivers/mfd/twl6040.c | 8 +- + drivers/mfd/ucb1x00-core.c | 14 +- + drivers/mfd/vexpress-sysreg.c | 2 +- + drivers/mfd/wl1273-core.c | 14 +- + drivers/mfd/wm5110-tables.c | 1 + + drivers/mfd/wm8400-core.c | 52 +- + include/dt-bindings/mfd/arizona.h | 5 + + include/dt-bindings/mfd/max77620.h | 39 ++ + include/linux/mfd/axp20x.h | 59 +++ + include/linux/mfd/core.h | 4 + + include/linux/mfd/hi655x-pmic.h | 55 ++ + include/linux/mfd/max77620.h | 346 ++++++++++++ + include/linux/mfd/syscon.h | 1 + + include/linux/mfd/wm8400-private.h | 1 - + 68 files changed, 1856 insertions(+), 485 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt + create mode 100644 Documentation/devicetree/bindings/mfd/max77620.txt + create mode 100644 drivers/mfd/hi655x-pmic.c + create mode 100644 drivers/mfd/max77620.c + create mode 100644 include/dt-bindings/mfd/max77620.h + create mode 100644 include/linux/mfd/hi655x-pmic.h + create mode 100644 include/linux/mfd/max77620.h +Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry) +$ git merge battery/master +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.txt | 59 +++++ + MAINTAINERS | 5 + + drivers/power/ipaq_micro_battery.c | 2 +- + drivers/power/max8925_power.c | 10 +- + drivers/power/reset/Kconfig | 8 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/at91-sama5d2_shdwc.c | 282 +++++++++++++++++++++ + drivers/power/sbs-battery.c | 4 - + 8 files changed, 361 insertions(+), 10 deletions(-) + create mode 100644 drivers/power/reset/at91-sama5d2_shdwc.c +Merging omap_dss2/for-next (ffe1b6c453ef video: AMBA CLCD: Remove unncessary include in amba-clcd.c) +$ git merge omap_dss2/for-next +Removing include/video/sh_mipi_dsi.h +Removing drivers/video/fbdev/sh_mipi_dsi.c +Auto-merging drivers/video/fbdev/amba-clcd.c +Auto-merging drivers/video/fbdev/Kconfig +Merge made by the 'recursive' strategy. + Documentation/fb/udlfb.txt | 6 +- + drivers/video/Kconfig | 4 - + drivers/video/fbdev/Kconfig | 1 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/amba-clcd.c | 2 - + drivers/video/fbdev/core/fbmem.c | 20 +- + drivers/video/fbdev/imxfb.c | 44 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 12 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 12 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 12 +- + drivers/video/fbdev/sh_mipi_dsi.c | 587 --------------------------- + drivers/video/fbdev/ssd1307fb.c | 2 +- + include/video/sh_mipi_dsi.h | 59 --- + 13 files changed, 68 insertions(+), 694 deletions(-) + delete mode 100644 drivers/video/fbdev/sh_mipi_dsi.c + delete mode 100644 include/video/sh_mipi_dsi.h +Merging regulator/for-next (6b3f657e5e3e Merge remote-tracking branch 'regulator/fix/ccv' into regulator-linus) +$ git merge regulator/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging security/next (b937190c40de LSM: LoadPin: provide enablement CONFIG) +$ git merge security/next +Already up-to-date. +Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record) +$ git merge keys/keys-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 ++++++++++++ + crypto/asymmetric_keys/pkcs7_key_type.c | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) +Merging selinux/next (b937190c40de LSM: LoadPin: provide enablement CONFIG) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression) +$ git merge tpmdd/next +Auto-merging include/uapi/linux/Kbuild +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/tpm/tpm_vtpm_proxy.txt | 71 ++++ + drivers/char/tpm/Kconfig | 11 + + drivers/char/tpm/Makefile | 1 + + drivers/char/tpm/st33zp24/Kconfig | 11 +- + drivers/char/tpm/st33zp24/i2c.c | 70 +++- + drivers/char/tpm/st33zp24/spi.c | 184 ++++++---- + drivers/char/tpm/st33zp24/st33zp24.c | 125 +++---- + drivers/char/tpm/st33zp24/st33zp24.h | 14 +- + drivers/char/tpm/tpm-chip.c | 284 ++++++++++----- + drivers/char/tpm/tpm-dev.c | 15 +- + drivers/char/tpm/tpm-interface.c | 105 +++--- + drivers/char/tpm/tpm-sysfs.c | 78 ++-- + drivers/char/tpm/tpm.h | 73 ++-- + drivers/char/tpm/tpm2-cmd.c | 11 +- + drivers/char/tpm/tpm_atmel.c | 63 ++-- + drivers/char/tpm/tpm_atmel.h | 16 +- + drivers/char/tpm/tpm_crb.c | 73 ++-- + drivers/char/tpm/tpm_eventlog.c | 2 +- + drivers/char/tpm/tpm_eventlog.h | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 39 +- + drivers/char/tpm/tpm_i2c_infineon.c | 55 ++- + drivers/char/tpm/tpm_i2c_nuvoton.c | 98 ++--- + drivers/char/tpm/tpm_ibmvtpm.c | 38 +- + drivers/char/tpm/tpm_infineon.c | 22 +- + drivers/char/tpm/tpm_nsc.c | 84 +++-- + drivers/char/tpm/tpm_tis.c | 266 +++++++------- + drivers/char/tpm/tpm_vtpm_proxy.c | 644 +++++++++++++++++++++++++++++++++ + drivers/char/tpm/xen-tpmfront.c | 36 +- + include/linux/platform_data/st33zp24.h | 2 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/vtpm_proxy.h | 36 ++ + 32 files changed, 1768 insertions(+), 765 deletions(-) + create mode 100644 Documentation/tpm/tpm_vtpm_proxy.txt + create mode 100644 drivers/char/tpm/tpm_vtpm_proxy.c + create mode 100644 include/uapi/linux/vtpm_proxy.h +Merging watchdog/master (ae67643edc6e Documentation: Add ebc-c384_wdt watchdog-parameters.txt entry) +$ git merge watchdog/master +Auto-merging drivers/watchdog/watchdog_core.c +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 4 +- + .../devicetree/bindings/watchdog/renesas-wdt.txt | 25 +++ + Documentation/watchdog/hpwdt.txt | 57 +++--- + Documentation/watchdog/watchdog-parameters.txt | 4 + + arch/arm64/configs/defconfig | 2 + + drivers/watchdog/Kconfig | 8 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/cpwd.c | 4 +- + drivers/watchdog/f71808e_wdt.c | 30 ++- + drivers/watchdog/imx2_wdt.c | 19 +- + drivers/watchdog/jz4740_wdt.c | 4 +- + drivers/watchdog/octeon-wdt-main.c | 2 +- + drivers/watchdog/qcom-wdt.c | 7 +- + drivers/watchdog/renesas_wdt.c | 213 +++++++++++++++++++++ + drivers/watchdog/shwdt.c | 4 +- + drivers/watchdog/sp5100_tco.c | 15 +- + drivers/watchdog/watchdog_core.c | 2 +- + drivers/watchdog/watchdog_dev.c | 1 - + 18 files changed, 348 insertions(+), 54 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/renesas-wdt.txt + create mode 100644 drivers/watchdog/renesas_wdt.c +Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/include/asm/dma-mapping.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/arm64/silicon-errata.txt | 2 + + .../devicetree/bindings/iommu/arm,smmu.txt | 1 + + Documentation/kernel-parameters.txt | 7 + + arch/arm/include/asm/dma-mapping.h | 2 +- + arch/arm/mm/dma-mapping.c | 6 +- + arch/arm64/include/asm/dma-mapping.h | 2 +- + arch/arm64/mm/dma-mapping.c | 8 +- + drivers/iommu/Kconfig | 13 +- + drivers/iommu/amd_iommu.c | 267 +++++++++-------- + drivers/iommu/amd_iommu_init.c | 329 ++++++++++++++++++--- + drivers/iommu/amd_iommu_types.h | 40 +-- + drivers/iommu/arm-smmu-v3.c | 19 +- + drivers/iommu/arm-smmu.c | 308 +++++++++++++------ + drivers/iommu/dma-iommu.c | 146 ++++++--- + drivers/iommu/dmar.c | 47 +-- + drivers/iommu/intel-iommu.c | 2 +- + drivers/iommu/io-pgtable-arm-v7s.c | 29 +- + drivers/iommu/io-pgtable-arm.c | 9 +- + drivers/iommu/io-pgtable.c | 3 +- + drivers/iommu/io-pgtable.h | 6 + + drivers/iommu/iommu.c | 22 +- + drivers/iommu/mtk_iommu.c | 16 +- + drivers/iommu/of_iommu.c | 14 +- + drivers/iommu/omap-iommu-debug.c | 2 +- + drivers/iommu/omap-iommu.c | 10 +- + drivers/iommu/rockchip-iommu.c | 2 + + drivers/of/device.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + include/asm-generic/io.h | 4 +- + include/linux/dma-iommu.h | 4 +- + include/linux/dma-mapping.h | 2 +- + include/linux/io-64-nonatomic-hi-lo.h | 25 ++ + include/linux/io-64-nonatomic-lo-hi.h | 25 ++ + include/linux/iommu.h | 6 +- + include/linux/of_iommu.h | 8 +- + 35 files changed, 974 insertions(+), 416 deletions(-) +Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching) +$ git merge dwmw2-iommu/master +Auto-merging drivers/iommu/intel-iommu.c +Merge made by the 'recursive' strategy. + drivers/iommu/intel-iommu.c | 318 +++++++++++++++++++++++---------- + drivers/iommu/iova.c | 417 +++++++++++++++++++++++++++++++++++++++++--- + include/linux/iova.h | 23 ++- + 3 files changed, 638 insertions(+), 120 deletions(-) +Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes) +$ git merge vfio/next +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 55 ++++++++++++++++++++++++++++++------- + drivers/vfio/pci/vfio_pci_config.c | 46 +++++++++++++++++++++++++------ + drivers/vfio/pci/vfio_pci_private.h | 1 + + drivers/vfio/vfio_iommu_spapr_tce.c | 2 -- + 4 files changed, 84 insertions(+), 20 deletions(-) +Merging jc_docs/docs-next (9f8036643dd9 doc: self-protection: provide initial details) +$ git merge jc_docs/docs-next +Resolved 'samples/Makefile' using previous resolution. +Auto-merging samples/connector/Makefile +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging Documentation/networking/filter.txt +Auto-merging Documentation/driver-model/devres.txt +Auto-merging Documentation/Makefile +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-selection.xml +Auto-merging Documentation/DocBook/media/v4l/controls.xml +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b6fcbb98031d] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/obsolete/sysfs-driver-hid-roccat-savu | 11 +- + .../testing/sysfs-bus-event_source-devices-hv_24x7 | 2 +- + Documentation/ABI/testing/sysfs-driver-hid-picolcd | 2 +- + Documentation/ABI/testing/sysfs-firmware-acpi | 2 +- + Documentation/DocBook/media/v4l/controls.xml | 2 +- + Documentation/DocBook/media/v4l/dev-raw-vbi.xml | 2 +- + .../DocBook/media/v4l/vidioc-g-selection.xml | 2 +- + Documentation/IRQ-domain.txt | 12 + + Documentation/Makefile | 2 +- + Documentation/RCU/RTFP.txt | 6 +- + Documentation/adding-syscalls.txt | 2 +- + Documentation/arm/SA1100/Assabet | 2 +- + Documentation/block/00-INDEX | 4 + + Documentation/cgroup-v1/memory.txt | 14 +- + Documentation/connector/connector.txt | 8 + + Documentation/devicetree/bindings/mfd/arizona.txt | 2 +- + Documentation/driver-model/devres.txt | 3 + + Documentation/filesystems/cifs/README | 2 +- + .../filesystems/pohmelfs/design_notes.txt | 2 +- + Documentation/filesystems/qnx6.txt | 2 +- + Documentation/firmware_class/README | 2 +- + Documentation/hwmon/abituguru | 2 +- + Documentation/infiniband/ipoib.txt | 2 +- + Documentation/ja_JP/HOWTO | 6 - + Documentation/kernel-docs.txt | 29 +- + Documentation/ko_KR/HOWTO | 8 +- + Documentation/laptops/toshiba_haps.txt | 2 +- + Documentation/lzo.txt | 4 +- + Documentation/mmc/00-INDEX | 2 + + Documentation/mmc/mmc-tools.txt | 34 +++ + Documentation/networking/can.txt | 2 +- + Documentation/networking/filter.txt | 2 +- + Documentation/pps/pps.txt | 2 +- + Documentation/robust-futexes.txt | 6 +- + Documentation/scsi/ChangeLog.megaraid_sas | 48 ++-- + Documentation/scsi/bfa.txt | 2 +- + Documentation/security/self-protection.txt | 261 +++++++++++++++++ + Documentation/serial/driver | 54 ++-- + Documentation/sysrq.txt | 2 +- + Documentation/timers/hrtimers.txt | 6 +- + Documentation/video4linux/README.cx88 | 2 +- + Documentation/video4linux/bttv/Sound-FAQ | 2 +- + Documentation/vm/hugetlbpage.txt | 6 +- + Documentation/vm/pagemap.txt | 2 +- + Documentation/x86/intel_mpx.txt | 4 +- + Documentation/xillybus.txt | 2 +- + Documentation/zh_CN/HOWTO | 4 +- + Documentation/zh_CN/arm64/booting.txt | 20 +- + README | 20 +- + samples/Kconfig | 9 + + samples/Makefile | 2 +- + {Documentation => samples}/connector/.gitignore | 0 + {Documentation => samples}/connector/Makefile | 6 +- + {Documentation => samples}/connector/cn_test.c | 0 + {Documentation => samples}/connector/ucon.c | 0 + scripts/docproc.c | 221 +++++++++++---- + scripts/kernel-doc | 315 ++++++++++++++++++--- + 57 files changed, 922 insertions(+), 253 deletions(-) + create mode 100644 Documentation/mmc/mmc-tools.txt + create mode 100644 Documentation/security/self-protection.txt + rename {Documentation => samples}/connector/.gitignore (100%) + rename {Documentation => samples}/connector/Makefile (76%) + rename {Documentation => samples}/connector/cn_test.c (100%) + rename {Documentation => samples}/connector/ucon.c (100%) +Merging trivial/for-next (52bbe141f37f gitignore: fix wording) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY) +$ git merge audit/next +Already up-to-date. +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (f2c27767af0a devicetree: Add Creative Technology vendor id) +$ git merge dt-rh/for-next +Resolved 'Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt' using previous resolution. +Resolved 'drivers/iommu/arm-smmu.c' using previous resolution. +Auto-merging scripts/Makefile.lib +Auto-merging include/linux/of.h +Auto-merging drivers/of/unittest.c +Auto-merging drivers/of/base.c +Auto-merging drivers/iommu/arm-smmu.c +CONFLICT (content): Merge conflict in drivers/iommu/arm-smmu.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/thermal/nvidia,tegra124-soctherm.txt +Auto-merging Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt +Auto-merging Documentation/devicetree/bindings/net/stmmac.txt +Auto-merging Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt +Auto-merging Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +Auto-merging Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.txt +Auto-merging Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt +Auto-merging Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aab97761ac7e] Merge remote-tracking branch 'dt-rh/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cci.txt | 2 +- + .../devicetree/bindings/arm/omap/crossbar.txt | 3 +- + .../devicetree/bindings/arm/spear-misc.txt | 2 +- + .../devicetree/bindings/arm/ux500/boards.txt | 2 +- + .../{tegra-sata.txt => nvidia,tegra124-ahci.txt} | 0 + .../bindings/clock/nvidia,tegra124-dfll.txt | 2 +- + .../bindings/clock/rockchip,rk3188-cru.txt | 2 +- + .../bindings/clock/rockchip,rk3288-cru.txt | 2 +- + .../devicetree/bindings/clock/st/st,clkgen.txt | 2 +- + ...124-cpufreq.txt => nvidia,tegra124-cpufreq.txt} | 0 + .../bindings/display/exynos/exynos_dsim.txt | 2 +- + ...egra20-apbdma.txt => nvidia,tegra20-apbdma.txt} | 0 + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 2 +- + .../devicetree/bindings/gpio/ibm,ppc4xx-gpio.txt | 24 ++ + .../devicetree/bindings/input/ads7846.txt | 2 +- + .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 2 +- + .../interrupt-controller/mediatek,sysirq.txt | 3 +- + ...ia,tegra-ictlr.txt => nvidia,tegra20-ictlr.txt} | 0 + .../interrupt-controller/ti,omap4-wugen-mpu | 4 +- + .../{tegra-emc.txt => nvidia,tegra124-emc.txt} | 4 +- + .../{nvidia,tegra-mc.txt => nvidia,tegra30-mc.txt} | 6 +- + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 4 +- + .../devicetree/bindings/mmc/mmc-pwrseq-emmc.txt | 2 +- + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 2 +- + .../devicetree/bindings/net/hisilicon-hns-nic.txt | 2 +- + Documentation/devicetree/bindings/net/stmmac.txt | 4 +- + .../devicetree/bindings/net/ti,dp83867.txt | 2 +- + Documentation/devicetree/bindings/opp/opp.txt | 2 +- + .../devicetree/bindings/pci/designware-pcie.txt | 2 +- + .../devicetree/bindings/pci/hisilicon-pcie.txt | 12 +- + .../devicetree/bindings/phy/phy-stih41x-usb.txt | 2 +- + .../pinctrl/nvidia,tegra124-xusb-padctl.txt | 6 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 +- + .../bindings/power/qcom,coincell-charger.txt | 2 +- + .../devicetree/bindings/regulator/palmas-pmic.txt | 8 + + .../devicetree/bindings/rtc/rtc-palmas.txt | 6 +- + .../bindings/{tty => }/serial/mvebu-uart.txt | 0 + .../bindings/soc/ti/keystone-navigator-qmss.txt | 6 +- + .../bindings/sound/nvidia,tegra30-hda.txt | 2 +- + Documentation/devicetree/bindings/sram/sram.txt | 2 +- + ...a-soctherm.txt => nvidia,tegra124-soctherm.txt} | 2 +- + .../devicetree/bindings/vendor-prefixes.txt | 4 + + drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c | 2 +- + drivers/iommu/arm-smmu.c | 38 +- + drivers/of/base.c | 209 +++++++---- + drivers/of/dynamic.c | 6 + + drivers/of/fdt.c | 382 +++++++++++++-------- + drivers/of/unittest.c | 3 +- + include/linux/of.h | 56 +++ + include/linux/of_fdt.h | 5 +- + include/linux/of_graph.h | 1 + + scripts/Makefile.lib | 5 + + scripts/dtc/checks.c | 26 ++ + scripts/dtc/flattree.c | 4 +- + scripts/dtc/libfdt/fdt_ro.c | 6 +- + scripts/dtc/version_gen.h | 2 +- + 56 files changed, 595 insertions(+), 290 deletions(-) + rename Documentation/devicetree/bindings/ata/{tegra-sata.txt => nvidia,tegra124-ahci.txt} (100%) + rename Documentation/devicetree/bindings/cpufreq/{tegra124-cpufreq.txt => nvidia,tegra124-cpufreq.txt} (100%) + rename Documentation/devicetree/bindings/dma/{tegra20-apbdma.txt => nvidia,tegra20-apbdma.txt} (100%) + create mode 100644 Documentation/devicetree/bindings/gpio/ibm,ppc4xx-gpio.txt + rename Documentation/devicetree/bindings/interrupt-controller/{nvidia,tegra-ictlr.txt => nvidia,tegra20-ictlr.txt} (100%) + rename Documentation/devicetree/bindings/memory-controllers/{tegra-emc.txt => nvidia,tegra124-emc.txt} (99%) + rename Documentation/devicetree/bindings/memory-controllers/{nvidia,tegra-mc.txt => nvidia,tegra30-mc.txt} (97%) + rename Documentation/devicetree/bindings/{tty => }/serial/mvebu-uart.txt (100%) + rename Documentation/devicetree/bindings/thermal/{tegra-soctherm.txt => nvidia,tegra124-soctherm.txt} (98%) +Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code) +$ git merge mailbox/mailbox-for-next +Removing include/linux/platform_data/mailbox-omap.h +Merge made by the 'recursive' strategy. + drivers/mailbox/mailbox-sti.c | 4 +- + drivers/mailbox/omap-mailbox.c | 220 +++++++++++++---------------- + include/linux/omap-mailbox.h | 2 - + include/linux/platform_data/mailbox-omap.h | 58 -------- + 4 files changed, 104 insertions(+), 180 deletions(-) + delete mode 100644 include/linux/platform_data/mailbox-omap.h +Merging spi/for-next (2dcd0af568b0 Linux 4.6) +$ git merge spi/for-next +Already up-to-date. +Merging tip/auto-latest (139f278f8e96 Merge branch 'core/urgent') +$ git merge tip/auto-latest +Auto-merging include/linux/sched.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/cpufeature.h | 12 +- + arch/x86/include/asm/disabled-features.h | 6 +- + arch/x86/include/asm/topology.h | 12 +- + arch/x86/include/asm/uaccess.h | 23 +- + arch/x86/kernel/cpu/common.c | 4 + + arch/x86/kernel/cpu/intel.c | 7 +- + arch/x86/kernel/tsc_msr.c | 3 + + arch/x86/platform/efi/efi_stub_64.S | 9 +- + include/linux/futex.h | 12 +- + include/linux/sched.h | 2 + + include/uapi/linux/futex.h | 6 +- + kernel/fork.c | 7 + + kernel/futex.c | 557 ++++++++++++++++++++++++++++++- + tools/objtool/Makefile | 4 + + tools/objtool/elf.h | 5 + + tools/perf/bench/futex-hash.c | 38 ++- + tools/perf/bench/futex.h | 14 + + 17 files changed, 657 insertions(+), 64 deletions(-) +Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test) +$ git merge clockevents/clockevents/next +Merge made by the 'recursive' strategy. +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 (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (0fc1b09ff1ff tracing: Use temp buffer when filtering events) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (0e7e2457e4e4 Merge commit 'dcd36d01fb3f99d1d5df01714f6ccbe3fbbaf81f' into HEAD) +$ git merge rcu/rcu/next +Auto-merging drivers/base/power/runtime.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/smp.c | 2 +- + arch/arm/mach-omap2/powerdomain.c | 9 +++++---- + drivers/base/power/runtime.c | 14 +++++++------- + drivers/clk/clk.c | 8 ++++---- + 4 files changed, 17 insertions(+), 16 deletions(-) +Merging kvm/linux-next (9842df62004f KVM: MTRR: remove MSR 0x2f8) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (064850532444 kvm: arm64: Enable hardware updates of the Access Flag for Stage 2 page tables) +$ git merge kvm-arm/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 (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (51c2a7526e54 xen/gntdev: reduce copy batch size to 16) +$ git merge xen-tip/linux-next +Resolved 'arch/arm64/kernel/setup.c' using previous resolution. +Resolved 'drivers/xen/efi.c' using previous resolution. +Auto-merging include/linux/of_fdt.h +Auto-merging drivers/xen/efi.c +CONFLICT (content): Merge conflict in drivers/xen/efi.c +Auto-merging drivers/of/fdt.c +Auto-merging arch/arm64/kernel/setup.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/setup.c +Auto-merging arch/arm/kernel/setup.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 096ce0d9e01e] Merge remote-tracking branch 'xen-tip/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/xen.txt | 35 +++++ + arch/arm/include/asm/xen/xen-ops.h | 6 + + arch/arm/kernel/setup.c | 2 +- + arch/arm/xen/Makefile | 1 + + arch/arm/xen/efi.c | 40 ++++++ + arch/arm/xen/enlighten.c | 103 ++++++++++---- + arch/arm64/include/asm/xen/xen-ops.h | 6 + + arch/arm64/kernel/setup.c | 3 +- + arch/arm64/xen/Makefile | 1 + + arch/x86/xen/efi.c | 112 +++++++++++++++ + arch/x86/xen/grant-table.c | 57 +------- + arch/x86/xen/time.c | 6 +- + drivers/acpi/scan.c | 74 ++++++++++ + drivers/of/fdt.c | 13 ++ + drivers/xen/Kconfig | 2 +- + drivers/xen/Makefile | 1 + + drivers/xen/arm-device.c | 196 ++++++++++++++++++++++++++ + drivers/xen/efi.c | 173 +++++------------------ + drivers/xen/gntdev.c | 2 +- + drivers/xen/xlate_mmu.c | 77 ++++++++++ + include/linux/of_fdt.h | 2 + + include/xen/interface/hvm/params.h | 40 +++++- + include/xen/interface/memory.h | 1 + + include/xen/xen-ops.h | 32 +++-- + 24 files changed, 749 insertions(+), 236 deletions(-) + create mode 100644 arch/arm/include/asm/xen/xen-ops.h + create mode 100644 arch/arm/xen/efi.c + create mode 100644 arch/arm64/include/asm/xen/xen-ops.h + create mode 100644 drivers/xen/arm-device.c +$ git am -3 ../patches/0001-xen-efi-merge-fix-patch.patch +Applying: xen: efi: merge fix patch +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/xen/efi.c +$ git add -A . +$ git commit -v -a --amend +[master 2b7011dfe814] Merge remote-tracking branch 'xen-tip/linux-next' + Date: Fri May 20 11:16:22 2016 +1000 +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (f831153ac9d3 asus-wmi: provide access to ALS control) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/intel_telemetry_pltdrv.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/intel_telemetry.h | 2 +- + drivers/platform/x86/asus-laptop.c | 15 ++++--- + drivers/platform/x86/asus-wmi.c | 5 +++ + drivers/platform/x86/fujitsu-laptop.c | 63 ++++++++++++++++++++++++--- + drivers/platform/x86/ideapad-laptop.c | 20 +++++++-- + drivers/platform/x86/intel_telemetry_core.c | 6 +-- + drivers/platform/x86/intel_telemetry_pltdrv.c | 2 +- + drivers/platform/x86/sony-laptop.c | 3 ++ + drivers/platform/x86/surfacepro3_button.c | 9 +++- + 9 files changed, 102 insertions(+), 23 deletions(-) +Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 10 ++ + drivers/platform/chrome/Makefile | 15 +-- + drivers/platform/chrome/chromeos_laptop.c | 37 ++++++- + drivers/platform/chrome/chromeos_pstore.c | 55 +++++++++- + drivers/platform/chrome/cros_ec_dev.c | 7 ++ + drivers/platform/chrome/cros_ec_lightbar.c | 10 +- + drivers/platform/chrome/cros_ec_proto.c | 4 +- + drivers/platform/chrome/cros_kbd_led_backlight.c | 122 +++++++++++++++++++++++ + include/linux/mfd/cros_ec.h | 6 +- + 9 files changed, 249 insertions(+), 17 deletions(-) + create mode 100644 drivers/platform/chrome/cros_kbd_led_backlight.c +Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk) +$ git merge hsi/for-next +Auto-merging drivers/hsi/controllers/omap_ssi_core.c +Merge made by the 'recursive' strategy. + drivers/hsi/controllers/Kconfig | 8 +- + drivers/hsi/controllers/Makefile | 4 +- + drivers/hsi/controllers/omap_ssi.h | 12 ++- + .../controllers/{omap_ssi.c => omap_ssi_core.c} | 107 ++++++++++++++++++--- + drivers/hsi/controllers/omap_ssi_port.c | 100 +++++++++---------- + 5 files changed, 157 insertions(+), 74 deletions(-) + rename drivers/hsi/controllers/{omap_ssi.c => omap_ssi_core.c} (86%) +Merging leds/for-next (80d6737b27bb leds: gpio: Support the "panic-indicator" firmware property) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (c6e360a0d9d2 Revert "base: dd: don't remove driver_data in -EPROBE_DEFER case") +$ git merge driver-core/driver-core-next +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/kernfs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/device.h +Auto-merging fs/kernfs/inode.c +Auto-merging fs/kernfs/dir.c +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/firmware/qemu_fw_cfg.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 1 + + Documentation/devices.txt | 86 ++-- + Documentation/isa.txt | 121 ++++++ + MAINTAINERS | 7 + + arch/x86/Kconfig | 4 +- + drivers/base/devcoredump.c | 83 +++- + drivers/firmware/qemu_fw_cfg.c | 4 +- + drivers/gpio/Kconfig | 38 +- + drivers/gpio/gpio-104-dio-48e.c | 106 ++--- + drivers/gpio/gpio-104-idi-48.c | 86 ++-- + drivers/gpio/gpio-104-idio-16.c | 85 ++-- + drivers/gpio/gpio-ws16c48.c | 88 ++--- + drivers/iio/dac/Kconfig | 2 +- + drivers/iio/dac/stx104.c | 24 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 4 +- + drivers/pnp/pnpbios/Kconfig | 2 +- + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/ebc-c384_wdt.c | 43 +- + fs/char_dev.c | 4 + + fs/debugfs/file.c | 436 +++++++++++++++++---- + fs/debugfs/inode.c | 108 ++++- + fs/debugfs/internal.h | 26 ++ + fs/kernfs/dir.c | 8 +- + fs/kernfs/file.c | 51 +-- + fs/kernfs/inode.c | 15 +- + include/linux/debugfs.h | 49 ++- + include/linux/devcoredump.h | 86 +++- + include/linux/device.h | 7 +- + include/linux/fs.h | 2 + + include/linux/isa.h | 32 ++ + include/linux/kernfs.h | 1 + + lib/Kconfig.debug | 1 + + .../api/debugfs/debugfs_simple_attr.cocci | 67 ++++ + 33 files changed, 1160 insertions(+), 519 deletions(-) + create mode 100644 Documentation/isa.txt + create mode 100644 fs/debugfs/internal.h + create mode 100644 scripts/coccinelle/api/debugfs/debugfs_simple_attr.cocci +Merging tty/tty-next (d20bb59af646 MAINTAINERS: 8250: remove website reference) +$ git merge tty/tty-next +Recorded preimage for 'include/uapi/linux/serial_core.h' +Resolved 'drivers/tty/serial/Makefile' using previous resolution. +Auto-merging include/uapi/linux/serial_core.h +CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h +Auto-merging include/linux/tty.h +Auto-merging include/linux/console.h +Auto-merging drivers/tty/synclinkmp.c +Auto-merging drivers/tty/synclink_gt.c +Auto-merging drivers/tty/synclink.c +Auto-merging drivers/tty/serial/serial_mctrl_gpio.h +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/tty/serial/Makefile +CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/8250/8250_pci.c +Auto-merging drivers/tty/n_gsm.c +Auto-merging drivers/s390/char/tty3270.c +Auto-merging drivers/char/pcmcia/synclink_cs.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/uapi/linux/serial_core.h'. +[master 5333435f0dbc] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/serial/arm,mps2-uart.txt | 19 + + .../devicetree/bindings/serial/fsl-imx-uart.txt | 4 +- + .../devicetree/bindings/serial/fsl-mxs-auart.txt | 16 +- + .../devicetree/bindings/serial/serial.txt | 57 ++ + .../devicetree/bindings/serial/sirf-uart.txt | 8 +- + Documentation/kernel-parameters.txt | 6 + + Documentation/serial/tty.txt | 3 - + MAINTAINERS | 1 - + arch/ia64/hp/sim/simserial.c | 2 +- + arch/mips/ath79/early_printk.c | 6 +- + drivers/char/pcmcia/synclink_cs.c | 29 +- + drivers/ipack/devices/ipoctal.c | 5 +- + drivers/isdn/i4l/isdn_tty.c | 44 +- + drivers/mmc/card/sdio_uart.c | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/s390/char/con3215.c | 22 +- + drivers/s390/char/tty3270.c | 4 +- + drivers/staging/dgnc/dgnc_tty.c | 2 +- + drivers/staging/fwserial/fwserial.c | 2 +- + drivers/staging/speakup/selection.c | 2 +- + drivers/tty/amiserial.c | 39 +- + drivers/tty/cyclades.c | 38 +- + drivers/tty/hvc/hvc_console.c | 4 +- + drivers/tty/hvc/hvcs.c | 2 +- + drivers/tty/hvc/hvsi.c | 2 +- + drivers/tty/ipwireless/hardware.c | 5 + + drivers/tty/isicom.c | 19 +- + drivers/tty/moxa.c | 12 +- + drivers/tty/mxser.c | 35 +- + drivers/tty/n_gsm.c | 12 +- + drivers/tty/n_hdlc.c | 4 +- + drivers/tty/n_tty.c | 70 ++- + drivers/tty/nozomi.c | 2 +- + drivers/tty/pty.c | 6 +- + drivers/tty/rocket.c | 16 +- + drivers/tty/serial/8250/8250.h | 15 +- + drivers/tty/serial/8250/8250_core.c | 3 + + drivers/tty/serial/8250/8250_dma.c | 68 ++- + drivers/tty/serial/8250/8250_dw.c | 8 +- + drivers/tty/serial/8250/8250_fintek.c | 118 +--- + drivers/tty/serial/8250/8250_mid.c | 44 +- + drivers/tty/serial/8250/8250_of.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 93 ++- + drivers/tty/serial/8250/8250_pci.c | 15 + + drivers/tty/serial/8250/8250_port.c | 38 +- + drivers/tty/serial/8250/8250_uniphier.c | 2 +- + drivers/tty/serial/8250/Kconfig | 24 +- + drivers/tty/serial/8250/Makefile | 2 +- + drivers/tty/serial/Kconfig | 20 +- + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/amba-pl011.c | 1 + + drivers/tty/serial/atmel_serial.c | 14 +- + drivers/tty/serial/crisv10.c | 30 +- + drivers/tty/serial/ifx6x60.c | 2 +- + drivers/tty/serial/imx.c | 174 ++++-- + drivers/tty/serial/meson_uart.c | 42 +- + drivers/tty/serial/mps2-uart.c | 625 ++++++++++++++++++++ + drivers/tty/serial/msm_serial.c | 101 ++-- + drivers/tty/serial/mvebu-uart.c | 29 +- + drivers/tty/serial/mxs-auart.c | 644 +++++++++++++++++---- + drivers/tty/serial/samsung.c | 4 +- + drivers/tty/serial/sc16is7xx.c | 13 +- + drivers/tty/serial/serial-tegra.c | 2 - + drivers/tty/serial/serial_core.c | 430 +++++++++----- + drivers/tty/serial/serial_mctrl_gpio.c | 7 +- + drivers/tty/serial/serial_mctrl_gpio.h | 2 - + drivers/tty/serial/sirfsoc_uart.c | 39 +- + drivers/tty/serial/uartlite.c | 12 +- + drivers/tty/serial/ucc_uart.c | 3 + + drivers/tty/synclink.c | 74 +-- + drivers/tty/synclink_gt.c | 41 +- + drivers/tty/synclinkmp.c | 41 +- + drivers/tty/tty_buffer.c | 34 +- + drivers/tty/tty_io.c | 9 +- + drivers/tty/tty_ioctl.c | 4 +- + drivers/tty/tty_port.c | 27 +- + drivers/tty/vt/selection.c | 2 +- + drivers/tty/vt/vt.c | 115 ++-- + drivers/usb/class/cdc-acm.c | 4 +- + drivers/usb/gadget/function/u_serial.c | 4 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 2 +- + drivers/usb/serial/console.c | 4 +- + drivers/usb/serial/digi_acceleport.c | 3 +- + drivers/usb/serial/generic.c | 6 +- + drivers/usb/serial/mxuport.c | 6 +- + drivers/usb/serial/sierra.c | 4 +- + drivers/usb/serial/usb-serial.c | 2 +- + drivers/usb/serial/usb_wwan.c | 4 +- + drivers/video/console/fbcon.c | 4 +- + drivers/video/console/mdacon.c | 2 +- + drivers/video/console/newport_con.c | 2 +- + drivers/video/console/sticon.c | 2 +- + drivers/video/console/vgacon.c | 5 +- + include/linux/console.h | 2 +- + include/linux/selection.h | 8 +- + include/linux/serial_8250.h | 2 + + include/linux/serial_core.h | 3 + + include/linux/tty.h | 89 ++- + include/uapi/linux/serial_core.h | 3 + + include/uapi/linux/tty_flags.h | 13 +- + include/uapi/linux/vt.h | 1 - + net/irda/ircomm/ircomm_tty.c | 31 +- + net/irda/ircomm/ircomm_tty_attach.c | 2 +- + net/irda/ircomm/ircomm_tty_ioctl.c | 18 +- + 104 files changed, 2528 insertions(+), 1174 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/arm,mps2-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/serial.txt + create mode 100644 drivers/tty/serial/mps2-uart.c +Merging usb/usb-next (60d5794fe5a5 Merge tag 'usb-serial-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next) +$ git merge usb/usb-next +Auto-merging drivers/usb/storage/scsiglue.c +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/usb/serial/mxuport.c +Auto-merging drivers/usb/host/Kconfig +Removing drivers/phy/phy-brcmstb-sata.c +Auto-merging drivers/phy/Makefile +Auto-merging drivers/phy/Kconfig +Auto-merging Documentation/devicetree/bindings/phy/brcm-sata-phy.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-usbip-vudc | 35 ++ + .../devicetree/bindings/phy/bcm-ns-usb2-phy.txt | 21 + + ...brcm,brcmstb-sata-phy.txt => brcm-sata-phy.txt} | 15 +- + .../devicetree/bindings/phy/phy-mt65xx-usb.txt | 4 +- + .../devicetree/bindings/phy/rcar-gen2-phy.txt | 8 +- + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 12 +- + .../devicetree/bindings/phy/samsung-phy.txt | 18 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 6 +- + .../devicetree/bindings/usb/qcom,dwc3.txt | 1 - + Documentation/usb/chipidea.txt | 13 +- + drivers/phy/Kconfig | 33 +- + drivers/phy/Makefile | 3 +- + drivers/phy/phy-bcm-ns-usb2.c | 137 +++++ + drivers/phy/phy-brcm-sata.c | 412 +++++++++++++ + drivers/phy/phy-brcmstb-sata.c | 250 -------- + drivers/phy/phy-exynos-mipi-video.c | 321 ++++++++-- + drivers/phy/phy-mt65xx-usb3.c | 77 ++- + drivers/phy/phy-rcar-gen2.c | 1 + + drivers/phy/phy-rcar-gen3-usb2.c | 88 ++- + drivers/phy/phy-rockchip-usb.c | 2 +- + drivers/usb/Kconfig | 3 +- + drivers/usb/atm/ueagle-atm.c | 10 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 4 - + drivers/usb/common/usb-otg-fsm.c | 10 +- + drivers/usb/core/buffer.c | 3 + + drivers/usb/core/devio.c | 11 +- + drivers/usb/core/driver.c | 40 +- + drivers/usb/core/hcd.c | 16 +- + drivers/usb/core/hub.c | 10 +- + drivers/usb/core/message.c | 48 +- + drivers/usb/core/usb.c | 1 - + drivers/usb/dwc2/gadget.c | 8 +- + drivers/usb/dwc2/hcd.c | 1 + + drivers/usb/dwc2/hcd.h | 1 + + drivers/usb/dwc2/hcd_queue.c | 3 +- + drivers/usb/dwc2/platform.c | 2 +- + drivers/usb/dwc3/core.c | 118 ++-- + drivers/usb/dwc3/core.h | 84 ++- + drivers/usb/dwc3/debug.h | 6 +- + drivers/usb/dwc3/debugfs.c | 358 +++++++++-- + drivers/usb/dwc3/dwc3-omap.c | 9 - + drivers/usb/dwc3/dwc3-pci.c | 18 +- + drivers/usb/dwc3/ep0.c | 43 +- + drivers/usb/dwc3/gadget.c | 427 +++++++------ + drivers/usb/dwc3/gadget.h | 6 +- + drivers/usb/dwc3/platform_data.h | 2 +- + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/composite.c | 22 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 36 +- + drivers/usb/gadget/function/f_mass_storage.h | 2 - + drivers/usb/gadget/legacy/acm_ms.c | 4 - + drivers/usb/gadget/legacy/mass_storage.c | 4 - + drivers/usb/gadget/legacy/multi.c | 12 - + drivers/usb/gadget/legacy/nokia.c | 7 - + drivers/usb/gadget/udc/at91_udc.c | 5 +- + drivers/usb/gadget/udc/pch_udc.c | 175 ++---- + drivers/usb/gadget/udc/r8a66597-udc.c | 2 +- + drivers/usb/gadget/udc/udc-core.c | 26 +- + drivers/usb/host/Kconfig | 3 +- + drivers/usb/host/bcma-hcd.c | 6 +- + drivers/usb/host/ehci-dbg.c | 86 ++- + drivers/usb/host/ehci-exynos.c | 2 +- + drivers/usb/host/ehci-msm.c | 2 +- + drivers/usb/host/ehci-omap.c | 2 +- + drivers/usb/host/ehci-spear.c | 2 +- + drivers/usb/host/fhci-sched.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 8 +- + drivers/usb/host/whci/hcd.c | 7 +- + drivers/usb/host/whci/qset.c | 8 +- + drivers/usb/host/xhci-mvebu.c | 7 +- + drivers/usb/host/xhci-mvebu.h | 7 +- + drivers/usb/host/xhci-plat.c | 60 +- + drivers/usb/host/xhci-plat.h | 20 +- + drivers/usb/host/xhci-rcar.c | 34 +- + drivers/usb/host/xhci-ring.c | 478 +++++---------- + drivers/usb/host/xhci.c | 41 -- + drivers/usb/host/xhci.h | 14 + + drivers/usb/isp1760/isp1760-if.c | 2 +- + drivers/usb/misc/Kconfig | 26 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/sisusbvga/sisusb.c | 4 +- + drivers/usb/misc/ucsi.c | 478 +++++++++++++++ + drivers/usb/misc/ucsi.h | 215 +++++++ + drivers/usb/misc/usbtest.c | 7 +- + drivers/usb/phy/phy-qcom-8x16-usb.c | 5 +- + drivers/usb/phy/phy-twl6030-usb.c | 10 +- + drivers/usb/renesas_usbhs/fifo.c | 16 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 9 +- + drivers/usb/renesas_usbhs/mod_host.c | 3 +- + drivers/usb/renesas_usbhs/pipe.c | 30 +- + drivers/usb/renesas_usbhs/pipe.h | 6 +- + drivers/usb/serial/cp210x.c | 102 +++- + drivers/usb/serial/ftdi_sio.c | 16 +- + drivers/usb/serial/io_edgeport.c | 56 +- + drivers/usb/serial/keyspan.c | 72 ++- + drivers/usb/serial/mxuport.c | 10 + + drivers/usb/serial/quatech2.c | 1 + + drivers/usb/serial/ti_usb_3410_5052.c | 55 +- + drivers/usb/serial/ti_usb_3410_5052.h | 8 + + drivers/usb/serial/usb-serial.c | 5 +- + drivers/usb/storage/alauda.c | 22 +- + drivers/usb/storage/cypress_atacb.c | 34 +- + drivers/usb/storage/datafab.c | 22 +- + drivers/usb/storage/debug.c | 3 +- + drivers/usb/storage/debug.h | 3 +- + drivers/usb/storage/ene_ub6250.c | 25 +- + drivers/usb/storage/freecom.c | 75 ++- + drivers/usb/storage/initializers.c | 15 +- + drivers/usb/storage/initializers.h | 15 +- + drivers/usb/storage/isd200.c | 51 +- + drivers/usb/storage/jumpshot.c | 22 +- + drivers/usb/storage/karma.c | 3 +- + drivers/usb/storage/option_ms.c | 6 +- + drivers/usb/storage/protocol.c | 12 +- + drivers/usb/storage/protocol.h | 3 +- + drivers/usb/storage/realtek_cr.c | 12 +- + drivers/usb/storage/scsiglue.c | 169 ++++-- + drivers/usb/storage/scsiglue.h | 3 +- + drivers/usb/storage/sddr09.c | 82 ++- + drivers/usb/storage/sddr55.c | 45 +- + drivers/usb/storage/shuttle_usbat.c | 16 +- + drivers/usb/storage/sierra_ms.c | 3 +- + drivers/usb/storage/transport.c | 165 +++-- + drivers/usb/storage/transport.h | 3 +- + drivers/usb/storage/uas.c | 3 +- + drivers/usb/storage/unusual_alauda.h | 3 +- + drivers/usb/storage/unusual_cypress.h | 3 +- + drivers/usb/storage/unusual_datafab.h | 6 +- + drivers/usb/storage/unusual_devs.h | 334 +++++++---- + drivers/usb/storage/unusual_freecom.h | 3 +- + drivers/usb/storage/unusual_isd200.h | 3 +- + drivers/usb/storage/unusual_jumpshot.h | 3 +- + drivers/usb/storage/unusual_karma.h | 3 +- + drivers/usb/storage/unusual_onetouch.h | 6 +- + drivers/usb/storage/unusual_realtek.h | 3 +- + drivers/usb/storage/unusual_sddr09.h | 3 +- + drivers/usb/storage/unusual_sddr55.h | 3 +- + drivers/usb/storage/unusual_uas.h | 3 +- + drivers/usb/storage/unusual_usbat.h | 3 +- + drivers/usb/storage/usb.c | 98 +-- + drivers/usb/storage/usb.h | 14 +- + drivers/usb/storage/usual-tables.c | 3 +- + drivers/usb/usbip/Kconfig | 17 +- + drivers/usb/usbip/Makefile | 3 + + drivers/usb/usbip/stub.h | 1 - + drivers/usb/usbip/stub_dev.c | 7 +- + drivers/usb/usbip/stub_rx.c | 19 +- + drivers/usb/usbip/stub_tx.c | 11 +- + drivers/usb/usbip/usbip_common.c | 17 +- + drivers/usb/usbip/usbip_common.h | 14 +- + drivers/usb/usbip/usbip_event.c | 168 ++++-- + drivers/usb/usbip/vudc.h | 190 ++++++ + drivers/usb/usbip/vudc_dev.c | 661 +++++++++++++++++++++ + drivers/usb/usbip/vudc_main.c | 113 ++++ + drivers/usb/usbip/vudc_rx.c | 234 ++++++++ + drivers/usb/usbip/vudc_sysfs.c | 229 +++++++ + drivers/usb/usbip/vudc_transfer.c | 506 ++++++++++++++++ + drivers/usb/usbip/vudc_tx.c | 289 +++++++++ + drivers/usb/wusbcore/crypto.c | 6 +- + drivers/usb/wusbcore/devconnect.c | 1 - + include/linux/bcma/bcma.h | 1 + + include/linux/bcma/bcma_driver_arm_c9.h | 15 + + include/linux/mfd/syscon/exynos5-pmu.h | 3 + + include/linux/usb.h | 11 +- + include/linux/usb/gadget.h | 4 + + include/linux/usb/hcd.h | 1 + + include/linux/usb/otg-fsm.h | 91 ++- + include/uapi/linux/usb/ch9.h | 121 ++++ + tools/usb/usbip/libsrc/Makefile.am | 4 +- + tools/usb/usbip/libsrc/usbip_common.h | 3 + + tools/usb/usbip/libsrc/usbip_device_driver.c | 163 +++++ + tools/usb/usbip/libsrc/usbip_device_driver.h | 34 ++ + tools/usb/usbip/libsrc/usbip_host_common.c | 273 +++++++++ + tools/usb/usbip/libsrc/usbip_host_common.h | 104 ++++ + tools/usb/usbip/libsrc/usbip_host_driver.c | 269 +-------- + tools/usb/usbip/libsrc/usbip_host_driver.h | 27 +- + tools/usb/usbip/src/usbip_attach.c | 10 +- + tools/usb/usbip/src/usbip_list.c | 96 ++- + tools/usb/usbip/src/usbip_port.c | 13 +- + tools/usb/usbip/src/usbipd.c | 42 +- + 181 files changed, 7482 insertions(+), 2518 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-usbip-vudc + create mode 100644 Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.txt + rename Documentation/devicetree/bindings/phy/{brcm,brcmstb-sata-phy.txt => brcm-sata-phy.txt} (69%) + create mode 100644 drivers/phy/phy-bcm-ns-usb2.c + create mode 100644 drivers/phy/phy-brcm-sata.c + delete mode 100644 drivers/phy/phy-brcmstb-sata.c + create mode 100644 drivers/usb/misc/ucsi.c + create mode 100644 drivers/usb/misc/ucsi.h + create mode 100644 drivers/usb/usbip/vudc.h + create mode 100644 drivers/usb/usbip/vudc_dev.c + create mode 100644 drivers/usb/usbip/vudc_main.c + create mode 100644 drivers/usb/usbip/vudc_rx.c + create mode 100644 drivers/usb/usbip/vudc_sysfs.c + create mode 100644 drivers/usb/usbip/vudc_transfer.c + create mode 100644 drivers/usb/usbip/vudc_tx.c + create mode 100644 include/linux/bcma/bcma_driver_arm_c9.h + create mode 100644 tools/usb/usbip/libsrc/usbip_device_driver.c + create mode 100644 tools/usb/usbip/libsrc/usbip_device_driver.h + create mode 100644 tools/usb/usbip/libsrc/usbip_host_common.c + create mode 100644 tools/usb/usbip/libsrc/usbip_host_common.h +Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging staging/staging-next (ffc83a79b44e Staging: emxx_udc: emxx_udc: fixed coding style issue) +$ git merge staging/staging-next +Resolved 'drivers/staging/lustre/lustre/llite/rw26.c' using previous resolution. +Auto-merging include/uapi/linux/sync_file.h +Auto-merging include/linux/sched.h +Auto-merging drivers/staging/wlan-ng/p80211netdev.c +Auto-merging drivers/staging/wlan-ng/cfg80211.c +Auto-merging drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +Auto-merging drivers/staging/vt6656/main_usb.c +Auto-merging drivers/staging/vme/devices/vme_pio2_gpio.c +Auto-merging drivers/staging/unisys/visorbus/visorchipset.c +Removing drivers/staging/unisys/Documentation/proc-entries.txt +Auto-merging drivers/staging/rtl8192u/r8192U_core.c +Auto-merging drivers/staging/lustre/lustre/llite/xattr.c +Auto-merging drivers/staging/lustre/lustre/llite/rw26.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Auto-merging drivers/staging/lustre/lustre/llite/lcommon_misc.c +Auto-merging drivers/staging/lustre/lustre/llite/glimpse.c +Auto-merging drivers/staging/lustre/lustre/llite/dir.c +Removing drivers/staging/lustre/lustre/lclient/lcommon_cl.c +Removing drivers/staging/lustre/lustre/include/linux/obd.h +Removing drivers/staging/lustre/lustre/include/lclient.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h +Removing drivers/staging/iio/impedance-analyzer/ad5933.h +Removing drivers/staging/iio/accel/adis16220_core.c +Removing drivers/staging/iio/accel/adis16220.h +Removing drivers/staging/iio/accel/adis16204_core.c +Removing drivers/staging/iio/accel/adis16204.h +Auto-merging drivers/staging/fwserial/fwserial.c +Auto-merging drivers/staging/dgnc/dgnc_tty.c +Removing drivers/staging/comedi/drivers/ni_mio_c_common.c +Removing drivers/staging/android/timed_output.h +Removing drivers/staging/android/timed_output.c +Removing drivers/staging/android/timed_gpio.h +Removing drivers/staging/android/timed_gpio.c +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +Auto-merging drivers/iio/dac/Kconfig +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-model/devres.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/DocBook/device-drivers.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 510061e19855] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 68 +- + Documentation/DocBook/device-drivers.tmpl | 2 + + .../devicetree/bindings/iio/accel/mma8452.txt | 3 +- + .../devicetree/bindings/iio/adc/lpc1850-adc.txt | 21 + + .../bindings/{staging => }/iio/adc/mxs-lradc.txt | 0 + .../bindings/iio/adc/rockchip-saradc.txt | 6 +- + .../devicetree/bindings/iio/dac/ad5592r.txt | 155 ++ + .../devicetree/bindings/iio/dac/lpc1850-dac.txt | 20 + + .../devicetree/bindings/iio/imu/inv_mpu6050.txt | 13 + + .../bindings/iio/magnetometer/ak8975.txt | 12 + + .../bindings/iio/potentiometer/ds1803.txt | 21 + + .../bindings/iio/potentiometer/mcp4131.txt | 84 + + .../devicetree/bindings/iio/pressure/hp03.txt | 17 + + .../devicetree/bindings/iio/pressure/ms5611.txt | 19 + + .../devicetree/bindings/iio/st-sensors.txt | 6 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/driver-model/devres.txt | 4 + + Documentation/sync_file.txt | 69 + + MAINTAINERS | 12 +- + drivers/Kconfig | 2 + + drivers/dma-buf/Kconfig | 11 + + drivers/dma-buf/Makefile | 1 + + drivers/dma-buf/sync_file.c | 395 ++++ + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 11 +- + drivers/gpu/drm/i915/i915_drv.h | 5 - + drivers/gpu/drm/i915/i915_gem.c | 14 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 14 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 11 +- + drivers/iio/accel/Kconfig | 5 +- + drivers/iio/accel/bmc150-accel-core.c | 127 +- + drivers/iio/accel/bmc150-accel-i2c.c | 7 +- + drivers/iio/accel/bmc150-accel-spi.c | 8 +- + drivers/iio/accel/bmc150-accel.h | 1 + + drivers/iio/accel/kxcjk-1013.c | 25 +- + drivers/iio/accel/mma7455_core.c | 5 +- + drivers/iio/accel/mma8452.c | 188 +- + drivers/iio/accel/mma9553.c | 1 - + drivers/iio/accel/mxc4005.c | 29 - + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 105 + + drivers/iio/accel/st_accel_i2c.c | 4 + + drivers/iio/accel/stk8312.c | 1 - + drivers/iio/accel/stk8ba50.c | 1 - + drivers/iio/adc/Kconfig | 16 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad799x.c | 2 +- + drivers/iio/adc/at91-sama5d2_adc.c | 102 +- + drivers/iio/adc/at91_adc.c | 8 +- + drivers/iio/adc/ina2xx-adc.c | 43 +- + drivers/iio/adc/lpc18xx_adc.c | 231 +++ + drivers/iio/adc/mcp3422.c | 6 +- + drivers/iio/adc/mxs-lradc.c | 37 +- + drivers/iio/adc/rockchip_saradc.c | 19 + + drivers/iio/adc/ti-adc081c.c | 118 +- + drivers/iio/adc/vf610_adc.c | 24 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 2 +- + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 2 +- + drivers/iio/common/st_sensors/st_sensors_buffer.c | 97 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 20 + + drivers/iio/common/st_sensors/st_sensors_trigger.c | 13 + + drivers/iio/dac/Kconfig | 37 + + drivers/iio/dac/Makefile | 4 + + drivers/iio/dac/ad5592r-base.c | 691 +++++++ + drivers/iio/dac/ad5592r-base.h | 76 + + drivers/iio/dac/ad5592r.c | 164 ++ + drivers/iio/dac/ad5593r.c | 131 ++ + drivers/iio/dac/lpc18xx_dac.c | 210 ++ + drivers/iio/frequency/ad9523.c | 19 +- + drivers/iio/gyro/Kconfig | 2 +- + drivers/iio/gyro/bmg160_core.c | 137 +- + drivers/iio/gyro/st_gyro.h | 1 + + drivers/iio/gyro/st_gyro_core.c | 4 + + drivers/iio/gyro/st_gyro_i2c.c | 5 + + drivers/iio/gyro/st_gyro_spi.c | 1 + + drivers/iio/humidity/Kconfig | 10 + + drivers/iio/humidity/Makefile | 1 + + drivers/iio/humidity/am2315.c | 303 +++ + drivers/iio/humidity/dht11.c | 40 +- + drivers/iio/imu/Kconfig | 2 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis.c | 7 +- + drivers/iio/imu/bmi160/Kconfig | 32 + + drivers/iio/imu/bmi160/Makefile | 6 + + drivers/iio/imu/bmi160/bmi160.h | 10 + + drivers/iio/imu/bmi160/bmi160_core.c | 596 ++++++ + drivers/iio/imu/bmi160/bmi160_i2c.c | 72 + + drivers/iio/imu/bmi160/bmi160_spi.c | 63 + + drivers/iio/imu/inv_mpu6050/Kconfig | 10 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 73 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 3 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 16 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 20 +- + drivers/iio/imu/kmx61.c | 1 - + drivers/iio/industrialio-core.c | 123 ++ + drivers/iio/inkern.c | 86 +- + drivers/iio/light/Kconfig | 32 + + drivers/iio/light/Makefile | 3 + + drivers/iio/light/apds9960.c | 13 +- + drivers/iio/light/bh1780.c | 297 +++ + drivers/iio/light/max44000.c | 639 ++++++ + drivers/iio/light/stk3310.c | 1 - + drivers/iio/light/tsl2563.c | 3 +- + drivers/iio/light/veml6070.c | 218 ++ + drivers/iio/magnetometer/Kconfig | 33 +- + drivers/iio/magnetometer/Makefile | 3 + + drivers/iio/magnetometer/ak8975.c | 232 ++- + drivers/iio/magnetometer/bmc150_magn.c | 156 +- + drivers/iio/magnetometer/bmc150_magn.h | 11 + + drivers/iio/magnetometer/bmc150_magn_i2c.c | 77 + + drivers/iio/magnetometer/bmc150_magn_spi.c | 68 + + drivers/iio/magnetometer/st_magn_core.c | 1 + + drivers/iio/potentiometer/Kconfig | 28 + + drivers/iio/potentiometer/Makefile | 2 + + drivers/iio/potentiometer/ds1803.c | 173 ++ + drivers/iio/potentiometer/mcp4131.c | 494 +++++ + drivers/iio/potentiometer/mcp4531.c | 13 +- + drivers/iio/potentiometer/tpl0102.c | 2 +- + drivers/iio/pressure/Kconfig | 28 +- + drivers/iio/pressure/Makefile | 2 + + drivers/iio/pressure/bmp280.c | 564 ++++- + drivers/iio/pressure/hp03.c | 312 +++ + drivers/iio/pressure/hp206c.c | 426 ++++ + drivers/iio/pressure/ms5611.h | 23 +- + drivers/iio/pressure/ms5611_core.c | 148 +- + drivers/iio/pressure/ms5611_i2c.c | 25 +- + drivers/iio/pressure/ms5611_spi.c | 34 +- + drivers/iio/pressure/st_pressure_core.c | 10 + + drivers/staging/android/Kconfig | 17 +- + drivers/staging/android/Makefile | 2 - + drivers/staging/android/ion/ion.c | 16 +- + drivers/staging/android/ion/ion_chunk_heap.c | 4 +- + drivers/staging/android/ion/ion_dummy_driver.c | 2 + + drivers/staging/android/ion/ion_test.c | 2 +- + drivers/staging/android/lowmemorykiller.c | 9 +- + drivers/staging/android/sync.c | 356 ---- + drivers/staging/android/sync.h | 91 +- + drivers/staging/android/sync_debug.c | 8 +- + drivers/staging/android/timed_gpio.c | 166 -- + drivers/staging/android/timed_gpio.h | 33 - + drivers/staging/android/timed_output.c | 110 - + drivers/staging/android/timed_output.h | 37 - + drivers/staging/board/armadillo800eva.c | 8 +- + drivers/staging/comedi/comedi_buf.c | 10 +- + drivers/staging/comedi/comedi_fops.c | 54 +- + drivers/staging/comedi/comedidev.h | 4 +- + drivers/staging/comedi/drivers.c | 40 +- + drivers/staging/comedi/drivers/amcc_s5933.h | 24 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 12 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 104 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 71 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 189 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 86 +- + drivers/staging/comedi/drivers/c6xdigio.c | 4 +- + drivers/staging/comedi/drivers/comedi_8254.h | 14 +- + drivers/staging/comedi/drivers/das1800.c | 1385 ++++++------- + drivers/staging/comedi/drivers/dt282x.c | 119 +- + drivers/staging/comedi/drivers/mite.c | 1113 ++++++---- + drivers/staging/comedi/drivers/mite.h | 329 +-- + drivers/staging/comedi/drivers/ni_660x.c | 1174 ++++------- + drivers/staging/comedi/drivers/ni_labpc.h | 33 +- + drivers/staging/comedi/drivers/ni_labpc_common.c | 65 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 95 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 4 +- + drivers/staging/comedi/drivers/ni_labpc_regs.h | 82 +- + drivers/staging/comedi/drivers/ni_mio_c_common.c | 0 + drivers/staging/comedi/drivers/ni_mio_common.c | 981 ++++----- + drivers/staging/comedi/drivers/ni_pcidio.c | 37 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 36 +- + drivers/staging/comedi/drivers/ni_stc.h | 56 +- + drivers/staging/comedi/drivers/ni_tio.c | 807 +++++--- + drivers/staging/comedi/drivers/ni_tio.h | 66 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 322 ++- + drivers/staging/comedi/drivers/ni_tiocmd.c | 127 +- + drivers/staging/comedi/drivers/plx9052.h | 122 +- + drivers/staging/comedi/drivers/plx9080.h | 2 +- + drivers/staging/comedi/drivers/z8536.h | 89 +- + drivers/staging/dgnc/dgnc_cls.c | 2 +- + drivers/staging/dgnc/dgnc_driver.c | 52 +- + drivers/staging/dgnc/dgnc_driver.h | 23 +- + drivers/staging/dgnc/dgnc_mgmt.c | 28 +- + drivers/staging/dgnc/dgnc_neo.c | 131 +- + drivers/staging/dgnc/dgnc_sysfs.c | 22 +- + drivers/staging/dgnc/dgnc_tty.c | 277 ++- + drivers/staging/dgnc/digi.h | 4 +- + drivers/staging/emxx_udc/emxx_udc.c | 24 +- + drivers/staging/emxx_udc/emxx_udc.h | 40 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 2 +- + drivers/staging/fbtft/fbtft-io.c | 8 +- + drivers/staging/fbtft/fbtft_device.c | 6 +- + drivers/staging/fsl-mc/README.txt | 138 +- + drivers/staging/fsl-mc/TODO | 13 - + drivers/staging/fsl-mc/bus/dpbp.c | 77 +- + drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 7 +- + drivers/staging/fsl-mc/bus/dpmcp.c | 35 +- + drivers/staging/fsl-mc/bus/dpmcp.h | 10 +- + drivers/staging/fsl-mc/bus/dprc-cmd.h | 6 +- + drivers/staging/fsl-mc/bus/dprc-driver.c | 33 +- + drivers/staging/fsl-mc/bus/dprc.c | 26 +- + drivers/staging/fsl-mc/bus/mc-allocator.c | 79 +- + drivers/staging/fsl-mc/bus/mc-bus.c | 90 +- + drivers/staging/fsl-mc/bus/mc-msi.c | 14 +- + drivers/staging/fsl-mc/include/dpbp-cmd.h | 4 +- + drivers/staging/fsl-mc/include/dpbp.h | 51 +- + drivers/staging/fsl-mc/include/dprc.h | 19 +- + drivers/staging/fsl-mc/include/mc-private.h | 2 + + drivers/staging/fwserial/dma_fifo.c | 8 +- + drivers/staging/fwserial/dma_fifo.h | 16 +- + drivers/staging/fwserial/fwserial.c | 42 +- + drivers/staging/fwserial/fwserial.h | 42 +- + drivers/staging/gdm724x/gdm_mux.c | 5 +- + drivers/staging/gdm724x/gdm_usb.c | 6 +- + drivers/staging/gdm724x/hci_packet.h | 2 +- + drivers/staging/gdm724x/netlink_k.c | 3 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 8 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +- + drivers/staging/gs_fpgaboot/io.c | 1 - + drivers/staging/i4l/act2000/act2000_isa.c | 24 +- + drivers/staging/i4l/pcbit/capi.h | 2 +- + drivers/staging/i4l/pcbit/drv.c | 8 +- + drivers/staging/i4l/pcbit/edss1.c | 2 +- + drivers/staging/i4l/pcbit/layer2.h | 2 +- + drivers/staging/iio/accel/Kconfig | 23 - + drivers/staging/iio/accel/Makefile | 6 - + drivers/staging/iio/accel/adis16201.h | 156 +- + drivers/staging/iio/accel/adis16201_core.c | 1 + + drivers/staging/iio/accel/adis16203.h | 132 +- + drivers/staging/iio/accel/adis16203_core.c | 1 + + drivers/staging/iio/accel/adis16204.h | 68 - + drivers/staging/iio/accel/adis16204_core.c | 253 --- + drivers/staging/iio/accel/adis16209.h | 39 + + drivers/staging/iio/accel/adis16209_core.c | 1 + + drivers/staging/iio/accel/adis16220.h | 140 -- + drivers/staging/iio/accel/adis16220_core.c | 494 ----- + drivers/staging/iio/accel/adis16240.h | 50 + + drivers/staging/iio/accel/adis16240_core.c | 5 +- + drivers/staging/iio/adc/ad7192.c | 50 +- + drivers/staging/iio/adc/ad7280a.c | 40 +- + drivers/staging/iio/adc/ad7280a.h | 8 +- + drivers/staging/iio/adc/ad7606.h | 28 +- + drivers/staging/iio/adc/ad7606_core.c | 18 +- + drivers/staging/iio/adc/ad7606_spi.c | 5 +- + drivers/staging/iio/adc/ad7780.c | 2 +- + drivers/staging/iio/frequency/ad9832.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 45 +- + drivers/staging/iio/impedance-analyzer/ad5933.h | 28 - + drivers/staging/iio/light/isl29028.c | 55 +- + drivers/staging/iio/light/tsl2x7x_core.c | 211 +- + drivers/staging/iio/meter/ade7753.c | 4 +- + drivers/staging/iio/meter/ade7754.c | 4 +- + drivers/staging/iio/meter/ade7758.h | 16 +- + drivers/staging/iio/meter/ade7758_core.c | 77 +- + drivers/staging/iio/meter/ade7758_ring.c | 4 +- + drivers/staging/iio/meter/ade7759.c | 4 +- + drivers/staging/iio/meter/ade7854.c | 3 +- + drivers/staging/iio/resolver/ad2s1210.h | 8 +- + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 15 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 51 +- + .../lustre/include/linux/libcfs/libcfs_cpu.h | 79 + + .../lustre/include/linux/libcfs/libcfs_crypto.h | 136 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 18 +- + .../lustre/include/linux/libcfs/libcfs_fail.h | 15 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 4 +- + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 161 +- + .../lustre/include/linux/libcfs/libcfs_prim.h | 31 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 75 - + .../lustre/include/linux/libcfs/libcfs_workitem.h | 12 +- + .../lustre/include/linux/libcfs/linux/libcfs.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-mem.h | 80 - + .../lustre/include/linux/libcfs/linux/linux-time.h | 4 +- + .../staging/lustre/include/linux/lnet/lib-dlc.h | 29 +- + .../staging/lustre/include/linux/lnet/lib-lnet.h | 9 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 2 + + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 405 +++- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 134 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 98 +- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 139 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 1 - + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 3 - + drivers/staging/lustre/lnet/libcfs/debug.c | 126 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 3 + + drivers/staging/lustre/lnet/libcfs/hash.c | 6 +- + drivers/staging/lustre/lnet/libcfs/libcfs_lock.c | 54 +- + drivers/staging/lustre/lnet/libcfs/libcfs_mem.c | 28 - + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 9 +- + .../lustre/lnet/libcfs/linux/linux-crypto.c | 283 ++- + .../lustre/lnet/libcfs/linux/linux-module.c | 154 +- + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 31 - + drivers/staging/lustre/lnet/libcfs/module.c | 132 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 17 +- + drivers/staging/lustre/lnet/libcfs/workitem.c | 12 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 143 +- + drivers/staging/lustre/lnet/lnet/config.c | 3 + + drivers/staging/lustre/lnet/lnet/lib-move.c | 10 +- + drivers/staging/lustre/lnet/lnet/module.c | 7 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 82 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 52 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 215 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 40 +- + drivers/staging/lustre/lnet/selftest/console.c | 282 +-- + drivers/staging/lustre/lnet/selftest/console.h | 47 +- + drivers/staging/lustre/lnet/selftest/framework.c | 270 +-- + drivers/staging/lustre/lnet/selftest/ping_test.c | 44 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 133 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 156 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 204 +- + drivers/staging/lustre/lnet/selftest/timer.c | 12 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 12 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 3 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 9 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 94 +- + drivers/staging/lustre/lustre/include/cl_object.h | 978 ++------- + drivers/staging/lustre/lustre/include/lclient.h | 408 ---- + drivers/staging/lustre/lustre/include/linux/obd.h | 125 -- + drivers/staging/lustre/lustre/include/lu_object.h | 75 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 112 +- + .../lustre/lustre/include/lustre/lustre_user.h | 54 +- + drivers/staging/lustre/lustre/include/lustre_cfg.h | 2 +- + .../staging/lustre/lustre/include/lustre_disk.h | 2 - + drivers/staging/lustre/lustre/include/lustre_dlm.h | 14 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 120 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 22 +- + .../staging/lustre/lustre/include/lustre_import.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 60 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 18 + + drivers/staging/lustre/lustre/include/lustre_net.h | 4 +- + .../staging/lustre/lustre/include/lustre_param.h | 1 + + .../lustre/lustre/include/lustre_req_layout.h | 3 +- + drivers/staging/lustre/lustre/include/obd.h | 77 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 1 + + drivers/staging/lustre/lustre/include/obd_class.h | 5 +- + .../staging/lustre/lustre/include/obd_support.h | 4 + + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 1203 ----------- + drivers/staging/lustre/lustre/ldlm/l_lock.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 30 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 19 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 14 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 115 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 28 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 163 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 19 +- + drivers/staging/lustre/lustre/llite/Makefile | 5 +- + drivers/staging/lustre/lustre/llite/dcache.c | 15 +- + drivers/staging/lustre/lustre/llite/dir.c | 95 +- + drivers/staging/lustre/lustre/llite/file.c | 277 +-- + .../lustre/lustre/{lclient => llite}/glimpse.c | 87 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 327 +++ + .../lustre/{lclient => llite}/lcommon_misc.c | 45 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 71 +- + .../staging/lustre/lustre/llite/llite_internal.h | 266 +-- + drivers/staging/lustre/lustre/llite/llite_lib.c | 176 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 48 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 29 +- + drivers/staging/lustre/lustre/llite/lloop.c | 3 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 33 +- + drivers/staging/lustre/lustre/llite/namei.c | 143 +- + drivers/staging/lustre/lustre/llite/rw.c | 367 ++-- + drivers/staging/lustre/lustre/llite/rw26.c | 314 ++- + drivers/staging/lustre/lustre/llite/statahead.c | 17 +- + drivers/staging/lustre/lustre/llite/super25.c | 14 +- + drivers/staging/lustre/lustre/llite/symlink.c | 10 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 270 ++- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 332 ++- + drivers/staging/lustre/lustre/llite/vvp_io.c | 928 +++++---- + drivers/staging/lustre/lustre/llite/vvp_lock.c | 53 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 141 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 211 +- + drivers/staging/lustre/lustre/llite/vvp_req.c | 121 ++ + drivers/staging/lustre/lustre/llite/xattr.c | 33 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 1 - + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 3 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 182 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 105 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 15 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 5 - + drivers/staging/lustre/lustre/lov/lov_internal.h | 34 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 246 +-- + drivers/staging/lustre/lustre/lov/lov_lock.c | 996 +-------- + drivers/staging/lustre/lustre/lov/lov_merge.c | 11 + + drivers/staging/lustre/lustre/lov/lov_obd.c | 26 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 54 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 12 + + drivers/staging/lustre/lustre/lov/lov_pack.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 183 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 62 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 11 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 9 +- + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 386 +--- + drivers/staging/lustre/lustre/lov/lovsub_object.c | 7 +- + drivers/staging/lustre/lustre/lov/lovsub_page.c | 4 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 8 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 24 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 5 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 26 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 12 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 430 ++-- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2152 +------------------- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 303 ++- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 659 +----- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 5 +- + drivers/staging/lustre/lustre/obdclass/debug.c | 4 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 1 - + .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 1 - + .../lustre/lustre/obdclass/lprocfs_status.c | 72 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 9 +- + .../staging/lustre/lustre/obdclass/lustre_peer.c | 3 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 26 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 15 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 3 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 173 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 68 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 531 ++++- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 159 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 27 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 283 +-- + drivers/staging/lustre/lustre/osc/osc_lock.c | 1698 ++++++--------- + drivers/staging/lustre/lustre/osc/osc_object.c | 38 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 544 +++-- + drivers/staging/lustre/lustre/osc/osc_request.c | 423 ++-- + drivers/staging/lustre/lustre/ptlrpc/client.c | 11 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 1 - + drivers/staging/lustre/lustre/ptlrpc/import.c | 12 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 31 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 11 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 7 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 3 - + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 21 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 52 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 12 +- + drivers/staging/media/omap1/omap1_camera.c | 68 +- + drivers/staging/media/omap4iss/iss.c | 2 +- + drivers/staging/most/hdm-dim2/dim2_errors.h | 8 - + drivers/staging/most/hdm-dim2/dim2_hal.h | 14 +- + drivers/staging/most/hdm-dim2/dim2_reg.h | 8 - + drivers/staging/netlogic/xlr_net.c | 2 +- + drivers/staging/nvec/nvec.c | 11 +- + drivers/staging/nvec/nvec_power.c | 4 +- + drivers/staging/octeon/ethernet-rx.c | 7 +- + drivers/staging/octeon/ethernet-rx.h | 2 +- + drivers/staging/octeon/ethernet-tx.c | 15 +- + drivers/staging/octeon/ethernet.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 5 - + drivers/staging/rtl8188eu/core/rtw_cmd.c | 49 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 5 - + drivers/staging/rtl8188eu/core/rtw_efuse.c | 7 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 5 - + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 5 - + drivers/staging/rtl8188eu/core/rtw_mlme.c | 13 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 49 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 5 - + drivers/staging/rtl8188eu/core/rtw_recv.c | 5 - + drivers/staging/rtl8188eu/core/rtw_rf.c | 5 - + drivers/staging/rtl8188eu/core/rtw_security.c | 5 - + drivers/staging/rtl8188eu/core/rtw_sreset.c | 5 - + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 5 - + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 5 - + drivers/staging/rtl8188eu/core/rtw_xmit.c | 5 - + .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 2 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/fw.c | 4 - + drivers/staging/rtl8188eu/hal/hal_com.c | 5 - + drivers/staging/rtl8188eu/hal/hal_intf.c | 7 +- + drivers/staging/rtl8188eu/hal/mac_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/odm.c | 5 - + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 5 - + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 5 - + drivers/staging/rtl8188eu/hal/phy.c | 5 - + drivers/staging/rtl8188eu/hal/pwrseq.c | 5 - + drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 4 - + drivers/staging/rtl8188eu/hal/rf.c | 4 - + drivers/staging/rtl8188eu/hal/rf_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 9 +- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 5 - + drivers/staging/rtl8188eu/hal/usb_halinit.c | 76 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 5 - + drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h | 5 - + .../staging/rtl8188eu/include/HalHWImg8188E_FW.h | 5 - + drivers/staging/rtl8188eu/include/HalVerDef.h | 5 - + drivers/staging/rtl8188eu/include/basic_types.h | 5 - + drivers/staging/rtl8188eu/include/drv_types.h | 5 - + drivers/staging/rtl8188eu/include/fw.h | 4 - + drivers/staging/rtl8188eu/include/hal_com.h | 5 - + drivers/staging/rtl8188eu/include/hal_intf.h | 5 - + drivers/staging/rtl8188eu/include/ieee80211.h | 5 - + drivers/staging/rtl8188eu/include/mlme_osdep.h | 5 - + drivers/staging/rtl8188eu/include/mp_custom_oid.h | 5 - + drivers/staging/rtl8188eu/include/odm.h | 5 - + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 4 - + drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 5 - + .../staging/rtl8188eu/include/odm_RegDefine11N.h | 5 - + drivers/staging/rtl8188eu/include/odm_debug.h | 5 - + drivers/staging/rtl8188eu/include/odm_precomp.h | 5 - + drivers/staging/rtl8188eu/include/odm_reg.h | 5 - + drivers/staging/rtl8188eu/include/odm_types.h | 5 - + drivers/staging/rtl8188eu/include/osdep_intf.h | 5 - + drivers/staging/rtl8188eu/include/osdep_service.h | 5 - + drivers/staging/rtl8188eu/include/pwrseq.h | 5 - + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 5 - + drivers/staging/rtl8188eu/include/recv_osdep.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_led.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4 - + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 5 - + drivers/staging/rtl8188eu/include/rtw_android.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ap.h | 5 - + drivers/staging/rtl8188eu/include/rtw_cmd.h | 5 - + drivers/staging/rtl8188eu/include/rtw_debug.h | 5 - + drivers/staging/rtl8188eu/include/rtw_eeprom.h | 5 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 5 - + drivers/staging/rtl8188eu/include/rtw_event.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ht.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 5 - + drivers/staging/rtl8188eu/include/rtw_iol.h | 5 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 5 - + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 5 - + .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h | 5 - + drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_qos.h | 5 - + drivers/staging/rtl8188eu/include/rtw_recv.h | 5 - + drivers/staging/rtl8188eu/include/rtw_rf.h | 5 - + drivers/staging/rtl8188eu/include/rtw_security.h | 5 - + drivers/staging/rtl8188eu/include/rtw_sreset.h | 5 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 5 - + drivers/staging/rtl8188eu/include/sta_info.h | 5 - + drivers/staging/rtl8188eu/include/usb_hal.h | 5 - + drivers/staging/rtl8188eu/include/usb_ops_linux.h | 5 - + drivers/staging/rtl8188eu/include/wifi.h | 5 - + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 5 - + drivers/staging/rtl8188eu/include/xmit_osdep.h | 5 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 13 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 5 - + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 - + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 5 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 7 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 4 - + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 5 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 73 +- + drivers/staging/rtl8192u/r8192U_wx.c | 22 - + drivers/staging/rtl8712/basic_types.h | 4 - + drivers/staging/rtl8712/drv_types.h | 4 - + drivers/staging/rtl8712/ethernet.h | 4 - + drivers/staging/rtl8712/hal_init.c | 25 +- + drivers/staging/rtl8712/ieee80211.c | 4 - + drivers/staging/rtl8712/mlme_linux.c | 2 +- + drivers/staging/rtl8712/os_intfs.c | 4 +- + drivers/staging/rtl8712/osdep_service.h | 3 - + drivers/staging/rtl8712/rtl8712_cmd.c | 18 +- + drivers/staging/rtl8712/rtl8712_recv.c | 10 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 8 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 80 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 16 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 6 - + drivers/staging/rtl8712/rtl871x_mlme.c | 16 +- + drivers/staging/rtl8712/rtl871x_recv.c | 2 +- + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 6 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8712/usb_ops_linux.c | 2 +- + drivers/staging/rtl8723au/Kconfig | 7 +- + drivers/staging/rtl8723au/core/rtw_ap.c | 3 +- + drivers/staging/rtl8723au/core/rtw_recv.c | 25 - + drivers/staging/rtl8723au/core/rtw_wlan_util.c | 10 - + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 2 - + drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 2 +- + drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 2 - + drivers/staging/rtl8723au/include/rtw_recv.h | 2 - + drivers/staging/rtl8723au/os_dep/usb_intf.c | 5 + + drivers/staging/rts5208/ms.c | 16 +- + drivers/staging/rts5208/rtsx_card.c | 21 - + drivers/staging/rts5208/rtsx_card.h | 2 - + drivers/staging/rts5208/rtsx_chip.c | 35 - + drivers/staging/rts5208/rtsx_chip.h | 3 - + drivers/staging/rts5208/sd.c | 16 +- + drivers/staging/skein/skein_api.c | 3 +- + drivers/staging/skein/skein_base.c | 90 +- + drivers/staging/skein/skein_base.h | 45 +- + drivers/staging/skein/skein_block.c | 92 +- + drivers/staging/skein/skein_generic.c | 6 +- + drivers/staging/skein/threefish_api.h | 2 +- + drivers/staging/skein/threefish_block.c | 2144 +++++++++---------- + drivers/staging/slicoss/slicoss.c | 8 +- + drivers/staging/sm750fb/ddk750_chip.c | 2 +- + drivers/staging/speakup/main.c | 6 +- + drivers/staging/speakup/serialio.h | 3 +- + .../Documentation/ABI/sysfs-platform-visorchipset | 14 - + drivers/staging/unisys/Documentation/overview.txt | 19 - + .../staging/unisys/Documentation/proc-entries.txt | 93 - + drivers/staging/unisys/MAINTAINERS | 1 - + drivers/staging/unisys/include/channel.h | 10 +- + drivers/staging/unisys/include/iochannel.h | 42 - + drivers/staging/unisys/include/visorbus.h | 127 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 394 +--- + drivers/staging/unisys/visorbus/visorchannel.c | 5 +- + drivers/staging/unisys/visorbus/visorchipset.c | 442 ++-- + drivers/staging/unisys/visorhba/visorhba_main.c | 114 +- + drivers/staging/unisys/visorinput/visorinput.c | 24 +- + drivers/staging/unisys/visornic/visornic_main.c | 223 +- + drivers/staging/vme/devices/vme_pio2_gpio.c | 5 +- + drivers/staging/vt6655/baseband.c | 24 +- + drivers/staging/vt6655/baseband.h | 6 +- + drivers/staging/vt6655/card.c | 95 +- + drivers/staging/vt6655/card.h | 9 +- + drivers/staging/vt6655/desc.h | 3 +- + drivers/staging/vt6655/mac.c | 15 +- + drivers/staging/vt6655/srom.c | 9 +- + drivers/staging/vt6656/baseband.c | 26 +- + drivers/staging/vt6656/main_usb.c | 6 +- + drivers/staging/vt6656/wcmd.c | 8 +- + drivers/staging/wilc1000/Kconfig | 1 - + drivers/staging/wilc1000/host_interface.c | 438 ++-- + drivers/staging/wilc1000/host_interface.h | 8 +- + drivers/staging/wilc1000/linux_mon.c | 24 +- + drivers/staging/wilc1000/linux_wlan.c | 98 +- + drivers/staging/wilc1000/wilc_spi.c | 3 - + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 71 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 15 +- + drivers/staging/wilc1000/wilc_wlan.c | 53 +- + drivers/staging/wilc1000/wilc_wlan.h | 6 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 7 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 21 - + drivers/staging/wlan-ng/cfg80211.c | 4 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 8 +- + drivers/staging/wlan-ng/p80211conv.c | 5 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/staging/wlan-ng/p80211netdev.h | 1 - + drivers/staging/wlan-ng/prism2fw.c | 28 +- + drivers/staging/wlan-ng/prism2usb.c | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 5 +- + drivers/staging/xgifb/vb_init.c | 16 +- + drivers/staging/xgifb/vb_setmode.c | 22 +- + drivers/staging/xgifb/vb_table.h | 135 +- + drivers/staging/xgifb/vb_util.h | 8 +- + include/dt-bindings/iio/adi,ad5592r.h | 16 + + include/linux/iio/buffer.h | 2 + + include/linux/iio/common/st_sensors.h | 9 + + include/linux/iio/consumer.h | 53 + + include/linux/iio/iio.h | 33 + + include/linux/iio/imu/adis.h | 1 + + include/linux/iio/magnetometer/ak8975.h | 16 + + include/linux/kernel.h | 7 + + include/linux/platform_data/invensense_mpu6050.h | 5 +- + include/linux/platform_data/st_sensors_pdata.h | 2 + + include/linux/sched.h | 4 + + include/linux/sync_file.h | 57 + + include/uapi/linux/iio/types.h | 2 + + .../uapi/sync.h => include/uapi/linux/sync_file.h | 44 +- + tools/iio/generic_buffer.c | 116 +- + tools/iio/iio_event_monitor.c | 18 + + tools/iio/iio_utils.h | 7 + + 668 files changed, 25475 insertions(+), 25049 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/lpc1850-adc.txt + rename Documentation/devicetree/bindings/{staging => }/iio/adc/mxs-lradc.txt (100%) + create mode 100644 Documentation/devicetree/bindings/iio/dac/ad5592r.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/lpc1850-dac.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/ds1803.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/mcp4131.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/hp03.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/ms5611.txt + create mode 100644 Documentation/sync_file.txt + create mode 100644 drivers/dma-buf/Kconfig + create mode 100644 drivers/dma-buf/sync_file.c + create mode 100644 drivers/iio/adc/lpc18xx_adc.c + create mode 100644 drivers/iio/dac/ad5592r-base.c + create mode 100644 drivers/iio/dac/ad5592r-base.h + create mode 100644 drivers/iio/dac/ad5592r.c + create mode 100644 drivers/iio/dac/ad5593r.c + create mode 100644 drivers/iio/dac/lpc18xx_dac.c + create mode 100644 drivers/iio/humidity/am2315.c + create mode 100644 drivers/iio/imu/bmi160/Kconfig + create mode 100644 drivers/iio/imu/bmi160/Makefile + create mode 100644 drivers/iio/imu/bmi160/bmi160.h + create mode 100644 drivers/iio/imu/bmi160/bmi160_core.c + create mode 100644 drivers/iio/imu/bmi160/bmi160_i2c.c + create mode 100644 drivers/iio/imu/bmi160/bmi160_spi.c + create mode 100644 drivers/iio/light/bh1780.c + create mode 100644 drivers/iio/light/max44000.c + create mode 100644 drivers/iio/light/veml6070.c + create mode 100644 drivers/iio/magnetometer/bmc150_magn.h + create mode 100644 drivers/iio/magnetometer/bmc150_magn_i2c.c + create mode 100644 drivers/iio/magnetometer/bmc150_magn_spi.c + create mode 100644 drivers/iio/potentiometer/ds1803.c + create mode 100644 drivers/iio/potentiometer/mcp4131.c + create mode 100644 drivers/iio/pressure/hp03.c + create mode 100644 drivers/iio/pressure/hp206c.c + delete mode 100644 drivers/staging/android/timed_gpio.c + delete mode 100644 drivers/staging/android/timed_gpio.h + delete mode 100644 drivers/staging/android/timed_output.c + delete mode 100644 drivers/staging/android/timed_output.h + delete mode 100644 drivers/staging/comedi/drivers/ni_mio_c_common.c + delete mode 100644 drivers/staging/iio/accel/adis16204.h + delete mode 100644 drivers/staging/iio/accel/adis16204_core.c + delete mode 100644 drivers/staging/iio/accel/adis16220.h + delete mode 100644 drivers/staging/iio/accel/adis16220_core.c + delete mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h + delete mode 100644 drivers/staging/lustre/lustre/include/lclient.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/obd.h + delete mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_cl.c + rename drivers/staging/lustre/lustre/{lclient => llite}/glimpse.c (80%) + create mode 100644 drivers/staging/lustre/lustre/llite/lcommon_cl.c + rename drivers/staging/lustre/lustre/{lclient => llite}/lcommon_misc.c (88%) + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_req.c + delete mode 100644 drivers/staging/unisys/Documentation/proc-entries.txt + create mode 100644 include/dt-bindings/iio/adi,ad5592r.h + create mode 100644 include/linux/iio/magnetometer/ak8975.h + create mode 100644 include/linux/sync_file.h + rename drivers/staging/android/uapi/sync.h => include/uapi/linux/sync_file.h (64%) +$ git am -3 ../patches/0001-staging-lustre-o2iblnd-fix-for-ib_map_mr_sg-API-chan.patch +Applying: staging: lustre: o2iblnd: fix for ib_map_mr_sg() API changes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +$ git add -A . +$ git commit -v -a --amend +[master 43ad2bcb4f06] Merge remote-tracking branch 'staging/staging-next' + Date: Fri May 20 12:35:36 2016 +1000 +Merging char-misc/char-misc-next (725d0123dfff Merge 4.6-rc7 into char-misc-testing) +$ git merge char-misc/char-misc-next +Auto-merging drivers/pci/host/pci-hyperv.c +Auto-merging drivers/misc/eeprom/at24.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-etb10 | 69 +- + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 13 + + .../ABI/testing/sysfs-bus-coresight-devices-stm | 53 + + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 77 + + Documentation/ABI/testing/sysfs-bus-mcb | 29 + + Documentation/ABI/testing/sysfs-class-stm | 10 + + .../devicetree/bindings/arm/coresight.txt | 28 + + Documentation/trace/coresight.txt | 37 +- + Documentation/w1/slaves/w1_therm | 10 +- + MAINTAINERS | 1 + + drivers/char/Kconfig | 4 +- + drivers/char/xillybus/xillybus_of.c | 11 +- + drivers/char/xillybus/xillybus_pcie.c | 10 +- + drivers/hv/channel_mgmt.c | 58 +- + drivers/hv/connection.c | 1 + + drivers/hv/hv_balloon.c | 5 +- + drivers/hv/hv_kvp.c | 31 + + drivers/hv/hyperv_vmbus.h | 23 +- + drivers/hv/ring_buffer.c | 95 +- + drivers/hv/vmbus_drv.c | 150 +- + drivers/hwtracing/coresight/Kconfig | 11 + + drivers/hwtracing/coresight/Makefile | 13 +- + drivers/hwtracing/coresight/coresight-etb10.c | 107 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 33 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 2126 +++++++++++++++++ + drivers/hwtracing/coresight/coresight-etm4x.c | 2478 +++----------------- + drivers/hwtracing/coresight/coresight-etm4x.h | 222 +- + drivers/hwtracing/coresight/coresight-funnel.c | 1 - + drivers/hwtracing/coresight/coresight-priv.h | 30 + + drivers/hwtracing/coresight/coresight-replicator.c | 1 - + drivers/hwtracing/coresight/coresight-stm.c | 920 ++++++++ + drivers/hwtracing/coresight/coresight-tmc-etf.c | 604 +++++ + drivers/hwtracing/coresight/coresight-tmc-etr.c | 329 +++ + drivers/hwtracing/coresight/coresight-tmc.c | 604 +---- + drivers/hwtracing/coresight/coresight-tmc.h | 140 ++ + drivers/hwtracing/coresight/coresight-tpiu.c | 1 - + drivers/hwtracing/coresight/coresight.c | 142 +- + drivers/hwtracing/intel_th/core.c | 29 +- + drivers/hwtracing/intel_th/intel_th.h | 6 + + drivers/hwtracing/intel_th/msu.c | 116 +- + drivers/hwtracing/intel_th/pci.c | 5 + + drivers/hwtracing/intel_th/pti.c | 6 +- + drivers/hwtracing/stm/core.c | 36 +- + drivers/hwtracing/stm/dummy_stm.c | 14 +- + drivers/hwtracing/stm/heartbeat.c | 14 +- + drivers/hwtracing/stm/policy.c | 5 +- + drivers/mcb/mcb-core.c | 99 +- + drivers/mcb/mcb-internal.h | 1 - + drivers/mcb/mcb-parse.c | 17 +- + drivers/mcb/mcb-pci.c | 23 +- + drivers/memory/of_memory.c | 2 +- + drivers/misc/eeprom/Kconfig | 2 - + drivers/misc/eeprom/at24.c | 103 +- + drivers/misc/eeprom/at25.c | 91 +- + drivers/misc/eeprom/eeprom_93xx46.c | 92 +- + drivers/misc/mei/amthif.c | 4 +- + drivers/misc/mei/bus.c | 42 +- + drivers/misc/mei/client.c | 30 +- + drivers/misc/mei/hbm.c | 26 +- + drivers/misc/mei/interrupt.c | 6 +- + drivers/misc/mei/mei_dev.h | 4 +- + drivers/misc/mic/Kconfig | 1 + + drivers/misc/mic/host/mic_boot.c | 6 +- + drivers/misc/mic/scif/scif_fence.c | 3 +- + drivers/misc/qcom-coincell.c | 3 +- + drivers/misc/sram.c | 4 +- + drivers/misc/ti-st/st_kim.c | 1 - + drivers/nvmem/Kconfig | 5 +- + drivers/nvmem/core.c | 67 +- + drivers/nvmem/imx-ocotp.c | 55 +- + drivers/nvmem/lpc18xx_eeprom.c | 94 +- + drivers/nvmem/qfprom.c | 56 +- + drivers/nvmem/rockchip-efuse.c | 49 +- + drivers/nvmem/sunxi_sid.c | 54 +- + drivers/nvmem/vf610-ocotp.c | 44 +- + drivers/parport/procfs.c | 2 +- + drivers/pci/host/pci-hyperv.c | 14 +- + drivers/spmi/spmi.c | 12 +- + drivers/uio/uio.c | 16 +- + drivers/video/fbdev/hyperv_fb.c | 4 +- + drivers/vme/bridges/vme_ca91cx42.c | 9 +- + drivers/vme/bridges/vme_tsi148.c | 9 +- + drivers/vme/vme.c | 26 +- + drivers/vme/vme_bridge.h | 1 + + drivers/w1/masters/ds2482.c | 18 + + drivers/w1/slaves/w1_therm.c | 218 +- + drivers/w1/w1.c | 2 +- + drivers/w1/w1.h | 2 + + include/linux/coresight-stm.h | 6 + + include/linux/hyperv.h | 170 +- + include/linux/mcb.h | 14 +- + include/linux/nvmem-provider.h | 10 + + include/linux/stm.h | 3 + + include/uapi/linux/coresight-stm.h | 21 + + scripts/checkkconfigsymbols.py | 2 +- + tools/hv/lsvmbus | 1 + + 96 files changed, 6448 insertions(+), 3804 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-stm + create mode 100644 Documentation/ABI/testing/sysfs-bus-mcb + create mode 100644 drivers/hwtracing/coresight/coresight-etm4x-sysfs.c + create mode 100644 drivers/hwtracing/coresight/coresight-stm.c + create mode 100644 drivers/hwtracing/coresight/coresight-tmc-etf.c + create mode 100644 drivers/hwtracing/coresight/coresight-tmc-etr.c + create mode 100644 drivers/hwtracing/coresight/coresight-tmc.h + create mode 100644 include/linux/coresight-stm.h + create mode 100644 include/uapi/linux/coresight-stm.h +Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-usb-gpio.c | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) +Merging cgroup/for-next (a6b18f07bc86 Merge branch 'for-4.6-fixes' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + Documentation/cgroup-v2.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging scsi/for-next (02714f2c73a6 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race) +$ git merge target-updates/for-next +Auto-merging include/target/target_core_fabric.h +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/target/iscsi/iscsi_target_util.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Merge made by the 'recursive' strategy. + Documentation/scsi/tcm_qla2xxx.txt | 22 + + Documentation/target/tcm_mod_builder.py | 16 - + drivers/infiniband/ulp/isert/ib_isert.c | 11 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 9 - + drivers/scsi/qla2xxx/Kconfig | 9 + + drivers/scsi/qla2xxx/qla_target.c | 56 +- + drivers/scsi/qla2xxx/qla_target.h | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 59 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 1 + + drivers/target/iscsi/Kconfig | 2 + + drivers/target/iscsi/Makefile | 1 + + drivers/target/iscsi/cxgbit/Kconfig | 7 + + drivers/target/iscsi/cxgbit/Makefile | 6 + + drivers/target/iscsi/cxgbit/cxgbit.h | 353 ++++ + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 2086 +++++++++++++++++++++ + drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 325 ++++ + drivers/target/iscsi/cxgbit/cxgbit_lro.h | 72 + + drivers/target/iscsi/cxgbit/cxgbit_main.c | 702 +++++++ + drivers/target/iscsi/cxgbit/cxgbit_target.c | 1561 +++++++++++++++ + drivers/target/iscsi/iscsi_target.c | 701 +++---- + drivers/target/iscsi/iscsi_target_configfs.c | 158 +- + drivers/target/iscsi/iscsi_target_datain_values.c | 1 + + drivers/target/iscsi/iscsi_target_erl0.c | 2 +- + drivers/target/iscsi/iscsi_target_login.c | 17 +- + drivers/target/iscsi/iscsi_target_nego.c | 19 +- + drivers/target/iscsi/iscsi_target_parameters.c | 1 + + drivers/target/iscsi/iscsi_target_util.c | 5 + + drivers/target/loopback/tcm_loop.c | 12 - + drivers/target/sbp/sbp_target.c | 12 - + drivers/target/target_core_alua.c | 6 +- + drivers/target/target_core_configfs.c | 70 +- + drivers/target/target_core_internal.h | 6 + + drivers/target/target_core_pr.c | 2 +- + drivers/target/target_core_rd.c | 4 - + drivers/target/target_core_tpg.c | 83 +- + drivers/target/target_core_transport.c | 26 +- + drivers/target/tcm_fc/tcm_fc.h | 1 - + drivers/target/tcm_fc/tfc_conf.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 12 - + drivers/usb/gadget/function/f_tcm.c | 11 - + drivers/vhost/scsi.c | 12 - + drivers/xen/xen-scsiback.c | 11 - + include/target/iscsi/iscsi_target_core.h | 27 + + include/target/iscsi/iscsi_transport.h | 41 + + include/target/target_core_base.h | 2 - + include/target/target_core_fabric.h | 6 - + 46 files changed, 5737 insertions(+), 814 deletions(-) + create mode 100644 Documentation/scsi/tcm_qla2xxx.txt + create mode 100644 drivers/target/iscsi/cxgbit/Kconfig + create mode 100644 drivers/target/iscsi/cxgbit/Makefile + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit.h + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_cm.c + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_ddp.c + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_lro.h + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_main.c + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_target.c +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 (a85742332511 Merge branch 'for-4.7' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + arch/powerpc/boot/dts/canyonlands.dts | 15 +- + drivers/ata/Kconfig | 13 +- + drivers/ata/libata-core.c | 215 +++++++++- + drivers/ata/libata-eh.c | 113 ++++- + drivers/ata/libata-scsi.c | 752 +++++++++++++++++++++++++++------ + drivers/ata/libata-trace.c | 72 ++++ + drivers/ata/libata.h | 8 +- + drivers/ata/sata_dwc_460ex.c | 552 ++++++++++++------------ + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 + + drivers/scsi/isci/request.c | 5 +- + drivers/scsi/libsas/sas_ata.c | 7 +- + drivers/scsi/mvsas/mv_sas.c | 5 +- + drivers/scsi/pm8001/pm8001_sas.c | 5 +- + drivers/scsi/scsi_common.c | 53 +++ + drivers/scsi/scsi_error.c | 3 +- + include/linux/ata.h | 72 +++- + include/linux/libata.h | 35 +- + include/scsi/scsi_common.h | 1 + + include/scsi/scsi_eh.h | 1 + + include/trace/events/libata.h | 10 +- + 20 files changed, 1485 insertions(+), 455 deletions(-) +Merging pinctrl/for-next (58d73d264a02 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging vhost/linux-next (21ba4174ef40 virtio_balloon: fix PFN format for virtio-1) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_balloon.c | 20 +++++++----- + tools/virtio/ringtest/Makefile | 4 ++- + tools/virtio/ringtest/virtio_ring_0_9.c | 49 ++++++++++++++++++++++++++++- + tools/virtio/ringtest/virtio_ring_inorder.c | 2 ++ + 4 files changed, 65 insertions(+), 10 deletions(-) + create mode 100644 tools/virtio/ringtest/virtio_ring_inorder.c +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (0259cd1b6496 Merge remote-tracking branches 'remoteproc/rpmsg-next' and 'remoteproc/rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (d30a2b47d4c2 MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB) +$ git merge gpio/for-next +Already up-to-date. +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 (18c588786c08 Merge branch 'for-4.7/pwm-atomic' into for-next) +$ git merge pwm/for-next +Auto-merging drivers/video/fbdev/ssd1307fb.c +Auto-merging drivers/input/misc/max8997_haptic.c +Auto-merging drivers/gpu/drm/i915/intel_panel.c +Merge made by the 'recursive' strategy. + Documentation/pwm.txt | 30 +++- + arch/arm/mach-s3c24xx/mach-rx1950.c | 6 + + drivers/clk/clk-pwm.c | 17 +- + drivers/gpu/drm/i915/intel_panel.c | 6 + + drivers/hwmon/pwm-fan.c | 26 ++- + drivers/input/misc/max77693-haptic.c | 17 +- + drivers/input/misc/max8997_haptic.c | 6 + + drivers/input/misc/pwm-beeper.c | 6 + + drivers/leds/leds-pwm.c | 11 +- + drivers/pwm/core.c | 224 ++++++++++++++---------- + drivers/pwm/pwm-crc.c | 2 +- + drivers/pwm/pwm-lpc18xx-sct.c | 2 +- + drivers/pwm/pwm-omap-dmtimer.c | 2 +- + drivers/pwm/pwm-rcar.c | 2 +- + drivers/pwm/pwm-sun4i.c | 3 +- + drivers/pwm/sysfs.c | 70 ++++++-- + drivers/video/backlight/lm3630a_bl.c | 9 +- + drivers/video/backlight/lp855x_bl.c | 6 + + drivers/video/backlight/lp8788_bl.c | 6 + + drivers/video/backlight/pwm_bl.c | 14 +- + drivers/video/fbdev/ssd1307fb.c | 11 +- + include/linux/pwm.h | 319 ++++++++++++++++++++++++++--------- + 22 files changed, 585 insertions(+), 210 deletions(-) +Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ 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 (ef56b79b66fa clk: fix critical clock locking) +$ git merge clk/clk-next +Resolved 'drivers/clk/Kconfig' using previous resolution. +Auto-merging drivers/clk/ti/clk-7xx.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +CONFLICT (content): Merge conflict in drivers/clk/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-model/devres.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 184057f43e7d] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../arm/marvell/ap806-system-controller.txt | 35 + + .../arm/marvell/cp110-system-controller0.txt | 83 ++ + .../devicetree/bindings/clock/artpec6.txt | 41 + + .../bindings/clock/axs10x-i2s-pll-clock.txt | 25 + + .../devicetree/bindings/clock/hi3519-crg.txt | 46 + + .../devicetree/bindings/clock/oxnas,stdclk.txt | 35 + + Documentation/devicetree/bindings/clock/sunxi.txt | 2 + + Documentation/driver-model/devres.txt | 1 + + MAINTAINERS | 2 +- + drivers/clk/Kconfig | 6 + + drivers/clk/Makefile | 5 +- + drivers/clk/at91/clk-h32mx.c | 2 +- + drivers/clk/axis/Makefile | 1 + + drivers/clk/axis/clk-artpec6.c | 242 ++++ + drivers/clk/axs10x/Makefile | 1 + + drivers/clk/axs10x/i2s_pll_clock.c | 228 ++++ + drivers/clk/bcm/clk-bcm2835.c | 1215 ++++++++++++-------- + drivers/clk/bcm/clk-kona-setup.c | 3 +- + drivers/clk/clk-clps711x.c | 19 +- + drivers/clk/clk-composite.c | 78 +- + drivers/clk/clk-divider.c | 91 +- + drivers/clk/clk-fixed-factor.c | 42 +- + drivers/clk/clk-fixed-rate.c | 44 +- + drivers/clk/clk-fractional-divider.c | 40 +- + drivers/clk/clk-gate.c | 43 +- + drivers/clk/clk-gpio.c | 52 +- + drivers/clk/clk-ls1x.c | 3 +- + drivers/clk/clk-mux.c | 57 +- + drivers/clk/clk-nspire.c | 3 +- + drivers/clk/clk-oxnas.c | 195 ++++ + drivers/clk/clk-palmas.c | 4 +- + drivers/clk/clk-qoriq.c | 5 +- + drivers/clk/clk-rk808.c | 1 - + drivers/clk/clk-tango4.c | 73 +- + drivers/clk/clk-twl6040.c | 1 - + drivers/clk/clk-wm831x.c | 1 - + drivers/clk/clk-xgene.c | 2 +- + drivers/clk/clk.c | 222 +++- + drivers/clk/clkdev.c | 75 +- + drivers/clk/hisilicon/Kconfig | 15 + + drivers/clk/hisilicon/Makefile | 2 + + drivers/clk/hisilicon/clk-hi3519.c | 131 +++ + drivers/clk/hisilicon/clk.c | 23 +- + drivers/clk/hisilicon/clk.h | 14 +- + drivers/clk/hisilicon/reset.c | 134 +++ + drivers/clk/hisilicon/reset.h | 36 + + drivers/clk/ingenic/cgu.c | 11 +- + drivers/clk/ingenic/cgu.h | 6 +- + drivers/clk/ingenic/jz4740-cgu.c | 24 +- + drivers/clk/ingenic/jz4780-cgu.c | 40 +- + drivers/clk/meson/meson8b-clkc.c | 6 +- + drivers/clk/mmp/clk-mmp2.c | 14 +- + drivers/clk/mmp/clk-of-mmp2.c | 10 +- + drivers/clk/mmp/clk-of-pxa168.c | 8 +- + drivers/clk/mmp/clk-of-pxa1928.c | 12 +- + drivers/clk/mmp/clk-of-pxa910.c | 8 +- + drivers/clk/mmp/clk-pxa168.c | 8 +- + drivers/clk/mmp/clk-pxa910.c | 8 +- + drivers/clk/mvebu/Kconfig | 6 + + drivers/clk/mvebu/Makefile | 2 + + drivers/clk/mvebu/ap806-system-controller.c | 168 +++ + drivers/clk/mvebu/cp110-system-controller.c | 406 +++++++ + drivers/clk/nxp/clk-lpc18xx-creg.c | 1 + + drivers/clk/qcom/gcc-msm8916.c | 2 + + drivers/clk/qcom/mmcc-msm8996.c | 32 - + drivers/clk/renesas/clk-mstp.c | 3 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 13 + + drivers/clk/renesas/renesas-cpg-mssr.c | 2 +- + drivers/clk/sirf/clk-atlas6.c | 7 +- + drivers/clk/sirf/clk-prima2.c | 7 +- + drivers/clk/sunxi/Makefile | 1 + + drivers/clk/sunxi/clk-a10-hosc.c | 3 +- + drivers/clk/sunxi/clk-sun4i-display.c | 261 +++++ + drivers/clk/ti/clk-54xx.c | 1 + + drivers/clk/ti/clk-7xx.c | 1 + + drivers/clk/ti/clk-dra7-atl.c | 2 + + drivers/clk/ti/clkt_dflt.c | 2 +- + drivers/clk/ti/clkt_dpll.c | 3 + + drivers/clk/ti/dpll.c | 5 + + drivers/clk/zte/clk-zx296702.c | 3 +- + include/dt-bindings/clock/axis,artpec6-clkctrl.h | 38 + + include/dt-bindings/clock/bcm2835.h | 20 +- + include/dt-bindings/clock/hi3519-clock.h | 40 + + include/linux/clk-provider.h | 102 +- + include/linux/clk/ti.h | 2 + + include/linux/clkdev.h | 7 +- + 86 files changed, 3901 insertions(+), 773 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt + create mode 100644 Documentation/devicetree/bindings/arm/marvell/cp110-system-controller0.txt + create mode 100644 Documentation/devicetree/bindings/clock/artpec6.txt + create mode 100644 Documentation/devicetree/bindings/clock/axs10x-i2s-pll-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/hi3519-crg.txt + create mode 100644 Documentation/devicetree/bindings/clock/oxnas,stdclk.txt + create mode 100644 drivers/clk/axis/Makefile + create mode 100644 drivers/clk/axis/clk-artpec6.c + create mode 100644 drivers/clk/axs10x/Makefile + create mode 100644 drivers/clk/axs10x/i2s_pll_clock.c + create mode 100644 drivers/clk/clk-oxnas.c + create mode 100644 drivers/clk/hisilicon/clk-hi3519.c + create mode 100644 drivers/clk/hisilicon/reset.c + create mode 100644 drivers/clk/hisilicon/reset.h + create mode 100644 drivers/clk/mvebu/ap806-system-controller.c + create mode 100644 drivers/clk/mvebu/cp110-system-controller.c + create mode 100644 drivers/clk/sunxi/clk-sun4i-display.c + create mode 100644 include/dt-bindings/clock/axis,artpec6-clkctrl.h + create mode 100644 include/dt-bindings/clock/hi3519-clock.h +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (6eab37daf0ec tools: testing: define the _GNU_SOURCE macro) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + tools/testing/selftests/ftrace/ftracetest | 9 ++- + .../selftests/ftrace/test.d/event/event-pid.tc | 72 ++++++++++++++++++++++ + tools/testing/selftests/intel_pstate/run.sh | 2 +- + 3 files changed, 80 insertions(+), 3 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/event/event-pid.tc +Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times) +$ git merge y2038/y2038 +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/afs/main.c | 6 ++---- + include/linux/fs.h | 29 ++++++++++++++++++++++++++++- + 2 files changed, 30 insertions(+), 5 deletions(-) +Merging luto-misc/next (afd2ff9b7e1b Linux 4.4) +$ 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 (6d9122078097 Merge branch 'for-4.7/core' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (f85f84cd36af coresight: Handle build path error) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight.c +Auto-merging drivers/hwtracing/coresight/coresight-etb10.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 5 +---- + drivers/hwtracing/coresight/coresight.c | 9 ++++++--- + 2 files changed, 7 insertions(+), 7 deletions(-) +Merging rtc/rtc-next (854ec813cc23 rtc: rename so the tps6586x-rtc module can be autoloaded at boot) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-ds1307.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/maxim-ds1302.txt | 46 ++ + .../devicetree/bindings/rtc/sa1100-rtc.txt | 2 +- + drivers/rtc/Kconfig | 52 +- + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-cmos.c | 2 +- + drivers/rtc/rtc-da9052.c | 13 +- + drivers/rtc/rtc-ds1216.c | 3 - + drivers/rtc/rtc-ds1286.c | 3 - + drivers/rtc/rtc-ds1302.c | 348 ++++++------ + drivers/rtc/rtc-ds1307.c | 23 +- + drivers/rtc/rtc-ds1343.c | 2 - + drivers/rtc/rtc-ds1511.c | 3 - + drivers/rtc/rtc-ds1553.c | 3 - + drivers/rtc/rtc-ds1672.c | 5 - + drivers/rtc/rtc-ds1685.c | 4 +- + drivers/rtc/rtc-ds1742.c | 3 - + drivers/rtc/rtc-ds3232.c | 9 +- + drivers/rtc/rtc-ep93xx.c | 3 - + drivers/rtc/rtc-gemini.c | 1 - + drivers/rtc/rtc-hym8563.c | 2 +- + drivers/rtc/rtc-isl12022.c | 5 - + drivers/rtc/rtc-isl1208.c | 6 - + drivers/rtc/rtc-m41t80.c | 447 ++++++++++------ + drivers/rtc/rtc-m48t35.c | 3 - + drivers/rtc/rtc-m48t86.c | 4 - + drivers/rtc/rtc-max6900.c | 5 - + drivers/rtc/rtc-mc13xxx.c | 19 - + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-mxc.c | 3 - + drivers/rtc/rtc-pcf2123.c | 4 - + drivers/rtc/rtc-pcf8563.c | 7 +- + drivers/rtc/rtc-rs5c313.c | 2 - + drivers/rtc/rtc-rs5c348.c | 4 - + drivers/rtc/rtc-rs5c372.c | 18 +- + drivers/rtc/rtc-rv3029c2.c | 596 +++++++++++++-------- + drivers/rtc/rtc-rx8581.c | 5 - + drivers/rtc/rtc-sh.c | 2 - + drivers/rtc/rtc-snvs.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 3 - + drivers/rtc/rtc-stmp3xxx.c | 7 +- + drivers/rtc/rtc-tps6586x.c | 2 +- + drivers/rtc/rtc-x1205.c | 5 - + drivers/rtc/rtc-zynqmp.c | 74 ++- + 43 files changed, 1019 insertions(+), 735 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/maxim-ds1302.txt +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 (e897b3cc7a5a Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging mm/huge_memory.c +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging include/acpi/acpi_bus.h +Auto-merging fs/block_dev.c +Auto-merging drivers/acpi/utils.c +Auto-merging drivers/Kconfig +Merge made by the 'recursive' strategy. + block/ioctl.c | 32 -- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/nfit.c | 282 ++++++++++++++++-- + drivers/acpi/nfit.h | 31 +- + drivers/acpi/utils.c | 4 +- + drivers/dax/Kconfig | 26 ++ + drivers/dax/Makefile | 4 + + drivers/dax/dax.c | 568 ++++++++++++++++++++++++++++++++++++ + drivers/dax/dax.h | 24 ++ + drivers/dax/pmem.c | 168 +++++++++++ + drivers/nvdimm/Kconfig | 13 + + drivers/nvdimm/Makefile | 1 + + drivers/nvdimm/blk.c | 208 +++++++------ + drivers/nvdimm/btt.c | 26 +- + drivers/nvdimm/btt_devs.c | 24 +- + drivers/nvdimm/bus.c | 54 +++- + drivers/nvdimm/claim.c | 63 ++++ + drivers/nvdimm/core.c | 2 +- + drivers/nvdimm/dax_devs.c | 99 +++++++ + drivers/nvdimm/dimm_devs.c | 18 +- + drivers/nvdimm/namespace_devs.c | 38 ++- + drivers/nvdimm/nd-core.h | 3 +- + drivers/nvdimm/nd.h | 72 ++++- + drivers/nvdimm/pfn.h | 4 +- + drivers/nvdimm/pfn_devs.c | 319 +++++++++++++++++--- + drivers/nvdimm/pmem.c | 492 +++++++------------------------ + drivers/nvdimm/region.c | 2 + + drivers/nvdimm/region_devs.c | 29 ++ + fs/block_dev.c | 96 ++---- + include/acpi/acpi_bus.h | 6 +- + include/linux/fs.h | 8 - + include/linux/libnvdimm.h | 7 +- + include/linux/nd.h | 11 +- + include/uapi/linux/fs.h | 1 - + include/uapi/linux/ndctl.h | 80 ++++- + mm/huge_memory.c | 1 + + mm/hugetlb.c | 1 + + tools/testing/nvdimm/Kbuild | 11 + + tools/testing/nvdimm/config_check.c | 2 + + tools/testing/nvdimm/test/iomap.c | 27 +- + tools/testing/nvdimm/test/nfit.c | 90 +++++- + 42 files changed, 2175 insertions(+), 775 deletions(-) + create mode 100644 drivers/dax/Kconfig + create mode 100644 drivers/dax/Makefile + create mode 100644 drivers/dax/dax.c + create mode 100644 drivers/dax/dax.h + create mode 100644 drivers/dax/pmem.c + create mode 100644 drivers/nvdimm/dax_devs.c +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Recorded preimage for 'include/linux/dax.h' +Resolved 'fs/block_dev.c' using previous resolution. +Auto-merging mm/memory.c +Auto-merging mm/filemap.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dax.h +CONFLICT (content): Merge conflict in include/linux/dax.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/dax.c +Auto-merging fs/block_dev.c +CONFLICT (content): Merge conflict in fs/block_dev.c +Auto-merging drivers/s390/block/dcssblk.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging block/ioctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/dax.h'. +[master 0a87391c8f4b] Merge remote-tracking branch 'dax-misc/dax-misc' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/dax.txt | 32 ++ + arch/powerpc/sysdev/axonram.c | 2 +- + block/ioctl.c | 1 - + drivers/block/brd.c | 2 +- + drivers/nvdimm/pmem.c | 10 +- + drivers/s390/block/dcssblk.c | 4 +- + fs/Kconfig | 1 + + fs/block_dev.c | 114 ++++-- + fs/dax.c | 842 ++++++++++++++++++++++---------------- + fs/ext2/file.c | 4 +- + fs/ext2/inode.c | 12 +- + fs/ext2/super.c | 11 +- + fs/ext4/file.c | 4 +- + fs/ext4/super.c | 11 +- + fs/xfs/xfs_bmap_util.c | 15 +- + fs/xfs/xfs_file.c | 7 +- + fs/xfs/xfs_super.c | 12 +- + include/linux/blkdev.h | 15 +- + include/linux/dax.h | 41 +- + include/linux/fs.h | 1 - + include/linux/mm.h | 7 + + include/linux/radix-tree.h | 9 - + mm/filemap.c | 30 +- + mm/memory.c | 40 +- + mm/truncate.c | 62 ++- + 25 files changed, 760 insertions(+), 529 deletions(-) +Merging akpm-current/current (db264f60346a ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'fs/dax.c' +Recorded preimage for 'include/linux/dax.h' +Resolved 'arch/mips/Kconfig' using previous resolution. +Resolved 'arch/mips/kernel/process.c' using previous resolution. +Resolved 'arch/powerpc/include/asm/book3s/64/pgtable.h' using previous resolution. +Resolved 'arch/tile/Kconfig' using previous resolution. +Resolved 'include/linux/radix-tree.h' using previous resolution. +Auto-merging mm/vmalloc.c +Auto-merging mm/memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/futex.c +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/signal.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/radix-tree.h +CONFLICT (content): Merge conflict in include/linux/radix-tree.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/device.h +Auto-merging include/linux/dax.h +CONFLICT (content): Merge conflict in include/linux/dax.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext2/file.c +Auto-merging fs/exec.c +Auto-merging fs/dax.c +CONFLICT (content): Merge conflict in fs/dax.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/block_dev.c +Auto-merging drivers/hwtracing/intel_th/msu.c +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/configs/tilepro_defconfig +Auto-merging arch/tile/configs/tilegx_defconfig +Auto-merging arch/tile/Kconfig +CONFLICT (content): Merge conflict in arch/tile/Kconfig +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/mips/mm/tlb-r4k.c +Auto-merging arch/mips/kernel/process.c +CONFLICT (content): Merge conflict in arch/mips/kernel/process.c +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/cpu-features.h +Auto-merging arch/mips/configs/nlm_xlr_defconfig +Auto-merging arch/mips/configs/nlm_xlp_defconfig +Auto-merging arch/mips/configs/lemote2f_defconfig +Auto-merging arch/mips/configs/bmips_be_defconfig +Auto-merging arch/mips/configs/bcm47xx_defconfig +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging arch/arc/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/dax.c'. +Recorded resolution for 'include/linux/dax.h'. +[master 90b043e54786] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-zram | 9 + + Documentation/DocBook/debugobjects.tmpl | 26 +- + Documentation/blockdev/zram.txt | 28 +- + Documentation/filesystems/nilfs2.txt | 5 + + Documentation/filesystems/proc.txt | 1 + + Documentation/gdb-kernel-debugging.txt | 21 + + Documentation/kdump/gdbmacros.txt | 96 +- + Documentation/kernel-parameters.txt | 14 +- + Documentation/memory-hotplug.txt | 9 +- + Documentation/sysctl/vm.txt | 14 + + Documentation/vm/transhuge.txt | 18 +- + Documentation/vm/z3fold.txt | 27 + + Kbuild | 10 + + MAINTAINERS | 10 +- + arch/Kconfig | 12 + + arch/alpha/Kconfig | 1 + + arch/alpha/kernel/process.c | 8 - + arch/arc/Kconfig | 1 + + arch/arc/include/asm/hugepage.h | 2 - + arch/arc/kernel/process.c | 7 - + arch/arm/Kconfig | 2 + + arch/arm/configs/axm55xx_defconfig | 2 +- + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/bcm_defconfig | 3 +- + arch/arm/configs/colibri_pxa270_defconfig | 2 +- + arch/arm/configs/colibri_pxa300_defconfig | 2 +- + arch/arm/configs/dove_defconfig | 2 +- + arch/arm/configs/efm32_defconfig | 2 +- + arch/arm/configs/exynos_defconfig | 2 +- + arch/arm/configs/ezx_defconfig | 2 +- + arch/arm/configs/h5000_defconfig | 2 +- + arch/arm/configs/hisi_defconfig | 2 +- + arch/arm/configs/imote2_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/keystone_defconfig | 2 +- + arch/arm/configs/lpc18xx_defconfig | 2 +- + arch/arm/configs/magician_defconfig | 2 +- + arch/arm/configs/mmp2_defconfig | 2 +- + arch/arm/configs/moxart_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/mvebu_v7_defconfig | 2 +- + arch/arm/configs/mxs_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/configs/pxa168_defconfig | 2 +- + arch/arm/configs/pxa3xx_defconfig | 2 +- + arch/arm/configs/pxa910_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm/configs/raumfeld_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/configs/socfpga_defconfig | 2 +- + arch/arm/configs/stm32_defconfig | 2 +- + arch/arm/configs/sunxi_defconfig | 2 +- + arch/arm/configs/tegra_defconfig | 2 +- + arch/arm/configs/u300_defconfig | 2 +- + arch/arm/configs/u8500_defconfig | 2 +- + arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- + arch/arm/configs/xcep_defconfig | 2 +- + arch/arm/configs/zx_defconfig | 3 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgtable-3level.h | 5 - + arch/arm/kernel/process.c | 4 +- + arch/arm/kernel/smp.c | 2 + + arch/arm/mm/Kconfig | 3 + + arch/arm/vfp/vfpmodule.c | 4 - + arch/arm64/configs/defconfig | 2 +- + arch/arm64/include/asm/pgtable.h | 5 - + arch/arm64/kernel/process.c | 7 - + arch/arm64/mm/hugetlbpage.c | 1 + + arch/avr32/Kconfig | 2 + + arch/avr32/kernel/process.c | 4 +- + arch/blackfin/Kconfig | 1 + + arch/blackfin/include/asm/processor.h | 7 - + arch/c6x/kernel/process.c | 4 - + arch/cris/Kconfig | 2 + + arch/cris/arch-v10/kernel/process.c | 9 - + arch/cris/arch-v32/kernel/process.c | 4 +- + arch/frv/include/asm/processor.h | 7 - + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/processor.h | 7 - + arch/hexagon/kernel/process.c | 7 - + arch/ia64/Kconfig | 1 + + arch/ia64/kernel/perfmon.c | 4 +- + arch/ia64/kernel/process.c | 14 +- + arch/m32r/Kconfig | 1 + + arch/m32r/kernel/process.c | 9 - + arch/m68k/Kconfig.cpu | 11 + + arch/m68k/include/asm/processor.h | 7 - + arch/metag/Kconfig | 2 + + arch/metag/include/asm/processor.h | 2 - + arch/metag/kernel/process.c | 6 +- + arch/metag/mm/hugetlbpage.c | 1 + + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/processor.h | 10 - + arch/mips/Kconfig | 3 +- + arch/mips/configs/bcm47xx_defconfig | 2 +- + arch/mips/configs/bmips_be_defconfig | 2 +- + arch/mips/configs/bmips_stb_defconfig | 2 +- + arch/mips/configs/ci20_defconfig | 2 +- + arch/mips/configs/db1xxx_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 2 +- + arch/mips/configs/loongson3_defconfig | 3 +- + arch/mips/configs/nlm_xlp_defconfig | 2 +- + arch/mips/configs/nlm_xlr_defconfig | 2 +- + arch/mips/configs/pistachio_defconfig | 2 +- + arch/mips/configs/qi_lb60_defconfig | 2 +- + arch/mips/configs/rt305x_defconfig | 2 +- + arch/mips/configs/xway_defconfig | 2 +- + arch/mips/include/asm/cpu-features.h | 10 + + arch/mips/include/asm/pgtable.h | 1 + + arch/mips/kernel/process.c | 4 - + arch/mips/mm/tlb-r4k.c | 21 +- + arch/mn10300/Kconfig | 1 + + arch/mn10300/configs/asb2364_defconfig | 1 - + arch/mn10300/include/asm/fpu.h | 6 +- + arch/mn10300/kernel/process.c | 4 +- + arch/nios2/Kconfig | 1 + + arch/nios2/include/asm/processor.h | 5 - + arch/openrisc/Kconfig | 1 + + arch/openrisc/include/asm/processor.h | 9 - + arch/parisc/Kconfig | 1 + + arch/parisc/configs/generic-64bit_defconfig | 2 +- + arch/parisc/kernel/process.c | 7 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/configs/40x/virtex_defconfig | 2 +- + arch/powerpc/configs/44x/virtex5_defconfig | 2 +- + arch/powerpc/configs/44x/warp_defconfig | 2 +- + arch/powerpc/configs/52xx/cm5200_defconfig | 2 +- + arch/powerpc/configs/52xx/lite5200b_defconfig | 2 +- + arch/powerpc/configs/52xx/motionpro_defconfig | 2 +- + arch/powerpc/configs/52xx/tqm5200_defconfig | 2 +- + arch/powerpc/configs/gamecube_defconfig | 2 +- + arch/powerpc/configs/mpc5200_defconfig | 2 +- + arch/powerpc/configs/pasemi_defconfig | 2 +- + arch/powerpc/configs/wii_defconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 + + arch/powerpc/include/asm/pgtable.h | 1 - + arch/powerpc/kernel/process.c | 4 - + arch/powerpc/mm/hugetlbpage.c | 6 +- + arch/s390/Kconfig | 3 + + arch/s390/configs/default_defconfig | 2 +- + arch/s390/configs/gcov_defconfig | 2 +- + arch/s390/configs/performance_defconfig | 2 +- + arch/s390/configs/zfcpdump_defconfig | 2 +- + arch/s390/include/asm/pgtable.h | 1 + + arch/s390/kernel/machine_kexec.c | 28 +- + arch/s390/kernel/process.c | 5 +- + arch/score/Kconfig | 1 + + arch/score/kernel/process.c | 2 - + arch/sh/Kconfig | 3 + + arch/sh/configs/apsh4ad0a_defconfig | 1 - + arch/sh/configs/edosk7760_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 3 +- + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/se7722_defconfig | 2 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/configs/urquell_defconfig | 3 +- + arch/sh/kernel/process_32.c | 7 - + arch/sh/kernel/process_64.c | 5 +- + arch/sparc/Kconfig | 3 + + arch/sparc/configs/sparc64_defconfig | 2 +- + arch/sparc/include/asm/pgtable_64.h | 2 - + arch/sparc/kernel/process_32.c | 12 +- + arch/sparc/kernel/process_64.c | 4 +- + arch/tile/Kconfig | 2 + + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 1 - + arch/tile/include/asm/pgtable.h | 1 - + arch/tile/kernel/process.c | 4 +- + arch/tile/kernel/setup.c | 4 +- + arch/tile/mm/hugetlbpage.c | 7 +- + arch/tile/mm/init.c | 2 +- + arch/um/configs/i386_defconfig | 1 - + arch/um/configs/x86_64_defconfig | 1 - + arch/um/kernel/process.c | 4 - + arch/unicore32/kernel/process.c | 7 - + arch/x86/Kconfig | 2 + + arch/x86/configs/i386_defconfig | 3 +- + arch/x86/configs/x86_64_defconfig | 3 +- + arch/x86/include/asm/pgtable.h | 1 + + arch/x86/include/asm/uaccess.h | 5 + + arch/x86/include/asm/uaccess_64.h | 7 + + arch/x86/kernel/apic/hw_nmi.c | 1 - + arch/x86/kernel/machine_kexec_64.c | 46 + + arch/x86/kernel/process.c | 5 +- + arch/x86/mm/hugetlbpage.c | 1 + + arch/x86/mm/numa.c | 4 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/configs/audio_kc705_defconfig | 2 +- + arch/xtensa/configs/generic_kc705_defconfig | 3 +- + arch/xtensa/configs/nommu_kc705_defconfig | 2 +- + arch/xtensa/configs/smp_lx200_defconfig | 3 +- + arch/xtensa/kernel/process.c | 4 +- + block/genhd.c | 2 +- + block/partitions/ldm.c | 60 +- + drivers/base/memory.c | 28 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/zram/zcomp.c | 300 ++--- + drivers/block/zram/zcomp.h | 14 +- + drivers/block/zram/zram_drv.c | 104 +- + drivers/block/zram/zram_drv.h | 2 +- + drivers/char/random.c | 21 +- + drivers/hwspinlock/hwspinlock_core.c | 2 +- + drivers/hwtracing/intel_th/msu.c | 2 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 2 +- + drivers/memstick/host/rtsx_usb_ms.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 20 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 6 +- + drivers/platform/x86/wmi.c | 104 +- + drivers/scsi/bfa/bfi.h | 2 +- + drivers/staging/comedi/drivers/daqboard2000.c | 2 +- + fs/befs/datastream.c | 8 +- + fs/befs/io.c | 4 +- + fs/befs/linuxvfs.c | 8 +- + fs/block_dev.c | 1 + + fs/btrfs/volumes.c | 2 +- + fs/buffer.c | 10 +- + fs/dax.c | 43 + + fs/efivarfs/inode.c | 40 +- + fs/efs/super.c | 4 +- + fs/eventpoll.c | 12 +- + fs/exec.c | 7 - + fs/ext2/file.c | 1 + + fs/ext4/file.c | 1 + + fs/ext4/fsync.c | 5 +- + fs/ext4/ioctl.c | 2 +- + fs/f2fs/file.c | 2 +- + fs/fs-writeback.c | 3 +- + fs/nilfs2/alloc.c | 39 +- + fs/nilfs2/alloc.h | 11 +- + fs/nilfs2/bmap.c | 10 +- + fs/nilfs2/bmap.h | 22 +- + fs/nilfs2/btnode.c | 9 +- + fs/nilfs2/btnode.h | 8 +- + fs/nilfs2/btree.c | 21 +- + fs/nilfs2/btree.h | 6 +- + fs/nilfs2/cpfile.c | 22 +- + fs/nilfs2/cpfile.h | 10 +- + fs/nilfs2/dat.c | 8 +- + fs/nilfs2/dat.h | 8 +- + fs/nilfs2/dir.c | 59 +- + fs/nilfs2/direct.c | 17 +- + fs/nilfs2/direct.h | 6 +- + fs/nilfs2/export.h | 2 +- + fs/nilfs2/file.c | 7 +- + fs/nilfs2/gcinode.c | 9 +- + fs/nilfs2/ifile.c | 14 +- + fs/nilfs2/ifile.h | 9 +- + fs/nilfs2/inode.c | 105 +- + fs/nilfs2/ioctl.c | 17 +- + fs/nilfs2/mdt.c | 63 +- + fs/nilfs2/mdt.h | 21 +- + fs/nilfs2/namei.c | 12 +- + fs/nilfs2/nilfs.h | 33 +- + fs/nilfs2/page.c | 15 +- + fs/nilfs2/page.h | 10 +- + fs/nilfs2/recovery.c | 25 +- + fs/nilfs2/segbuf.c | 10 +- + fs/nilfs2/segbuf.h | 11 +- + fs/nilfs2/segment.c | 125 +- + fs/nilfs2/segment.h | 44 +- + fs/nilfs2/sufile.c | 14 +- + fs/nilfs2/sufile.h | 10 +- + fs/nilfs2/super.c | 21 +- + fs/nilfs2/sysfs.c | 10 +- + fs/nilfs2/sysfs.h | 6 +- + fs/nilfs2/the_nilfs.c | 16 +- + fs/nilfs2/the_nilfs.h | 27 +- + fs/notify/fsnotify.h | 7 + + fs/notify/group.c | 17 +- + fs/notify/mark.c | 78 +- + fs/ocfs2/alloc.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 185 ++- + fs/ocfs2/ocfs2_fs.h | 2 +- + fs/ocfs2/slot_map.c | 6 +- + fs/proc/array.c | 20 +- + fs/proc/base.c | 42 +- + fs/proc/page.c | 2 +- + fs/ramfs/file-nommu.c | 8 +- + fs/reiserfs/objectid.c | 2 +- + fs/select.c | 67 +- + fs/ubifs/sb.c | 2 +- + fs/userfaultfd.c | 41 +- + fs/xfs/xfs_file.c | 1 + + include/asm-generic/pgtable.h | 8 + + include/linux/bootmem.h | 16 +- + include/linux/compaction.h | 151 ++- + include/linux/compiler-gcc.h | 1 + + include/linux/compiler.h | 4 + + include/linux/cpuset.h | 42 +- + include/linux/crc64_ecma.h | 56 + + include/linux/dax.h | 3 + + include/linux/debugobjects.h | 17 +- + include/linux/device.h | 12 +- + include/linux/efi.h | 14 +- + include/linux/fsnotify_backend.h | 2 - + include/linux/genhd.h | 23 +- + include/linux/hardirq.h | 2 + + include/linux/huge_mm.h | 4 +- + include/linux/hugetlb.h | 11 +- + include/linux/hugetlb_cgroup.h | 4 - + include/linux/hugetlb_inline.h | 6 +- + include/linux/kasan-checks.h | 12 + + include/linux/kasan.h | 13 +- + include/linux/kernel.h | 4 +- + include/linux/kexec.h | 6 +- + include/linux/memcontrol.h | 31 - + include/linux/memory_hotplug.h | 8 +- + include/linux/mempolicy.h | 16 +- + include/linux/mempool.h | 3 +- + include/linux/mm.h | 42 +- + include/linux/mm_inline.h | 24 +- + include/linux/mm_types.h | 16 +- + include/linux/mmzone.h | 51 +- + include/linux/nilfs2_fs.h | 79 +- + include/linux/nodemask.h | 11 +- + include/linux/oom.h | 32 +- + include/linux/padata.h | 5 - + include/linux/page-flags.h | 25 +- + include/linux/page_ref.h | 26 +- + include/linux/pagemap.h | 32 +- + include/linux/percpu.h | 3 - + include/linux/poll.h | 11 +- + include/linux/printk.h | 14 +- + include/linux/radix-tree.h | 171 +-- + include/linux/random.h | 1 - + include/linux/sched.h | 29 +- + include/linux/sem.h | 1 + + include/linux/signal.h | 16 +- + include/linux/slab.h | 16 +- + include/linux/slab_def.h | 4 + + include/linux/string.h | 2 +- + include/linux/swap.h | 1 + + include/linux/syscalls.h | 8 +- + include/linux/time64.h | 17 +- + include/linux/timekeeping.h | 1 + + include/linux/types.h | 1 - + include/linux/uuid.h | 21 +- + include/linux/vmalloc.h | 3 +- + include/linux/vmstat.h | 12 +- + include/linux/zsmalloc.h | 4 +- + include/trace/events/compaction.h | 3 +- + include/trace/events/huge_memory.h | 38 +- + include/uapi/linux/uuid.h | 4 - + init/Kconfig | 36 + + init/main.c | 10 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 +- + kernel/cpuset.c | 22 +- + kernel/exit.c | 34 +- + kernel/fork.c | 69 +- + kernel/futex.c | 2 + + kernel/irq/irqdomain.c | 7 +- + kernel/kexec.c | 109 +- + kernel/kexec_core.c | 12 +- + kernel/kexec_file.c | 8 +- + kernel/padata.c | 138 +-- + kernel/panic.c | 6 +- + kernel/printk/Makefile | 1 + + kernel/printk/internal.h | 57 + + kernel/printk/nmi.c | 260 ++++ + kernel/printk/printk.c | 107 +- + kernel/rcu/update.c | 26 +- + kernel/signal.c | 10 +- + kernel/sysctl.c | 7 + + kernel/sysctl_binary.c | 23 +- + kernel/time/hrtimer.c | 23 +- + kernel/time/time.c | 21 + + kernel/time/timekeeping.c | 13 + + kernel/time/timer.c | 63 +- + kernel/workqueue.c | 52 +- + lib/Kconfig | 10 + + lib/Kconfig.debug | 8 +- + lib/Makefile | 3 +- + lib/crc64_ecma.c | 341 ++++++ + lib/debugobjects.c | 92 +- + lib/gcd.c | 77 +- + lib/nmi_backtrace.c | 89 +- + lib/nodemask.c | 30 + + lib/percpu_counter.c | 6 +- + lib/radix-tree.c | 933 +++++++-------- + lib/strncpy_from_user.c | 2 + + lib/test_kasan.c | 69 ++ + lib/uuid.c | 91 +- + lib/vsprintf.c | 21 +- + mm/Kconfig | 66 +- + mm/Makefile | 1 + + mm/backing-dev.c | 20 +- + mm/compaction.c | 262 ++-- + mm/filemap.c | 35 +- + mm/highmem.c | 12 +- + mm/huge_memory.c | 145 ++- + mm/hugetlb.c | 37 +- + mm/hugetlb_cgroup.c | 35 +- + mm/internal.h | 14 +- + mm/kasan/Makefile | 1 + + mm/kasan/kasan.c | 133 ++- + mm/kasan/kasan.h | 21 +- + mm/kasan/quarantine.c | 291 +++++ + mm/kasan/report.c | 1 + + mm/memblock.c | 33 +- + mm/memcontrol.c | 41 +- + mm/memory-failure.c | 72 +- + mm/memory.c | 38 +- + mm/memory_hotplug.c | 91 +- + mm/mempolicy.c | 63 +- + mm/mempool.c | 2 +- + mm/migrate.c | 7 +- + mm/mmap.c | 17 +- + mm/mmzone.c | 2 +- + mm/mremap.c | 47 +- + mm/oom_kill.c | 143 ++- + mm/page-writeback.c | 12 +- + mm/page_alloc.c | 1263 +++++++++++++------- + mm/page_isolation.c | 10 +- + mm/page_owner.c | 5 +- + mm/page_poison.c | 8 +- + mm/rmap.c | 4 +- + mm/shmem.c | 130 +- + mm/slab.c | 785 +++++++----- + mm/slab.h | 2 + + mm/slab_common.c | 2 + + mm/slub.c | 21 +- + mm/swap.c | 5 +- + mm/swap_state.c | 3 +- + mm/util.c | 29 + + mm/vmalloc.c | 39 +- + mm/vmscan.c | 164 +-- + mm/vmstat.c | 175 +-- + mm/z3fold.c | 792 ++++++++++++ + mm/zsmalloc.c | 175 ++- + mm/zswap.c | 12 +- + net/socket.c | 8 +- + net/wireless/util.c | 2 +- + samples/kprobes/jprobe_example.c | 2 +- + samples/kprobes/kprobe_example.c | 38 +- + scripts/bloat-o-meter | 6 + + scripts/checkpatch.pl | 142 ++- + scripts/decode_stacktrace.sh | 55 +- + scripts/gdb/linux/Makefile | 12 +- + scripts/gdb/linux/constants.py.in | 59 + + scripts/gdb/linux/cpus.py | 38 + + scripts/gdb/linux/dmesg.py | 11 +- + scripts/gdb/linux/lists.py | 21 + + scripts/gdb/linux/modules.py | 24 +- + scripts/gdb/linux/proc.py | 156 +++ + scripts/gdb/linux/radixtree.py | 97 ++ + scripts/gdb/linux/tasks.py | 19 + + scripts/gdb/linux/utils.py | 32 +- + scripts/gdb/vmlinux-gdb.py | 2 + + scripts/spelling.txt | 1 + + security/integrity/ima/ima_policy.c | 14 +- + tools/testing/radix-tree/Makefile | 4 +- + tools/testing/radix-tree/generated/autoconf.h | 3 + + tools/testing/radix-tree/linux/init.h | 1 + + tools/testing/radix-tree/linux/kernel.h | 15 +- + tools/testing/radix-tree/linux/slab.h | 1 - + tools/testing/radix-tree/linux/types.h | 7 +- + tools/testing/radix-tree/main.c | 84 +- + tools/testing/radix-tree/multiorder.c | 337 ++++++ + tools/testing/radix-tree/regression2.c | 7 - + tools/testing/radix-tree/tag_check.c | 10 + + tools/testing/radix-tree/test.c | 49 +- + tools/testing/radix-tree/test.h | 11 +- + .../selftests/rcutorture/configs/lock/CFcommon | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 +- + 468 files changed, 9120 insertions(+), 4758 deletions(-) + create mode 100644 Documentation/vm/z3fold.txt + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/kasan-checks.h + create mode 100644 kernel/printk/internal.h + create mode 100644 kernel/printk/nmi.c + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/nodemask.c + create mode 100644 mm/kasan/quarantine.c + create mode 100644 mm/z3fold.c + create mode 100644 scripts/gdb/linux/constants.py.in + create mode 100644 scripts/gdb/linux/radixtree.py + create mode 100644 tools/testing/radix-tree/generated/autoconf.h + create mode 100644 tools/testing/radix-tree/linux/init.h + create mode 100644 tools/testing/radix-tree/multiorder.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: mm: make optimistic check for swapin readahead fix +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: mm: make mmap_sem for write waits killable for mm syscalls +Applying: mm: make vm_mmap killable +Applying: mm: make vm_munmap killable +Applying: mm, aout: handle vm_brk failures +Applying: mm, elf: handle vm_brk error +Applying: mm: make vm_brk killable +Applying: mm, proc: make clear_refs killable +Applying: mm, fork: make dup_mmap wait for mmap_sem for write killable +Applying: ipc, shm: make shmem attach/detach wait for mmap_sem killable +Applying: vdso: make arch_setup_additional_pages wait for mmap_sem for write killable +Applying: coredump: make coredump_wait wait for mmap_sem for write killable +Applying: aio: make aio_setup_ring killable +Applying: exec: make exec path waiting for mmap_sem killable +Applying: prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable +Applying: uprobes: wait for mmap_sem for write killable +Applying: drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable +Applying: drm/radeon: make radeon_mn_get wait for mmap_sem killable +Applying: drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable +Applying: drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get +Applying: kgdb: depends on VT +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + a462de4cf5aa...259a35d944af akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (259a35d944af kgdb: depends on VT) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm/kernel/process.c | 3 ++- + arch/arm64/kernel/vdso.c | 6 ++++-- + arch/hexagon/kernel/vdso.c | 3 ++- + arch/mips/kernel/vdso.c | 3 ++- + arch/powerpc/kernel/vdso.c | 3 ++- + arch/s390/kernel/vdso.c | 3 ++- + arch/sh/kernel/vsyscall/vsyscall.c | 4 +++- + arch/x86/entry/vdso/vma.c | 3 ++- + arch/x86/ia32/ia32_aout.c | 22 +++++++++++++++------- + arch/x86/um/vdso/vma.c | 3 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 5 ++++- + drivers/gpu/drm/i915/i915_gem.c | 5 ++++- + drivers/gpu/drm/radeon/radeon_mn.c | 4 +++- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + fs/aio.c | 7 ++++++- + fs/binfmt_aout.c | 11 ++++++++--- + fs/binfmt_elf.c | 7 +++++-- + fs/coredump.c | 4 +++- + fs/exec.c | 10 ++++++++-- + fs/proc/task_mmu.c | 11 +++++++++-- + include/linux/mm.h | 4 ++-- + ipc/shm.c | 9 +++++++-- + kernel/events/uprobes.c | 7 +++++-- + kernel/fork.c | 6 +++++- + kernel/sys.c | 3 ++- + lib/Kconfig.kgdb | 2 +- + mm/huge_memory.c | 3 ++- + mm/internal.h | 2 +- + mm/madvise.c | 8 +++++--- + mm/mlock.c | 16 ++++++++++------ + mm/mmap.c | 24 +++++++++++++++++++----- + mm/mprotect.c | 3 ++- + mm/mremap.c | 3 ++- + mm/util.c | 3 ++- + 34 files changed, 152 insertions(+), 61 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..195163909790 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.5-rc2 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..32f41212d8e3 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160520 |