diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-06-20 16:03:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-06-20 16:03:13 +1000 |
| commit | 6ab97590a2c63c8de00d0ce4850fdb8780a33fab (patch) | |
| tree | 9b3cfd09a1d623fa75b0b35d75ea00dea25df0aa | |
| parent | c3d725e4b199698d8415ad3e168d7436bb9806aa (diff) | |
| download | linux-next-20160620.tar.gz linux-next-20160620.tar.xz | |
Add linux-next specific files for 20160620next-20160620
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 236 | ||||
| -rw-r--r-- | Next/Trees | 238 | ||||
| -rw-r--r-- | Next/merge.log | 6663 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7142 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..09b0fbb9fa2e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,236 @@ +Name SHA1 +---- ---- +origin c3695331f3a326a468bd6a5b6f05b481b399726b +fixes 5edb56491d4812c42175980759da53388e5d86f5 +kbuild-current b36fad65d61fffe4b662d4bfb1ed673c455a36a2 +arc-current 5edb56491d4812c42175980759da53388e5d86f5 +arm-current 56530f5d2ddc9b9fade7ef8db9cb886e9dc689b5 +m68k-current 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes 8550e2fa34f077c8a87cf1ba2453102bbbc9ade9 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 6b15d6650c5301ce023d8df0cc3a60b1a76d377e +net ab522fd68bc78f3f81f6c553f785dae3462859fa +ipsec d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a +ipvs 50219538ffc0493a2b451a3aa0191138ef8bfe9d +wireless-drivers 034fdd4a17ff089c2428ece18efa65c5396810d2 +mac80211 3d5fdff46c4b2b9534fa2f9fc78e90a48e0ff724 +sound-current 8198868f0a283eb23e264951632ce61ec2f82228 +pci-current af8c34ce6ae32addda3788d54a7e340cad22516b +driver-core.current e80dac114c63dd54398c3c785a6431622c320e87 +tty.current 5edb56491d4812c42175980759da53388e5d86f5 +usb.current e80dac114c63dd54398c3c785a6431622c320e87 +usb-gadget-fixes 50c763f8c1bac0dc00f7788a75f227276c0efd54 +usb-serial-fixes af8c34ce6ae32addda3788d54a7e340cad22516b +usb-chipidea-fixes ea1d39a31d3b1b6060b6e83e5a29c069a124c68a +staging.current e80dac114c63dd54398c3c785a6431622c320e87 +char-misc.current e80dac114c63dd54398c3c785a6431622c320e87 +input-current 30172936eefb70c27fade1bc912a25fc90827b76 +crypto-current 19ced623db2fe91604d69f7d86b03144c5107739 +ide 1993b176a8224e371e0732ffada7ab9eb3b0912b +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes ce7585f3c4d76bca1dff4b66ae1ea32552954f9e +kselftest-fixes f80eb4289491f6ddb0788636ce0bd6f5d3a2012a +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 59461c018204c3a6f8a31a6b7798be43d036c04a +drm-intel-fixes 476490a945e1f0f6bd58e303058d2d8ca93a974c +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc 5edb56491d4812c42175980759da53388e5d86f5 +arm f07617e99523965a18177fc833301014cab8256b +arm-perf 4ba2578fa7b557012b8f59ad7a9284ff15394338 +arm-soc 1a8883e0ddcd0ee6bb0acd97d262324b82f16a7b +amlogic 32535cf02be1e7a78ffaf426b57c39e7d20eb938 +at91 0f59c948faed3715331c2648b46d6d0033d86f5c +bcm2835 aa5c0a1e15c2e6a0e12cdb3719b4cc8ec56d487c +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 24c3004a32589d82025fb0d3a4f0efdaab999fe9 +keystone a9015e7c9dd232c191713a1f4ac350b701852b8b +mvebu 56454a34f5d65864f37a855afa293f52e7eddfbf +omap be5f1e3cfa8670075c2726fe41fdaebb4bcc7bd7 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 275804c07f4119d4a121ea497f022a40e434a266 +renesas adc9b8a6ecde406059f7ea0f5e70348c24602abc +rockchip 5e46e8d66d01057fd62ff94490d33b53c6514f14 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk a0c8f253cf3e277e16c0f570e3502e2e970c29c3 +tegra 7c7a0b23a909ef8ad34e93bd5bdf9d5544c60b25 +arm64 e6d9a52543338603e25e71e0e4942f05dae0dd8a +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 70f4f9352317ed8bc70cd7fe2bf34a3f9f7f21e3 +m68k 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +m68knommu 5edb56491d4812c42175980759da53388e5d86f5 +metag 592ddeeff8cb0ba7ae11dbd08f583280bd15f865 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 847e858f3d0eb4c3c29c046dc6aa82d3334a0917 +nios2 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f +parisc-hd 5975b2c0c10adbc7894a54ab7b30db4fbcdd8c41 +powerpc a430739009384ba2c4804f3a427334ff395433cd +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 1eef33bec12d7e46a58f12b3604556a80c362a0d +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 63bf903583d72283ab4f5358f1a26e1d2dd5ee22 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile ca768667d87331d2e2fc84e1546fbf96f22ed5fe +uml a78ff1112263fdd871d3506dbcff44f6f12e8423 +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs c315ef8d9db7f1a0ebd023a395ebdfde1c68057e +btrfs-kdave 8f4aa7bf64af68b080e622585b489ab830c29da0 +ceph f6973c09490c919398fc87d9c6bec9c0b670c4c4 +cifs 3bdc426e2497fb98a1051fc69f6c1709c00e377c +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 e008bb6134a6e68fd2c827a46b27d017d920de8f +ext4 12735f881952c32b31bc4e433768f18489f79ec9 +f2fs a2481adac819f05d4e36cf29afbde7a5effc16bb +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 507c552aa58fa48fdea1373948cfc0a1fd0bf61b +gfs2 1e875f5a95a28b5286165db9fa832b0773657ddb +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs a12a4fc64de7c96fd1832a9856fabffffbf35967 +nfsd ee8f2a36a99cbd9bc97fb82993af1925ac8bf663 +orangefs 2dcd0af568b0cf583645c8a317dd12e344b1c72a +overlayfs f920c41f047a72bfc0b23bf31136e7a56742def6 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 61edc3f3b51d2d3948029197cfff6fef7d94e939 +xfs 26f1fe858f2744edfc75e92d34a6be0af5e8b45d +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 1eb82bc8e71279eea0cc6a9c9d591d8f706c4206 +pci 34bfa4dd01cfede798bd90a30aaf114f8b3382f6 +pstore 35da60941e44dbf57868e67686dd24cc1a33125a +hid 646944182a4b759a25d8ef296586d166929d8725 +i2c d86a4c24d68e429dade0b3651eb891ef3073ba03 +jdelvare-hwmon 18c358ac5e32ad43e9a50b4e5f344a896b9d1dad +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging e616f770b52c566f1c078a603cf8625daabf50bb +v4l-dvb 2ed52999aaf393e1e11c46c284c5978fb672a512 +pm 8fa3e03d92494c816afb5eafe3f44c092370f794 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 2c5ce98e1e836184a45f4268a598a18a5a02af06 +thermal-soc ddc8fdc6e2f06aabdbb9dc4a5e01ca793cd2e285 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 82c7d823cc31cf56d964eebe1f91aaf1691cddce +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma f1faa4f5b460e2ef441eac5e319c10533aa779f4 +net-next 697666eac664dbea7c2c1fa7518fd5dfe098776f +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 625b44fc15f829bf63a9aea8d62ec267c904b0a1 +wireless-drivers-next 1bb57c8a5e33bcbec031ce0c629968922d5af89d +bluetooth a78c16e1b9ea74a64b356d667261a326fdc49513 +mac80211-next e69f73bfecb0178ae6bd20eb778211739cd71fab +rdma 61c78eea9516a921799c17b4c20558e2aa780fd3 +rdma-leon 5edb56491d4812c42175980759da53388e5d86f5 +rdma-leon-test a5792590474b1ce3cb45a25338dc5c656d9cd0c0 +mtd becc7ae544c61395b5eba7b9913e14aa567ca07a +l2-mtd 95193796256cfce16e5d881318e15b6b04062c15 +nand e2442baf99bc400e8141a6f5cebe993282d44549 +crypto 5a7de97309f5af4458b1a25a2a529a1a893c5269 +drm a0877f52035280370707bdefeddc6faa6478b892 +drm-panel f103b93d90c287e3680929b1852b36919cca3b37 +drm-intel a02b01096def82df28363b0b9e7afdea9b5587fd +drm-tegra 057eab2013ecbba2e772293acc177e2e3210f05d +drm-misc e63d87c0b02f2f0ee876ea79dcbe13a7235a2d55 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 2b669875332fbdff0a7ad559e8662e875e7a1526 +hdlcd f6c68b4bd4a98033d1e79479212bbd376e145728 +mali-dp 59ba2422b4308b02438506d35d5042df5d42c249 +sunxi b7e7559f439cd374fc5a52764d1a704cb3474604 +kbuild 3f306a53b5714582749ed8c2dc71d51180ee6b5c +kspp 6b31814f05078cdc3677177f06fce96cd91eb46f +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 65a003e5c0c9e26d1b7245d9e153c20448df0c16 +sound 3915bf2946520ace5bcc8104717a3cb0452d7430 +sound-asoc 1a7d46a9dfeb578ece0a707f9d97f7bd097cd4a4 +modules e2d1248432c4bc8b3e4cdfc13074acbce3a749cd +input 9096a45d99d00eea80ebef884c281675be006244 +block 3cee5575153ab74469a7792188a6aa2e9ebb73c4 +lightnvm 2a65aee4011bd3a372ce23681ceb3a6960a96c8c +device-mapper 68c1c4d5eafc65dda05bf7d3d172f10f6982e092 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh b281733437037559aec39be0c0699b044571bddf +md d787be4092e27728cb4c012bee9762098ef3c662 +mfd 1cf9326d4c07238f86265c8291ed29476632f42a +backlight 4db8c9572ce17527ba69227dbbfde95a5452d6eb +battery 2e05b518c89714d60000dfe0cd39490da68763e0 +omap_dss2 ab366b40b8513e7590858229ecbb5e1434a52b54 +regulator 1fc4aeb3d1516a52e4a0c0e4aa2412a173cc507c +security 26703c636c1f3272b39bd0f6d04d2e970984f1b6 +integrity 848b134bf8e78eec8b3ca5017b36ec6015a80a25 +keys 75aeddd12f205d07b36ed76db3426e974b8f2a21 +selinux 309c5fad5de44fb9b1703a8f7bd814a223c57d60 +tpmdd 3051e8c007641bee01751303cd20985696e2c6fa +watchdog 1a695a905c18548062509178b98bc91e67510864 +iommu da3189d191e407f038610e809aa432cda4d7e012 +dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108 +vfio f70552809419cd2abc0cc6469a07c9792a3aaa6c +jc_docs 8569de68e79e94cce6709831edd94accb6942ade +trivial 52bbe141f37f093e2c612e97c40d27422e5a1fdf +audit 66b12abc846d31e75fa5f2f31db1396ddfa8ee4a +devicetree 06dfeef88573cf032e5c27e37f80ff5237b3318a +mailbox 9ef3c5112139cc5c5666ee096e05bc1e00e94015 +spi 10a340f4245c9e09499262215ecce8b32622c1f7 +tip 2e8756bc09bd58eac55da9a9eb742f21662b212b +clockevents dda57f6be11f4976b064fb3507d9d09c5242f795 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd bba142957e04c400440d2df83c1b3b2dfc42e220 +irqchip ebf63bb87f67fbb656eea7c25190fcc7630cf267 +ftrace 97f8827a8c7963756ae7d3ee898675b4667eca73 +rcu b4aa201e0c7c73a9f4fee7d82d4ff46b85feeea9 +kvm 64672c95ea4c2f7096e519e826076867e8ef0938 +kvm-arm 35a2d58588f0992627e74b447ccab21570544c86 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus b1a4286b8f3393857a205ec89607683161b75f90 +kvms390 a7e19ab55ffdd82f1a8d12694b9a0c0beeef534c +xen-tip bdadcaf2a7c19d667c7c021da2ffc8fa18c44031 +percpu 6710e594f71ccaad8101bc64321152af7cd9ea28 +workqueues d945b5e9f0e35cb56a3783d849b5f0f37da0a7f1 +drivers-x86 b740d2e9233cb33626d3b62210bcfc6a34baa839 +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi ea12c45f1b368e2a0ad080e863291171ee2f98b1 +leds ba6bc7dc4d393d6002fbffedd9c74cb54b5b6723 +ipmi 4e80ad011c9cc10fcaa0de6ba73ea5abe4b3c55d +driver-core 5edb56491d4812c42175980759da53388e5d86f5 +tty 5edb56491d4812c42175980759da53388e5d86f5 +usb 76d15c8fba655c9b2d60cf01834858f2c44483dc +usb-gadget 2a58f9c12bb360f38fb39e470bb5ff94014356e6 +usb-serial af8c34ce6ae32addda3788d54a7e340cad22516b +usb-chipidea-next 764763f0a0c81cbed4d2c7dc2b05e7173ff85b5b +staging 0fd9da9a979aecfb9df40dfb3304db2b16fa7e05 +char-misc c0ff9019ee64101fda8f19338da799fda8217e14 +extcon 4239b7f76be31d6c2a76dff363ec8dd6b5d63398 +cgroup 44fa3a451ffee1eb44d2bb89b0e9594372d89b25 +scsi 3236f0748964fff558cfb54601c761ec845df169 +target-updates 8f0dfb3d8b1120c61f6e2cc3729290db10772b2d +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata da780c64d2b61a511aab5fc2b79b69c49c9e4c0f +pinctrl fe9f516997c6932cd68b64cd22e8ca14ccf62422 +vhost 139ab4d4e68b8cf2a611b06c006a2195dc6bedf1 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg ef583d3620479b2287e565fb00de283e7d10f0d8 +gpio c35285cb1570b77d4c25d4ae6b8d6b20a575937a +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 31848056915635fff23570a049162642ca43d075 +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk 071a0cb66cc6d355f70e5c3aa701033f22ac7476 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 1a695a905c18548062509178b98bc91e67510864 +y2038 4b277763c5b3ce6d60168797e6f38260416d9b13 +luto-misc 6436d4c1a83cbe083e54c53bb2b16efaab9b62f4 +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 6d9122078097233dbfc4ad3a45512393cddf8540 +coresight c95eca78d3c8da9827e91b9b85ef639e46962ad1 +rtc c361db5c2c64f1b7ffed5e9cc42e5062432238f2 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 36092ee8ba695fce023b2118ececa6c2a56b1331 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current dc87c36fac153fd0919082afdd3b8d194d23d4e6 +akpm e80940b56fc8d08ccace4a20493abe85a4d48967 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..65c24edde911 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,238 @@ +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 +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 +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +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 +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +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 +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +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/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..acc98b0bcf36 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6663 @@ +$ date -R +Mon, 20 Jun 2016 09:27:46 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at d325ea859490 Merge tag 'drm-fixes-for-v4.7-rc4' of git://people.freedesktop.org/~airlied/linux +Merging origin/master (c3695331f3a3 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge origin/master +Updating d325ea859490..c3695331f3a3 +Fast-forward + Documentation/ABI/testing/configfs-usb-gadget-uvc | 58 ++--- + .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 2 +- + Documentation/leds/leds-class.txt | 4 +- + MAINTAINERS | 3 + + arch/Kconfig | 3 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- + 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/dra7.dtsi | 2 + + arch/arm/boot/dts/dra74x.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 13 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 13 +- + 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/boot/dts/socfpga_cyclone5_vining_fpga.dts | 1 + + arch/arm/boot/dts/stih407-family.dtsi | 3 + + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 - + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 2 - + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 5 +- + arch/arm/include/asm/pgtable.h | 1 - + arch/arm/kernel/smp.c | 2 +- + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-imx/mach-imx6ul.c | 2 +- + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 6 +- + arch/arm/mach-omap1/ams-delta-fiq.c | 5 +- + arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | 2 + + arch/arm/mach-omap2/Kconfig | 12 + + arch/arm/mach-omap2/omap-secure.h | 1 + + arch/arm/mach-omap2/omap-smp.c | 48 +++- + arch/arm/mach-omap2/powerdomain.c | 9 +- + arch/arm/mach-omap2/powerdomains7xx_data.c | 76 +----- + arch/arm/mach-omap2/timer.c | 7 +- + arch/arm/plat-samsung/devs.c | 2 +- + arch/arm64/boot/dts/lg/lg1312.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + arch/arm64/include/asm/kgdb.h | 45 +++- + arch/arm64/include/asm/spinlock.h | 42 +++- + arch/arm64/kernel/kgdb.c | 14 +- + arch/arm64/kernel/traps.c | 26 +-- + arch/arm64/mm/fault.c | 2 +- + arch/mips/include/asm/kvm_host.h | 3 +- + arch/mips/kvm/emulate.c | 19 +- + arch/mips/kvm/interrupt.h | 1 + + arch/mips/kvm/locore.S | 1 + + arch/mips/kvm/mips.c | 11 +- + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/kvm/intercept.c | 2 + + arch/s390/kvm/kvm-s390.c | 3 +- + arch/x86/Kconfig | 9 + + arch/x86/include/asm/kvm_host.h | 11 + + arch/x86/kvm/svm.c | 21 +- + arch/x86/kvm/vmx.c | 15 +- + drivers/acpi/acpica/hwregs.c | 146 +----------- + drivers/base/Makefile | 2 +- + drivers/base/isa.c | 2 +- + drivers/base/module.c | 8 +- + drivers/base/power/opp/cpu.c | 12 +- + drivers/base/power/opp/of.c | 10 +- + drivers/base/power/opp/opp.h | 8 +- + drivers/cpufreq/intel_pstate.c | 22 +- + drivers/dma/at_xdmac.c | 82 +++++-- + drivers/dma/mv_xor.c | 10 +- + drivers/extcon/extcon-palmas.c | 2 + + drivers/gpio/Kconfig | 8 +- + drivers/hid/hid-elo.c | 2 +- + drivers/hid/hid-multitouch.c | 5 + + drivers/hwtracing/coresight/coresight-tmc-etr.c | 11 +- + drivers/hwtracing/coresight/coresight.c | 15 +- + drivers/iio/accel/st_accel_buffer.c | 2 +- + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/common/st_sensors/st_sensors_buffer.c | 25 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 8 + + drivers/iio/common/st_sensors/st_sensors_trigger.c | 96 +++++++- + drivers/iio/dac/Kconfig | 2 +- + drivers/iio/dac/ad5592r-base.c | 2 +- + drivers/iio/gyro/st_gyro_buffer.c | 2 +- + drivers/iio/gyro/st_gyro_core.c | 1 + + drivers/iio/humidity/am2315.c | 4 +- + drivers/iio/humidity/hdc100x.c | 20 +- + drivers/iio/imu/bmi160/bmi160_core.c | 16 +- + drivers/iio/industrialio-trigger.c | 23 +- + drivers/iio/light/apds9960.c | 1 + + drivers/iio/light/bh1780.c | 10 +- + drivers/iio/light/max44000.c | 1 - + drivers/iio/magnetometer/st_magn_buffer.c | 2 +- + drivers/iio/magnetometer/st_magn_core.c | 1 + + drivers/iio/pressure/bmp280.c | 4 +- + drivers/iio/pressure/st_pressure_buffer.c | 2 +- + drivers/iio/pressure/st_pressure_core.c | 81 ++++--- + drivers/iio/proximity/as3935.c | 17 +- + drivers/iommu/arm-smmu-v3.c | 1 + + drivers/iommu/intel-iommu.c | 17 +- + drivers/iommu/rockchip-iommu.c | 2 +- + drivers/leds/led-core.c | 9 +- + drivers/leds/trigger/ledtrig-heartbeat.c | 31 +++ + drivers/mcb/mcb-core.c | 17 +- + drivers/memory/omap-gpmc.c | 2 +- + drivers/misc/mei/client.c | 2 +- + drivers/perf/arm_pmu.c | 2 +- + drivers/phy/phy-exynos-mipi-video.c | 6 +- + drivers/phy/phy-ti-pipe3.c | 15 +- + drivers/phy/phy-twl4030-usb.c | 14 +- + drivers/pwm/core.c | 3 +- + drivers/pwm/pwm-atmel-hlcdc.c | 2 +- + drivers/pwm/sysfs.c | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 7 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 3 +- + drivers/usb/core/quirks.c | 23 +- + drivers/usb/dwc2/core.h | 27 +++ + drivers/usb/dwc2/gadget.c | 24 +- + drivers/usb/dwc3/core.h | 1 + + drivers/usb/dwc3/dwc3-exynos.c | 19 +- + drivers/usb/dwc3/dwc3-st.c | 10 +- + drivers/usb/dwc3/gadget.c | 30 ++- + drivers/usb/gadget/composite.c | 21 +- + drivers/usb/gadget/configfs.c | 1 + + drivers/usb/gadget/function/f_fs.c | 30 +-- + drivers/usb/gadget/function/f_printer.c | 8 - + drivers/usb/gadget/function/f_tcm.c | 20 +- + drivers/usb/gadget/function/f_uac2.c | 13 +- + drivers/usb/gadget/function/storage_common.c | 4 +- + drivers/usb/gadget/legacy/inode.c | 17 +- + drivers/usb/gadget/udc/udc-core.c | 12 +- + drivers/usb/host/ehci-hcd.c | 9 + + drivers/usb/host/ehci-hub.c | 14 +- + drivers/usb/host/ehci-msm.c | 14 +- + drivers/usb/host/ehci-tegra.c | 16 +- + drivers/usb/host/ohci-q.c | 3 +- + drivers/usb/host/xhci-pci.c | 5 + + drivers/usb/host/xhci-plat.c | 3 + + drivers/usb/host/xhci-ring.c | 30 ++- + drivers/usb/host/xhci.c | 29 +-- + drivers/usb/musb/musb_core.c | 85 +++---- + drivers/usb/musb/musb_core.h | 3 +- + drivers/usb/musb/musb_gadget.c | 34 ++- + drivers/usb/musb/musb_host.c | 68 +++--- + drivers/usb/musb/omap2430.c | 257 +++++++-------------- + drivers/usb/musb/sunxi.c | 54 +++-- + drivers/usb/phy/phy-twl6030-usb.c | 29 ++- + drivers/usb/serial/mos7720.c | 1 + + drivers/usb/storage/uas.c | 2 +- + drivers/usb/usbip/vhci_hcd.c | 2 +- + drivers/watchdog/Kconfig | 2 +- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/ctree.c | 7 +- + fs/btrfs/disk-io.c | 36 ++- + fs/btrfs/extent-tree.c | 12 +- + fs/btrfs/extent_io.c | 15 +- + fs/btrfs/inode.c | 11 +- + fs/btrfs/super.c | 4 +- + fs/btrfs/transaction.c | 7 +- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-log.c | 4 +- + fs/btrfs/volumes.c | 4 +- + fs/debugfs/file.c | 7 +- + fs/nfsd/blocklayout.c | 2 +- + fs/nfsd/nfs4callback.c | 18 +- + fs/nfsd/nfs4state.c | 67 +++--- + fs/nfsd/state.h | 2 +- + fs/overlayfs/dir.c | 13 +- + fs/overlayfs/inode.c | 26 +-- + fs/reiserfs/super.c | 9 +- + fs/udf/partition.c | 13 +- + fs/udf/super.c | 22 +- + fs/udf/udf_sb.h | 5 + + include/linux/dcache.h | 12 + + include/linux/iio/common/st_sensors.h | 9 +- + include/linux/isa.h | 5 +- + include/linux/leds.h | 23 +- + include/linux/pwm.h | 3 + + include/linux/sunrpc/clnt.h | 2 - + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/xprt.h | 1 + + include/linux/usb/gadget.h | 3 + + include/linux/usb/musb.h | 5 +- + kernel/kcov.c | 7 +- + net/sunrpc/clnt.c | 31 ++- + net/sunrpc/svc_xprt.c | 2 + + net/sunrpc/xprtsock.c | 1 + + net/unix/af_unix.c | 6 +- + security/keys/key.c | 2 +- + virt/kvm/kvm_main.c | 2 +- + 195 files changed, 1679 insertions(+), 1135 deletions(-) +Merging fixes/master (5edb56491d48 Linux 4.7-rc3) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) +$ git merge kbuild-current/rc-fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 ++ + 1 file changed, 2 insertions(+) +Merging arc-current/for-curr (5edb56491d48 Linux 4.7-rc3) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent) +$ 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 (8550e2fa34f0 powerpc/mm/hash: Use the correct PPP mask when updating HPTE) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/book3s/32/pgalloc.h | 1 - + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 + + arch/powerpc/include/asm/book3s/64/pgalloc.h | 16 ++++- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 3 + + arch/powerpc/include/asm/book3s/64/tlbflush.h | 14 ++++ + arch/powerpc/include/asm/book3s/pgalloc.h | 5 -- + arch/powerpc/mm/hash_native_64.c | 8 +-- + arch/powerpc/mm/tlb-radix.c | 84 ++++++++++++++++------ + 8 files changed, 100 insertions(+), 32 deletions(-) +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge sparc/master +Already up-to-date. +Merging net/master (ab522fd68bc7 Merge branch 'qed-fixes') +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/amd/au1000_eth.c | 4 +- + drivers/net/ethernet/atheros/alx/alx.h | 4 -- + drivers/net/ethernet/atheros/alx/main.c | 61 ++++------------- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 61 ++++++++++++----- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 + + drivers/net/ethernet/mellanox/mlx4/cmd.c | 1 - + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 11 ++- + drivers/net/ethernet/mellanox/mlx4/main.c | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 5 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 6 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_l2.c | 8 +-- + drivers/net/ethernet/qlogic/qed/qed_main.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_spq.c | 21 +++++- + drivers/net/ethernet/qlogic/qede/qede_main.c | 7 +- + drivers/net/ethernet/sfc/farch.c | 3 +- + drivers/net/ethernet/ti/cpsw.c | 4 -- + drivers/net/ethernet/tile/tilegx.c | 6 +- + drivers/net/fddi/skfp/Makefile | 2 +- + drivers/net/geneve.c | 14 +++- + drivers/net/macsec.c | 49 ++++++++++--- + drivers/net/phy/marvell.c | 38 ++++++---- + drivers/net/phy/smsc.c | 17 ++--- + drivers/net/usb/r8152.c | 37 +++++++--- + drivers/net/vxlan.c | 58 +++++++++------- + include/linux/bpf.h | 28 +++++++- + include/linux/inet_diag.h | 6 ++ + include/linux/net.h | 3 +- + include/linux/qed/qed_eth_if.h | 1 + + include/net/gre.h | 2 +- + include/net/netfilter/nf_tables.h | 1 + + include/uapi/linux/netfilter/Kbuild | 1 + + include/uapi/linux/netfilter/xt_SYNPROXY.h | 2 + + kernel/bpf/verifier.c | 41 ++--------- + kernel/trace/bpf_trace.c | 10 ++- + net/ax25/af_ax25.c | 3 +- + net/ax25/ax25_ds_timer.c | 5 +- + net/ax25/ax25_std_timer.c | 5 +- + net/ax25/ax25_subr.c | 3 +- + net/bridge/br_input.c | 15 +++- + net/core/filter.c | 16 ++++- + net/ipv4/gre_demux.c | 10 +-- + net/ipv4/ip_gre.c | 26 ++++--- + net/ipv4/ipconfig.c | 4 +- + net/ipv4/udp.c | 80 ++++++---------------- + net/ipv6/icmp.c | 2 +- + net/ipv6/ip6_checksum.c | 7 +- + net/ipv6/ip6_gre.c | 2 +- + net/ipv6/sit.c | 4 +- + net/ipv6/tcp_ipv6.c | 4 +- + net/ipv6/udp.c | 71 +++++-------------- + net/netfilter/nf_conntrack_core.c | 2 + + net/netfilter/nf_tables_api.c | 24 +++---- + net/netfilter/nf_tables_core.c | 2 +- + net/netfilter/nft_hash.c | 3 +- + net/netfilter/nft_rbtree.c | 3 +- + net/rds/ib_cm.c | 2 +- + net/rds/loop.c | 5 +- + net/rds/sysctl.c | 3 +- + net/rds/tcp.h | 2 +- + net/rds/tcp_connect.c | 26 +++---- + net/rds/tcp_listen.c | 2 +- + net/rds/tcp_recv.c | 2 +- + net/rds/tcp_send.c | 14 ++-- + net/rds/transport.c | 3 +- + net/sched/act_api.c | 2 +- + net/sched/act_ipt.c | 7 +- + net/sched/sch_fifo.c | 4 ++ + net/sched/sch_htb.c | 2 + + net/sched/sch_prio.c | 67 +++++++----------- + net/sctp/sctp_diag.c | 6 -- + net/tipc/bearer.c | 2 +- + net/tipc/link.c | 3 +- + net/tipc/socket.c | 54 +++++++++++---- + 75 files changed, 547 insertions(+), 474 deletions(-) +Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) +$ git merge ipsec/master +Already up-to-date. +Merging ipvs/master (50219538ffc0 vmxnet3: segCnt can be 1 for LRO packets) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/core.c | 2 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 1 - + drivers/net/wireless/ath/ath10k/mac.c | 2 +- + drivers/net/wireless/ath/ath9k/reg.h | 8 ++++---- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 8 ++++---- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 +++- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 16 +++++++++++++++- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 2 +- + 9 files changed, 30 insertions(+), 15 deletions(-) +Merging mac80211/master (3d5fdff46c4b wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (8198868f0a28 ALSA: hdac_regmap - fix the register access for runtime PM) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/hda/hdac_regmap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (af8c34ce6ae3 Linux 4.7-rc2) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (5edb56491d48 Linux 4.7-rc3) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (af8c34ce6ae3 Linux 4.7-rc2) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. + drivers/usb/common/usb-otg-fsm.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging staging.current/staging-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (30172936eefb MAINTAINERS: add Pali Rohár as reviewer of ALPS PS/2 touchpad driver) +$ git merge input-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++++ + drivers/input/joystick/xpad.c | 16 ++++++++-------- + include/uapi/linux/input-event-codes.h | 31 +++++++++++++++++++++++++++++++ + include/uapi/linux/input.h | 1 + + 4 files changed, 44 insertions(+), 8 deletions(-) +Merging crypto-current/master (19ced623db2f crypto: ux500 - memmove the right size) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/ux500/hash/hash_core.c | 4 ++-- + drivers/crypto/vmx/aes_cbc.c | 2 +- + drivers/crypto/vmx/aes_ctr.c | 2 +- + drivers/crypto/vmx/ppc-xlate.pl | 2 +- + 4 files changed, 5 insertions(+), 5 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 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 (ce7585f3c4d7 vfio/pci: Allow VPD short read) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/exec/Makefile | 3 +- + tools/testing/selftests/timers/Makefile | 3 +- + tools/testing/selftests/timers/set-tz.c | 119 ++++++++++++++++++++++++++++++++ + 3 files changed, 123 insertions(+), 2 deletions(-) + create mode 100644 tools/testing/selftests/timers/set-tz.c +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 (59461c018204 mfd: max77620: Fix FPS switch statements) +$ git merge mfd-fixes/for-mfd-fixes +Merge made by the 'recursive' strategy. + drivers/mfd/max77620.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging drm-intel-fixes/for-linux-next-fixes (476490a945e1 drm/i915/ilk: Don't disable SSC source if it's in use) +$ 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 +Already up-to-date. +Merging arc/for-next (5edb56491d48 Linux 4.7-rc3) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (f07617e99523 Merge branches 'component', 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/Makefile | 1 + + arch/arm/boot/Makefile | 6 +- + arch/arm/include/asm/assembler.h | 4 +- + arch/arm/include/asm/delay.h | 6 +- + arch/arm/include/asm/ptrace.h | 10 +++ + arch/arm/include/asm/uaccess.h | 114 ++++++++++++---------------- + arch/arm/kernel/asm-offsets.c | 4 +- + arch/arm/kernel/devtree.c | 3 + + arch/arm/kernel/entry-armv.S | 12 +-- + arch/arm/kernel/entry-common.S | 2 +- + arch/arm/kernel/entry-header.S | 8 +- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/process.c | 2 +- + arch/arm/lib/Makefile | 5 +- + arch/arm/lib/delay-loop.S | 15 ++-- + drivers/gpu/drm/arm/hdlcd_drv.c | 10 ++- + drivers/gpu/drm/armada/armada_drv.c | 9 ++- + drivers/gpu/drm/drm_of.c | 13 +++- + drivers/gpu/drm/msm/msm_drv.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 +++- + drivers/gpu/drm/sti/sti_drv.c | 9 ++- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 9 ++- + drivers/iommu/mtk_iommu.c | 13 +++- + 23 files changed, 159 insertions(+), 119 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 (1a8883e0ddcd Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging drivers/soc/samsung/pm_domains.c +Removing arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/olimex.txt | 8 +- + .../bindings/arm/samsung/samsung-boards.txt | 1 + + .../bindings/memory-controllers/atmel,ebi.txt | 136 + + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../bindings/reset/amlogic,meson-reset.txt | 18 + + Documentation/driver-model/devres.txt | 4 + + arch/arm/Kconfig | 34 +- + arch/arm/Kconfig.debug | 61 +- + arch/arm/arm-soc-for-next-contents.txt | 92 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/aks-cdu.dts | 2 +- + arch/arm/boot/dts/animeo_ip.dts | 11 +- + arch/arm/boot/dts/at91-ariag25.dts | 9 - + arch/arm/boot/dts/at91-cosino.dtsi | 9 - + arch/arm/boot/dts/at91-foxg20.dts | 11 +- + arch/arm/boot/dts/at91-kizbox.dts | 2 +- + arch/arm/boot/dts/at91-qil_a9260.dts | 11 +- + arch/arm/boot/dts/at91-sam9_l9260.dts | 115 + + arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 7 +- + arch/arm/boot/dts/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 +- + arch/arm/boot/dts/emev2-kzm9d.dts | 16 +- + arch/arm/boot/dts/emev2.dtsi | 26 +- + arch/arm/boot/dts/ethernut5.dts | 2 +- + arch/arm/boot/dts/evk-pro3.dts | 2 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 28 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 18 + + arch/arm/boot/dts/exynos4412-odroidx.dts | 11 + + arch/arm/boot/dts/exynos4412-odroidx2.dts | 11 + + arch/arm/boot/dts/exynos4412-origen.dts | 16 + + arch/arm/boot/dts/exynos4412-trats2.dts | 4 +- + arch/arm/boot/dts/exynos5.dtsi | 215 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 2 +- + arch/arm/boot/dts/exynos5250.dtsi | 1701 ++++++------ + arch/arm/boot/dts/exynos5410-odroidxu.dts | 580 ++++ + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 210 ++ + arch/arm/boot/dts/exynos5410-smdk5410.dts | 6 +- + arch/arm/boot/dts/exynos5410.dtsi | 333 ++- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 26 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 12 +- + arch/arm/boot/dts/exynos5420.dtsi | 2770 +++++++++----------- + arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 103 - + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 98 +- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 35 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 35 +- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 50 + + arch/arm/boot/dts/exynos54xx.dtsi | 199 ++ + arch/arm/boot/dts/exynos5800-peach-pi.dts | 26 +- + arch/arm/boot/dts/ge863-pro3.dtsi | 9 - + arch/arm/boot/dts/mpa1600.dts | 9 - + arch/arm/boot/dts/pm9g45.dts | 9 - + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 8 +- + arch/arm/boot/dts/r8a73a4.dtsi | 34 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 12 +- + arch/arm/boot/dts/r8a7740.dtsi | 2 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 5 +- + arch/arm/boot/dts/r8a7778.dtsi | 28 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 4 +- + arch/arm/boot/dts/r8a7790-lager.dts | 20 +- + arch/arm/boot/dts/r8a7790.dtsi | 232 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 12 +- + arch/arm/boot/dts/r8a7791-porter.dts | 8 +- + arch/arm/boot/dts/r8a7791.dtsi | 224 +- + arch/arm/boot/dts/r8a7793-gose.dts | 12 +- + arch/arm/boot/dts/r8a7793.dtsi | 198 +- + arch/arm/boot/dts/r8a7794-silk.dts | 6 +- + arch/arm/boot/dts/r8a7794.dtsi | 132 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 11 +- + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 24 +- + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 7 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 1 + + arch/arm/boot/dts/ste-href.dtsi | 1 - + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 120 + + arch/arm/boot/dts/ste-snowball.dts | 84 +- + arch/arm/boot/dts/tny_a9260_common.dtsi | 9 - + arch/arm/boot/dts/tny_a9263.dts | 9 - + arch/arm/boot/dts/uniphier-common32.dtsi | 12 +- + arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 2 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 5 + + arch/arm/boot/dts/uniphier-proxstream2-gentil.dts | 8 +- + arch/arm/boot/dts/uniphier-proxstream2-vodka.dts | 8 +- + arch/arm/boot/dts/uniphier-proxstream2.dtsi | 2 +- + arch/arm/boot/dts/usb_a9260_common.dtsi | 11 +- + arch/arm/boot/dts/usb_a9263.dts | 9 - + arch/arm/boot/dts/usb_a9g20_common.dtsi | 3 +- + arch/arm/configs/exynos_defconfig | 27 +- + arch/arm/configs/multi_v5_defconfig | 54 +- + arch/arm/configs/multi_v7_defconfig | 30 +- + arch/arm/include/debug/at91.S | 10 +- + arch/arm/mach-at91/Kconfig | 2 +- + arch/arm/mach-bcm/Kconfig | 7 +- + arch/arm/mach-berlin/Kconfig | 2 +- + arch/arm/mach-digicolor/Kconfig | 2 +- + arch/arm/mach-exynos/Kconfig | 3 +- + arch/arm/mach-exynos/Makefile | 1 - + arch/arm/mach-imx/Kconfig | 2 +- + arch/arm/mach-integrator/Kconfig | 4 +- + arch/arm/mach-meson/Kconfig | 2 +- + arch/arm/mach-mmp/Kconfig | 2 +- + arch/arm/mach-moxart/Kconfig | 2 +- + arch/arm/mach-mv78xx0/Kconfig | 2 +- + arch/arm/mach-mvebu/Kconfig | 4 +- + arch/arm/mach-mxs/Kconfig | 2 +- + arch/arm/mach-nomadik/Kconfig | 2 +- + arch/arm/mach-omap2/Kconfig | 2 +- + arch/arm/mach-orion5x/Kconfig | 2 +- + arch/arm/mach-oxnas/Kconfig | 2 +- + arch/arm/mach-picoxcell/Kconfig | 2 +- + arch/arm/mach-prima2/Kconfig | 2 +- + arch/arm/mach-rockchip/Kconfig | 2 +- + arch/arm/mach-s3c24xx/Kconfig | 2 +- + arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 2 +- + arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/mach-n30.c | 2 +- + arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- + arch/arm/mach-s3c24xx/pll-s3c2410.c | 3 +- + arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 1 + + arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 1 + + arch/arm/mach-s3c64xx/Kconfig | 2 +- + arch/arm/mach-s3c64xx/include/mach/map.h | 2 +- + arch/arm/mach-s5pv210/Kconfig | 2 +- + arch/arm/mach-shmobile/Kconfig | 2 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 13 +- + arch/arm/mach-shmobile/pm-rmobile.c | 2 +- + arch/arm/mach-spear/Kconfig | 2 +- + arch/arm/mach-sti/Kconfig | 2 +- + arch/arm/mach-sunxi/Kconfig | 2 +- + arch/arm/mach-tegra/Kconfig | 2 +- + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm/mach-uniphier/platsmp.c | 18 +- + arch/arm/mach-ux500/Kconfig | 2 +- + arch/arm/mach-vexpress/Kconfig | 2 +- + arch/arm/mach-vt8500/Kconfig | 2 +- + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 2 +- + arch/arm/plat-samsung/include/plat/fb-s3c2410.h | 2 +- + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 +- + arch/arm/plat-samsung/pm-check.c | 2 +- + arch/arm/plat-samsung/watchdog-reset.c | 2 +- + arch/arm64/Kconfig.platforms | 3 + + arch/arm64/boot/dts/lg/Makefile | 1 + + arch/arm64/boot/dts/lg/lg1313-ref.dts | 36 + + arch/arm64/boot/dts/lg/lg1313.dtsi | 351 +++ + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 14 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 98 +- + .../boot/dts/socionext/uniphier-ph1-ld20.dtsi | 20 +- + arch/arm64/configs/defconfig | 3 +- + drivers/memory/Kconfig | 11 + + drivers/memory/Makefile | 1 + + drivers/memory/atmel-ebi.c | 771 ++++++ + drivers/reset/Kconfig | 4 + + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 37 + + drivers/reset/reset-ath79.c | 3 +- + drivers/reset/reset-meson.c | 136 + + drivers/reset/reset-oxnas.c | 12 +- + drivers/reset/reset-pistachio.c | 12 +- + drivers/reset/reset-socfpga.c | 12 +- + drivers/reset/reset-sunxi.c | 12 +- + drivers/reset/reset-zynq.c | 12 +- + drivers/reset/sti/Kconfig | 1 - + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a7796-sysc.c | 48 + + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + drivers/soc/samsung/Kconfig | 4 + + drivers/soc/samsung/Makefile | 1 + + .../soc/samsung}/pm_domains.c | 34 +- + include/dt-bindings/clock/exynos5410.h | 76 +- + include/dt-bindings/clock/r8a7794-clock.h | 1 - + include/dt-bindings/power/r8a7796-sysc.h | 36 + + .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 210 ++ + include/dt-bindings/reset/amlogic,meson8b-reset.h | 175 ++ + include/linux/reset-controller.h | 4 + + include/linux/reset.h | 4 +- + 180 files changed, 7182 insertions(+), 3596 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/atmel,ebi.txt + create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/at91-sam9_l9260.dts + create mode 100644 arch/arm/boot/dts/exynos5410-odroidxu.dts + delete mode 100644 arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi + create mode 100644 arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi + create mode 100644 arch/arm/boot/dts/exynos54xx.dtsi + create mode 100644 arch/arm64/boot/dts/lg/lg1313-ref.dts + create mode 100644 arch/arm64/boot/dts/lg/lg1313.dtsi + create mode 100644 drivers/memory/atmel-ebi.c + create mode 100644 drivers/reset/reset-meson.c + create mode 100644 drivers/soc/renesas/r8a7796-sysc.c + rename {arch/arm/mach-exynos => drivers/soc/samsung}/pm_domains.c (85%) + create mode 100644 include/dt-bindings/power/r8a7796-sysc.h + create mode 100644 include/dt-bindings/reset/amlogic,meson-gxbb-reset.h + create mode 100644 include/dt-bindings/reset/amlogic,meson8b-reset.h +Merging amlogic/for-next (32535cf02be1 Merge branch 'v4.7/deps/external' into tmp/aml-reset) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../devicetree/bindings/rng/amlogic,meson-rng.txt | 14 ++ + arch/arm/boot/dts/meson8b.dtsi | 7 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 20 +++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 9 ++ + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 164 ++++++++++++++++++++- + 7 files changed, 218 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt +Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next) +$ git merge bcm2835/for-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 + + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 + + arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 19 ++++++ + arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 19 ++++++ + arch/arm/boot/dts/bcm283x.dtsi | 2 + + arch/arm64/Kconfig.platforms | 13 ++++ + arch/arm64/boot/dts/broadcom/Makefile | 1 + + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 30 +++++++++ + arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 76 ++++++++++++++++++++++ + arch/arm64/include/asm/dma-mapping.h | 17 ++++- + drivers/gpu/drm/vc4/vc4_dpi.c | 14 +--- + drivers/irqchip/irq-bcm2835.c | 3 +- + drivers/irqchip/irq-bcm2836.c | 2 +- + 16 files changed, 188 insertions(+), 16 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837.dtsi +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 (24c3004a3258 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Removing arch/arm/mach-imx/eukrea-baseboards.h +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/fsl-fec.txt | 3 + + .../devicetree/bindings/pci/layerscape-pci.txt | 4 + + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/imx1-ads.dts | 4 +- + arch/arm/boot/dts/imx1-apf9328.dts | 4 +- + arch/arm/boot/dts/imx23-sansa.dts | 207 +++++++ + arch/arm/boot/dts/imx23-xfi3.dts | 179 ++++++ + arch/arm/boot/dts/imx23.dtsi | 48 ++ + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 4 +- + arch/arm/boot/dts/imx25-pdk.dts | 2 +- + arch/arm/boot/dts/imx25-pinfunc.h | 627 +++++++++++---------- + arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 2 +- + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 6 +- + arch/arm/boot/dts/imx27-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 6 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 4 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 4 + + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-tx28.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 5 + + arch/arm/boot/dts/imx31-bug.dts | 2 +- + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 4 +- + arch/arm/boot/dts/imx35-pdk.dts | 2 +- + arch/arm/boot/dts/imx51-babbage.dts | 4 +- + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 4 +- + arch/arm/boot/dts/imx51-ts4800.dts | 27 + + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 6 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 1 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 4 +- + arch/arm/boot/dts/imx6q-arm2.dts | 3 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 281 +++++++-- + arch/arm/boot/dts/imx6q-h100.dts | 395 +++++++++++++ + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6q-utilite-pro.dts | 197 +++++++ + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl.dtsi | 4 +- + arch/arm/boot/dts/imx6sl-warp.dts | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 13 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 14 +- + arch/arm/boot/dts/imx6sx.dtsi | 12 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 63 ++- + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 6 +- + arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 4 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 6 +- + arch/arm/boot/dts/imx6ul.dtsi | 9 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- + arch/arm/boot/dts/imx7d-pinfunc.h | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 11 + + arch/arm/boot/dts/imx7d.dtsi | 2 +- + arch/arm/boot/dts/ls1021a.dtsi | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/cpuidle-imx6q.c | 16 + + arch/arm/mach-imx/devices/devices.c | 3 + + arch/arm/mach-imx/devices/platform-gpio-mxc.c | 1 + + arch/arm/mach-imx/eukrea-baseboards.h | 42 -- + arch/arm/mach-imx/mach-imx50.c | 1 - + arch/arm/mach-imx/mach-imx51.c | 1 - + arch/arm/mach-imx/mach-imx53.c | 1 - + arch/arm/mach-imx/mach-imx6q.c | 2 +- + arch/arm/mach-imx/tzic.c | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 16 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 20 +- + drivers/clk/imx/clk-imx6q.c | 14 +- + drivers/clk/imx/clk-imx6sl.c | 14 +- + drivers/clk/imx/clk-imx6sx.c | 14 +- + drivers/clk/imx/clk-imx6ul.c | 18 +- + drivers/clk/imx/clk-imx7d.c | 14 +- + drivers/clk/imx/clk-pllv3.c | 28 +- + drivers/net/ethernet/freescale/fec.h | 2 + + drivers/net/ethernet/freescale/fec_main.c | 12 + + include/soc/imx/cpuidle.h | 25 + + 90 files changed, 1960 insertions(+), 562 deletions(-) + create mode 100644 arch/arm/boot/dts/imx23-sansa.dts + create mode 100644 arch/arm/boot/dts/imx23-xfi3.dts + create mode 100644 arch/arm/boot/dts/imx6q-h100.dts + create mode 100644 arch/arm/boot/dts/imx6q-utilite-pro.dts + delete mode 100644 arch/arm/mach-imx/eukrea-baseboards.h + create mode 100644 include/soc/imx/cpuidle.h +Merging keystone/next (a9015e7c9dd2 Merge branch 'for_4.8/keystone_config' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-k2e.dtsi | 7 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 11 +++ + arch/arm/boot/dts/keystone-k2g.dtsi | 8 ++ + arch/arm/boot/dts/keystone-k2l.dtsi | 149 +++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/keystone.dtsi | 7 +- + arch/arm/configs/keystone_defconfig | 1 + + arch/arm/mach-keystone/Kconfig | 2 +- + include/dt-bindings/pinctrl/keystone.h | 39 +++++++++ + 8 files changed, 219 insertions(+), 5 deletions(-) + create mode 100644 include/dt-bindings/pinctrl/keystone.h +Merging mvebu/for-next (56454a34f5d6 Merge branch 'mvebu/defconfig64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-385-linksys.dtsi | 4 ++-- + arch/arm/mach-mvebu/coherency.c | 23 +++++++++-------------- + arch/arm/mach-mvebu/coherency.h | 1 + + arch/arm/mach-mvebu/cpu-reset.c | 2 ++ + arch/arm/mach-mvebu/kirkwood-pm.c | 4 ++-- + arch/arm/mach-mvebu/kirkwood.c | 2 +- + arch/arm/mach-mvebu/pm.c | 1 + + arch/arm/mach-mvebu/pmsu.c | 3 ++- + arch/arm/mach-mvebu/system-controller.c | 2 +- + arch/arm/mach-orion5x/irq.c | 2 +- + arch/arm64/configs/defconfig | 1 + + 11 files changed, 23 insertions(+), 22 deletions(-) +Merging omap/for-next (be5f1e3cfa86 Merge branch 'omap-for-v4.7/fixes' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/ti-edma.txt | 4 +- + .../devicetree/bindings/pwm/pwm-tiecap.txt | 38 ++++- + .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 38 ++++- + .../devicetree/bindings/pwm/pwm-tipwmss.txt | 33 +++- + arch/arm/boot/dts/am335x-bone-common.dtsi | 8 +- + arch/arm/boot/dts/am335x-boneblack.dts | 11 ++ + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-icev2.dts | 7 + + arch/arm/boot/dts/am33xx.dtsi | 126 +++++++++++--- + arch/arm/boot/dts/am4372.dtsi | 104 +++++++++--- + arch/arm/boot/dts/am437x-gp-evm.dts | 4 + + arch/arm/boot/dts/am437x-idk-evm.dts | 1 + + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 +- + arch/arm/boot/dts/dm814x.dtsi | 2 +- + arch/arm/boot/dts/dra7.dtsi | 189 ++++++++++++++++++++- + arch/arm/boot/dts/dra72-evm-common.dtsi | 12 +- + arch/arm/boot/dts/dra72x.dtsi | 16 -- + arch/arm/boot/dts/dra74x.dtsi | 25 +-- + arch/arm/boot/dts/omap3-gta04.dtsi | 66 ++++++- + arch/arm/boot/dts/omap3-n900.dts | 12 ++ + arch/arm/boot/dts/omap3.dtsi | 10 ++ + arch/arm/boot/dts/omap4-duovero.dtsi | 5 + + arch/arm/boot/dts/omap4-panda-common.dtsi | 5 + + arch/arm/boot/dts/omap4-sdp.dts | 5 + + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 5 + + arch/arm/boot/dts/omap5-board-common.dtsi | 5 + + arch/arm/mach-omap1/ams-delta-fiq.c | 2 +- + arch/arm/mach-omap1/include/mach/mtd-xip.h | 2 +- + arch/arm/mach-omap2/board-ldp.c | 3 +- + arch/arm/mach-omap2/board-rx51-video.c | 4 +- + arch/arm/mach-omap2/cm3xxx.c | 2 +- + arch/arm/mach-omap2/display.c | 2 +- + arch/arm/mach-omap2/display.h | 5 + + arch/arm/mach-omap2/dss-common.c | 2 +- + arch/arm/mach-omap2/mcbsp.c | 31 ++-- + arch/arm/mach-omap2/mux34xx.c | 4 +- + arch/arm/mach-omap2/omap4-common.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 2 +- + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 18 -- + .../omap_hwmod_33xx_43xx_interconnect_data.c | 64 ------- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 84 --------- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 9 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 24 +-- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 54 ------ + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 41 ----- + arch/arm/mach-omap2/pdata-quirks.c | 18 ++ + arch/arm/mach-omap2/sdrc.h | 4 +- + drivers/clk/ti/clk-33xx.c | 3 + + drivers/clk/ti/clk-43xx.c | 6 + + include/linux/platform_data/asoc-ti-mcbsp.h | 4 +- + include/linux/platform_data/omapdss.h | 42 +++++ + include/video/omapdss.h | 31 +--- + sound/soc/omap/mcbsp.c | 21 ++- + sound/soc/omap/mcbsp.h | 3 +- + sound/soc/omap/omap-mcbsp.c | 5 +- + 56 files changed, 745 insertions(+), 486 deletions(-) + create mode 100644 include/linux/platform_data/omapdss.h +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 (275804c07f41 firmware: qcom: scm: Peripheral Authentication Service) +$ git merge qcom/for-next +Auto-merging arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 28 ++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 138 +++++++++ + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 4 +- + .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 4 +- + .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 116 ++++++++ + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 2 +- + ...tsi => qcom-apq8064-arrow-sd-600eval-pins.dtsi} | 0 + ...b600c.dts => qcom-apq8064-arrow-sd-600eval.dts} | 10 +- + arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 40 +++ + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 44 +-- + arch/arm/boot/dts/qcom-apq8064.dtsi | 10 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 247 ++++++++++++++++ + arch/arm/boot/dts/qcom-apq8084.dtsi | 8 + + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 4 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 28 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 20 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 16 ++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 78 ++++- + drivers/firmware/qcom_scm-32.c | 314 ++++++++++++--------- + drivers/firmware/qcom_scm-64.c | 291 ++++++++++++++++++- + drivers/firmware/qcom_scm.c | 314 ++++++++++++++++++++- + drivers/firmware/qcom_scm.h | 45 ++- + drivers/soc/qcom/smem_state.c | 12 +- + drivers/soc/qcom/smp2p.c | 7 +- + drivers/soc/qcom/smsm.c | 2 +- + drivers/soc/qcom/wcnss_ctrl.c | 125 ++++++-- + include/linux/qcom_scm.h | 8 + + include/linux/soc/qcom/wcnss_ctrl.h | 8 + + 29 files changed, 1676 insertions(+), 248 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt + rename arch/arm/boot/dts/{qcom-apq8064-arrow-db600c-pins.dtsi => qcom-apq8064-arrow-sd-600eval-pins.dtsi} (100%) + rename arch/arm/boot/dts/{qcom-apq8064-arrow-db600c.dts => qcom-apq8064-arrow-sd-600eval.dts} (96%) + create mode 100644 include/linux/soc/qcom/wcnss_ctrl.h +Merging renesas/next (adc9b8a6ecde Merge branches 'heads/dt-for-v4.8', 'heads/rcar-sysc-for-v4.8' and 'heads/soc-for-v4.8' into next) +$ git merge renesas/next +Auto-merging arch/arm/mach-shmobile/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 2 + + MAINTAINERS | 1 - + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 4 +- + arch/arm/boot/dts/r8a7790-lager.dts | 10 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 8 +- + arch/arm/boot/dts/r8a7791-porter.dts | 4 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 66 ++++ + arch/arm/boot/dts/r8a7792.dtsi | 337 +++++++++++++++++++++ + arch/arm/boot/dts/r8a7793-gose.dts | 6 +- + arch/arm/boot/dts/r8a7794-alt.dts | 4 +- + arch/arm/boot/dts/r8a7794-silk.dts | 4 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/mach-shmobile/Kconfig | 4 + + arch/arm/mach-shmobile/Makefile | 1 + + arch/arm/mach-shmobile/setup-r8a7792.c | 35 +++ + arch/arm/mach-shmobile/setup-rcar-gen2.c | 42 +-- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 + + drivers/Makefile | 1 - + drivers/sh/pm_runtime.c | 9 - + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a7792-sysc.c | 34 +++ + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + include/dt-bindings/clock/r8a7792-clock.h | 102 +++++++ + include/dt-bindings/power/r8a7792-sysc.h | 26 ++ + 29 files changed, 662 insertions(+), 56 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7792-blanche.dts + create mode 100644 arch/arm/boot/dts/r8a7792.dtsi + create mode 100644 arch/arm/mach-shmobile/setup-r8a7792.c + create mode 100644 drivers/soc/renesas/r8a7792-sysc.c + create mode 100644 include/dt-bindings/clock/r8a7792-clock.h + create mode 100644 include/dt-bindings/power/r8a7792-sysc.h +Merging rockchip/for-next (5e46e8d66d01 Merge branch 'v4.7-clk/fixes' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3288-firefly.dtsi | 31 ++++--- + arch/arm/boot/dts/rk3288-miqi.dts | 26 +++--- + arch/arm/boot/dts/rk3288-popmetal.dts | 31 ++++--- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 31 ++++--- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 101 ++++++++++++++++++++++ + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 1 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 31 ++++--- + arch/arm/boot/dts/rk3288.dtsi | 5 ++ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 16 ++++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 16 +++- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 12 +++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 54 +++++++++++- + drivers/clk/rockchip/clk-cpu.c | 4 +- + drivers/clk/rockchip/clk-mmc-phase.c | 12 +-- + drivers/clk/rockchip/clk-rk3399.c | 17 +++- + 15 files changed, 294 insertions(+), 94 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi +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 (a0c8f253cf3e Merge branch 'for-v4.8/exynos-mfc' into for-next) +$ git merge samsung-krzk/for-next +Resolved 'arch/arm/boot/dts/exynos5420.dtsi' using previous resolution. +Auto-merging include/linux/of_reserved_mem.h +Auto-merging drivers/of/of_reserved_mem.c +Removing arch/arm/mach-exynos/s5p-dev-mfc.c +Removing arch/arm/mach-exynos/mfc.h +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6c1a29525c4b] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/media/s5p-mfc.txt | 39 +++- + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 35 ++++ + arch/arm/boot/dts/exynos3250-rinato.dts | 4 - + arch/arm/boot/dts/exynos3250.dtsi | 1 - + arch/arm/boot/dts/exynos4.dtsi | 1 - + arch/arm/boot/dts/exynos4210-origen.dts | 7 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 7 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 + + arch/arm/boot/dts/exynos4412-origen.dts | 7 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 7 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 6 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 +- + arch/arm/boot/dts/exynos5250-spring.dts | 6 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 6 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 6 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 6 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 6 +- + arch/arm/mach-exynos/Makefile | 2 - + arch/arm/mach-exynos/exynos.c | 19 -- + arch/arm/mach-exynos/mfc.h | 16 -- + arch/arm/mach-exynos/s5p-dev-mfc.c | 93 ---------- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 13 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 2 + + drivers/media/platform/exynos4-is/fimc-core.c | 2 + + drivers/media/platform/exynos4-is/fimc-is.c | 2 + + drivers/media/platform/exynos4-is/fimc-lite.c | 2 + + drivers/media/platform/s5p-g2d/g2d.c | 2 + + drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 + + drivers/media/platform/s5p-mfc/s5p_mfc.c | 198 ++++++++++++--------- + drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 79 ++++++++ + drivers/media/platform/s5p-tv/mixer_video.c | 2 + + drivers/media/v4l2-core/videobuf2-dma-contig.c | 53 ++++++ + drivers/of/of_reserved_mem.c | 85 ++++++--- + include/linux/of_reserved_mem.h | 25 ++- + include/media/videobuf2-dma-contig.h | 2 + + 36 files changed, 436 insertions(+), 320 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi + delete mode 100644 arch/arm/mach-exynos/mfc.h + delete mode 100644 arch/arm/mach-exynos/s5p-dev-mfc.c + create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h +Merging tegra/for-next (7c7a0b23a909 Merge branch for-4.8/arm64 into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra114-roth.dts | 4 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 6 +- + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra20-whistler.dts | 2 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 7 +- + arch/arm/boot/dts/tegra30-beaver.dts | 2 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 2 +- + arch/arm/mach-tegra/common.h | 22 ++ + arch/arm/mach-tegra/cpuidle-tegra114.c | 1 + + arch/arm/mach-tegra/cpuidle-tegra20.c | 1 + + arch/arm/mach-tegra/cpuidle-tegra30.c | 1 + + arch/arm/mach-tegra/cpuidle.h | 2 + + arch/arm/mach-tegra/hotplug.c | 1 + + arch/arm/mach-tegra/irq.c | 1 + + arch/arm/mach-tegra/pm.h | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 249 ++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 45 ++++ + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 284 +++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 190 ++++++++++++++ + arch/arm64/configs/defconfig | 16 ++ + drivers/clk/tegra/clk-id.h | 1 - + drivers/clk/tegra/clk-tegra-periph.c | 23 +- + drivers/clk/tegra/clk-tegra210.c | 101 ++++---- + drivers/soc/tegra/pmc.c | 16 +- + include/dt-bindings/clock/tegra210-car.h | 2 +- + 35 files changed, 915 insertions(+), 88 deletions(-) +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 d21e27961374] 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 (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/include/asm/io.h | 2 ++ + 1 file changed, 2 insertions(+) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (70f4f9352317 ia64: efi: use timespec64 for persistent clock) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/kernel/efi.c | 4 ++-- + arch/ia64/kernel/time.c | 2 +- + include/linux/efi.h | 2 +- + 3 files changed, 4 insertions(+), 4 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 (5edb56491d48 Linux 4.7-rc3) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (592ddeeff8cb metag: Fix typos) +$ git merge metag/for-next +Auto-merging arch/metag/include/asm/metag_regs.h +Merge made by the 'recursive' strategy. + arch/metag/include/asm/metag_mem.h | 2 +- + arch/metag/include/asm/metag_regs.h | 2 +- + arch/metag/kernel/cachepart.c | 2 +- + arch/metag/lib/divsi3.S | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + drivers/ssb/driver_gpio.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) +Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (a43073900938 cxl: Make vPHB device node match adapter's) +$ git merge powerpc/next +Auto-merging arch/powerpc/mm/hash_native_64.c +Auto-merging arch/powerpc/include/asm/book3s/64/mmu-hash.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/rtc/rtc-opal.txt | 2 +- + arch/powerpc/crypto/aes-spe-regs.h | 2 +- + arch/powerpc/include/asm/asm-prototypes.h | 75 ++++++++++ + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 2 +- + arch/powerpc/include/asm/code-patching.h | 10 +- + arch/powerpc/include/asm/eeh.h | 2 +- + arch/powerpc/include/asm/ftrace.h | 8 +- + arch/powerpc/include/asm/kprobes.h | 8 +- + arch/powerpc/include/asm/linkage.h | 6 +- + arch/powerpc/include/asm/nohash/32/pte-44x.h | 2 +- + arch/powerpc/include/asm/opal-api.h | 5 +- + arch/powerpc/include/asm/pmac_feature.h | 2 +- + arch/powerpc/include/asm/ppc_asm.h | 4 +- + arch/powerpc/include/asm/processor.h | 2 +- + arch/powerpc/include/asm/ps3av.h | 2 +- + arch/powerpc/include/asm/pte-common.h | 2 +- + arch/powerpc/include/asm/ptrace.h | 2 +- + arch/powerpc/include/asm/sections.h | 4 +- + arch/powerpc/include/asm/smu.h | 2 +- + arch/powerpc/include/asm/spinlock.h | 38 ++++- + arch/powerpc/include/asm/string.h | 4 - + arch/powerpc/include/asm/tsi108.h | 2 +- + arch/powerpc/include/asm/types.h | 8 ++ + arch/powerpc/kernel/align.c | 4 +- + arch/powerpc/kernel/asm-offsets.c | 49 ------- + arch/powerpc/kernel/cpu_setup_6xx.S | 2 +- + arch/powerpc/kernel/crash.c | 15 +- + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/entry_64.S | 2 +- + arch/powerpc/kernel/exceptions-64e.S | 2 +- + arch/powerpc/kernel/ftrace.c | 4 +- + arch/powerpc/kernel/head_64.S | 2 +- + arch/powerpc/kernel/kprobes.c | 6 +- + arch/powerpc/kernel/machine_kexec_64.c | 1 + + arch/powerpc/kernel/misc_32.S | 14 -- + arch/powerpc/kernel/misc_64.S | 2 +- + arch/powerpc/kernel/module_64.c | 4 +- + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/process.c | 18 ++- + arch/powerpc/kernel/rtas-proc.c | 2 +- + arch/powerpc/kernel/rtasd.c | 6 +- + arch/powerpc/kernel/signal_64.c | 11 +- + arch/powerpc/kernel/smp.c | 2 + + arch/powerpc/kernel/sysfs.c | 2 +- + arch/powerpc/kernel/traps.c | 1 + + arch/powerpc/kvm/book3s_interrupts.S | 2 +- + arch/powerpc/kvm/book3s_rmhandlers.S | 2 +- + arch/powerpc/lib/locks.c | 16 --- + arch/powerpc/lib/ppc_ksyms.c | 4 - + arch/powerpc/lib/rheap.c | 2 +- + arch/powerpc/lib/string.S | 44 +----- + arch/powerpc/lib/vmx-helper.c | 1 + + arch/powerpc/mm/hash_native_64.c | 4 +- + arch/powerpc/mm/mem.c | 8 +- + arch/powerpc/mm/numa.c | 36 +++-- + arch/powerpc/oprofile/cell/spu_task_sync.c | 2 +- + arch/powerpc/perf/core-book3s.c | 2 +- + arch/powerpc/perf/hv-24x7.c | 2 +- + arch/powerpc/perf/hv-24x7.h | 2 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 2 +- + arch/powerpc/platforms/cell/iommu.c | 4 +- + arch/powerpc/platforms/cell/spider-pic.c | 2 +- + arch/powerpc/platforms/cell/spu_base.c | 4 +- + arch/powerpc/platforms/cell/spufs/file.c | 2 +- + arch/powerpc/platforms/cell/spufs/run.c | 2 +- + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- + arch/powerpc/platforms/powernv/idle.c | 2 +- + arch/powerpc/platforms/powernv/opal-tracepoints.c | 1 + + arch/powerpc/platforms/powernv/pci-ioda.c | 6 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 2 +- + arch/powerpc/platforms/pseries/event_sources.c | 53 ++----- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 13 -- + arch/powerpc/platforms/pseries/io_event_irq.c | 2 +- + arch/powerpc/platforms/pseries/kexec.c | 23 +-- + arch/powerpc/platforms/pseries/lpar.c | 1 + + arch/powerpc/platforms/pseries/nvram.c | 2 - + arch/powerpc/platforms/pseries/power.c | 2 + + arch/powerpc/platforms/pseries/pseries.h | 14 +- + arch/powerpc/platforms/pseries/pseries_energy.c | 8 +- + arch/powerpc/platforms/pseries/setup.c | 79 +---------- + arch/powerpc/platforms/pseries/smp.c | 31 +--- + drivers/misc/cxl/api.c | 12 +- + drivers/misc/cxl/cxl.h | 28 ++++ + drivers/misc/cxl/debugfs.c | 35 +++-- + drivers/misc/cxl/flash.c | 4 +- + drivers/misc/cxl/guest.c | 1 + + drivers/misc/cxl/native.c | 127 +++++++++++++---- + drivers/misc/cxl/pci.c | 156 +++++++++++++++++---- + drivers/misc/cxl/vphb.c | 21 ++- + 90 files changed, 607 insertions(+), 510 deletions(-) + create mode 100644 arch/powerpc/include/asm/asm-prototypes.h +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 (63bf903583d7 Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL") +$ git merge s390/features +Auto-merging arch/s390/kvm/kvm-s390.c +Removing arch/s390/include/asm/sfp-util.h +Removing arch/s390/include/asm/sfp-machine.h +Removing arch/s390/include/asm/mathemu.h +Removing arch/s390/include/asm/etr.h +Merge made by the 'recursive' strategy. + Documentation/cputopology.txt | 40 +- + Documentation/s390/s390dbf.txt | 2 +- + arch/s390/Kconfig | 15 +- + arch/s390/configs/default_defconfig | 1 + + arch/s390/configs/gcov_defconfig | 1 + + arch/s390/configs/performance_defconfig | 1 + + arch/s390/crypto/Makefile | 3 + + arch/s390/crypto/crc32-vx.c | 310 +++++++++ + arch/s390/crypto/crc32be-vx.S | 207 ++++++ + arch/s390/crypto/crc32le-vx.S | 268 ++++++++ + arch/s390/defconfig | 4 + + arch/s390/hypfs/hypfs_diag.c | 2 +- + arch/s390/hypfs/hypfs_vm.c | 2 +- + arch/s390/include/asm/cache.h | 5 +- + arch/s390/include/asm/cio.h | 2 +- + arch/s390/include/asm/diag.h | 2 +- + arch/s390/include/asm/etr.h | 261 -------- + arch/s390/include/asm/fcx.h | 2 +- + arch/s390/include/asm/fpu/api.h | 75 +++ + arch/s390/include/asm/fpu/types.h | 10 + + arch/s390/include/asm/ipl.h | 10 +- + arch/s390/include/asm/irq.h | 7 +- + arch/s390/include/asm/jump_label.h | 1 + + arch/s390/include/asm/mathemu.h | 28 - + arch/s390/include/asm/mmu.h | 2 +- + arch/s390/include/asm/mmu_context.h | 15 +- + arch/s390/include/asm/page.h | 7 +- + arch/s390/include/asm/pgtable.h | 201 +++++- + arch/s390/include/asm/processor.h | 17 +- + arch/s390/include/asm/sections.h | 1 + + arch/s390/include/asm/sfp-machine.h | 142 ----- + arch/s390/include/asm/sfp-util.h | 67 -- + arch/s390/include/asm/stp.h | 51 ++ + arch/s390/include/asm/timex.h | 66 +- + arch/s390/include/asm/tlbflush.h | 28 +- + arch/s390/include/asm/topology.h | 4 + + arch/s390/include/asm/uaccess.h | 4 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/cache.c | 7 +- + arch/s390/kernel/dis.c | 1 - + arch/s390/kernel/early.c | 22 + + arch/s390/kernel/fpu.c | 249 ++++++++ + arch/s390/kernel/ipl.c | 32 +- + arch/s390/kernel/irq.c | 7 +- + arch/s390/kernel/machine_kexec.c | 55 +- + arch/s390/kernel/nmi.c | 13 +- + arch/s390/kernel/processor.c | 113 +++- + arch/s390/kernel/setup.c | 18 +- + arch/s390/kernel/smp.c | 8 +- + arch/s390/kernel/sysinfo.c | 38 +- + arch/s390/kernel/time.c | 1053 ++----------------------------- + arch/s390/kernel/topology.c | 89 +-- + arch/s390/kernel/vmlinux.lds.S | 21 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/lib/uaccess.c | 6 +- + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/mm/fault.c | 2 +- + arch/s390/mm/init.c | 13 +- + arch/s390/mm/pageattr.c | 267 +++++++- + arch/s390/mm/pgtable.c | 56 +- + arch/s390/mm/vmem.c | 73 +-- + arch/s390/numa/mode_emu.c | 25 +- + arch/s390/pci/pci_dma.c | 4 +- + drivers/base/topology.c | 13 + + drivers/crypto/Kconfig | 13 + + drivers/s390/block/dasd_eckd.c | 4 +- + drivers/s390/char/keyboard.c | 15 +- + drivers/s390/char/sclp_config.c | 2 +- + drivers/s390/char/zcore.c | 2 +- + drivers/s390/cio/chp.h | 2 +- + drivers/s390/cio/chsc.c | 8 +- + drivers/s390/cio/idset.h | 2 +- + include/asm-generic/vmlinux.lds.h | 10 +- + include/linux/bitmap.h | 4 + + 74 files changed, 2196 insertions(+), 1921 deletions(-) + create mode 100644 arch/s390/crypto/crc32-vx.c + create mode 100644 arch/s390/crypto/crc32be-vx.S + create mode 100644 arch/s390/crypto/crc32le-vx.S + delete mode 100644 arch/s390/include/asm/etr.h + delete mode 100644 arch/s390/include/asm/mathemu.h + delete mode 100644 arch/s390/include/asm/sfp-machine.h + delete mode 100644 arch/s390/include/asm/sfp-util.h + create mode 100644 arch/s390/include/asm/stp.h + create mode 100644 arch/s390/kernel/fpu.c +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 (ca768667d873 tile 32-bit big-endian: fix bugs in syscall argument order) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/setup.h | 5 +++++ + arch/tile/kernel/compat.c | 35 ++++++++++++++++++++++------------- + arch/tile/kernel/sys.c | 13 ++++++++++--- + 3 files changed, 37 insertions(+), 16 deletions(-) +Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support) +$ 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 +Already up-to-date. +Merging btrfs-kdave/for-next (8f4aa7bf64af Merge branch 'for-next-next-4.7-20160617' into for-next-20160617) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/async-thread.c | 31 +- + fs/btrfs/async-thread.h | 6 +- + fs/btrfs/backref.c | 362 ++++++++++++++++++++- + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 95 +++--- + fs/btrfs/delayed-inode.h | 10 +- + fs/btrfs/delayed-ref.c | 9 +- + fs/btrfs/disk-io.c | 47 +-- + fs/btrfs/extent-tree.c | 736 +++++++++++++++++++++++++++---------------- + fs/btrfs/extent_io.c | 34 +- + fs/btrfs/file.c | 56 ++-- + fs/btrfs/inode.c | 133 ++++---- + fs/btrfs/qgroup.c | 19 +- + fs/btrfs/qgroup.h | 9 +- + fs/btrfs/relocation.c | 45 +-- + fs/btrfs/scrub.c | 10 +- + fs/btrfs/super.c | 2 +- + fs/btrfs/tree-log.c | 85 ++++- + include/trace/events/btrfs.h | 404 ++++++++++++++++-------- + 19 files changed, 1495 insertions(+), 613 deletions(-) +Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (3bdc426e2497 cifs: dynamic allocation of ntlmssp blob) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 3 +++ + fs/cifs/cifsglob.h | 1 + + fs/cifs/file.c | 14 +++++++--- + fs/cifs/ntlmssp.h | 2 +- + fs/cifs/sess.c | 78 ++++++++++++++++++++++++++++++------------------------ + fs/cifs/smb2pdu.c | 10 ++----- + 6 files changed, 61 insertions(+), 47 deletions(-) +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 (e008bb6134a6 quota: use time64_t internally) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ocfs2/quota_global.c | 2 +- + fs/quota/dquot.c | 16 ++++++++-------- + include/linux/quota.h | 4 ++-- + 3 files changed, 11 insertions(+), 11 deletions(-) +Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (a2481adac819 f2fs: avoid latency-critical readahead of node pages) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 3 + + fs/f2fs/acl.c | 9 +- + fs/f2fs/checkpoint.c | 73 ++++++++---- + fs/f2fs/data.c | 139 +++++++++------------- + fs/f2fs/debug.c | 5 +- + fs/f2fs/dir.c | 113 +++++++----------- + fs/f2fs/extent_cache.c | 37 +++--- + fs/f2fs/f2fs.h | 228 ++++++++++++++++++++++++++++--------- + fs/f2fs/file.c | 115 +++++++++---------- + fs/f2fs/gc.c | 16 +-- + fs/f2fs/inline.c | 83 ++++---------- + fs/f2fs/inode.c | 46 +++++--- + fs/f2fs/namei.c | 107 ++++++++--------- + fs/f2fs/node.c | 76 ++++++------- + fs/f2fs/node.h | 14 ++- + fs/f2fs/recovery.c | 14 ++- + fs/f2fs/segment.c | 54 +++++++-- + fs/f2fs/segment.h | 21 ++-- + fs/f2fs/shrinker.c | 5 +- + fs/f2fs/super.c | 111 ++++++++++++++++-- + fs/f2fs/xattr.c | 16 +-- + 21 files changed, 729 insertions(+), 556 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 (507c552aa58f fuse: improve aio directIO write performance for size extending writes) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 21 +++++++++------------ + fs/fuse/fuse_i.h | 1 + + 2 files changed, 10 insertions(+), 12 deletions(-) +Merging gfs2/for-next (1e875f5a95a2 gfs2: Initialize iopen glock holder for new inodes) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/main.c | 1 + + fs/gfs2/rgrp.c | 12 ++++++++---- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (a12a4fc64de7 Merge branch 'writeback') +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtsock.c +Merge made by the 'recursive' strategy. + fs/nfs/Makefile | 2 +- + fs/nfs/dir.c | 61 +++++++++++++--------- + fs/nfs/direct.c | 72 +++++++++++++------------ + fs/nfs/file.c | 59 +++++---------------- + fs/nfs/inode.c | 73 ++++++++++++++++++-------- + fs/nfs/internal.h | 30 +++++++++++ + fs/nfs/io.c | 96 ++++++++++++++++++++++++++++++++++ + fs/nfs/nfs4proc.c | 13 +++-- + fs/nfs/nfs4state.c | 2 +- + fs/nfs/nfstrace.h | 1 - + fs/nfs/pnfs.c | 10 ++-- + fs/nfs/pnfs_nfs.c | 12 ++++- + fs/nfs/read.c | 4 +- + fs/nfs/write.c | 15 +----- + include/linux/nfs_fs.h | 4 +- + include/linux/sunrpc/sched.h | 5 ++ + include/linux/sunrpc/xprtsock.h | 1 + + net/sunrpc/sched.c | 67 +++++++++++++++++++----- + net/sunrpc/xprt.c | 14 ++--- + net/sunrpc/xprtsock.c | 113 +++++++++++++++++++++++----------------- + 20 files changed, 431 insertions(+), 223 deletions(-) + create mode 100644 fs/nfs/io.c +Merging nfsd/nfsd-next (ee8f2a36a99c nfsd: allow nfsd to advertise multiple layout types) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/Kconfig | 17 +++++ + fs/nfsd/Makefile | 1 + + fs/nfsd/blocklayout.c | 2 + + fs/nfsd/export.c | 14 +++- + fs/nfsd/export.h | 2 +- + fs/nfsd/flexfilelayout.c | 133 ++++++++++++++++++++++++++++++++++++++ + fs/nfsd/flexfilelayoutxdr.c | 115 ++++++++++++++++++++++++++++++++ + fs/nfsd/flexfilelayoutxdr.h | 49 ++++++++++++++ + fs/nfsd/nfs4layouts.c | 16 ++++- + fs/nfsd/nfs4proc.c | 45 ++++++++++++- + fs/nfsd/nfs4state.c | 32 +++++++-- + fs/nfsd/nfs4xdr.c | 81 +++++++++++------------ + fs/nfsd/nfsd.h | 5 ++ + fs/nfsd/pnfs.h | 4 ++ + fs/nfsd/state.h | 1 + + fs/nfsd/xdr4.h | 5 ++ + include/linux/nfs4.h | 11 ++++ + include/linux/nfs_xdr.h | 11 ---- + include/linux/sunrpc/cache.h | 2 - + net/sunrpc/auth_gss/svcauth_gss.c | 5 +- + net/sunrpc/cache.c | 2 +- + 21 files changed, 477 insertions(+), 76 deletions(-) + create mode 100644 fs/nfsd/flexfilelayout.c + create mode 100644 fs/nfsd/flexfilelayoutxdr.c + create mode 100644 fs/nfsd/flexfilelayoutxdr.h +Merging orangefs/for-next (2dcd0af568b0 Linux 4.6) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (f920c41f047a ovl: move some common code in a function) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/namei.c +Auto-merging fs/dcache.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 4 +-- + Documentation/filesystems/vfs.txt | 39 +++++++++++++++--------- + fs/dcache.c | 3 -- + fs/namei.c | 2 +- + fs/open.c | 17 ++++++++--- + fs/overlayfs/dir.c | 20 ++++++++----- + fs/overlayfs/inode.c | 63 ++++++++++----------------------------- + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/super.c | 18 ++++++++--- + include/linux/dcache.h | 29 +++++++----------- + include/linux/fs.h | 2 +- + 11 files changed, 95 insertions(+), 104 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 (61edc3f3b51d ubi: Don't bypass ->getattr()) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (26f1fe858f27 xfs: reduce lock hold times in buffer writeback) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_alloc.c | 2 +- + fs/xfs/libxfs/xfs_alloc.h | 7 ----- + fs/xfs/libxfs/xfs_attr_leaf.h | 3 --- + fs/xfs/libxfs/xfs_fs.h | 8 ++---- + fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- + fs/xfs/xfs_attr_inactive.c | 2 +- + fs/xfs/xfs_attr_list.c | 2 +- + fs/xfs/xfs_bmap_util.c | 6 ++--- + fs/xfs/xfs_bmap_util.h | 2 -- + fs/xfs/xfs_buf.c | 60 +++++++++++++++++++++++++------------------ + fs/xfs/xfs_buf_item.c | 18 +++++++++---- + fs/xfs/xfs_inode.c | 16 +++--------- + fs/xfs/xfs_inode.h | 7 ----- + fs/xfs/xfs_log.c | 8 +++--- + fs/xfs/xfs_log.h | 5 ---- + fs/xfs/xfs_rtalloc.h | 2 -- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_super.h | 2 -- + 18 files changed, 65 insertions(+), 89 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 (1eb82bc8e712 Merge branch 'for-linus' into for-next) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + 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 (34bfa4dd01cf Merge branch 'pci/resource' into next) +$ git merge pci/next +Auto-merging include/linux/pci-ecam.h +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/axis,artpec6-pcie.txt | 46 ++++ + Documentation/kernel-parameters.txt | 4 + + MAINTAINERS | 10 + + arch/arm/Kconfig | 2 +- + arch/arm64/Kconfig | 6 +- + arch/arm64/kernel/pci.c | 146 ++++++++++- + arch/microblaze/include/asm/pci.h | 3 - + arch/microblaze/pci/pci-common.c | 73 ++---- + arch/mips/include/asm/pci.h | 10 - + arch/mips/pci/pci.c | 10 + + arch/powerpc/include/asm/pci.h | 3 - + arch/powerpc/kernel/pci-common.c | 79 ++---- + arch/sparc/include/asm/pci_64.h | 3 - + arch/sparc/kernel/pci.c | 20 +- + arch/x86/pci/common.c | 2 +- + arch/x86/pci/vmd.c | 7 +- + drivers/acpi/Kconfig | 3 + + drivers/acpi/Makefile | 1 + + drivers/acpi/pci_mcfg.c | 92 +++++++ + drivers/acpi/pci_root.c | 35 +++ + drivers/irqchip/Kconfig | 18 +- + drivers/pci/Kconfig | 2 +- + drivers/pci/bus.c | 30 ++- + drivers/pci/ecam.c | 6 +- + drivers/pci/host/Kconfig | 39 ++- + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-host-common.c | 64 ++--- + drivers/pci/host/pci-host-generic.c | 3 +- + drivers/pci/host/pci-hyperv.c | 16 +- + drivers/pci/host/pci-mvebu.c | 17 +- + drivers/pci/host/pci-rcar-gen2.c | 4 + + drivers/pci/host/pci-tegra.c | 35 +-- + drivers/pci/host/pci-thunder-ecam.c | 3 +- + drivers/pci/host/pci-thunder-pem.c | 6 +- + drivers/pci/host/pci-versatile.c | 29 +-- + drivers/pci/host/pci-xgene.c | 16 +- + drivers/pci/host/pcie-altera.c | 35 +-- + drivers/pci/host/pcie-artpec6.c | 284 +++++++++++++++++++++ + drivers/pci/host/pcie-designware.c | 34 ++- + drivers/pci/host/pcie-iproc.c | 4 + + drivers/pci/host/pcie-rcar.c | 33 +-- + drivers/pci/host/pcie-xilinx-nwl.c | 20 +- + drivers/pci/host/pcie-xilinx.c | 16 +- + drivers/pci/hotplug/acpiphp_glue.c | 4 + + drivers/pci/hotplug/pciehp_hpc.c | 4 + + drivers/pci/pci-driver.c | 5 +- + drivers/pci/pci-sysfs.c | 5 + + drivers/pci/pci.c | 206 ++++++++++++++- + drivers/pci/pci.h | 11 + + drivers/pci/pcie/aspm.c | 2 +- + drivers/pci/pcie/portdrv_core.c | 3 + + drivers/pci/pcie/portdrv_pci.c | 52 +++- + drivers/pci/probe.c | 13 +- + drivers/pci/proc.c | 9 +- + drivers/pci/quirks.c | 13 +- + drivers/pci/remove.c | 2 + + drivers/usb/host/xhci-pci.c | 2 +- + include/linux/pci-acpi.h | 2 + + drivers/pci/ecam.h => include/linux/pci-ecam.h | 4 +- + include/linux/pci.h | 34 ++- + 60 files changed, 1241 insertions(+), 400 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt + create mode 100644 drivers/acpi/pci_mcfg.c + create mode 100644 drivers/pci/host/pcie-artpec6.c + rename drivers/pci/ecam.h => include/linux/pci-ecam.h (95%) +Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/misc/ramoops.txt | 48 ++++ + Documentation/ramoops.txt | 6 +- + arch/powerpc/kernel/nvram_64.c | 4 +- + drivers/acpi/apei/erst.c | 7 +- + drivers/firmware/efi/efi-pstore.c | 13 + + fs/pstore/Kconfig | 31 ++- + fs/pstore/inode.c | 1 - + fs/pstore/platform.c | 269 ++++++++++++++++++--- + fs/pstore/ram.c | 105 +++++++- + include/linux/pstore.h | 3 +- + 10 files changed, 436 insertions(+), 51 deletions(-) + create mode 100644 Documentation/devicetree/bindings/misc/ramoops.txt +Merging hid/for-next (646944182a4b Merge branch 'for-4.8/alps' into for-next) +$ git merge hid/for-next +Removing drivers/usb/misc/usbled.c +Auto-merging drivers/usb/misc/Makefile +Auto-merging drivers/usb/misc/Kconfig +Merge made by the 'recursive' strategy. + Documentation/hid/hid-alps.txt | 139 +++++++++++ + drivers/hid/Kconfig | 20 ++ + drivers/hid/Makefile | 2 + + drivers/hid/hid-alps.c | 525 +++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-core.c | 6 +- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-led.c | 288 ++++++++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid.c | 1 + + drivers/hid/uhid.c | 33 ++- + drivers/usb/misc/Kconfig | 9 - + drivers/usb/misc/Makefile | 1 - + drivers/usb/misc/usbled.c | 273 --------------------- + 12 files changed, 1006 insertions(+), 295 deletions(-) + create mode 100644 Documentation/hid/hid-alps.txt + create mode 100644 drivers/hid/hid-alps.c + create mode 100644 drivers/hid/hid-led.c + delete mode 100644 drivers/usb/misc/usbled.c +Merging i2c/i2c/for-next (d86a4c24d68e Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 16 +- + Documentation/devicetree/bindings/i2c/i2c.txt | 7 + + Documentation/i2c/smbus-protocol | 6 + + drivers/char/ipmi/ipmi_ssif.c | 6 +- + drivers/hwmon/lm90.c | 6 +- + drivers/i2c/busses/Kconfig | 4 +- + drivers/i2c/busses/i2c-designware-core.c | 2 +- + drivers/i2c/busses/i2c-designware-core.h | 1 + + drivers/i2c/busses/i2c-designware-pcidrv.c | 143 +++--- + drivers/i2c/busses/i2c-elektor.c | 14 +- + drivers/i2c/busses/i2c-i801.c | 2 +- + drivers/i2c/busses/i2c-jz4780.c | 4 - + drivers/i2c/busses/i2c-pca-isa.c | 15 +- + drivers/i2c/busses/i2c-qup.c | 131 +++--- + drivers/i2c/busses/i2c-rk3x.c | 498 +++++++++++++++++---- + drivers/i2c/busses/i2c-robotfuzz-osif.c | 2 +- + drivers/i2c/i2c-boardinfo.c | 4 +- + drivers/i2c/i2c-core.c | 41 ++ + drivers/i2c/i2c-smbus.c | 112 ++++- + include/linux/i2c-smbus.h | 44 ++ + include/linux/i2c.h | 15 +- + include/uapi/linux/i2c.h | 1 + + 22 files changed, 819 insertions(+), 255 deletions(-) +Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. +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 (e616f770b52c hwmon: (ads7871) Convert to devm_hwmon_device_register_with_groups) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/abituguru | 2 +- + Documentation/hwmon/ina3221 | 35 ++ + Documentation/hwmon/max1668 | 2 +- + Documentation/hwmon/sht3x | 72 ++++ + Documentation/hwmon/submitting-patches | 40 +- + Documentation/hwmon/tmp401 | 14 +- + drivers/hwmon/Kconfig | 24 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/ad7314.c | 48 +-- + drivers/hwmon/ads7871.c | 65 +-- + drivers/hwmon/dell-smm-hwmon.c | 60 ++- + drivers/hwmon/ina3221.c | 446 ++++++++++++++++++++ + drivers/hwmon/jz4740-hwmon.c | 65 +-- + drivers/hwmon/sht3x.c | 725 +++++++++++++++++++++++++++++++++ + drivers/hwmon/tmp401.c | 35 +- + include/linux/platform_data/sht3x.h | 25 ++ + 16 files changed, 1483 insertions(+), 177 deletions(-) + create mode 100644 Documentation/hwmon/ina3221 + create mode 100644 Documentation/hwmon/sht3x + create mode 100644 drivers/hwmon/ina3221.c + create mode 100644 drivers/hwmon/sht3x.c + create mode 100644 include/linux/platform_data/sht3x.h +Merging v4l-dvb/master (2ed52999aaf3 Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Removing drivers/staging/media/timb/timblogiw.c +Removing drivers/staging/media/timb/Makefile +Removing drivers/staging/media/timb/Kconfig +Removing drivers/staging/media/omap1/omap1_camera.c +Removing drivers/staging/media/omap1/TODO +Removing drivers/staging/media/omap1/Makefile +Removing drivers/staging/media/omap1/Kconfig +Removing drivers/staging/media/mx3/mx3_camera.c +Removing drivers/staging/media/mx3/TODO +Removing drivers/staging/media/mx3/Makefile +Removing drivers/staging/media/mx3/Kconfig +Removing drivers/staging/media/mx2/mx2_camera.c +Removing drivers/staging/media/mx2/TODO +Removing drivers/staging/media/mx2/Makefile +Removing drivers/staging/media/mx2/Kconfig +Removing drivers/staging/media/mn88472/TODO +Removing drivers/staging/media/mn88472/Makefile +Removing drivers/staging/media/mn88472/Kconfig +Auto-merging drivers/of/of_reserved_mem.c +Auto-merging drivers/media/usb/uvc/uvc_v4l2.c +Auto-merging drivers/media/dvb-frontends/mn88472_priv.h +Auto-merging drivers/media/dvb-frontends/mn88472.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/mediatek-vpu.txt | 31 + + MAINTAINERS | 18 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 17 +- + drivers/media/dvb-frontends/Kconfig | 15 + + drivers/media/dvb-frontends/Makefile | 2 + + drivers/media/dvb-frontends/cxd2841er.c | 1467 +++++++++++++---- + drivers/media/dvb-frontends/cxd2841er.h | 24 +- + drivers/media/dvb-frontends/cxd2841er_priv.h | 1 + + drivers/media/dvb-frontends/ds3000.c | 9 + + drivers/media/dvb-frontends/helene.c | 1042 ++++++++++++ + drivers/media/dvb-frontends/helene.h | 79 + + drivers/media/dvb-frontends/horus3a.c | 26 +- + drivers/media/dvb-frontends/m88rs2000.c | 2 +- + .../mn88472 => media/dvb-frontends}/mn88472.c | 519 +++--- + drivers/media/dvb-frontends/mn88472.h | 45 +- + .../mn88472 => media/dvb-frontends}/mn88472_priv.h | 11 +- + drivers/media/dvb-frontends/mn88473.c | 7 +- + drivers/media/dvb-frontends/rtl2832.c | 25 +- + drivers/media/dvb-frontends/rtl2832_priv.h | 1 + + drivers/media/i2c/adv7604.c | 46 +- + drivers/media/media-device.c | 47 +- + drivers/media/media-devnode.c | 149 +- + drivers/media/pci/netup_unidvb/Kconfig | 7 +- + drivers/media/pci/netup_unidvb/netup_unidvb.h | 10 + + drivers/media/pci/netup_unidvb/netup_unidvb_ci.c | 4 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 170 +- + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 2 + + drivers/media/platform/rcar-vin/Kconfig | 11 + + drivers/media/platform/rcar-vin/Makefile | 3 + + drivers/media/platform/rcar-vin/rcar-core.c | 334 ++++ + drivers/media/platform/rcar-vin/rcar-dma.c | 1196 ++++++++++++++ + drivers/media/platform/rcar-vin/rcar-v4l2.c | 768 +++++++++ + drivers/media/platform/rcar-vin/rcar-vin.h | 163 ++ + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 3 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 12 +- + drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 1 + + drivers/media/platform/soc_camera/Kconfig | 4 +- + drivers/media/platform/soc_camera/Makefile | 2 +- + drivers/media/tuners/mt2063.c | 30 +- + drivers/media/usb/au0828/au0828-core.c | 4 +- + drivers/media/usb/dvb-usb-v2/Kconfig | 13 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 227 +-- + drivers/media/usb/dvb-usb-v2/af9035.h | 1 + + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 2 +- + drivers/media/usb/em28xx/em28xx-i2c.c | 5 +- + drivers/media/usb/uvc/uvc_driver.c | 2 +- + drivers/media/usb/uvc/uvc_v4l2.c | 19 +- + drivers/media/usb/uvc/uvc_video.c | 1 + + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- + drivers/media/v4l2-core/videobuf2-core.c | 10 +- + drivers/media/v4l2-core/videobuf2-v4l2.c | 6 + + drivers/of/of_reserved_mem.c | 2 +- + drivers/staging/media/Kconfig | 10 - + drivers/staging/media/Makefile | 5 - + drivers/staging/media/mn88472/Kconfig | 7 - + drivers/staging/media/mn88472/Makefile | 5 - + drivers/staging/media/mn88472/TODO | 21 - + drivers/staging/media/mx2/Kconfig | 15 - + drivers/staging/media/mx2/Makefile | 3 - + drivers/staging/media/mx2/TODO | 10 - + drivers/staging/media/mx2/mx2_camera.c | 1636 ------------------- + drivers/staging/media/mx3/Kconfig | 15 - + drivers/staging/media/mx3/Makefile | 3 - + drivers/staging/media/mx3/TODO | 10 - + drivers/staging/media/mx3/mx3_camera.c | 1264 --------------- + drivers/staging/media/omap1/Kconfig | 13 - + drivers/staging/media/omap1/Makefile | 3 - + drivers/staging/media/omap1/TODO | 8 - + drivers/staging/media/omap1/omap1_camera.c | 1702 -------------------- + drivers/staging/media/timb/Kconfig | 11 - + drivers/staging/media/timb/Makefile | 1 - + drivers/staging/media/timb/timblogiw.c | 870 ---------- + include/media/media-device.h | 5 +- + include/media/media-devnode.h | 46 +- + 76 files changed, 5697 insertions(+), 6566 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/mediatek-vpu.txt + create mode 100644 drivers/media/dvb-frontends/helene.c + create mode 100644 drivers/media/dvb-frontends/helene.h + rename drivers/{staging/media/mn88472 => media/dvb-frontends}/mn88472.c (58%) + rename drivers/{staging/media/mn88472 => media/dvb-frontends}/mn88472_priv.h (88%) + create mode 100644 drivers/media/platform/rcar-vin/Kconfig + create mode 100644 drivers/media/platform/rcar-vin/Makefile + create mode 100644 drivers/media/platform/rcar-vin/rcar-core.c + create mode 100644 drivers/media/platform/rcar-vin/rcar-dma.c + create mode 100644 drivers/media/platform/rcar-vin/rcar-v4l2.c + create mode 100644 drivers/media/platform/rcar-vin/rcar-vin.h + delete mode 100644 drivers/staging/media/mn88472/Kconfig + delete mode 100644 drivers/staging/media/mn88472/Makefile + delete mode 100644 drivers/staging/media/mn88472/TODO + delete mode 100644 drivers/staging/media/mx2/Kconfig + delete mode 100644 drivers/staging/media/mx2/Makefile + delete mode 100644 drivers/staging/media/mx2/TODO + delete mode 100644 drivers/staging/media/mx2/mx2_camera.c + delete mode 100644 drivers/staging/media/mx3/Kconfig + delete mode 100644 drivers/staging/media/mx3/Makefile + delete mode 100644 drivers/staging/media/mx3/TODO + delete mode 100644 drivers/staging/media/mx3/mx3_camera.c + delete mode 100644 drivers/staging/media/omap1/Kconfig + delete mode 100644 drivers/staging/media/omap1/Makefile + delete mode 100644 drivers/staging/media/omap1/TODO + delete mode 100644 drivers/staging/media/omap1/omap1_camera.c + delete mode 100644 drivers/staging/media/timb/Kconfig + delete mode 100644 drivers/staging/media/timb/Makefile + delete mode 100644 drivers/staging/media/timb/timblogiw.c +Merging pm/linux-next (8fa3e03d9249 Merge branches 'pm-cpufreq-fixes' and 'acpica-fixes' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/cpu-freq/core.txt | 4 +- + Documentation/cpu-freq/cpu-drivers.txt | 10 +- + arch/arm64/include/asm/acpi.h | 8 + + arch/arm64/include/asm/numa.h | 2 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/acpi_numa.c | 112 ++++++++++++++ + arch/arm64/kernel/smp.c | 2 + + arch/arm64/mm/numa.c | 28 ++-- + arch/ia64/include/asm/acpi.h | 3 + + arch/ia64/kernel/acpi.c | 2 +- + arch/ia64/kernel/setup.c | 1 + + arch/powerpc/platforms/cell/cpufreq_spudemand.c | 72 +++++---- + arch/x86/include/asm/acpi.h | 1 - + arch/x86/include/asm/topology.h | 12 +- + arch/x86/kernel/cpu/intel.c | 7 +- + arch/x86/mm/numa.c | 2 +- + arch/x86/mm/srat.c | 116 +-------------- + arch/x86/platform/atom/punit_atom_debug.c | 5 +- + drivers/acpi/acpi_lpss.c | 5 +- + drivers/acpi/numa.c | 189 +++++++++++++++++------- + drivers/acpi/processor_core.c | 26 +++- + drivers/base/power/clock_ops.c | 13 ++ + drivers/cpufreq/Kconfig | 13 +- + drivers/cpufreq/amd_freq_sensitivity.c | 10 +- + drivers/cpufreq/cpufreq.c | 186 ++++++++++++----------- + drivers/cpufreq/cpufreq_conservative.c | 88 +++-------- + drivers/cpufreq/cpufreq_governor.c | 73 +++------ + drivers/cpufreq/cpufreq_governor.h | 24 ++- + drivers/cpufreq/cpufreq_ondemand.c | 40 ++--- + drivers/cpufreq/cpufreq_ondemand.h | 1 - + drivers/cpufreq/cpufreq_performance.c | 19 +-- + drivers/cpufreq/cpufreq_powersave.c | 19 +-- + drivers/cpufreq/cpufreq_stats.c | 157 +++----------------- + drivers/cpufreq/cpufreq_userspace.c | 104 ++++++------- + drivers/cpufreq/davinci-cpufreq.c | 22 +-- + drivers/cpufreq/freq_table.c | 37 +++-- + drivers/cpufreq/intel_pstate.c | 58 +++++--- + drivers/cpufreq/mvebu-cpufreq.c | 2 +- + drivers/cpufreq/powernv-cpufreq.c | 5 +- + drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 3 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 33 +---- + drivers/cpufreq/s5pv210-cpufreq.c | 8 +- + drivers/idle/intel_idle.c | 71 ++++----- + drivers/mmc/host/sdhci-acpi.c | 3 +- + drivers/of/of_numa.c | 4 +- + drivers/platform/x86/intel_telemetry_debugfs.c | 3 +- + drivers/platform/x86/intel_telemetry_pltdrv.c | 3 +- + drivers/powercap/intel_rapl.c | 156 +++++++++++++------ + drivers/thermal/cpu_cooling.c | 24 ++- + drivers/thermal/intel_soc_dts_thermal.c | 4 +- + include/acpi/acpi_numa.h | 4 + + include/acpi/processor.h | 1 + + include/linux/acpi.h | 1 - + include/linux/cpufreq.h | 41 +++-- + include/linux/suspend.h | 5 +- + kernel/power/Makefile | 2 + + kernel/power/console.c | 8 +- + kernel/sched/cpufreq_schedutil.c | 43 ++---- + 58 files changed, 933 insertions(+), 963 deletions(-) + create mode 100644 arch/arm64/kernel/acpi_numa.c +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/Makefile | 3 +- + drivers/thermal/thermal_core.c | 1363 +++++++++---------------------------- + drivers/thermal/thermal_core.h | 26 + + drivers/thermal/thermal_helpers.c | 144 ++++ + drivers/thermal/thermal_sysfs.c | 851 +++++++++++++++++++++++ + include/linux/thermal.h | 4 +- + 6 files changed, 1334 insertions(+), 1057 deletions(-) + create mode 100644 drivers/thermal/thermal_helpers.c + create mode 100644 drivers/thermal/thermal_sysfs.c +Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Resolved 'drivers/thermal/rockchip_thermal.c' using previous resolution. +Resolved 'drivers/thermal/tango_thermal.c' using previous resolution. +Auto-merging drivers/thermal/tango_thermal.c +CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c +Auto-merging drivers/thermal/rockchip_thermal.c +CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ed583cf94e80] Merge remote-tracking branch 'thermal-soc/next' +$ git diff -M --stat --summary HEAD^.. +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 (f1faa4f5b460 Merge branch 'topic/tegra' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/at_xdmac.c | 4 +- + drivers/dma/bcm2835-dma.c | 2 +- + drivers/dma/edma.c | 15 ++-- + drivers/dma/mv_xor.c | 2 +- + drivers/dma/sh/rcar-dmac.c | 2 +- + drivers/dma/sirf-dma.c | 6 +- + drivers/dma/ste_dma40_ll.c | 2 +- + drivers/dma/tegra20-apb-dma.c | 12 ++- + drivers/dma/xilinx/xilinx_vdma.c | 190 +++++++++++++++++++++++++++++++++++++-- + 9 files changed, 204 insertions(+), 31 deletions(-) +Merging net-next/master (697666eac664 net: ethernet: bcmsysport: use phy_ethtool_{get|set}_link_ksettings) +$ git merge net-next/master +Recorded preimage for 'drivers/net/ethernet/qlogic/qed/qed_hsi.h' +Recorded preimage for 'net/rds/tcp_connect.c' +Recorded preimage for 'net/rds/tcp_listen.c' +Resolved 'tools/virtio/ringtest/Makefile' using previous resolution. +Auto-merging tools/virtio/ringtest/Makefile +CONFLICT (content): Merge conflict in tools/virtio/ringtest/Makefile +Auto-merging net/tipc/link.c +Auto-merging net/tipc/bearer.c +Auto-merging net/sched/sch_prio.c +Auto-merging net/sched/sch_htb.c +Auto-merging net/sched/sch_fifo.c +Auto-merging net/sched/act_ipt.c +Auto-merging net/sched/act_api.c +Auto-merging net/rxrpc/transport.c +Auto-merging net/rxrpc/skbuff.c +Auto-merging net/rxrpc/recvmsg.c +Auto-merging net/rxrpc/output.c +Auto-merging net/rxrpc/key.c +Auto-merging net/rxrpc/input.c +Auto-merging net/rxrpc/conn_object.c +Auto-merging net/rxrpc/conn_event.c +Auto-merging net/rxrpc/call_object.c +Auto-merging net/rxrpc/call_event.c +Auto-merging net/rxrpc/call_accept.c +Removing net/rxrpc/ar-peer.c +Removing net/rxrpc/ar-local.c +Removing net/rxrpc/ar-error.c +Auto-merging net/rds/tcp_send.c +Auto-merging net/rds/tcp_recv.c +Auto-merging net/rds/tcp_listen.c +CONFLICT (content): Merge conflict in net/rds/tcp_listen.c +Auto-merging net/rds/tcp_connect.c +CONFLICT (content): Merge conflict in net/rds/tcp_connect.c +Auto-merging net/rds/loop.c +Auto-merging net/rds/ib_cm.c +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv6/sit.c +Auto-merging net/ipv6/icmp.c +Auto-merging net/ipv4/ip_gre.c +Auto-merging net/ipv4/gre_demux.c +Auto-merging net/core/filter.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging include/linux/qed/qed_eth_if.h +Auto-merging include/linux/bpf.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/net/vxlan.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/geneve.c +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/qlogic/qede/qede_main.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_spq.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_l2.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_hsi.h +CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qed/qed_hsi.h +Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_common.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging arch/arm/boot/dts/rk3288.dtsi +Auto-merging arch/arm/boot/dts/dra7.dtsi +Auto-merging arch/arm/boot/dts/dm814x.dtsi +Auto-merging arch/arm/boot/dts/am4372.dtsi +Auto-merging arch/arm/boot/dts/am33xx.dtsi +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/ethernet/qlogic/qed/qed_hsi.h'. +Recorded resolution for 'net/rds/tcp_connect.c'. +Recorded resolution for 'net/rds/tcp_listen.c'. +[master 659219a59ba8] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 1 + + .../bindings/net/brcm,mdio-mux-iproc.txt | 59 + + .../devicetree/bindings/net/can/rcar_canfd.txt | 89 + + .../devicetree/bindings/net/cirrus,cs89x0.txt | 13 + + Documentation/devicetree/bindings/net/cpsw.txt | 1 - + Documentation/devicetree/bindings/net/dsa/b53.txt | 88 + + Documentation/devicetree/bindings/net/dsa/dsa.txt | 278 +- + Documentation/devicetree/bindings/net/mdio-mux.txt | 3 +- + .../bindings/phy/brcm,mdio-mux-bus-pci.txt | 27 + + Documentation/networking/can.txt | 25 +- + Documentation/networking/gen_stats.txt | 2 +- + MAINTAINERS | 16 + + arch/arm/boot/dts/am33xx.dtsi | 1 - + arch/arm/boot/dts/am4372.dtsi | 1 - + arch/arm/boot/dts/dm814x.dtsi | 1 - + arch/arm/boot/dts/dra7.dtsi | 1 - + arch/arm/boot/dts/rk3288.dtsi | 5 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 328 +- + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 16 + + arch/arm64/boot/dts/broadcom/ns2.dtsi | 39 + + arch/arm64/net/bpf_jit.h | 3 +- + arch/arm64/net/bpf_jit_comp.c | 111 +- + drivers/isdn/hardware/eicon/divasmain.c | 12 +- + drivers/isdn/hardware/eicon/platform.h | 6 +- + drivers/net/bonding/bond_main.c | 22 +- + drivers/net/can/Kconfig | 11 +- + drivers/net/can/Makefile | 2 +- + drivers/net/can/dev.c | 140 +- + drivers/net/can/rcar/Kconfig | 21 + + drivers/net/can/rcar/Makefile | 6 + + drivers/net/can/{ => rcar}/rcar_can.c | 0 + drivers/net/can/rcar/rcar_canfd.c | 1695 +++ + drivers/net/can/sja1000/tscan1.c | 12 +- + drivers/net/can/slcan.c | 4 +- + drivers/net/can/usb/gs_usb.c | 141 +- + drivers/net/dsa/Kconfig | 2 + + drivers/net/dsa/Makefile | 2 + + drivers/net/dsa/b53/Kconfig | 33 + + drivers/net/dsa/b53/Makefile | 6 + + drivers/net/dsa/b53/b53_common.c | 1787 +++ + drivers/net/dsa/b53/b53_mdio.c | 392 + + drivers/net/dsa/b53/b53_mmap.c | 256 + + drivers/net/dsa/b53/b53_priv.h | 387 + + drivers/net/dsa/b53/b53_regs.h | 434 + + drivers/net/dsa/b53/b53_spi.c | 331 + + drivers/net/dsa/b53/b53_srab.c | 415 + + drivers/net/dsa/bcm_sf2.c | 701 +- + drivers/net/dsa/bcm_sf2.h | 16 + + drivers/net/dsa/bcm_sf2_regs.h | 70 + + drivers/net/dsa/mv88e6xxx.c | 267 +- + drivers/net/dsa/mv88e6xxx.h | 6 + + drivers/net/ethernet/8390/ax88796.c | 40 +- + drivers/net/ethernet/agere/et131x.c | 60 +- + drivers/net/ethernet/aurora/nb8800.c | 69 +- + drivers/net/ethernet/aurora/nb8800.h | 1 - + drivers/net/ethernet/broadcom/Kconfig | 21 - + drivers/net/ethernet/broadcom/bcmsysport.c | 49 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 1 - + drivers/net/ethernet/broadcom/bgmac.c | 135 + + drivers/net/ethernet/broadcom/bgmac.h | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 94 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 392 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 65 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 199 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 3 + + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 41 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 719 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 260 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 71 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 1 + + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 169 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 21 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 62 +- + drivers/net/ethernet/cavium/liquidio/octeon_main.h | 23 +- + .../net/ethernet/cavium/liquidio/octeon_network.h | 229 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 35 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.h | 154 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 101 +- + .../ethernet/cavium/liquidio/response_manager.c | 9 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 82 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 8 +- + drivers/net/ethernet/cirrus/cs89x0.c | 12 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 28 +- + drivers/net/ethernet/emulex/benet/Kconfig | 8 - + drivers/net/ethernet/emulex/benet/be.h | 16 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 147 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 14 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 35 +- + drivers/net/ethernet/emulex/benet/be_main.c | 235 +- + drivers/net/ethernet/freescale/fec_main.c | 7 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/hisilicon/Kconfig | 2 +- + drivers/net/ethernet/hisilicon/hns/hnae.c | 18 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 247 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 105 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 33 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 250 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h | 7 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 15 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 5 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 10 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 90 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 2 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 150 +- + drivers/net/ethernet/intel/Kconfig | 43 - + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 36 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 186 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 57 +- + drivers/net/ethernet/lantiq_etop.c | 1 - + drivers/net/ethernet/mellanox/mlx4/Kconfig | 7 - + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 25 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 45 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 - + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 20 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 22 +- + drivers/net/ethernet/qlogic/Kconfig | 30 - + drivers/net/ethernet/qlogic/qed/qed.h | 13 + + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 1347 ++- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 24 + + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 1623 ++- + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 28 + + drivers/net/ethernet/qlogic/qed/qed_dev.c | 542 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 8 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 10948 +++++++++++-------- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 12 +- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 184 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 115 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 27 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 57 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 41 +- + drivers/net/ethernet/qlogic/qed/qed_sp.h | 26 + + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 26 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 40 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 506 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 9 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 95 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 13 +- + drivers/net/ethernet/qlogic/qede/Makefile | 1 + + drivers/net/ethernet/qlogic/qede/qede.h | 3 + + drivers/net/ethernet/qlogic/qede/qede_dcbnl.c | 348 + + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 2 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 141 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2 - + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 1 - + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 4 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 30 +- + drivers/net/ethernet/renesas/ravb_main.c | 8 +- + drivers/net/ethernet/sfc/ef10.c | 744 +- + drivers/net/ethernet/sfc/ef10_sriov.c | 44 +- + drivers/net/ethernet/sfc/ef10_sriov.h | 3 + + drivers/net/ethernet/sfc/efx.c | 66 +- + drivers/net/ethernet/sfc/efx.h | 9 + + drivers/net/ethernet/sfc/mcdi_pcol.h | 1327 ++- + drivers/net/ethernet/sfc/net_driver.h | 19 +- + drivers/net/ethernet/sfc/nic.h | 5 + + drivers/net/ethernet/stmicro/stmmac/Kconfig | 14 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 48 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +- + drivers/net/ethernet/ti/cpsw.c | 16 +- + drivers/net/ethernet/ti/cpsw.h | 1 - + drivers/net/ethernet/ti/davinci_cpdma.c | 6 + + drivers/net/ethernet/ti/davinci_cpdma.h | 1 + + drivers/net/ethernet/ti/tlan.c | 1 - + drivers/net/ethernet/wiznet/w5100.c | 3 +- + drivers/net/fjes/fjes_main.c | 5 +- + drivers/net/geneve.c | 61 +- + drivers/net/gtp.c | 1 - + drivers/net/hamradio/baycom_par.c | 6 +- + drivers/net/hyperv/hyperv_net.h | 19 +- + drivers/net/hyperv/netvsc.c | 25 +- + drivers/net/hyperv/netvsc_drv.c | 22 +- + drivers/net/hyperv/rndis_filter.c | 159 +- + drivers/net/ipvlan/ipvlan_main.c | 22 +- + drivers/net/loopback.c | 5 +- + drivers/net/macvlan.c | 59 +- + drivers/net/macvtap.c | 95 +- + drivers/net/phy/Kconfig | 19 + + drivers/net/phy/Makefile | 2 + + drivers/net/phy/intel-xway.c | 376 + + drivers/net/phy/mdio-mux-bcm-iproc.c | 248 + + drivers/net/phy/mdio-mux-gpio.c | 2 +- + drivers/net/phy/mdio-mux-mmioreg.c | 2 +- + drivers/net/phy/mdio-mux.c | 26 +- + drivers/net/ppp/ppp_generic.c | 3 +- + drivers/net/team/team.c | 19 +- + drivers/net/tun.c | 97 +- + drivers/net/usb/r8152.c | 59 +- + drivers/net/virtio_net.c | 90 +- + drivers/net/vmxnet3/Makefile | 4 +- + drivers/net/vmxnet3/upt1_defs.h | 4 +- + drivers/net/vmxnet3/vmxnet3_defs.h | 105 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 285 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 215 +- + drivers/net/vmxnet3/vmxnet3_int.h | 54 +- + drivers/net/vrf.c | 557 +- + drivers/net/vxlan.c | 85 +- + drivers/net/wan/Kconfig | 11 + + drivers/net/wan/Makefile | 1 + + drivers/net/wan/fsl_ucc_hdlc.c | 1192 ++ + drivers/net/wan/fsl_ucc_hdlc.h | 147 + + drivers/net/wireless/mac80211_hwsim.c | 97 +- + drivers/phy/Kconfig | 8 + + drivers/phy/Makefile | 2 +- + drivers/phy/phy-bcm-ns2-pcie.c | 115 + + drivers/s390/net/qeth_core.h | 45 +- + drivers/s390/net/qeth_core_main.c | 231 +- + drivers/s390/net/qeth_core_sys.c | 4 + + drivers/s390/net/qeth_l2.h | 7 + + drivers/s390/net/qeth_l2_main.c | 105 +- + drivers/s390/net/qeth_l3.h | 31 +- + drivers/s390/net/qeth_l3_main.c | 1024 +- + drivers/s390/net/qeth_l3_sys.c | 78 +- + drivers/soc/fsl/qe/Kconfig | 6 +- + drivers/soc/fsl/qe/Makefile | 1 + + drivers/soc/fsl/qe/qe.c | 6 + + drivers/soc/fsl/qe/qe_tdm.c | 276 + + drivers/soc/fsl/qe/ucc.c | 450 + + drivers/soc/fsl/qe/ucc_fast.c | 36 + + drivers/vhost/net.c | 64 +- + fs/afs/rxrpc.c | 34 +- + include/linux/acpi.h | 13 + + include/linux/bpf.h | 25 +- + include/linux/icmpv6.h | 5 +- + include/linux/ipv6.h | 7 + + include/linux/mdio-mux.h | 4 +- + include/linux/mlx5/mlx5_ifc.h | 275 +- + include/linux/netdev_features.h | 7 +- + include/linux/netdevice.h | 91 +- + include/linux/platform_data/b53.h | 33 + + include/linux/ptr_ring.h | 393 + + include/linux/qed/common_hsi.h | 397 +- + include/linux/qed/eth_common.h | 124 +- + include/linux/qed/iscsi_common.h | 1439 +++ + include/linux/qed/qed_chain.h | 556 +- + include/linux/qed/qed_eth_if.h | 63 + + include/linux/qed/qed_if.h | 158 +- + include/linux/qed/rdma_common.h | 44 + + include/linux/qed/roce_common.h | 17 + + include/linux/qed/storage_common.h | 91 + + include/linux/qed/tcp_common.h | 226 + + include/linux/rtnetlink.h | 5 +- + include/linux/rxrpc.h | 18 +- + include/linux/skb_array.h | 169 + + include/linux/skbuff.h | 8 + + include/linux/stmmac.h | 2 + + include/linux/virtio_net.h | 101 + + include/net/6lowpan.h | 16 + + include/net/act_api.h | 28 +- + include/net/addrconf.h | 10 + + include/net/cfg80211.h | 81 +- + include/net/dsa.h | 56 +- + include/net/fib_rules.h | 24 +- + include/net/gen_stats.h | 12 +- + include/net/geneve.h | 9 - + include/net/ip6_route.h | 23 +- + include/net/ip_tunnels.h | 2 + + include/net/l3mdev.h | 60 +- + include/net/mac80211.h | 18 +- + include/net/ndisc.h | 248 +- + include/net/pkt_sched.h | 4 +- + include/net/sch_generic.h | 116 +- + include/net/sctp/sctp.h | 4 + + include/net/sctp/structs.h | 5 + + include/net/tc_act/tc_defact.h | 4 +- + include/net/tcp.h | 2 + + include/net/udp.h | 4 +- + include/net/udp_tunnel.h | 42 + + include/net/vxlan.h | 13 +- + include/soc/fsl/qe/immap_qe.h | 5 +- + include/soc/fsl/qe/qe.h | 19 + + include/soc/fsl/qe/qe_tdm.h | 94 + + include/soc/fsl/qe/ucc.h | 4 + + include/soc/fsl/qe/ucc_fast.h | 27 +- + include/uapi/linux/can/bcm.h | 1 + + include/uapi/linux/fib_rules.h | 1 + + include/uapi/linux/icmp.h | 1 + + include/uapi/linux/if_tunnel.h | 1 + + include/uapi/linux/netlink_diag.h | 1 + + include/uapi/linux/nl80211.h | 14 +- + include/uapi/linux/openvswitch.h | 6 + + include/uapi/linux/pkt_cls.h | 7 +- + include/uapi/linux/virtio_net.h | 9 +- + include/uapi/linux/wireless.h | 63 +- + kernel/bpf/arraymap.c | 116 +- + kernel/bpf/syscall.c | 13 +- + kernel/trace/bpf_trace.c | 18 +- + net/6lowpan/6lowpan_i.h | 4 + + net/6lowpan/Makefile | 2 +- + net/6lowpan/core.c | 50 +- + net/6lowpan/debugfs.c | 39 + + net/6lowpan/iphc.c | 167 +- + net/6lowpan/ndisc.c | 234 + + net/batman-adv/routing.c | 2 +- + net/batman-adv/send.c | 4 +- + net/bluetooth/6lowpan.c | 13 +- + net/can/Makefile | 3 +- + net/can/af_can.h | 11 + + net/can/bcm.c | 309 +- + net/can/proc.c | 3 +- + net/core/dev.c | 52 +- + net/core/ethtool.c | 1 + + net/core/fib_rules.c | 33 +- + net/core/filter.c | 78 +- + net/core/gen_estimator.c | 24 +- + net/core/gen_stats.c | 35 +- + net/core/pktgen.c | 1 - + net/core/rtnetlink.c | 22 + + net/core/skbuff.c | 46 +- + net/dsa/Makefile | 2 +- + net/dsa/dsa.c | 253 +- + net/dsa/dsa2.c | 690 ++ + net/dsa/dsa_priv.h | 9 +- + net/dsa/slave.c | 80 +- + net/dsa/tag_brcm.c | 4 +- + net/dsa/tag_dsa.c | 10 +- + net/dsa/tag_edsa.c | 10 +- + net/dsa/tag_trailer.c | 4 +- + net/ieee802154/6lowpan/core.c | 27 +- + net/ieee802154/6lowpan/tx.c | 113 +- + net/ipv4/Kconfig | 16 + + net/ipv4/Makefile | 1 + + net/ipv4/fib_rules.c | 6 +- + net/ipv4/fou.c | 81 +- + net/ipv4/gre_demux.c | 1 + + net/ipv4/inet_fragment.c | 2 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_gre.c | 51 +- + net/ipv4/ip_output.c | 2 +- + net/ipv4/ip_tunnel.c | 2 +- + net/ipv4/tcp_dctcp.c | 4 +- + net/ipv4/tcp_input.c | 31 +- + net/ipv4/tcp_nv.c | 476 + + net/ipv4/tcp_output.c | 4 +- + net/ipv4/udp_tunnel.c | 61 + + net/ipv4/xfrm4_policy.c | 8 +- + net/ipv6/addrconf.c | 268 +- + net/ipv6/af_inet6.c | 6 + + net/ipv6/fib6_rules.c | 6 +- + net/ipv6/icmp.c | 78 +- + net/ipv6/ila/ila.h | 3 +- + net/ipv6/ila/ila_common.c | 16 +- + net/ipv6/ila/ila_lwt.c | 4 +- + net/ipv6/ila/ila_xlat.c | 8 +- + net/ipv6/ip6_icmp.c | 2 +- + net/ipv6/ip6_input.c | 1 + + net/ipv6/ip6_output.c | 14 +- + net/ipv6/ndisc.c | 123 +- + net/ipv6/ping.c | 4 +- + net/ipv6/raw.c | 8 +- + net/ipv6/route.c | 32 +- + net/ipv6/sit.c | 47 +- + net/ipv6/udp.c | 8 +- + net/ipv6/xfrm6_policy.c | 4 +- + net/iucv/af_iucv.c | 223 +- + net/l2tp/l2tp_eth.c | 4 +- + net/l2tp/l2tp_ip6.c | 8 +- + net/l3mdev/l3mdev.c | 64 +- + net/mac80211/agg-tx.c | 8 +- + net/mac80211/debugfs.c | 173 + + net/mac80211/debugfs_sta.c | 78 +- + net/mac80211/ieee80211_i.h | 31 +- + net/mac80211/iface.c | 26 +- + net/mac80211/main.c | 10 +- + net/mac80211/rx.c | 2 +- + net/mac80211/sta_info.c | 14 +- + net/mac80211/tx.c | 292 +- + net/mac80211/util.c | 34 +- + net/mpls/af_mpls.c | 9 +- + net/netfilter/xt_RATEEST.c | 2 +- + net/netlink/af_netlink.h | 14 - + net/openvswitch/actions.c | 40 +- + net/openvswitch/datapath.c | 29 +- + net/openvswitch/datapath.h | 5 +- + net/openvswitch/flow_netlink.c | 9 + + net/openvswitch/vport-internal_dev.c | 2 +- + net/openvswitch/vport.c | 1 + + net/packet/af_packet.c | 36 +- + net/rds/cong.c | 3 +- + net/rds/connection.c | 329 +- + net/rds/ib.c | 1 + + net/rds/ib_cm.c | 3 +- + net/rds/ib_rdma.c | 3 +- + net/rds/ib_recv.c | 1 + + net/rds/ib_send.c | 1 + + net/rds/loop.c | 1 + + net/rds/rdma_transport.c | 1 + + net/rds/rds.h | 152 +- + net/rds/rds_single_path.h | 30 + + net/rds/recv.c | 27 +- + net/rds/send.c | 293 +- + net/rds/tcp.c | 7 +- + net/rds/tcp_connect.c | 4 +- + net/rds/tcp_listen.c | 11 +- + net/rds/tcp_recv.c | 1 + + net/rds/tcp_send.c | 1 + + net/rds/threads.c | 95 +- + net/rxrpc/Makefile | 36 +- + net/rxrpc/af_rxrpc.c | 234 +- + net/rxrpc/ar-error.c | 230 - + net/rxrpc/ar-internal.h | 295 +- + net/rxrpc/ar-local.c | 415 - + net/rxrpc/ar-peer.c | 303 - + net/rxrpc/{ar-accept.c => call_accept.c} | 29 +- + net/rxrpc/{ar-ack.c => call_event.c} | 17 +- + net/rxrpc/{ar-call.c => call_object.c} | 176 +- + net/rxrpc/{ar-connevent.c => conn_event.c} | 17 +- + net/rxrpc/{ar-connection.c => conn_object.c} | 19 +- + net/rxrpc/{ar-input.c => input.c} | 46 +- + net/rxrpc/{ar-key.c => key.c} | 4 +- + net/rxrpc/local_event.c | 116 + + net/rxrpc/local_object.c | 385 + + net/rxrpc/misc.c | 6 + + net/rxrpc/{ar-output.c => output.c} | 192 +- + net/rxrpc/peer_event.c | 281 + + net/rxrpc/peer_object.c | 310 + + net/rxrpc/{ar-proc.c => proc.c} | 0 + net/rxrpc/{ar-recvmsg.c => recvmsg.c} | 4 +- + net/rxrpc/rxkad.c | 2 + + net/rxrpc/{ar-security.c => security.c} | 0 + net/rxrpc/{ar-skbuff.c => skbuff.c} | 2 + + net/rxrpc/sysctl.c | 10 + + net/rxrpc/{ar-transport.c => transport.c} | 21 +- + net/rxrpc/utils.c | 41 + + net/sched/act_api.c | 32 +- + net/sched/act_bpf.c | 8 +- + net/sched/act_connmark.c | 6 +- + net/sched/act_csum.c | 7 +- + net/sched/act_gact.c | 7 +- + net/sched/act_ife.c | 13 +- + net/sched/act_ipt.c | 19 +- + net/sched/act_mirred.c | 9 +- + net/sched/act_nat.c | 7 +- + net/sched/act_pedit.c | 8 +- + net/sched/act_police.c | 12 +- + net/sched/act_simple.c | 10 +- + net/sched/act_skbedit.c | 10 +- + net/sched/act_vlan.c | 13 +- + net/sched/cls_api.c | 48 +- + net/sched/cls_flower.c | 65 +- + net/sched/sch_api.c | 30 +- + net/sched/sch_atm.c | 24 +- + net/sched/sch_cbq.c | 298 +- + net/sched/sch_choke.c | 25 +- + net/sched/sch_codel.c | 2 +- + net/sched/sch_drr.c | 31 +- + net/sched/sch_dsmark.c | 18 - + net/sched/sch_fifo.c | 7 +- + net/sched/sch_fq.c | 22 +- + net/sched/sch_fq_codel.c | 42 +- + net/sched/sch_generic.c | 12 +- + net/sched/sch_gred.c | 35 - + net/sched/sch_hfsc.c | 38 +- + net/sched/sch_hhf.c | 14 +- + net/sched/sch_htb.c | 44 +- + net/sched/sch_mq.c | 2 +- + net/sched/sch_mqprio.c | 11 +- + net/sched/sch_multiq.c | 25 +- + net/sched/sch_netem.c | 42 +- + net/sched/sch_pie.c | 2 +- + net/sched/sch_plug.c | 16 +- + net/sched/sch_prio.c | 23 +- + net/sched/sch_qfq.c | 56 +- + net/sched/sch_red.c | 21 - + net/sched/sch_sfq.c | 3 +- + net/sched/sch_tbf.c | 22 +- + net/sctp/Makefile | 3 +- + net/sctp/input.c | 57 +- + net/sctp/inqueue.c | 78 +- + net/sctp/offload.c | 98 + + net/sctp/output.c | 366 +- + net/sctp/protocol.c | 6 +- + net/sctp/sm_sideeffect.c | 4 +- + net/sctp/socket.c | 10 +- + net/tipc/Makefile | 2 +- + net/tipc/addr.h | 1 + + net/tipc/bearer.c | 8 +- + net/tipc/bearer.h | 2 +- + net/tipc/core.c | 1 + + net/tipc/core.h | 15 +- + net/tipc/link.c | 51 +- + net/tipc/monitor.c | 651 ++ + net/tipc/monitor.h | 73 + + net/tipc/node.c | 48 +- + net/wireless/core.c | 30 + + net/wireless/core.h | 4 +- + net/wireless/nl80211.c | 232 +- + net/wireless/nl80211.h | 2 +- + net/wireless/sme.c | 8 +- + tools/virtio/ringtest/Makefile | 5 +- + tools/virtio/ringtest/ptr_ring.c | 192 + + 499 files changed, 42268 insertions(+), 13879 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt + create mode 100644 Documentation/devicetree/bindings/net/can/rcar_canfd.txt + create mode 100644 Documentation/devicetree/bindings/net/cirrus,cs89x0.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/b53.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt + create mode 100644 drivers/net/can/rcar/Kconfig + create mode 100644 drivers/net/can/rcar/Makefile + rename drivers/net/can/{ => rcar}/rcar_can.c (100%) + create mode 100644 drivers/net/can/rcar/rcar_canfd.c + create mode 100644 drivers/net/dsa/b53/Kconfig + create mode 100644 drivers/net/dsa/b53/Makefile + create mode 100644 drivers/net/dsa/b53/b53_common.c + create mode 100644 drivers/net/dsa/b53/b53_mdio.c + create mode 100644 drivers/net/dsa/b53/b53_mmap.c + create mode 100644 drivers/net/dsa/b53/b53_priv.h + create mode 100644 drivers/net/dsa/b53/b53_regs.h + create mode 100644 drivers/net/dsa/b53/b53_spi.c + create mode 100644 drivers/net/dsa/b53/b53_srab.c + create mode 100644 drivers/net/ethernet/qlogic/qede/qede_dcbnl.c + create mode 100644 drivers/net/phy/intel-xway.c + create mode 100644 drivers/net/phy/mdio-mux-bcm-iproc.c + create mode 100644 drivers/net/wan/fsl_ucc_hdlc.c + create mode 100644 drivers/net/wan/fsl_ucc_hdlc.h + create mode 100644 drivers/phy/phy-bcm-ns2-pcie.c + create mode 100644 drivers/soc/fsl/qe/qe_tdm.c + create mode 100644 include/linux/platform_data/b53.h + create mode 100644 include/linux/ptr_ring.h + create mode 100644 include/linux/qed/iscsi_common.h + create mode 100644 include/linux/qed/rdma_common.h + create mode 100644 include/linux/qed/roce_common.h + create mode 100644 include/linux/qed/storage_common.h + create mode 100644 include/linux/qed/tcp_common.h + create mode 100644 include/linux/skb_array.h + create mode 100644 include/linux/virtio_net.h + create mode 100644 include/soc/fsl/qe/qe_tdm.h + create mode 100644 net/6lowpan/ndisc.c + create mode 100644 net/dsa/dsa2.c + create mode 100644 net/ipv4/tcp_nv.c + create mode 100644 net/rds/rds_single_path.h + delete mode 100644 net/rxrpc/ar-error.c + delete mode 100644 net/rxrpc/ar-local.c + delete mode 100644 net/rxrpc/ar-peer.c + rename net/rxrpc/{ar-accept.c => call_accept.c} (95%) + rename net/rxrpc/{ar-ack.c => call_event.c} (98%) + rename net/rxrpc/{ar-call.c => call_object.c} (90%) + rename net/rxrpc/{ar-connevent.c => conn_event.c} (96%) + rename net/rxrpc/{ar-connection.c => conn_object.c} (98%) + rename net/rxrpc/{ar-input.c => input.c} (96%) + rename net/rxrpc/{ar-key.c => key.c} (99%) + create mode 100644 net/rxrpc/local_event.c + create mode 100644 net/rxrpc/local_object.c + rename net/rxrpc/{ar-output.c => output.c} (88%) + create mode 100644 net/rxrpc/peer_event.c + create mode 100644 net/rxrpc/peer_object.c + rename net/rxrpc/{ar-proc.c => proc.c} (100%) + rename net/rxrpc/{ar-recvmsg.c => recvmsg.c} (99%) + rename net/rxrpc/{ar-security.c => security.c} (100%) + rename net/rxrpc/{ar-skbuff.c => skbuff.c} (98%) + rename net/rxrpc/{ar-transport.c => transport.c} (94%) + create mode 100644 net/rxrpc/utils.c + create mode 100644 net/sctp/offload.c + create mode 100644 net/tipc/monitor.c + create mode 100644 net/tipc/monitor.h + create mode 100644 tools/virtio/ringtest/ptr_ring.c +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 (625b44fc15f8 ipvs: count pre-established TCP states as active) +$ git merge ipvs-next/master +Auto-merging net/netfilter/nf_conntrack_helper.c +Merge made by the 'recursive' strategy. + net/bridge/netfilter/ebt_stp.c | 40 +++++++++++------------ + net/netfilter/ipvs/ip_vs_proto_tcp.c | 25 +++++++++++++-- + net/netfilter/nf_conntrack_helper.c | 61 +++++++++++++++++++----------------- + 3 files changed, 75 insertions(+), 51 deletions(-) +Merging wireless-drivers-next/master (1bb57c8a5e33 Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +Removing drivers/net/wireless/broadcom/b43/phy_a.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Auto-merging drivers/net/wireless/ath/ath10k/htt_rx.c +Auto-merging drivers/net/wireless/ath/ath10k/core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 +- + drivers/net/wireless/ath/ath10k/ahb.c | 11 +- + drivers/net/wireless/ath/ath10k/core.c | 105 +++- + drivers/net/wireless/ath/ath10k/core.h | 24 +- + drivers/net/wireless/ath/ath10k/debug.c | 32 +- + drivers/net/wireless/ath/ath10k/hif.h | 14 + + drivers/net/wireless/ath/ath10k/htt.h | 6 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 36 +- + drivers/net/wireless/ath/ath10k/hw.c | 26 +- + drivers/net/wireless/ath/ath10k/hw.h | 73 +++ + drivers/net/wireless/ath/ath10k/mac.c | 59 +- + drivers/net/wireless/ath/ath10k/pci.c | 245 ++++++++- + drivers/net/wireless/ath/ath10k/pci.h | 6 + + drivers/net/wireless/ath/ath10k/rx_desc.h | 87 +-- + drivers/net/wireless/ath/ath10k/targaddrs.h | 3 + + drivers/net/wireless/ath/ath10k/txrx.c | 3 + + drivers/net/wireless/ath/ath10k/wmi.c | 4 + + drivers/net/wireless/ath/ath10k/wmi.h | 4 + + drivers/net/wireless/ath/ath5k/pcu.c | 2 +- + drivers/net/wireless/ath/ath6kl/core.h | 2 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 3 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 +- + drivers/net/wireless/ath/ath9k/tx99.c | 3 +- + drivers/net/wireless/ath/carl9170/Kconfig | 8 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 16 + + drivers/net/wireless/ath/wil6210/debug.c | 46 +- + drivers/net/wireless/ath/wil6210/p2p.c | 6 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 68 ++- + drivers/net/wireless/ath/wil6210/pm.c | 25 +- + drivers/net/wireless/ath/wil6210/txrx.c | 42 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 6 + + drivers/net/wireless/ath/wil6210/wil_platform.h | 4 +- + drivers/net/wireless/broadcom/b43/Makefile | 2 +- + drivers/net/wireless/broadcom/b43/leds.c | 8 +- + drivers/net/wireless/broadcom/b43/main.c | 31 +- + drivers/net/wireless/broadcom/b43/phy_a.c | 595 --------------------- + drivers/net/wireless/broadcom/b43/phy_a.h | 22 - + drivers/net/wireless/broadcom/b43/phy_common.h | 3 - + drivers/net/wireless/broadcom/b43/phy_g.c | 25 +- + drivers/net/wireless/broadcom/b43/wa.c | 283 +--------- + drivers/net/wireless/broadcom/b43/xmit.c | 30 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 47 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 164 ++++-- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 26 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 1 - + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 17 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 3 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmutil/d11.c | 18 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + + .../broadcom/brcm80211/include/brcmu_d11.h | 22 + + drivers/net/wireless/intel/iwlegacy/3945.c | 3 +- + drivers/net/wireless/marvell/libertas/if_sdio.c | 3 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 4 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 7 - + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 2 +- + drivers/net/wireless/marvell/mwifiex/init.c | 1 + + drivers/net/wireless/marvell/mwifiex/join.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 6 +- + drivers/net/wireless/marvell/mwifiex/main.h | 3 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 9 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 64 ++- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 5 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 12 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 13 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 13 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 15 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 31 +- + 83 files changed, 1256 insertions(+), 1357 deletions(-) + delete mode 100644 drivers/net/wireless/broadcom/b43/phy_a.c +Merging bluetooth/master (a78c16e1b9ea mdio: mux: avoid 'maybe-uninitialized' warning) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle') +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (61c78eea9516 IB/IPoIB: Don't update neigh validity for unresolved entries) +$ git merge rdma/for-next +Already up-to-date. +Merging rdma-leon/rdma-next (5edb56491d48 Linux 4.7-rc3) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (a5792590474b Merge branch 'topic/rxe' into testing/rdma-next) +$ git merge rdma-leon-test/testing/rdma-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/uverbs.h | 13 + + drivers/infiniband/core/uverbs_cmd.c | 537 +++++++- + drivers/infiniband/core/uverbs_main.c | 38 + + drivers/infiniband/core/verbs.c | 163 ++- + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/mlx5/cq.c | 87 +- + drivers/infiniband/hw/mlx5/main.c | 408 +++++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 74 ++ + drivers/infiniband/hw/mlx5/mr.c | 4 + + drivers/infiniband/hw/mlx5/qp.c | 691 +++++++++- + drivers/infiniband/hw/mlx5/srq.c | 112 +- + drivers/infiniband/hw/mlx5/user.h | 88 +- + drivers/infiniband/hw/rxe/Kconfig | 24 + + drivers/infiniband/hw/rxe/Makefile | 24 + + drivers/infiniband/hw/rxe/rxe.c | 394 ++++++ + drivers/infiniband/hw/rxe/rxe.h | 77 ++ + drivers/infiniband/hw/rxe/rxe_av.c | 98 ++ + drivers/infiniband/hw/rxe/rxe_comp.c | 734 +++++++++++ + drivers/infiniband/hw/rxe/rxe_cq.c | 165 +++ + drivers/infiniband/hw/rxe/rxe_dma.c | 166 +++ + drivers/infiniband/hw/rxe/rxe_hdr.h | 952 ++++++++++++++ + drivers/infiniband/hw/rxe/rxe_icrc.c | 96 ++ + drivers/infiniband/hw/rxe/rxe_loc.h | 289 +++++ + drivers/infiniband/hw/rxe/rxe_mcast.c | 190 +++ + drivers/infiniband/hw/rxe/rxe_mmap.c | 173 +++ + drivers/infiniband/hw/rxe/rxe_mr.c | 679 ++++++++++ + drivers/infiniband/hw/rxe/rxe_net.c | 708 ++++++++++ + drivers/infiniband/hw/rxe/rxe_net.h | 53 + + drivers/infiniband/hw/rxe/rxe_opcode.c | 961 ++++++++++++++ + drivers/infiniband/hw/rxe/rxe_opcode.h | 128 ++ + drivers/infiniband/hw/rxe/rxe_param.h | 173 +++ + drivers/infiniband/hw/rxe/rxe_pool.c | 510 ++++++++ + drivers/infiniband/hw/rxe/rxe_pool.h | 164 +++ + drivers/infiniband/hw/rxe/rxe_qp.c | 851 ++++++++++++ + drivers/infiniband/hw/rxe/rxe_queue.c | 217 ++++ + drivers/infiniband/hw/rxe/rxe_queue.h | 178 +++ + drivers/infiniband/hw/rxe/rxe_recv.c | 420 ++++++ + drivers/infiniband/hw/rxe/rxe_req.c | 692 ++++++++++ + drivers/infiniband/hw/rxe/rxe_resp.c | 1364 ++++++++++++++++++++ + drivers/infiniband/hw/rxe/rxe_srq.c | 193 +++ + drivers/infiniband/hw/rxe/rxe_sysfs.c | 157 +++ + drivers/infiniband/hw/rxe/rxe_task.c | 154 +++ + drivers/infiniband/hw/rxe/rxe_task.h | 95 ++ + drivers/infiniband/hw/rxe/rxe_verbs.c | 1352 +++++++++++++++++++ + drivers/infiniband/hw/rxe/rxe_verbs.h | 486 +++++++ + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 265 ++-- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 4 + + include/linux/mlx5/cq.h | 2 + + include/linux/mlx5/driver.h | 6 +- + include/linux/mlx5/qp.h | 4 +- + include/linux/mlx5/srq.h | 25 + + include/rdma/ib_verbs.h | 99 +- + include/uapi/rdma/Kbuild | 1 + + include/uapi/rdma/ib_user_rxe.h | 139 ++ + include/uapi/rdma/ib_user_verbs.h | 95 ++ + 57 files changed, 15548 insertions(+), 235 deletions(-) + create mode 100644 drivers/infiniband/hw/rxe/Kconfig + create mode 100644 drivers/infiniband/hw/rxe/Makefile + create mode 100644 drivers/infiniband/hw/rxe/rxe.c + create mode 100644 drivers/infiniband/hw/rxe/rxe.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_av.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_comp.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_cq.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_dma.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_hdr.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_icrc.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_loc.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_mcast.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_mmap.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_mr.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_net.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_net.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_opcode.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_opcode.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_param.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_pool.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_pool.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_qp.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_queue.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_queue.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_recv.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_req.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_resp.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_srq.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_sysfs.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_task.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_task.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_verbs.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_verbs.h + create mode 100644 include/uapi/rdma/ib_user_rxe.h +Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings) +$ git merge mtd/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/devices/m25p80.c | 37 +++++++++----- + drivers/mtd/spi-nor/fsl-quadspi.c | 29 +++++------ + drivers/mtd/spi-nor/mtk-quadspi.c | 42 +++++++++------- + drivers/mtd/spi-nor/nxp-spifi.c | 25 +++++----- + drivers/mtd/spi-nor/spi-nor.c | 100 +++++++++++++++++++++++++------------- + include/linux/mtd/spi-nor.h | 8 +-- + 6 files changed, 148 insertions(+), 93 deletions(-) +Merging nand/nand/next (e2442baf99bc mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare()) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/omap-gpmc.txt | 7 +- + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 1 + + .../devicetree/bindings/mtd/gpmc-nand.txt | 2 +- + .../devicetree/bindings/mtd/sunxi-nand.txt | 4 + + drivers/mtd/nand/brcmnand/brcmnand.c | 171 ++++++++++- + drivers/mtd/nand/nand_ids.c | 1 + + drivers/mtd/nand/omap2.c | 7 +- + drivers/mtd/nand/sunxi_nand.c | 330 ++++++++++++++++++++- + include/linux/mtd/nand.h | 1 + + 9 files changed, 496 insertions(+), 28 deletions(-) +Merging crypto/master (5a7de97309f5 crypto: rsa - return raw integers for the ASN.1 parser) +$ git merge crypto/master +Auto-merging drivers/usb/misc/Kconfig +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 2 +- + .../devicetree/bindings/rng/brcm,bcm2835.txt | 7 +- + MAINTAINERS | 2 + + arch/arm/boot/dts/bcm-nsp.dtsi | 5 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 43 ++ + arch/arm64/include/asm/io.h | 4 +- + arch/powerpc/kernel/iomap.c | 24 + + arch/x86/crypto/sha-mb/sha1_mb.c | 110 ++-- + arch/x86/crypto/sha1_ssse3_glue.c | 6 + + arch/x86/crypto/sha256_ssse3_glue.c | 10 + + arch/x86/crypto/sha512_ssse3_glue.c | 6 + + crypto/Kconfig | 1 + + crypto/ablkcipher.c | 1 - + crypto/crypto_user.c | 10 +- + crypto/drbg.c | 269 ++++++--- + crypto/rsa.c | 105 +++- + crypto/rsa_helper.c | 111 ++-- + drivers/char/hw_random/Kconfig | 16 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/bcm2835-rng.c | 46 +- + drivers/char/hw_random/exynos-rng.c | 4 +- + drivers/char/hw_random/meson-rng.c | 131 ++++ + drivers/char/hw_random/stm32-rng.c | 10 +- + drivers/crypto/caam/Kconfig | 6 +- + drivers/crypto/caam/caamhash.c | 5 +- + drivers/crypto/caam/ctrl.c | 125 ++-- + drivers/crypto/caam/desc.h | 9 +- + drivers/crypto/caam/desc_constr.h | 44 +- + drivers/crypto/caam/jr.c | 22 +- + drivers/crypto/caam/pdb.h | 137 ++++- + drivers/crypto/caam/regs.h | 151 +++-- + drivers/crypto/caam/sg_sw_sec4.h | 17 +- + drivers/crypto/omap-aes.c | 18 +- + drivers/crypto/qat/qat_common/adf_aer.c | 3 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 2 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 2 +- + drivers/crypto/qat/qat_common/qat_algs.c | 8 +- + drivers/crypto/s5p-sss.c | 80 +-- + drivers/crypto/talitos.c | 672 +++++++++++++-------- + drivers/usb/misc/Kconfig | 11 +- + drivers/usb/misc/chaoskey.c | 21 +- + include/asm-generic/io.h | 71 ++- + include/asm-generic/iomap.h | 8 + + include/crypto/drbg.h | 12 + + include/crypto/internal/rsa.h | 22 +- + include/linux/crypto.h | 10 +- + include/linux/mpi.h | 1 - + lib/digsig.c | 16 +- + lib/mpi/mpicoder.c | 126 +--- + 50 files changed, 1675 insertions(+), 852 deletions(-) + create mode 100644 drivers/char/hw_random/meson-rng.c +Merging drm/drm-next (a0877f520352 Merge tag 'topic/drm-misc-2016-06-15' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Auto-merging include/video/omapfb_dss.h +Auto-merging drivers/gpu/drm/vc4/vc4_kms.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_dpi.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/sti/sti_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Auto-merging drivers/gpu/drm/radeon/atombios_crtc.c +Auto-merging drivers/gpu/drm/omapdrm/dss/hdmi5.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dsi.c +Auto-merging drivers/gpu/drm/msm/msm_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_vbt_defs.h +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dsi.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +Auto-merging drivers/gpu/drm/drm_crtc_helper.c +Auto-merging drivers/gpu/drm/armada/armada_drv.c +Auto-merging drivers/gpu/drm/arm/hdlcd_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging arch/arc/boot/dts/nsimosci_hs_idu.dts +Auto-merging arch/arc/boot/dts/nsimosci_hs.dts +Auto-merging arch/arc/boot/dts/nsimosci.dts +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 046613b5c295] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/.gitignore | 1 + + Documentation/DocBook/Makefile | 7 +- + Documentation/DocBook/device-drivers.tmpl | 4 + + Documentation/DocBook/gpu.tmpl | 38 +- + Documentation/Makefile.sphinx | 63 + + Documentation/conf.py | 414 +++++ + .../bindings/display/panel/panel-dpi.txt | 2 + + Documentation/dmaengine/provider.txt | 2 +- + Documentation/index.rst | 23 + + Documentation/kernel-parameters.txt | 5 +- + Documentation/mic/mpssd/mpssd.c | 4 +- + Documentation/security/self-protection.txt | 28 +- + Documentation/sphinx/convert_template.sed | 18 + + Documentation/sphinx/kernel-doc.py | 127 ++ + Documentation/sphinx/post_convert.sed | 23 + + Documentation/sphinx/tmplcvt | 19 + + Documentation/sync_file.txt | 6 +- + Documentation/zh_CN/CodingStyle | 581 ++++--- + MAINTAINERS | 18 + + Makefile | 5 +- + arch/arc/boot/dts/nsimosci.dts | 14 +- + arch/arc/boot/dts/nsimosci_hs.dts | 14 +- + arch/arc/boot/dts/nsimosci_hs_idu.dts | 14 +- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 13 +- + arch/arc/boot/dts/vdk_hs38_smp.dts | 2 +- + arch/arc/configs/nsimosci_defconfig | 3 +- + arch/arc/configs/nsimosci_hs_defconfig | 3 +- + arch/arc/configs/nsimosci_hs_smp_defconfig | 3 +- + arch/arc/configs/vdk_hs38_smp_defconfig | 7 +- + arch/x86/kernel/early-quirks.c | 404 +++-- + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/fence-array.c | 144 ++ + drivers/dma-buf/fence.c | 8 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 16 +- + drivers/gpu/drm/arc/Makefile | 2 +- + drivers/gpu/drm/arc/arcpgu.h | 2 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 44 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 18 - + drivers/gpu/drm/arc/arcpgu_sim.c | 128 ++ + drivers/gpu/drm/arm/hdlcd_crtc.c | 19 - + drivers/gpu/drm/arm/hdlcd_drv.c | 10 +- + drivers/gpu/drm/armada/armada_crtc.c | 14 +- + drivers/gpu/drm/armada/armada_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/ast/ast_fb.c | 3 - + drivers/gpu/drm/ast/ast_mode.c | 10 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 12 - + drivers/gpu/drm/bochs/bochs_drv.c | 2 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 - + drivers/gpu/drm/bridge/dw-hdmi.c | 11 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 8 - + drivers/gpu/drm/bridge/parade-ps8622.c | 10 - + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 11 +- + drivers/gpu/drm/drm_atomic.c | 102 +- + drivers/gpu/drm/drm_atomic_helper.c | 566 +++++-- + drivers/gpu/drm/drm_bridge.c | 2 +- + drivers/gpu/drm/drm_crtc.c | 454 +----- + drivers/gpu/drm/drm_crtc_helper.c | 33 - + drivers/gpu/drm/drm_drv.c | 2 - + drivers/gpu/drm/drm_edid_load.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 28 +- + drivers/gpu/drm/drm_fb_helper.c | 54 +- + drivers/gpu/drm/drm_fops.c | 24 +- + drivers/gpu/drm/drm_fourcc.c | 320 ++++ + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_irq.c | 213 +-- + drivers/gpu/drm/drm_mipi_dsi.c | 38 + + drivers/gpu/drm/drm_mm.c | 4 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_modeset_lock.c | 13 +- + drivers/gpu/drm/drm_plane_helper.c | 10 +- + drivers/gpu/drm/drm_prime.c | 10 +- + drivers/gpu/drm/drm_probe_helper.c | 21 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 205 +++ + drivers/gpu/drm/drm_sysfs.c | 71 - + drivers/gpu/drm/drm_vma_manager.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 9 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 9 - + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 8 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 23 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 9 - + drivers/gpu/drm/gma500/gma_display.c | 11 +- + drivers/gpu/drm/gma500/gma_display.h | 4 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 7 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 44 +- + drivers/gpu/drm/i915/i915_debugfs.c | 171 +- + drivers/gpu/drm/i915/i915_dma.c | 132 +- + drivers/gpu/drm/i915/i915_drv.c | 129 +- + drivers/gpu/drm/i915/i915_drv.h | 405 +++-- + drivers/gpu/drm/i915/i915_gem.c | 417 +++-- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 6 +- + drivers/gpu/drm/i915/i915_gem_context.c | 464 +++--- + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 26 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 14 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 239 +-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 39 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 17 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 48 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 4 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 12 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 81 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 6 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 174 ++- + drivers/gpu/drm/i915/i915_irq.c | 515 +++--- + drivers/gpu/drm/i915/i915_params.c | 18 +- + drivers/gpu/drm/i915/i915_params.h | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 21 +- + drivers/gpu/drm/i915/i915_sysfs.c | 11 +- + drivers/gpu/drm/i915/i915_trace.h | 48 +- + drivers/gpu/drm/i915/i915_vgpu.c | 31 +- + drivers/gpu/drm/i915/i915_vgpu.h | 2 +- + drivers/gpu/drm/i915/intel_atomic.c | 5 +- + drivers/gpu/drm/i915/intel_audio.c | 8 +- + drivers/gpu/drm/i915/intel_bios.c | 21 +- + drivers/gpu/drm/i915/intel_bios.h | 16 +- + drivers/gpu/drm/i915/intel_color.c | 3 +- + drivers/gpu/drm/i915/intel_crt.c | 3 +- + drivers/gpu/drm/i915/intel_csr.c | 30 +- + drivers/gpu/drm/i915/intel_ddi.c | 4 +- + drivers/gpu/drm/i915/intel_display.c | 1649 +++++++++++--------- + drivers/gpu/drm/i915/intel_dp.c | 468 +----- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 172 ++ + drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 470 ++++++ + drivers/gpu/drm/i915/intel_dpll_mgr.c | 37 +- + drivers/gpu/drm/i915/intel_drv.h | 194 ++- + drivers/gpu/drm/i915/intel_dsi.c | 52 +- + drivers/gpu/drm/i915/intel_dsi.h | 4 + + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 179 +++ + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 77 +- + drivers/gpu/drm/i915/intel_dvo.c | 19 +- + drivers/gpu/drm/i915/intel_fbc.c | 7 +- + drivers/gpu/drm/i915/intel_fbdev.c | 41 +- + drivers/gpu/drm/i915/intel_guc.h | 37 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 3 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 179 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 355 +---- + drivers/gpu/drm/i915/intel_hotplug.c | 13 +- + drivers/gpu/drm/i915/intel_lrc.c | 704 ++++----- + drivers/gpu/drm/i915/intel_lrc.h | 19 +- + drivers/gpu/drm/i915/intel_lvds.c | 5 +- + drivers/gpu/drm/i915/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/intel_opregion.c | 109 +- + drivers/gpu/drm/i915/intel_overlay.c | 147 +- + drivers/gpu/drm/i915/intel_panel.c | 8 + + drivers/gpu/drm/i915/intel_pm.c | 1189 ++++++++------ + drivers/gpu/drm/i915/intel_psr.c | 53 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 476 +++--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 41 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 61 +- + drivers/gpu/drm/i915/intel_sdvo.c | 3 +- + drivers/gpu/drm/i915/intel_sprite.c | 43 +- + drivers/gpu/drm/i915/intel_tv.c | 3 +- + drivers/gpu/drm/i915/intel_uncore.c | 221 ++- + drivers/gpu/drm/i915/intel_vbt_defs.h | 6 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 9 - + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 9 +- + drivers/gpu/drm/msm/edp/edp_connector.c | 10 - + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 8 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 20 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 9 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 10 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 12 +- + drivers/gpu/drm/msm/msm_atomic.c | 39 +- + drivers/gpu/drm/msm/msm_fb.c | 8 - + drivers/gpu/drm/msm/msm_fbdev.c | 14 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 22 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 1 - + drivers/gpu/drm/nouveau/nv50_display.c | 9 +- + drivers/gpu/drm/omapdrm/displays/Kconfig | 28 +- + drivers/gpu/drm/omapdrm/displays/Makefile | 28 +- + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 11 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 4 +- + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 4 +- + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 3 +- + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 3 +- + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 3 +- + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 26 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 4 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 22 +- + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 +- + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 4 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 3 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 3 +- + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 +- + drivers/gpu/drm/omapdrm/dss/core.c | 5 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 471 +++++- + drivers/gpu/drm/omapdrm/dss/dispc.h | 5 + + drivers/gpu/drm/omapdrm/dss/dispc_coefs.c | 2 +- + drivers/gpu/drm/omapdrm/dss/display.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 136 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 57 +- + drivers/gpu/drm/omapdrm/dss/dss-of.c | 3 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 255 ++- + drivers/gpu/drm/omapdrm/dss/dss.h | 45 +- + drivers/gpu/drm/omapdrm/dss/dss_features.c | 46 +- + drivers/gpu/drm/omapdrm/dss/dss_features.h | 1 - + drivers/gpu/drm/omapdrm/dss/hdmi.h | 6 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 11 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 11 +- + drivers/gpu/drm/omapdrm/dss/hdmi_common.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 78 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 871 ++++++++++- + drivers/gpu/drm/omapdrm/dss/output.c | 3 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 129 +- + drivers/gpu/drm/omapdrm/dss/rfbi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 3 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 9 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 10 - + drivers/gpu/drm/omapdrm/omap_crtc.c | 56 + + drivers/gpu/drm/omapdrm/omap_drv.c | 15 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 14 - + drivers/gpu/drm/omapdrm/omap_fb.c | 16 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 5 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 15 +- + drivers/gpu/drm/qxl/qxl_display.c | 8 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 4 - + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 4 +- + drivers/gpu/drm/radeon/radeon.h | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 17 +- + drivers/gpu/drm/radeon/radeon_drv.c | 10 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- + drivers/gpu/drm/radeon/radeon_pm.c | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 - + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 3 - + drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 10 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 20 +- + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 - + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 15 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 9 - + drivers/gpu/drm/rockchip/inno_hdmi.c | 9 - + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 204 +-- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 12 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 72 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 68 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 +- + drivers/gpu/drm/sti/sti_cursor.c | 7 - + drivers/gpu/drm/sti/sti_drv.c | 10 +- + drivers/gpu/drm/sti/sti_dvo.c | 17 - + drivers/gpu/drm/sti/sti_gdp.c | 14 - + drivers/gpu/drm/sti/sti_hda.c | 17 - + drivers/gpu/drm/sti/sti_hdmi.c | 17 - + drivers/gpu/drm/sti/sti_hqvdp.c | 7 - + drivers/gpu/drm/sti/sti_mixer.c | 7 - + drivers/gpu/drm/sti/sti_tvout.c | 7 - + drivers/gpu/drm/sti/sti_vid.c | 7 - + drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 - + drivers/gpu/drm/sun4i/sun4i_tv.c | 9 - + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/drm/tegra/drm.h | 2 - + drivers/gpu/drm/tegra/dsi.c | 1 - + drivers/gpu/drm/tegra/hdmi.c | 1 - + drivers/gpu/drm/tegra/output.c | 8 - + drivers/gpu/drm/tegra/rgb.c | 1 - + drivers/gpu/drm/tegra/sor.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/udl/udl_modeset.c | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 2 - + drivers/gpu/drm/vc4/vc4_crtc.c | 21 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 9 - + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 +- + drivers/gpu/drm/vc4/vc4_gem.c | 11 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 9 - + drivers/gpu/drm/vc4/vc4_kms.c | 12 +- + drivers/gpu/drm/vc4/vc4_plane.c | 5 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 181 +-- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 + + drivers/gpu/drm/virtio/virtgpu_plane.c | 150 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- + drivers/gpu/vga/vga_switcheroo.c | 34 +- + drivers/media/platform/omap/omap_vout.c | 2 +- + drivers/media/platform/omap/omap_voutdef.h | 2 +- + drivers/media/platform/omap/omap_voutlib.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/pd.c | 4 +- + drivers/staging/android/sync.h | 3 +- + .../omap2/omapfb/displays/connector-analog-tv.c | 10 +- + .../fbdev/omap2/omapfb/displays/connector-dvi.c | 60 +- + .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 44 +- + .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 2 +- + .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 46 +- + .../omap2/omapfb/displays/encoder-tpd12s015.c | 3 +- + .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 2 +- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 54 +- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 58 +- + .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 47 +- + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 83 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 45 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 46 +- + drivers/video/fbdev/omap2/omapfb/dss/apply.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/core.c | 4 +- + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/display.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.h | 11 + + .../video/fbdev/omap2/omapfb/dss/dss_features.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 3 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/manager.c | 3 +- + drivers/video/fbdev/omap2/omapfb/dss/output.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/pll.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/rfbi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb.h | 2 +- + include/drm/drmP.h | 38 +- + include/drm/drm_atomic.h | 82 +- + include/drm/drm_atomic_helper.h | 42 +- + include/drm/drm_crtc.h | 329 +++- + include/drm/drm_crtc_helper.h | 3 - + include/drm/drm_dp_helper.h | 1 + + include/drm/drm_fb_helper.h | 11 - + include/drm/drm_fourcc.h | 37 + + include/drm/drm_mipi_dsi.h | 3 + + include/drm/drm_modes.h | 2 + + include/drm/drm_modeset_helper_vtables.h | 49 +- + include/drm/drm_simple_kms_helper.h | 94 ++ + include/drm/i915_drm.h | 3 + + include/linux/fence-array.h | 73 + + include/linux/fence.h | 13 +- + include/linux/io-mapping.h | 10 +- + include/linux/platform_data/omapdss.h | 5 - + include/linux/vga_switcheroo.h | 2 + + include/sound/omap-hdmi-audio.h | 9 +- + include/video/omap-panel-data.h | 157 -- + include/video/{omapdss.h => omapfb_dss.h} | 49 +- + scripts/kernel-doc | 393 +++-- + sound/soc/omap/omap-hdmi-audio.c | 1 - + 392 files changed, 12183 insertions(+), 8583 deletions(-) + create mode 100644 Documentation/.gitignore + create mode 100644 Documentation/Makefile.sphinx + create mode 100644 Documentation/conf.py + create mode 100644 Documentation/index.rst + create mode 100644 Documentation/sphinx/convert_template.sed + create mode 100644 Documentation/sphinx/kernel-doc.py + create mode 100644 Documentation/sphinx/post_convert.sed + create mode 100755 Documentation/sphinx/tmplcvt + create mode 100644 drivers/dma-buf/fence-array.c + create mode 100644 drivers/gpu/drm/arc/arcpgu_sim.c + create mode 100644 drivers/gpu/drm/drm_fourcc.c + create mode 100644 drivers/gpu/drm/drm_simple_kms_helper.c + create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c + create mode 100644 drivers/gpu/drm/i915/intel_dpio_phy.c + create mode 100644 drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c + create mode 100644 include/drm/drm_fourcc.h + create mode 100644 include/drm/drm_simple_kms_helper.h + create mode 100644 include/linux/fence-array.h + rename include/video/{omapdss.h => omapfb_dss.h} (94%) +Merging drm-panel/drm/panel/for-next (f103b93d90c2 drm/dsi: Add uevent callback) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/panel/panel-simple.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) +Merging drm-intel/for-linux-next (a02b01096def drm/i915: Update DRIVER_DATE to 20160620) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'recursive' strategy. + drivers/char/agp/intel-gtt.c | 8 + + drivers/gpu/drm/i915/Kconfig | 22 ++ + drivers/gpu/drm/i915/Makefile | 5 + + drivers/gpu/drm/i915/gvt/Makefile | 5 + + drivers/gpu/drm/i915/gvt/debug.h | 34 +++ + drivers/gpu/drm/i915/gvt/gvt.c | 145 +++++++++++ + drivers/gpu/drm/i915/gvt/gvt.h | 69 +++++ + drivers/gpu/drm/i915/gvt/hypercall.h | 38 +++ + drivers/gpu/drm/i915/gvt/mpt.h | 49 ++++ + drivers/gpu/drm/i915/i915_cmd_parser.c | 9 +- + drivers/gpu/drm/i915/i915_debugfs.c | 8 + + drivers/gpu/drm/i915/i915_dma.c | 39 +++ + drivers/gpu/drm/i915/i915_drv.c | 7 +- + drivers/gpu/drm/i915/i915_drv.h | 50 +++- + drivers/gpu/drm/i915/i915_gem.c | 366 ++++++++++++++++++++++----- + drivers/gpu/drm/i915/i915_gem_context.c | 38 +++ + drivers/gpu/drm/i915/i915_gem_dmabuf.h | 45 ++++ + drivers/gpu/drm/i915/i915_gem_gtt.c | 77 +++++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 5 + + drivers/gpu/drm/i915/i915_gem_render_state.c | 28 ++ + drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 355 +++++++++++++++----------- + drivers/gpu/drm/i915/i915_irq.c | 7 +- + drivers/gpu/drm/i915/i915_params.c | 13 +- + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pvinfo.h | 113 +++++++++ + drivers/gpu/drm/i915/i915_reg.h | 55 ++++ + drivers/gpu/drm/i915/i915_vgpu.c | 17 +- + drivers/gpu/drm/i915/i915_vgpu.h | 92 +------ + drivers/gpu/drm/i915/intel_ddi.c | 212 +++++++++------- + drivers/gpu/drm/i915/intel_display.c | 266 ++++++++++++------- + drivers/gpu/drm/i915/intel_drv.h | 27 +- + drivers/gpu/drm/i915/intel_dsi.c | 6 + + drivers/gpu/drm/i915/intel_fbc.c | 39 ++- + drivers/gpu/drm/i915/intel_fbdev.c | 2 - + drivers/gpu/drm/i915/intel_guc.h | 8 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 37 +-- + drivers/gpu/drm/i915/intel_gvt.c | 100 ++++++++ + drivers/gpu/drm/i915/intel_gvt.h | 45 ++++ + drivers/gpu/drm/i915/intel_lrc.c | 130 +++++++--- + drivers/gpu/drm/i915/intel_lrc.h | 5 + + drivers/gpu/drm/i915/intel_mocs.c | 10 + + drivers/gpu/drm/i915/intel_pm.c | 67 ++++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 161 +++++++++--- + drivers/gpu/drm/i915/intel_runtime_pm.c | 144 +++++++++-- + drivers/gpu/drm/i915/intel_sprite.c | 14 + + include/drm/intel-gtt.h | 3 + + 47 files changed, 2315 insertions(+), 667 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gvt/Makefile + create mode 100644 drivers/gpu/drm/i915/gvt/debug.h + create mode 100644 drivers/gpu/drm/i915/gvt/gvt.c + create mode 100644 drivers/gpu/drm/i915/gvt/gvt.h + create mode 100644 drivers/gpu/drm/i915/gvt/hypercall.h + create mode 100644 drivers/gpu/drm/i915/gvt/mpt.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_dmabuf.h + create mode 100644 drivers/gpu/drm/i915/i915_pvinfo.h + create mode 100644 drivers/gpu/drm/i915/intel_gvt.c + create mode 100644 drivers/gpu/drm/i915/intel_gvt.h +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 (e63d87c0b02f drm/i915: Move backlight unregistration to connector unregistration) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/sti/sti_drv.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dsi.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/armada/armada_overlay.c | 1 + + drivers/gpu/drm/drm_auth.c | 217 +++++++++++++++++++++++++ + drivers/gpu/drm/drm_crtc.c | 39 ++++- + drivers/gpu/drm/drm_debugfs.c | 3 - + drivers/gpu/drm/drm_dp_helper.c | 56 +++++-- + drivers/gpu/drm/drm_drv.c | 192 ++++++++-------------- + drivers/gpu/drm/drm_fops.c | 119 +------------- + drivers/gpu/drm/drm_info.c | 89 ----------- + drivers/gpu/drm/drm_internal.h | 18 +-- + drivers/gpu/drm/drm_legacy.h | 8 +- + drivers/gpu/drm/drm_lock.c | 238 ++++++++++++++-------------- + drivers/gpu/drm/drm_plane_helper.c | 28 ++-- + drivers/gpu/drm/drm_simple_kms_helper.c | 1 + + drivers/gpu/drm/drm_vm.c | 54 ------- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/i915/intel_crt.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 15 +- + drivers/gpu/drm/i915/intel_dp.c | 21 ++- + drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- + drivers/gpu/drm/i915/intel_drv.h | 17 +- + drivers/gpu/drm/i915/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/intel_panel.c | 13 +- + drivers/gpu/drm/i915/intel_sdvo.c | 26 ++- + drivers/gpu/drm/i915/intel_tv.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + + drivers/gpu/drm/rockchip/Kconfig | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + + drivers/gpu/drm/sti/sti_drv.c | 1 - + include/drm/drmP.h | 11 +- + include/drm/drm_crtc.h | 29 ++++ + include/drm/drm_dp_helper.h | 1 + + include/drm/drm_plane_helper.h | 1 + + 35 files changed, 605 insertions(+), 614 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 (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver) +$ git merge mali-dp/for-upstream/mali-dp +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/arm,malidp.txt | 65 ++ + MAINTAINERS | 10 +- + drivers/gpu/drm/arm/Kconfig | 16 + + drivers/gpu/drm/arm/Makefile | 2 + + drivers/gpu/drm/arm/malidp_crtc.c | 216 +++++++ + drivers/gpu/drm/arm/malidp_drv.c | 512 +++++++++++++++ + drivers/gpu/drm/arm/malidp_drv.h | 54 ++ + drivers/gpu/drm/arm/malidp_hw.c | 691 +++++++++++++++++++++ + drivers/gpu/drm/arm/malidp_hw.h | 241 +++++++ + drivers/gpu/drm/arm/malidp_planes.c | 298 +++++++++ + drivers/gpu/drm/arm/malidp_regs.h | 172 +++++ + 11 files changed, 2276 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/display/arm,malidp.txt + create mode 100644 drivers/gpu/drm/arm/malidp_crtc.c + create mode 100644 drivers/gpu/drm/arm/malidp_drv.c + create mode 100644 drivers/gpu/drm/arm/malidp_drv.h + create mode 100644 drivers/gpu/drm/arm/malidp_hw.c + create mode 100644 drivers/gpu/drm/arm/malidp_hw.h + create mode 100644 drivers/gpu/drm/arm/malidp_planes.c + create mode 100644 drivers/gpu/drm/arm/malidp_regs.h +Merging sunxi/sunxi/for-next (b7e7559f439c Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/dt-for-4.8' and 'sunxi/fixes-for-4.7' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/gpu/drm/sun4i/sun4i_rgb.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/axp209.dtsi | 1 + + arch/arm/boot/dts/axp22x.dtsi | 12 + + arch/arm/boot/dts/axp809.dtsi | 53 +++ + arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 1 + + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 1 + + arch/arm/boot/dts/sun4i-a10.dtsi | 222 ++++++++---- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 7 + + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 10 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 14 + + arch/arm/boot/dts/sun5i-a13.dtsi | 122 +++++++ + arch/arm/boot/dts/sun5i-q8-common.dtsi | 55 +++ + arch/arm/boot/dts/sun5i-r8-chip.dts | 2 +- + arch/arm/boot/dts/sun5i-r8.dtsi | 120 +------ + arch/arm/boot/dts/sun6i-a31-m9.dts | 96 +++++- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 96 +++++- + arch/arm/boot/dts/sun7i-a20.dtsi | 384 +++++++++++++-------- + .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 34 +- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 15 - + arch/arm/boot/dts/sun8i-a33-q8-tablet.dts | 15 - + .../arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts | 195 +++++++++++ + arch/arm/boot/dts/sun8i-h3.dtsi | 21 +- + arch/arm/boot/dts/sun8i-q8-common.dtsi | 42 +++ + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 164 ++++++++- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 195 +++++++++-- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 2 + + drivers/clk/sunxi/clk-sun4i-display.c | 5 +- + drivers/clk/sunxi/clk-sun4i-tcon-ch1.c | 4 - + drivers/gpu/drm/sun4i/Kconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 39 ++- + drivers/gpu/drm/sun4i/sun4i_drv.c | 50 ++- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 16 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 23 +- + 36 files changed, 1545 insertions(+), 485 deletions(-) + create mode 100644 arch/arm/boot/dts/axp809.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts +Merging kbuild/for-next (3f306a53b571 Merge branch 'kbuild/rc-fixes' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .gitignore | 1 + + Documentation/dontdiff | 1 + + Documentation/gcc-plugins.txt | 87 +++ + MAINTAINERS | 9 + + Makefile | 24 +- + arch/Kconfig | 36 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/um/Kconfig.common | 1 + + arch/x86/Kconfig | 1 + + arch/x86/entry/vdso/Makefile | 3 +- + arch/x86/purgatory/Makefile | 2 + + lib/Kconfig.debug | 2 + + scripts/Makefile | 2 +- + scripts/Makefile.build | 2 +- + scripts/Makefile.clean | 4 +- + scripts/Makefile.gcc-plugins | 43 ++ + scripts/Makefile.host | 55 +- + scripts/gcc-plugin.sh | 51 ++ + scripts/gcc-plugins/Makefile | 27 + + scripts/gcc-plugins/cyc_complexity_plugin.c | 73 ++ + scripts/gcc-plugins/gcc-common.h | 830 +++++++++++++++++++++ + scripts/gcc-plugins/gcc-generate-gimple-pass.h | 175 +++++ + scripts/gcc-plugins/gcc-generate-ipa-pass.h | 289 +++++++ + scripts/gcc-plugins/gcc-generate-rtl-pass.h | 175 +++++ + scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h | 175 +++++ + scripts/gcc-plugins/sancov_plugin.c | 144 ++++ + scripts/link-vmlinux.sh | 2 +- + scripts/package/builddeb | 1 + + 29 files changed, 2200 insertions(+), 17 deletions(-) + create mode 100644 Documentation/gcc-plugins.txt + create mode 100644 scripts/Makefile.gcc-plugins + create mode 100755 scripts/gcc-plugin.sh + create mode 100644 scripts/gcc-plugins/Makefile + create mode 100644 scripts/gcc-plugins/cyc_complexity_plugin.c + create mode 100644 scripts/gcc-plugins/gcc-common.h + create mode 100644 scripts/gcc-plugins/gcc-generate-gimple-pass.h + create mode 100644 scripts/gcc-plugins/gcc-generate-ipa-pass.h + create mode 100644 scripts/gcc-plugins/gcc-generate-rtl-pass.h + create mode 100644 scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h + create mode 100644 scripts/gcc-plugins/sancov_plugin.c +$ git am -3 ../patches/0001-gcc-plugins-disable-under-COMPILE_TEST.patch +Applying: gcc-plugins: disable under COMPILE_TEST +$ git reset HEAD^ +Unstaged changes after reset: +M arch/Kconfig +M lib/Kconfig.debug +$ git add -A . +$ git commit -v -a --amend +[master 9ff91737f3c6] Merge remote-tracking branch 'kbuild/for-next' + Date: Mon Jun 20 11:57:56 2016 +1000 +Merging kspp/for-next/kspp (6b31814f0507 gcc-plugins: disable under COMPILE_TEST) +$ git merge kspp/for-next/kspp +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/arm/kernel/smp.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/cpuidle.c | 2 +- + arch/arm/kernel/setup.c | 10 +++++----- + arch/arm/kernel/smp.c | 2 +- + arch/arm/lib/delay.c | 2 +- + arch/arm/mm/mmu.c | 9 ++------- + arch/x86/include/asm/desc.h | 2 +- + arch/x86/include/asm/fpu/xstate.h | 3 ++- + arch/x86/kernel/apic/apic_flat_64.c | 6 +++--- + arch/x86/kernel/apic/apic_noop.c | 2 +- + arch/x86/kernel/apic/bigsmp_32.c | 2 +- + arch/x86/kernel/apic/msi.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 4 ++-- + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/cpu/common.c | 11 ++++++++--- + arch/x86/kernel/cpu/mtrr/main.c | 4 ++-- + arch/x86/kernel/cpu/mtrr/mtrr.h | 2 +- + arch/x86/kernel/ksysfs.c | 2 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/ptrace.c | 6 +++--- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 4 ++-- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/smp.c | 2 +- + arch/x86/kernel/x86_init.c | 6 +++--- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/pci/pcbios.c | 7 +++++-- + 30 files changed, 56 insertions(+), 52 deletions(-) +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 (65a003e5c0c9 Merge remote-tracking branches 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next) +$ git merge regmap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/base/regmap/regmap-irq.c | 15 +++++++++++---- + include/linux/regmap.h | 10 ++++++++++ + 3 files changed, 22 insertions(+), 4 deletions(-) +Merging sound/for-next (3915bf294652 ALSA: seq_timer: use monotonic times internally) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/core/seq/oss/seq_oss_synth.c | 10 +++++----- + sound/core/seq/seq_timer.c | 23 +++++++++-------------- + sound/core/seq/seq_timer.h | 2 +- + sound/hda/hdmi_chmap.c | 28 +++++++++++++++++++++++++--- + sound/isa/ad1848/ad1848.c | 13 +------------ + sound/isa/adlib.c | 13 +------------ + sound/isa/cmi8328.c | 13 +------------ + sound/isa/cs423x/cs4231.c | 13 +------------ + sound/isa/galaxy/galaxy.c | 13 +------------ + sound/isa/gus/gusclassic.c | 13 +------------ + sound/isa/gus/gusextreme.c | 13 +------------ + sound/isa/gus/gusmax.c | 13 +------------ + sound/isa/sb/jazz16.c | 13 +------------ + sound/isa/sb/sb8.c | 13 +------------ + sound/isa/sc6000.c | 13 +------------ + sound/oss/aedsp16.c | 14 +++++++------- + sound/oss/sound_timer.c | 2 +- + sound/oss/sys_timer.c | 2 +- + sound/pci/ctxfi/cthw20k2.c | 34 +++++++++++++++++----------------- + sound/pci/hda/hda_codec.c | 8 +++++++- + sound/pci/hda/hda_generic.c | 4 ---- + sound/pci/hda/patch_hdmi.c | 5 +++++ + sound/pci/hda/patch_realtek.c | 38 +++++++++++++++++++++++++++++++++++++- + sound/sh/aica.c | 16 +++------------- + sound/usb/mixer_maps.c | 6 ++++-- + 25 files changed, 133 insertions(+), 202 deletions(-) +Merging sound-asoc/for-next (1a7d46a9dfeb Merge remote-tracking branches 'asoc/topic/wm8731' and 'asoc/topic/wm8985' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/samsung/odroidx2_max98090.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,adau17x1.txt | 8 + + .../devicetree/bindings/sound/adi,adau7002.txt | 19 + + .../bindings/sound/brcm,cygnus-audio.txt | 67 + + .../devicetree/bindings/sound/cs53l30.txt | 40 + + .../devicetree/bindings/sound/designware-i2s.txt | 4 + + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 +- + .../devicetree/bindings/sound/max9860.txt | 28 + + .../devicetree/bindings/sound/mt8173-rt5650.txt | 5 + + .../devicetree/bindings/sound/omap-mcpdm.txt | 10 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 2 + + .../devicetree/bindings/sound/rockchip-i2s.txt | 5 + + .../bindings/sound/samsung,odroidx2-max98090.txt | 35 - + .../devicetree/bindings/sound/sgtl5000.txt | 18 +- + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 20 +- + Documentation/sound/alsa/soc/machine.txt | 2 +- + MAINTAINERS | 11 +- + include/linux/mfd/arizona/core.h | 10 + + include/sound/compress_driver.h | 5 + + include/sound/soc-dapm.h | 5 +- + include/sound/soc.h | 11 + + sound/core/compress_offload.c | 67 +- + sound/soc/atmel/Kconfig | 1 + + sound/soc/bcm/Kconfig | 9 + + sound/soc/bcm/Makefile | 5 + + sound/soc/bcm/cygnus-pcm.c | 861 +++++++++++ + sound/soc/bcm/cygnus-ssp.c | 1529 ++++++++++++++++++++ + sound/soc/bcm/cygnus-ssp.h | 139 ++ + sound/soc/codecs/Kconfig | 34 +- + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/adau-utils.c | 61 + + sound/soc/codecs/adau-utils.h | 7 + + sound/soc/codecs/adau1373.c | 38 +- + sound/soc/codecs/adau1761-i2c.c | 2 +- + sound/soc/codecs/adau1761-spi.c | 2 +- + sound/soc/codecs/adau1781-i2c.c | 2 +- + sound/soc/codecs/adau1781-spi.c | 2 +- + sound/soc/codecs/adau17x1.c | 251 ++-- + sound/soc/codecs/adau17x1.h | 6 + + sound/soc/codecs/adau7002.c | 80 + + sound/soc/codecs/ak4613.c | 14 +- + sound/soc/codecs/ak4642.c | 13 +- + sound/soc/codecs/arizona.c | 91 +- + sound/soc/codecs/arizona.h | 22 +- + sound/soc/codecs/cs47l24.c | 19 + + sound/soc/codecs/cs53l30.c | 1108 ++++++++++++++ + sound/soc/codecs/cs53l30.h | 458 ++++++ + sound/soc/codecs/cx20442.c | 1 + + sound/soc/codecs/hdac_hdmi.c | 20 + + sound/soc/codecs/max9860.c | 753 ++++++++++ + sound/soc/codecs/max9860.h | 162 +++ + sound/soc/codecs/nau8825.c | 1245 ++++++++++++++-- + sound/soc/codecs/nau8825.h | 127 +- + sound/soc/codecs/pcm1681.c | 2 +- + sound/soc/codecs/pcm179x.c | 2 +- + sound/soc/codecs/pcm5102a.c | 1 - + sound/soc/codecs/rt5514-spi.c | 459 ++++++ + sound/soc/codecs/rt5514-spi.h | 38 + + sound/soc/codecs/rt5514.c | 136 +- + sound/soc/codecs/rt5514.h | 4 + + sound/soc/codecs/rt5670.c | 2 +- + sound/soc/codecs/sgtl5000.c | 421 ++---- + sound/soc/codecs/sgtl5000.h | 2 + + sound/soc/codecs/tas571x.c | 188 +++ + sound/soc/codecs/tas571x.h | 40 + + sound/soc/codecs/tlv320aic31xx.h | 134 +- + sound/soc/codecs/wm5102.c | 3 +- + sound/soc/codecs/wm5110.c | 20 + + sound/soc/codecs/wm8731.c | 5 +- + sound/soc/codecs/wm8940.c | 1 + + sound/soc/codecs/wm8985.c | 143 +- + sound/soc/codecs/wm8985.h | 38 + + sound/soc/codecs/wm8998.c | 1 + + sound/soc/codecs/wm_adsp.c | 26 +- + sound/soc/codecs/wm_adsp.h | 4 + + sound/soc/davinci/davinci-mcasp.c | 65 +- + sound/soc/davinci/davinci-mcasp.h | 4 +- + sound/soc/dwc/Kconfig | 9 + + sound/soc/dwc/Makefile | 1 + + sound/soc/dwc/designware_i2s.c | 229 ++- + sound/soc/dwc/designware_pcm.c | 225 +++ + sound/soc/dwc/local.h | 128 ++ + sound/soc/fsl/Kconfig | 1 + + sound/soc/generic/simple-card.c | 55 +- + sound/soc/intel/Kconfig | 16 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 460 ++++++ + sound/soc/intel/boards/bxt_rt298.c | 140 ++ + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 39 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 39 +- + sound/soc/intel/common/sst-acpi.h | 2 +- + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/bxt-sst.c | 52 +- + sound/soc/intel/skylake/skl-messages.c | 45 +- + sound/soc/intel/skylake/skl-nhlt.c | 40 + + sound/soc/intel/skylake/skl-nhlt.h | 22 + + sound/soc/intel/skylake/skl-pcm.c | 93 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 15 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 10 + + sound/soc/intel/skylake/skl-sst-ipc.h | 7 + + sound/soc/intel/skylake/skl-sst-utils.c | 256 ++++ + sound/soc/intel/skylake/skl-sst.c | 37 +- + sound/soc/intel/skylake/skl-topology.c | 217 ++- + sound/soc/intel/skylake/skl-topology.h | 6 +- + sound/soc/intel/skylake/skl.c | 18 +- + sound/soc/intel/skylake/skl.h | 10 + + sound/soc/mediatek/mt8173-rt5650.c | 45 +- + sound/soc/mediatek/mtk-afe-pcm.c | 16 +- + sound/soc/omap/Kconfig | 3 +- + sound/soc/omap/omap-mcpdm.c | 74 +- + sound/soc/rockchip/rockchip_i2s.c | 71 +- + sound/soc/rockchip/rockchip_i2s.h | 11 +- + sound/soc/rockchip/rockchip_max98090.c | 65 +- + sound/soc/samsung/Kconfig | 8 - + sound/soc/samsung/Makefile | 2 - + sound/soc/samsung/i2s.c | 31 +- + sound/soc/samsung/odroidx2_max98090.c | 185 --- + sound/soc/sh/rcar/adg.c | 20 +- + sound/soc/sh/rcar/gen.c | 12 +- + sound/soc/sh/rcar/rsrc-card.c | 2 - + sound/soc/soc-dapm.c | 60 +- + sound/soc/soc-pcm.c | 43 +- + sound/soc/sti/uniperif_player.c | 4 +- + 122 files changed, 10619 insertions(+), 1394 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.txt + create mode 100644 Documentation/devicetree/bindings/sound/brcm,cygnus-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs53l30.txt + create mode 100644 Documentation/devicetree/bindings/sound/max9860.txt + delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt + create mode 100644 sound/soc/bcm/cygnus-pcm.c + create mode 100644 sound/soc/bcm/cygnus-ssp.c + create mode 100644 sound/soc/bcm/cygnus-ssp.h + create mode 100644 sound/soc/codecs/adau-utils.c + create mode 100644 sound/soc/codecs/adau-utils.h + create mode 100644 sound/soc/codecs/adau7002.c + create mode 100644 sound/soc/codecs/cs53l30.c + create mode 100644 sound/soc/codecs/cs53l30.h + create mode 100644 sound/soc/codecs/max9860.c + create mode 100644 sound/soc/codecs/max9860.h + create mode 100644 sound/soc/codecs/rt5514-spi.c + create mode 100644 sound/soc/codecs/rt5514-spi.h + create mode 100644 sound/soc/dwc/designware_pcm.c + create mode 100644 sound/soc/dwc/local.h + create mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c + create mode 100644 sound/soc/intel/skylake/skl-sst-utils.c + delete mode 100644 sound/soc/samsung/odroidx2_max98090.c +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 (9096a45d99d0 Input: psmouse - use same format for secondary devices as for primary) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/input.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/atmel,captouch.txt | 36 + + .../devicetree/bindings/input/raydium_i2c_ts.txt | 20 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/input/input-mt.c | 17 +- + drivers/input/input.c | 7 +- + drivers/input/keyboard/tc3589x-keypad.c | 2 +- + drivers/input/misc/Kconfig | 14 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/atmel_captouch.c | 290 +++++ + drivers/input/mouse/elantech.c | 2 +- + drivers/input/mouse/lifebook.c | 2 +- + drivers/input/rmi4/rmi_f01.c | 22 +- + drivers/input/tablet/Kconfig | 15 + + drivers/input/tablet/Makefile | 1 + + drivers/input/tablet/pegasus_notetaker.c | 421 +++++++ + drivers/input/touchscreen/Kconfig | 28 +- + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/migor_ts.c | 6 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 1214 ++++++++++++++++++++ + drivers/input/touchscreen/surface3_spi.c | 427 +++++++ + drivers/input/touchscreen/ti_am335x_tsc.c | 2 +- + 21 files changed, 2506 insertions(+), 24 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/atmel,captouch.txt + create mode 100644 Documentation/devicetree/bindings/input/raydium_i2c_ts.txt + create mode 100644 drivers/input/misc/atmel_captouch.c + create mode 100644 drivers/input/tablet/pegasus_notetaker.c + create mode 100644 drivers/input/touchscreen/raydium_i2c_ts.c + create mode 100644 drivers/input/touchscreen/surface3_spi.c +Merging block/for-next (3cee5575153a Merge branch 'for-4.8/core' into for-next) +$ git merge block/for-next +Recorded preimage for 'fs/f2fs/data.c' +Resolved 'block/blk-lib.c' using previous resolution. +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Resolved 'fs/f2fs/segment.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/f2fs/segment.c +CONFLICT (content): Merge conflict in fs/f2fs/segment.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/inline.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +CONFLICT (content): Merge conflict in fs/f2fs/data.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.h +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/check-integrity.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/block/nbd.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-lib.c +CONFLICT (content): Merge conflict in block/blk-lib.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/f2fs/data.c'. +[master e88f74f80fde] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/writeback_cache_control.txt | 28 +- + Documentation/device-mapper/log-writes.txt | 10 +- + arch/um/drivers/ubd_kern.c | 2 +- + block/bio-integrity.c | 1 + + block/bio.c | 20 +- + block/blk-cgroup.c | 4 +- + block/blk-core.c | 119 ++--- + block/blk-flush.c | 23 +- + block/blk-lib.c | 44 +- + block/blk-map.c | 2 +- + block/blk-merge.c | 22 +- + block/blk-mq.c | 42 +- + block/cfq-iosched.c | 407 ++++++++++------- + block/elevator.c | 7 +- + block/partition-generic.c | 3 - + drivers/ata/libata-scsi.c | 2 +- + drivers/block/brd.c | 2 +- + drivers/block/drbd/drbd_actlog.c | 61 ++- + drivers/block/drbd/drbd_bitmap.c | 92 ++-- + drivers/block/drbd/drbd_debugfs.c | 13 +- + drivers/block/drbd/drbd_int.h | 57 ++- + drivers/block/drbd/drbd_interval.h | 14 +- + drivers/block/drbd/drbd_main.c | 135 +++++- + drivers/block/drbd/drbd_nl.c | 282 +++++++++--- + drivers/block/drbd/drbd_proc.c | 30 +- + drivers/block/drbd/drbd_protocol.h | 79 +++- + drivers/block/drbd/drbd_receiver.c | 569 +++++++++++++++++++----- + drivers/block/drbd/drbd_req.c | 86 +++- + drivers/block/drbd/drbd_req.h | 5 +- + drivers/block/drbd/drbd_state.c | 61 ++- + drivers/block/drbd/drbd_state.h | 2 +- + drivers/block/drbd/drbd_strings.c | 8 +- + drivers/block/drbd/drbd_worker.c | 90 +++- + drivers/block/floppy.c | 3 +- + drivers/block/loop.c | 14 +- + drivers/block/mg_disk.c | 7 +- + drivers/block/mtip32xx/mtip32xx.c | 2 +- + drivers/block/nbd.c | 4 +- + drivers/block/osdblk.c | 2 +- + drivers/block/pktcdvd.c | 4 +- + drivers/block/ps3disk.c | 4 +- + drivers/block/rbd.c | 4 +- + drivers/block/rsxx/dma.c | 2 +- + drivers/block/skd_main.c | 2 +- + drivers/block/umem.c | 2 +- + drivers/block/virtio_blk.c | 2 +- + drivers/block/xen-blkback/blkback.c | 27 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/xen-blkfront.c | 75 ++-- + drivers/block/zram/zram_drv.c | 2 +- + drivers/ide/ide-cd_ioctl.c | 3 - + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-floppy.c | 2 +- + drivers/lightnvm/rrpc.c | 6 +- + drivers/md/bcache/btree.c | 4 +- + drivers/md/bcache/debug.c | 6 +- + drivers/md/bcache/io.c | 2 +- + drivers/md/bcache/journal.c | 9 +- + drivers/md/bcache/movinggc.c | 2 +- + drivers/md/bcache/request.c | 28 +- + drivers/md/bcache/super.c | 31 +- + drivers/md/bcache/writeback.c | 4 +- + drivers/md/bitmap.c | 6 +- + drivers/md/dm-bufio.c | 9 +- + drivers/md/dm-cache-target.c | 18 +- + drivers/md/dm-crypt.c | 11 +- + drivers/md/dm-era-target.c | 4 +- + drivers/md/dm-flakey.c | 2 +- + drivers/md/dm-io.c | 57 +-- + drivers/md/dm-kcopyd.c | 11 +- + drivers/md/dm-log-writes.c | 13 +- + drivers/md/dm-log.c | 5 +- + drivers/md/dm-raid.c | 5 +- + drivers/md/dm-raid1.c | 22 +- + drivers/md/dm-region-hash.c | 6 +- + drivers/md/dm-snap-persistent.c | 24 +- + drivers/md/dm-snap.c | 6 +- + drivers/md/dm-stats.c | 9 +- + drivers/md/dm-stripe.c | 6 +- + drivers/md/dm-thin.c | 22 +- + drivers/md/dm.c | 45 +- + drivers/md/linear.c | 4 +- + drivers/md/md.c | 18 +- + drivers/md/md.h | 5 +- + drivers/md/multipath.c | 2 +- + drivers/md/raid0.c | 4 +- + drivers/md/raid1.c | 37 +- + drivers/md/raid10.c | 51 ++- + drivers/md/raid5-cache.c | 33 +- + drivers/md/raid5.c | 48 +- + drivers/mmc/card/block.c | 21 +- + drivers/mmc/card/queue.c | 8 +- + drivers/mmc/card/queue.h | 6 +- + drivers/mtd/mtd_blkdevs.c | 4 +- + drivers/nvme/host/core.c | 73 ++- + drivers/nvme/host/nvme.h | 5 +- + drivers/nvme/host/pci.c | 30 +- + drivers/scsi/osd/osd_initiator.c | 12 +- + drivers/scsi/sd.c | 20 +- + drivers/staging/lustre/lustre/llite/lloop.c | 6 +- + drivers/target/target_core_iblock.c | 41 +- + drivers/target/target_core_pscsi.c | 2 +- + fs/btrfs/check-integrity.c | 61 +-- + fs/btrfs/check-integrity.h | 6 +- + fs/btrfs/compression.c | 17 +- + fs/btrfs/ctree.h | 2 +- + fs/btrfs/disk-io.c | 43 +- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/extent_io.c | 91 ++-- + fs/btrfs/extent_io.h | 8 +- + fs/btrfs/inode.c | 70 +-- + fs/btrfs/raid56.c | 17 +- + fs/btrfs/scrub.c | 15 +- + fs/btrfs/volumes.c | 91 ++-- + fs/btrfs/volumes.h | 6 +- + fs/buffer.c | 69 +-- + fs/crypto/crypto.c | 3 +- + fs/direct-io.c | 35 +- + fs/exofs/ore.c | 2 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/crypto.c | 3 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 8 +- + fs/ext4/mmp.c | 4 +- + fs/ext4/namei.c | 3 +- + fs/ext4/page-io.c | 7 +- + fs/ext4/readpage.c | 9 +- + fs/ext4/super.c | 2 +- + fs/f2fs/checkpoint.c | 10 +- + fs/f2fs/data.c | 48 +- + fs/f2fs/f2fs.h | 5 +- + fs/f2fs/gc.c | 9 +- + fs/f2fs/inline.c | 3 +- + fs/f2fs/node.c | 8 +- + fs/f2fs/segment.c | 14 +- + fs/f2fs/trace.c | 7 +- + fs/fat/misc.c | 2 +- + fs/gfs2/bmap.c | 4 +- + fs/gfs2/dir.c | 2 +- + fs/gfs2/log.c | 8 +- + fs/gfs2/lops.c | 12 +- + fs/gfs2/lops.h | 2 +- + fs/gfs2/meta_io.c | 18 +- + fs/gfs2/ops_fstype.c | 3 +- + fs/gfs2/quota.c | 2 +- + fs/hfsplus/hfsplus_fs.h | 2 +- + fs/hfsplus/part_tbl.c | 5 +- + fs/hfsplus/super.c | 6 +- + fs/hfsplus/wrapper.c | 15 +- + fs/isofs/compress.c | 2 +- + fs/jbd2/commit.c | 6 +- + fs/jbd2/journal.c | 10 +- + fs/jbd2/recovery.c | 4 +- + fs/jfs/jfs_logmgr.c | 6 +- + fs/jfs/jfs_metapage.c | 10 +- + fs/logfs/dev_bdev.c | 17 +- + fs/mpage.c | 41 +- + fs/nfs/blocklayout/blocklayout.c | 22 +- + fs/nilfs2/btnode.c | 6 +- + fs/nilfs2/btnode.h | 2 +- + fs/nilfs2/btree.c | 6 +- + fs/nilfs2/gcinode.c | 5 +- + fs/nilfs2/mdt.c | 11 +- + fs/nilfs2/segbuf.c | 18 +- + fs/ntfs/aops.c | 6 +- + fs/ntfs/compress.c | 2 +- + fs/ntfs/file.c | 2 +- + fs/ntfs/logfile.c | 2 +- + fs/ntfs/mft.c | 4 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/buffer_head_io.c | 8 +- + fs/ocfs2/cluster/heartbeat.c | 14 +- + fs/ocfs2/super.c | 2 +- + fs/reiserfs/inode.c | 4 +- + fs/reiserfs/journal.c | 14 +- + fs/reiserfs/stree.c | 4 +- + fs/reiserfs/super.c | 2 +- + fs/squashfs/block.c | 4 +- + fs/udf/dir.c | 2 +- + fs/udf/directory.c | 2 +- + fs/udf/inode.c | 2 +- + fs/ufs/balloc.c | 2 +- + fs/ufs/util.c | 2 +- + fs/xfs/xfs_aops.c | 11 +- + fs/xfs/xfs_buf.c | 32 +- + include/linux/bio.h | 83 +--- + include/linux/blk-cgroup.h | 13 +- + include/linux/blk_types.h | 69 ++- + include/linux/blkdev.h | 64 +-- + include/linux/blktrace_api.h | 2 +- + include/linux/buffer_head.h | 11 +- + include/linux/bvec.h | 96 ++++ + include/linux/dm-io.h | 3 +- + include/linux/drbd.h | 10 +- + include/linux/drbd_genl.h | 7 +- + include/linux/drbd_limits.h | 15 +- + include/linux/elevator.h | 4 +- + include/linux/fs.h | 43 +- + include/linux/nvme.h | 69 ++- + include/trace/events/bcache.h | 12 +- + include/trace/events/block.h | 31 +- + include/trace/events/f2fs.h | 37 +- + kernel/power/swap.c | 33 +- + kernel/trace/blktrace.c | 83 ++-- + lib/iov_iter.c | 45 +- + mm/page_io.c | 10 +- + 207 files changed, 3203 insertions(+), 1881 deletions(-) + create mode 100644 include/linux/bvec.h +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 (68c1c4d5eafc dm raid: don't use 'const' in function return) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-raid.txt | 58 +- + drivers/md/Makefile | 3 +- + drivers/md/dm-builtin.c | 2 +- + drivers/md/dm-core.h | 149 ++ + drivers/md/dm-io.c | 2 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-kcopyd.c | 2 +- + drivers/md/dm-mpath.c | 354 +++- + drivers/md/dm-raid.c | 2855 +++++++++++++++++++++++++------ + drivers/md/dm-rq.c | 968 +++++++++++ + drivers/md/dm-rq.h | 64 + + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-sysfs.c | 3 +- + drivers/md/dm-table.c | 69 +- + drivers/md/dm-target.c | 2 +- + drivers/md/dm.c | 1125 +----------- + drivers/md/dm.h | 35 +- + include/linux/device-mapper.h | 16 + + 18 files changed, 3955 insertions(+), 1756 deletions(-) + create mode 100644 drivers/md/dm-core.h + create mode 100644 drivers/md/dm-rq.c + create mode 100644 drivers/md/dm-rq.h +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 (b28173343703 mmc: tmio: make a cast explicit) +$ git merge mmc-uh/next +Auto-merging drivers/mmc/card/block.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 1 + + MAINTAINERS | 1 + + drivers/mmc/card/block.c | 4 +- + drivers/mmc/core/bus.c | 3 +- + drivers/mmc/core/core.c | 9 +++ + drivers/mmc/core/debugfs.c | 3 +- + drivers/mmc/core/host.c | 2 + + drivers/mmc/core/mmc.c | 84 ++++++++++++++++++++++++++- + drivers/mmc/host/sdhci-of-arasan.c | 20 +++++++ + drivers/mmc/host/sdhci.c | 17 +++++- + drivers/mmc/host/sh_mobile_sdhi.c | 14 +++-- + drivers/mmc/host/tmio_mmc.h | 2 +- + include/linux/mmc/card.h | 1 + + include/linux/mmc/host.h | 12 ++++ + include/linux/mmc/mmc.h | 3 + + 15 files changed, 163 insertions(+), 13 deletions(-) +Merging md/for-next (d787be4092e2 md: reduce the number of synchronize_rcu() calls when multiple devices fail.) +$ git merge md/for-next +Resolved 'drivers/md/raid1.c' using previous resolution. +Resolved 'drivers/md/raid10.c' using previous resolution. +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +CONFLICT (content): Merge conflict in drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +CONFLICT (content): Merge conflict in drivers/md/raid1.c +Auto-merging drivers/md/multipath.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/md.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3492a593e884] Merge remote-tracking branch 'md/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/md/md.c | 65 +++++++++++---- + drivers/md/md.h | 8 ++ + drivers/md/multipath.c | 29 ++++--- + drivers/md/raid1.c | 133 +++++++++++++++--------------- + drivers/md/raid10.c | 218 ++++++++++++++++++++++++++++++------------------- + drivers/md/raid5.c | 45 ++++++---- + 6 files changed, 303 insertions(+), 195 deletions(-) +Merging mfd/for-mfd-next (1cf9326d4c07 mfd: max14577: Allow driver to be built as a module) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mfd/max77620.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 +++ + drivers/mfd/Kconfig | 15 ++- + drivers/mfd/Makefile | 2 + + drivers/mfd/altera-a10sr.c | 169 ++++++++++++++++++++++++++++++++++ + drivers/mfd/arizona-irq.c | 16 +++- + drivers/mfd/axp20x.c | 17 ++++ + drivers/mfd/hi655x-pmic.c | 52 ++++++++--- + drivers/mfd/max14577.c | 2 +- + drivers/mfd/max77620.c | 75 ++++++++++----- + drivers/mfd/max77843.c | 24 +---- + drivers/mfd/max8925-i2c.c | 14 +-- + drivers/mfd/max8997.c | 30 +----- + drivers/mfd/max8998.c | 27 +----- + drivers/mfd/omap-usb-tll.c | 2 + + drivers/mfd/qcom_rpm.c | 52 +++++++---- + drivers/mfd/si476x-i2c.c | 2 +- + drivers/mfd/ti_am335x_tscadc.c | 135 +++++++++++---------------- + drivers/mfd/tps6507x.c | 4 +- + include/linux/mfd/altera-a10sr.h | 85 +++++++++++++++++ + include/linux/mfd/arizona/registers.h | 6 -- + include/linux/mfd/hi655x-pmic.h | 25 +++-- + include/linux/mfd/ti_am335x_tscadc.h | 2 +- + 22 files changed, 525 insertions(+), 242 deletions(-) + create mode 100644 drivers/mfd/altera-a10sr.c + create mode 100644 include/linux/mfd/altera-a10sr.h +Merging backlight/for-backlight-next (4db8c9572ce1 backlight: lp855x: Add enable regulator) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/lp855x_bl.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/backlight/lp855x.txt | 2 ++ + drivers/video/backlight/lp855x_bl.c | 29 ++++++++++++++++++++++ + 2 files changed, 31 insertions(+) +Merging battery/master (2e05b518c897 power_supply: bq27xxx_battery: Group register mappings into one table) +$ git merge battery/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../{ => power}/reset/brcm,bcm21664-resetmgr.txt | 0 + .../bindings/power_supply/axp20x_usb_power.txt | 3 +- + MAINTAINERS | 2 + + drivers/power/axp20x_usb_power.c | 92 +++++-- + drivers/power/bq27xxx_battery.c | 284 ++++++++++----------- + drivers/power/bq27xxx_battery_i2c.c | 2 +- + drivers/power/reset/Kconfig | 3 +- + drivers/power/reset/syscon-poweroff.c | 2 +- + 8 files changed, 213 insertions(+), 175 deletions(-) + rename Documentation/devicetree/bindings/{ => power}/reset/brcm,bcm21664-resetmgr.txt (100%) +Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (1fc4aeb3d151 Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/pfuze100', 'regulator/topic/pwm', 'regulator/topic/qcom-smd' and 'regulator/topic/twl' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/axp20x.txt | 6 + + drivers/regulator/Kconfig | 4 +- + drivers/regulator/anatop-regulator.c | 2 +- + drivers/regulator/axp20x-regulator.c | 147 ++++++++++++++++++----- + drivers/regulator/core.c | 27 ----- + drivers/regulator/fixed.c | 14 +-- + drivers/regulator/max8973-regulator.c | 16 +-- + drivers/regulator/mt6397-regulator.c | 95 +++++++++++++-- + drivers/regulator/pfuze100-regulator.c | 15 ++- + drivers/regulator/pv88060-regulator.c | 3 - + drivers/regulator/pv88080-regulator.c | 3 - + drivers/regulator/pv88090-regulator.c | 3 - + drivers/regulator/pwm-regulator.c | 5 - + drivers/regulator/qcom_smd-regulator.c | 1 - + drivers/regulator/twl-regulator.c | 2 +- + include/linux/regulator/consumer.h | 6 - + 16 files changed, 227 insertions(+), 122 deletions(-) +Merging security/next (26703c636c1f um/ptrace: run seccomp after ptrace) +$ git merge security/next +Auto-merging arch/powerpc/kernel/ptrace.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/kernel/ptrace.c | 13 +- + arch/arm64/kernel/ptrace.c | 8 +- + arch/mips/kernel/ptrace.c | 9 +- + arch/parisc/kernel/ptrace.c | 9 +- + arch/powerpc/kernel/ptrace.c | 46 +++---- + arch/s390/kernel/ptrace.c | 21 ++- + arch/tile/kernel/ptrace.c | 11 +- + arch/um/kernel/skas/syscall.c | 9 +- + arch/x86/entry/common.c | 106 +++------------- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/include/asm/ptrace.h | 6 - + include/linux/capability.h | 5 + + include/linux/seccomp.h | 14 +- + kernel/capability.c | 46 +++++-- + kernel/seccomp.c | 144 ++++++++------------- + net/sysctl_net.c | 2 +- + security/security.c | 29 ++++- + security/tomoyo/gc.c | 9 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 176 ++++++++++++++++++++++++-- + 20 files changed, 379 insertions(+), 288 deletions(-) +Merging integrity/next (848b134bf8e7 ima: extend the measurement entry specific pcr) +$ git merge integrity/next +Merge made by the 'recursive' strategy. + security/integrity/iint.c | 2 ++ + security/integrity/ima/ima.h | 11 +++++++---- + security/integrity/ima/ima_api.c | 21 +++++++++++++-------- + security/integrity/ima/ima_appraise.c | 3 ++- + security/integrity/ima/ima_fs.c | 9 ++++----- + security/integrity/ima/ima_init.c | 3 ++- + security/integrity/ima/ima_main.c | 12 +++++++++--- + security/integrity/ima/ima_policy.c | 35 +++++++++++++++++++++++++++++++++-- + security/integrity/ima/ima_queue.c | 13 +++++++------ + security/integrity/integrity.h | 1 + + 10 files changed, 80 insertions(+), 30 deletions(-) +Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record) +$ git merge keys/keys-next +Already up-to-date. +Merging selinux/next (309c5fad5de4 selinux: fix type mismatch) +$ git merge selinux/next +Auto-merging net/iucv/af_iucv.c +Merge made by the 'recursive' strategy. + net/iucv/af_iucv.c | 5 ++- + net/netlabel/netlabel_kapi.c | 21 ++++++++----- + security/selinux/selinuxfs.c | 2 +- + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/services.c | 70 +++++++++++++----------------------------- + 5 files changed, 42 insertions(+), 58 deletions(-) +Merging tpmdd/next (3051e8c00764 tpm_crb: fix address space of the return pointer in crb_map_res()) +$ git merge tpmdd/next +Recorded preimage for 'Documentation/devicetree/bindings/vendor-prefixes.txt' +Auto-merging include/uapi/linux/Kbuild +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/devicetree/bindings/vendor-prefixes.txt'. +[master bec6a10b5993] Merge remote-tracking branch 'tpmdd/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/security/tpm/tpm_tis_spi.txt | 24 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/tpm/tpm_vtpm_proxy.txt | 71 ++ + drivers/char/tpm/Kconfig | 30 + + drivers/char/tpm/Makefile | 3 + + 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 | 78 +- + 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 | 75 +- + 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 | 829 ++------------------ + drivers/char/tpm/tpm_tis_core.c | 862 +++++++++++++++++++++ + drivers/char/tpm/tpm_tis_core.h | 156 ++++ + drivers/char/tpm/tpm_tis_spi.c | 272 +++++++ + 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 + + 37 files changed, 3030 insertions(+), 1410 deletions(-) + create mode 100644 Documentation/devicetree/bindings/security/tpm/tpm_tis_spi.txt + create mode 100644 Documentation/tpm/tpm_vtpm_proxy.txt + create mode 100644 drivers/char/tpm/tpm_tis_core.c + create mode 100644 drivers/char/tpm/tpm_tis_core.h + create mode 100644 drivers/char/tpm/tpm_tis_spi.c + create mode 100644 drivers/char/tpm/tpm_vtpm_proxy.c + create mode 100644 include/uapi/linux/vtpm_proxy.h +Merging watchdog/master (1a695a905c18 Linux 4.7-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (da3189d191e4 Merge branches 'iommu/fixes', 'x86/amd', 'x86/vt-d', 'arm/exynos' and 'arm/mediatek' into next) +$ git merge iommu/next +Recorded preimage for 'drivers/iommu/mtk_iommu.c' +Auto-merging drivers/iommu/mtk_iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/iommu/mtk_iommu.c'. +[master b478e9c6eb30] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + drivers/iommu/amd_iommu.c | 4 ++ + drivers/iommu/dmar.c | 16 ++++++- + drivers/iommu/exynos-iommu.c | 101 ++++++++++++++++++++----------------------- + drivers/iommu/intel-iommu.c | 4 +- + drivers/iommu/mtk_iommu.c | 15 ++----- + 5 files changed, 70 insertions(+), 70 deletions(-) +Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (8569de68e79e docs: kernel-doc: Add "example" and "note" to the magic section types) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (52bbe141f37f gitignore: fix wording) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (66b12abc846d audit: fix some horrible switch statement style crimes) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Merge made by the 'recursive' strategy. + kernel/auditfilter.c | 12 ++++++++---- + kernel/auditsc.c | 8 ++++++-- + 2 files changed, 14 insertions(+), 6 deletions(-) +Merging devicetree/for-next (06dfeef88573 drivers: of: add definition of early_init_dt_alloc_reserved_memory_arch) +$ git merge devicetree/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (9ef3c5112139 mailbox: mailbox-test: set tdev->signal to NULL after freeing) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/mailbox-test.c | 1 + + 1 file changed, 1 insertion(+) +Merging spi/for-next (10a340f4245c Merge remote-tracking branches 'spi/topic/rockchip' and 'spi/topic/sunxi' into spi-next) +$ git merge spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 5 +- + .../devicetree/bindings/spi/spi-orion.txt | 49 +++++- + .../devicetree/bindings/spi/spi-rockchip.txt | 11 +- + MAINTAINERS | 1 + + drivers/spi/spi-imx.c | 179 ++++++++++----------- + drivers/spi/spi-orion.c | 88 ++++++++++ + drivers/spi/spi-pxa2xx.c | 10 +- + drivers/spi/spi-rockchip.c | 7 +- + drivers/spi/spi-sun4i.c | 29 +++- + drivers/spi/spi-sun6i.c | 15 +- + drivers/spi/spi-ti-qspi.c | 7 + + drivers/spi/spi.c | 28 ++++ + include/linux/spi/spi.h | 4 + + 13 files changed, 315 insertions(+), 118 deletions(-) +Merging tip/auto-latest (2e8756bc09bd Merge branch 'x86/boot') +$ git merge tip/auto-latest +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging drivers/irqchip/Kconfig +Auto-merging arch/x86/include/asm/fpu/xstate.h +Auto-merging arch/x86/entry/vdso/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/arm,gic.txt | 3 +- + Documentation/kernel-parameters.txt | 10 +- + Documentation/memory-barriers.txt | 41 + + Documentation/x86/early-microcode.txt | 5 +- + MAINTAINERS | 22 +- + arch/alpha/include/asm/atomic.h | 87 +- + arch/alpha/include/asm/rwsem.h | 68 +- + arch/alpha/include/asm/spinlock.h | 9 +- + arch/arc/include/asm/atomic.h | 101 +- + arch/arc/include/asm/spinlock.h | 7 +- + arch/arm/include/asm/atomic.h | 106 +- + arch/arm/include/asm/spinlock.h | 19 +- + arch/arm64/include/asm/atomic.h | 60 + + arch/arm64/include/asm/atomic_ll_sc.h | 110 +- + arch/arm64/include/asm/atomic_lse.h | 278 +++- + arch/avr32/include/asm/atomic.h | 54 +- + arch/blackfin/include/asm/atomic.h | 8 + + arch/blackfin/include/asm/spinlock.h | 5 +- + arch/blackfin/kernel/bfin_ksyms.c | 1 + + arch/blackfin/mach-bf561/atomic.S | 43 +- + arch/frv/include/asm/atomic.h | 30 +- + arch/frv/include/asm/atomic_defs.h | 2 + + arch/h8300/include/asm/atomic.h | 29 +- + arch/hexagon/include/asm/atomic.h | 31 +- + arch/hexagon/include/asm/spinlock.h | 10 +- + arch/ia64/include/asm/atomic.h | 130 +- + arch/ia64/include/asm/mutex.h | 2 +- + arch/ia64/include/asm/rwsem.h | 31 +- + arch/ia64/include/asm/spinlock.h | 4 + + arch/m32r/include/asm/atomic.h | 36 +- + arch/m32r/include/asm/spinlock.h | 9 +- + arch/m68k/include/asm/atomic.h | 51 +- + arch/metag/include/asm/atomic_lnkget.h | 36 +- + arch/metag/include/asm/atomic_lock1.h | 33 +- + arch/metag/include/asm/spinlock.h | 14 +- + arch/mips/include/asm/atomic.h | 154 +- + arch/mips/include/asm/spinlock.h | 19 +- + arch/mn10300/include/asm/atomic.h | 33 +- + arch/mn10300/include/asm/spinlock.h | 8 +- + arch/parisc/include/asm/atomic.h | 63 +- + arch/parisc/include/asm/spinlock.h | 9 +- + arch/powerpc/include/asm/atomic.h | 83 +- + arch/powerpc/include/asm/mutex.h | 2 +- + arch/s390/include/asm/atomic.h | 40 +- + arch/s390/include/asm/rwsem.h | 37 - + arch/s390/include/asm/spinlock.h | 3 + + arch/sh/include/asm/atomic-grb.h | 34 +- + arch/sh/include/asm/atomic-irq.h | 31 +- + arch/sh/include/asm/atomic-llsc.h | 32 +- + arch/sh/include/asm/spinlock.h | 10 +- + arch/sparc/include/asm/atomic_32.h | 13 +- + arch/sparc/include/asm/atomic_64.h | 16 +- + arch/sparc/include/asm/spinlock_32.h | 7 +- + arch/sparc/include/asm/spinlock_64.h | 10 +- + arch/sparc/lib/atomic32.c | 29 +- + arch/sparc/lib/atomic_64.S | 61 +- + arch/sparc/lib/ksyms.c | 17 +- + arch/tile/include/asm/atomic.h | 2 + + arch/tile/include/asm/atomic_32.h | 60 +- + arch/tile/include/asm/atomic_64.h | 115 +- + arch/tile/include/asm/barrier.h | 7 + + arch/tile/include/asm/bitops_32.h | 18 +- + arch/tile/lib/atomic_32.c | 42 +- + arch/tile/lib/atomic_asm_32.S | 14 +- + arch/tile/lib/spinlock_32.c | 6 + + arch/tile/lib/spinlock_64.c | 6 + + arch/x86/Kconfig | 35 +- + arch/x86/boot/bitops.h | 8 +- + arch/x86/boot/boot.h | 17 +- + arch/x86/boot/compressed/Makefile | 18 + + arch/x86/boot/compressed/kaslr.c | 175 ++- + arch/x86/boot/compressed/misc.c | 49 +- + arch/x86/boot/compressed/misc.h | 25 +- + arch/x86/boot/compressed/pagetable.c | 26 +- + arch/x86/boot/string.c | 2 +- + arch/x86/entry/vdso/Makefile | 5 +- + arch/x86/entry/vdso/vdso32/sigreturn.S | 8 - + arch/x86/entry/vdso/vdso32/system_call.S | 7 +- + arch/x86/events/core.c | 23 + + arch/x86/events/intel/core.c | 181 ++- + arch/x86/events/intel/cstate.c | 47 +- + arch/x86/events/intel/rapl.c | 32 +- + arch/x86/events/intel/uncore.c | 86 +- + arch/x86/events/intel/uncore.h | 4 + + arch/x86/events/intel/uncore_snbep.c | 96 +- + arch/x86/events/msr.c | 63 +- + arch/x86/events/perf_event.h | 10 + + arch/x86/include/asm/apm.h | 6 +- + arch/x86/include/asm/arch_hweight.h | 24 +- + arch/x86/include/asm/archrandom.h | 132 +- + arch/x86/include/asm/asm.h | 12 + + arch/x86/include/asm/atomic.h | 51 +- + arch/x86/include/asm/atomic64_32.h | 25 +- + arch/x86/include/asm/atomic64_64.h | 53 +- + arch/x86/include/asm/bitops.h | 50 +- + arch/x86/include/asm/compat.h | 11 + + arch/x86/include/asm/fpu/internal.h | 5 + + arch/x86/include/asm/fpu/xstate.h | 2 +- + arch/x86/include/asm/intel-mid.h | 8 + + arch/x86/include/asm/local.h | 16 +- + arch/x86/include/asm/microcode.h | 26 - + arch/x86/include/asm/microcode_amd.h | 1 - + arch/x86/include/asm/microcode_intel.h | 5 - + arch/x86/include/asm/mutex_32.h | 2 +- + arch/x86/include/asm/mutex_64.h | 6 +- + arch/x86/include/asm/percpu.h | 17 +- + arch/x86/include/asm/preempt.h | 2 +- + arch/x86/include/asm/processor.h | 3 +- + arch/x86/include/asm/rmwcc.h | 20 +- + arch/x86/include/asm/rwsem.h | 35 +- + arch/x86/include/asm/signal.h | 6 +- + arch/x86/include/asm/sync_bitops.h | 18 +- + arch/x86/include/asm/topology.h | 9 + + arch/x86/include/asm/trace/fpu.h | 119 ++ + arch/x86/include/asm/uaccess.h | 23 +- + arch/x86/kernel/apic/apic.c | 6 +- + arch/x86/kernel/apic/hw_nmi.c | 8 + + arch/x86/kernel/apic/io_apic.c | 18 +- + arch/x86/kernel/cpu/mcheck/mce-apei.c | 2 +- + arch/x86/kernel/cpu/microcode/amd.c | 33 +- + arch/x86/kernel/cpu/microcode/core.c | 9 +- + arch/x86/kernel/cpu/microcode/intel.c | 251 ++-- + arch/x86/kernel/cpu/rdrand.c | 4 +- + arch/x86/kernel/fpu/core.c | 25 +- + arch/x86/kernel/fpu/init.c | 21 +- + arch/x86/kernel/fpu/signal.c | 35 +- + arch/x86/kernel/fpu/xstate.c | 92 +- + arch/x86/kernel/i386_ksyms_32.c | 2 + + arch/x86/kernel/kprobes/core.c | 12 + + arch/x86/kernel/kvm.c | 2 - + arch/x86/kernel/signal_compat.c | 108 ++ + arch/x86/kernel/smpboot.c | 25 +- + arch/x86/kernel/vm86_32.c | 5 +- + arch/x86/kernel/x8664_ksyms_64.c | 3 + + arch/x86/kvm/x86.c | 6 +- + arch/x86/lguest/boot.c | 17 +- + arch/x86/lib/Makefile | 2 +- + arch/x86/lib/hweight.S | 77 + + arch/x86/mm/init.c | 7 - + arch/x86/pci/intel_mid_pci.c | 52 +- + arch/x86/platform/atom/punit_atom_debug.c | 15 +- + arch/x86/platform/intel-mid/Makefile | 2 +- + arch/x86/platform/intel-mid/device_libs/Makefile | 6 +- + .../intel-mid/device_libs/platform_pcal9555a.c | 99 ++ + arch/x86/platform/intel-mid/pwr.c | 416 +++++ + arch/x86/power/hibernate_64.c | 66 +- + arch/x86/power/hibernate_asm_64.S | 31 +- + arch/x86/xen/enlighten.c | 4 +- + arch/xtensa/include/asm/atomic.h | 52 +- + arch/xtensa/include/asm/spinlock.h | 10 +- + drivers/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-gic-common.c | 4 +- + drivers/irqchip/irq-gic-pm.c | 184 +++ + drivers/irqchip/irq-gic-v3-its.c | 404 +++-- + drivers/irqchip/irq-gic.c | 134 +- + drivers/irqchip/irq-mips-gic.c | 15 +- + drivers/pci/Makefile | 3 + + drivers/pci/pci-mid.c | 77 + + drivers/platform/x86/intel_pmc_core.c | 9 +- + fs/timerfd.c | 10 + + include/asm-generic/atomic-long.h | 36 +- + include/asm-generic/atomic.h | 47 + + include/asm-generic/atomic64.h | 15 +- + include/asm-generic/barrier.h | 41 +- + include/asm-generic/mutex-dec.h | 2 +- + include/asm-generic/mutex-xchg.h | 6 +- + include/asm-generic/qspinlock.h | 5 +- + include/asm-generic/rwsem.h | 22 +- + include/linux/atomic.h | 627 ++++++-- + include/linux/compiler.h | 21 +- + include/linux/futex.h | 12 +- + include/linux/irq.h | 4 + + include/linux/irqchip/arm-gic-v3.h | 4 + + include/linux/irqchip/arm-gic.h | 11 + + include/linux/irqdomain.h | 3 + + include/linux/nmi.h | 1 + + include/linux/percpu-refcount.h | 12 +- + include/linux/perf_event.h | 15 +- + include/linux/random.h | 12 +- + include/linux/rwsem.h | 8 +- + include/linux/sched.h | 5 + + include/linux/spinlock_up.h | 10 +- + include/uapi/linux/futex.h | 6 +- + include/uapi/linux/perf_event.h | 6 +- + ipc/sem.c | 13 +- + kernel/bpf/stackmap.c | 2 +- + kernel/events/callchain.c | 14 +- + kernel/events/core.c | 158 +- + kernel/exit.c | 84 +- + kernel/fork.c | 7 + + kernel/futex.c | 557 ++++++- + kernel/irq/chip.c | 40 + + kernel/irq/internals.h | 1 + + kernel/irq/irqdomain.c | 58 +- + kernel/irq/manage.c | 45 +- + kernel/irq/proc.c | 9 +- + kernel/locking/lockdep.c | 13 +- + kernel/locking/mutex-debug.h | 4 +- + kernel/locking/mutex.h | 10 +- + kernel/locking/qrwlock.c | 2 +- + kernel/locking/qspinlock.c | 86 +- + kernel/locking/qspinlock_paravirt.h | 4 +- + kernel/locking/rtmutex.c | 2 +- + kernel/locking/rwsem-xadd.c | 194 ++- + kernel/locking/rwsem.c | 8 +- + kernel/locking/rwsem.h | 52 +- + kernel/power/hibernate.c | 6 - + kernel/rcu/tree.c | 1 - + kernel/sched/core.c | 18 +- + kernel/sched/cputime.c | 16 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 48 +- + kernel/sched/idle.c | 4 +- + kernel/sched/sched.h | 15 +- + kernel/smp.c | 2 +- + kernel/task_work.c | 1 - + kernel/time/hrtimer.c | 2 +- + kernel/time/timer.c | 8 +- + kernel/watchdog.c | 7 + + lib/Makefile | 5 - + lib/atomic64.c | 32 +- + lib/atomic64_test.c | 34 + + lib/earlycpio.c | 5 +- + lib/hweight.c | 4 + + net/netfilter/nf_conntrack_core.c | 23 +- + tools/lib/api/Makefile | 1 + + tools/lib/api/fd/array.c | 5 +- + tools/lib/api/fd/array.h | 3 +- + tools/lib/bpf/libbpf.c | 60 +- + tools/lib/bpf/libbpf.h | 25 +- + tools/perf/.gitignore | 1 + + tools/perf/Documentation/perf-mem.txt | 3 + + tools/perf/Documentation/perf-probe.txt | 4 + + tools/perf/Documentation/perf-stat.txt | 32 + + tools/perf/arch/arm/util/Build | 2 +- + tools/perf/arch/arm64/util/Build | 2 +- + tools/perf/arch/arm64/util/unwind-libunwind.c | 4 +- + tools/perf/arch/common.c | 2 +- + tools/perf/arch/common.h | 1 + + tools/perf/arch/x86/util/Build | 3 +- + tools/perf/arch/x86/util/group.c | 27 + + tools/perf/arch/x86/util/tsc.c | 2 + + tools/perf/arch/x86/util/unwind-libunwind.c | 6 +- + tools/perf/bench/futex-hash.c | 38 +- + tools/perf/bench/futex.h | 14 + + tools/perf/builtin-diff.c | 7 +- + tools/perf/builtin-mem.c | 1 + + tools/perf/builtin-probe.c | 1 + + tools/perf/builtin-record.c | 9 +- + tools/perf/builtin-report.c | 3 +- + tools/perf/builtin-script.c | 23 +- + tools/perf/builtin-stat.c | 165 +- + tools/perf/builtin-top.c | 2 +- + tools/perf/config/Makefile | 55 +- + tools/perf/tests/fdarray.c | 8 +- + tools/perf/tests/parse-events.c | 4 +- + tools/perf/ui/browsers/hists.c | 39 +- + tools/perf/ui/gtk/hists.c | 2 +- + tools/perf/ui/hist.c | 11 +- + tools/perf/ui/stdio/hist.c | 133 +- + tools/perf/util/Build | 3 + + tools/perf/util/bpf-loader.c | 132 +- + tools/perf/util/build-id.c | 112 +- + tools/perf/util/build-id.h | 4 + + tools/perf/util/callchain.h | 1 + + tools/perf/util/config.c | 76 +- + tools/perf/util/db-export.c | 13 +- + tools/perf/util/dso.h | 5 + + tools/perf/util/evlist.c | 48 +- + tools/perf/util/evlist.h | 2 + + tools/perf/util/evsel.c | 44 +- + tools/perf/util/evsel.h | 4 + + tools/perf/util/group.h | 7 + + tools/perf/util/hist.c | 2 +- + tools/perf/util/hist.h | 7 +- + tools/perf/util/libunwind/arm64.c | 35 + + tools/perf/util/libunwind/x86_32.c | 37 + + tools/perf/util/machine.c | 14 +- + tools/perf/util/mem-events.c | 17 +- + tools/perf/util/mem-events.h | 1 + + tools/perf/util/parse-events.c | 8 + + tools/perf/util/parse-events.h | 1 + + tools/perf/util/parse-events.l | 2 + + tools/perf/util/probe-event.c | 128 +- + tools/perf/util/probe-event.h | 5 + + tools/perf/util/probe-file.c | 331 ++++ + tools/perf/util/probe-file.h | 20 + + tools/perf/util/session.c | 2 + + tools/perf/util/sort.c | 14 +- + tools/perf/util/stat-shadow.c | 162 ++ + tools/perf/util/stat.c | 5 + + tools/perf/util/stat.h | 5 + + tools/perf/util/symbol.c | 71 +- + tools/perf/util/thread.c | 24 +- + tools/perf/util/thread.h | 11 +- + tools/perf/util/unwind-libunwind-local.c | 697 +++++++++ + tools/perf/util/unwind-libunwind.c | 688 +-------- + tools/perf/util/unwind.h | 22 +- + tools/perf/util/util.c | 13 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/mpx-debug.h | 14 + + tools/testing/selftests/x86/mpx-dig.c | 498 ++++++ + tools/testing/selftests/x86/mpx-hw.h | 123 ++ + tools/testing/selftests/x86/mpx-mini-test.c | 1585 ++++++++++++++++++++ + tools/testing/selftests/x86/mpx-mm.h | 9 + + 306 files changed, 11496 insertions(+), 3173 deletions(-) + create mode 100644 arch/x86/include/asm/trace/fpu.h + create mode 100644 arch/x86/lib/hweight.S + create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_pcal9555a.c + create mode 100644 arch/x86/platform/intel-mid/pwr.c + create mode 100644 drivers/irqchip/irq-gic-pm.c + create mode 100644 drivers/pci/pci-mid.c + create mode 100644 tools/perf/arch/x86/util/group.c + create mode 100644 tools/perf/util/group.h + create mode 100644 tools/perf/util/libunwind/arm64.c + create mode 100644 tools/perf/util/libunwind/x86_32.c + create mode 100644 tools/perf/util/unwind-libunwind-local.c + create mode 100644 tools/testing/selftests/x86/mpx-debug.h + create mode 100644 tools/testing/selftests/x86/mpx-dig.c + create mode 100644 tools/testing/selftests/x86/mpx-hw.h + create mode 100644 tools/testing/selftests/x86/mpx-mini-test.c + create mode 100644 tools/testing/selftests/x86/mpx-mm.h +Merging clockevents/clockevents/next (dda57f6be11f Merge branches 'clockevents/clksrc-of-ret' and 'clockevents/compile-test' into clockevents/next) +$ git merge clockevents/clockevents/next +Resolved 'arch/arm/Kconfig' using previous resolution. +Resolved 'arch/arm/mach-mxs/Kconfig' using previous resolution. +Auto-merging include/linux/of.h +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Auto-merging arch/arm/mach-u300/Kconfig +Auto-merging arch/arm/mach-prima2/Kconfig +Auto-merging arch/arm/mach-mxs/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig +Auto-merging arch/arm/mach-moxart/Kconfig +Auto-merging arch/arm/mach-keystone/Kconfig +Auto-merging arch/arm/mach-integrator/Kconfig +Auto-merging arch/arm/mach-bcm/Kconfig +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9ac4e249b6fd] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/timer/oxsemi,rps-timer.txt | 17 ++ + ...chip,rk3288-timer.txt => rockchip,rk-timer.txt} | 6 +- + arch/arc/kernel/time.c | 63 +++-- + arch/arm/Kconfig | 2 +- + arch/arm/kernel/smp_twd.c | 3 +- + arch/arm/mach-bcm/Kconfig | 2 + + arch/arm/mach-integrator/Kconfig | 2 +- + arch/arm/mach-keystone/Kconfig | 2 +- + arch/arm/mach-moxart/Kconfig | 2 +- + arch/arm/mach-mxs/Kconfig | 2 +- + arch/arm/mach-nspire/Kconfig | 1 + + arch/arm/mach-prima2/Kconfig | 2 + + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 + + arch/microblaze/kernel/timer.c | 49 +++- + arch/mips/ralink/cevt-rt3352.c | 17 +- + arch/nios2/kernel/time.c | 63 +++-- + drivers/clocksource/Kconfig | 104 +++++++- + drivers/clocksource/Makefile | 23 +- + drivers/clocksource/arm_arch_timer.c | 46 ++-- + drivers/clocksource/arm_global_timer.c | 26 +- + drivers/clocksource/armv7m_systick.c | 17 +- + drivers/clocksource/asm9260_timer.c | 22 +- + drivers/clocksource/bcm2835_timer.c | 38 ++- + drivers/clocksource/bcm_kona_timer.c | 9 +- + drivers/clocksource/cadence_ttc_timer.c | 74 +++-- + drivers/clocksource/clksrc-dbx500-prcmu.c | 4 +- + drivers/clocksource/clksrc-probe.c | 14 +- + drivers/clocksource/clksrc_st_lpc.c | 20 +- + drivers/clocksource/clps711x-timer.c | 10 +- + drivers/clocksource/dw_apb_timer_of.c | 4 +- + drivers/clocksource/exynos_mct.c | 32 ++- + drivers/clocksource/fsl_ftm_timer.c | 20 +- + drivers/clocksource/h8300_timer16.c | 12 +- + drivers/clocksource/h8300_timer8.c | 11 +- + drivers/clocksource/h8300_tpu.c | 10 +- + drivers/clocksource/meson6_timer.c | 19 +- + drivers/clocksource/mips-gic-timer.c | 24 +- + drivers/clocksource/moxart_timer.c | 39 ++- + drivers/clocksource/mps2-timer.c | 8 +- + drivers/clocksource/mtk_timer.c | 8 +- + drivers/clocksource/mxs_timer.c | 26 +- + drivers/clocksource/nomadik-mtu.c | 43 +-- + drivers/clocksource/pxa_timer.c | 44 ++- + drivers/clocksource/qcom-timer.c | 23 +- + drivers/clocksource/rockchip_timer.c | 44 ++- + drivers/clocksource/samsung_pwm_timer.c | 70 ++--- + drivers/clocksource/sun4i_timer.c | 43 ++- + drivers/clocksource/tango_xtal.c | 10 +- + drivers/clocksource/tegra20_timer.c | 24 +- + drivers/clocksource/time-armada-370-xp.c | 98 +++++-- + drivers/clocksource/time-efm32.c | 17 +- + drivers/clocksource/time-lpc32xx.c | 10 +- + drivers/clocksource/time-orion.c | 50 +++- + drivers/clocksource/time-pistachio.c | 18 +- + drivers/clocksource/timer-atlas7.c | 30 ++- + drivers/clocksource/timer-atmel-pit.c | 41 ++- + drivers/clocksource/timer-atmel-st.c | 42 +-- + drivers/clocksource/timer-digicolor.c | 16 +- + drivers/clocksource/timer-imx-gpt.c | 51 ++-- + drivers/clocksource/timer-integrator-ap.c | 57 ++-- + drivers/clocksource/timer-keystone.c | 13 +- + drivers/clocksource/timer-nps.c | 14 +- + drivers/clocksource/timer-oxnas-rps.c | 297 +++++++++++++++++++++ + drivers/clocksource/timer-prima2.c | 42 ++- + drivers/clocksource/timer-sp804.c | 87 ++++-- + drivers/clocksource/timer-stm32.c | 8 +- + drivers/clocksource/timer-sun5i.c | 33 ++- + drivers/clocksource/timer-ti-32k.c | 8 +- + drivers/clocksource/timer-u300.c | 36 ++- + drivers/clocksource/versatile.c | 6 +- + drivers/clocksource/vf_pit_timer.c | 25 +- + drivers/clocksource/vt8500_timer.c | 24 +- + drivers/clocksource/zevio-timer.c | 4 +- + include/clocksource/timer-sp804.h | 8 +- + include/linux/clk.h | 4 + + include/linux/clocksource.h | 2 +- + include/linux/of.h | 3 + + 78 files changed, 1599 insertions(+), 609 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/oxsemi,rps-timer.txt + rename Documentation/devicetree/bindings/timer/{rockchip,rk3288-timer.txt => rockchip,rk-timer.txt} (75%) + create mode 100644 drivers/clocksource/timer-oxnas-rps.c +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 (bba142957e04 EDAC: Correct channel count limit) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/altera/socfpga-eccmgr.txt | 14 +- + drivers/edac/altera_edac.c | 187 ++++++++++++++++----- + drivers/edac/altera_edac.h | 5 +- + drivers/edac/amd64_edac.c | 4 +- + drivers/edac/edac_mc_sysfs.c | 20 ++- + 5 files changed, 181 insertions(+), 49 deletions(-) +Merging irqchip/irqchip/for-next (ebf63bb87f67 Merge branch 'irqchip/misc' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-armada-370-xp.c | 2 +- + drivers/irqchip/irq-bcm2836.c | 4 ++-- + drivers/irqchip/irq-bcm7120-l2.c | 10 +++++----- + drivers/irqchip/irq-brcmstb-l2.c | 4 ++-- + drivers/irqchip/irq-gic-v2m.c | 1 + + drivers/irqchip/irq-omap-intc.c | 2 ++ + drivers/irqchip/irq-sirfsoc.c | 11 ++++++++--- + drivers/irqchip/irq-tegra.c | 4 ++-- + drivers/irqchip/irq-vic.c | 5 +++-- + 9 files changed, 26 insertions(+), 17 deletions(-) +Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (b4aa201e0c7c torture: Convert torture_shutdown() to hrtimer) +$ git merge rcu/rcu/next +Resolved 'kernel/rcu/tree.c' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Auto-merging init/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d5b07a209d8e] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Requirements/Requirements.html | 35 ++ + Documentation/RCU/stallwarn.txt | 2 +- + Documentation/RCU/whatisRCU.txt | 3 + + Documentation/sysctl/kernel.txt | 12 + + include/linux/kernel.h | 1 + + include/linux/rcupdate.h | 23 +- + include/linux/torture.h | 4 + + init/Kconfig | 1 + + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcuperf.c | 25 +- + kernel/rcu/rcutorture.c | 9 +- + kernel/rcu/tree.c | 588 +----------------- + kernel/rcu/tree.h | 15 + + kernel/rcu/tree_exp.h | 656 +++++++++++++++++++++ + kernel/rcu/tree_plugin.h | 96 +-- + kernel/rcu/update.c | 7 +- + kernel/rcu/waketorture.c | 537 +++++++++++++++++ + kernel/sysctl.c | 11 + + kernel/torture.c | 186 +++--- + lib/Kconfig.debug | 51 +- + .../testing/selftests/rcutorture/bin/functions.sh | 12 +- + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 ++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 34 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 4 +- + .../selftests/rcutorture/bin/parse-console.sh | 7 +- + .../selftests/rcutorture/configs/wake/CFLIST | 1 + + .../selftests/rcutorture/configs/wake/CFcommon | 2 + + tools/testing/selftests/rcutorture/configs/wake/SH | 19 + + .../selftests/rcutorture/configs/wake/SH.boot | 1 + + .../testing/selftests/rcutorture/configs/wake/STI | 19 + + .../selftests/rcutorture/configs/wake/STI.boot | 1 + + .../rcutorture/configs/wake/ver_functions.sh | 43 ++ + tools/testing/selftests/rcutorture/doc/initrd.txt | 22 + + 34 files changed, 1672 insertions(+), 799 deletions(-) + create mode 100644 kernel/rcu/tree_exp.h + create mode 100644 kernel/rcu/waketorture.c + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh +$ git am -3 ../patches/0001-rcu-merge-fix-for-kernel-rcu-tree_exp.h.patch +Applying: rcu: merge fix for kernel/rcu/tree_exp.h +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/rcu/tree_exp.h +$ git add -A . +$ git commit -v -a --amend +[master f3a303f2d1c1] Merge remote-tracking branch 'rcu/rcu/next' + Date: Mon Jun 20 14:02:00 2016 +1000 +Merging kvm/linux-next (64672c95ea4c kvm: vmx: hook preemption timer support) +$ git merge kvm/linux-next +Resolved 'arch/s390/hypfs/hypfs_diag.c' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kvm/intercept.c +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/include/asm/page.h +Auto-merging arch/s390/include/asm/kvm_host.h +Auto-merging arch/s390/include/asm/diag.h +Auto-merging arch/s390/hypfs/hypfs_diag.c +CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 97eb07d45ee5] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 8 + + Documentation/virtual/kvm/devices/vm.txt | 87 +++- + Documentation/virtual/kvm/locking.txt | 4 +- + arch/arm/kvm/arm.c | 2 +- + arch/arm/kvm/emulate.c | 2 +- + arch/arm/kvm/guest.c | 2 +- + arch/arm/kvm/reset.c | 2 +- + arch/arm64/include/asm/kvm_arm.h | 2 +- + arch/arm64/kvm/guest.c | 2 +- + arch/arm64/kvm/reset.c | 2 +- + arch/mips/include/asm/kvm_host.h | 300 +++++-------- + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 2 +- + arch/mips/include/asm/mipsregs.h | 21 +- + arch/mips/include/asm/setup.h | 1 + + arch/mips/include/uapi/asm/inst.h | 35 +- + arch/mips/kernel/asm-offsets.c | 4 - + arch/mips/kernel/traps.c | 23 +- + arch/mips/kvm/Makefile | 1 + + arch/mips/kvm/commpage.c | 2 +- + arch/mips/kvm/dyntrans.c | 158 +++---- + arch/mips/kvm/emulate.c | 405 ++++++++--------- + arch/mips/kvm/interrupt.c | 12 +- + arch/mips/kvm/interrupt.h | 10 +- + arch/mips/kvm/locore.S | 11 +- + arch/mips/kvm/mips.c | 279 ++++++++---- + arch/mips/kvm/mmu.c | 370 +++++++++++++++ + arch/mips/kvm/stats.c | 21 - + arch/mips/kvm/tlb.c | 496 ++------------------- + arch/mips/kvm/trace.h | 254 ++++++++++- + arch/mips/kvm/trap_emul.c | 170 ++++--- + arch/mips/mm/c-r4k.c | 2 +- + arch/s390/hypfs/hypfs_diag.c | 375 +++++----------- + arch/s390/include/asm/cpacf.h | 10 + + arch/s390/include/asm/diag.h | 149 +++++++ + arch/s390/include/asm/kvm_host.h | 10 +- + arch/s390/include/asm/page.h | 7 +- + arch/s390/include/asm/pgtable.h | 7 +- + arch/s390/include/asm/sclp.h | 23 +- + arch/s390/include/uapi/asm/kvm.h | 29 ++ + arch/s390/include/uapi/asm/sie.h | 1 + + arch/s390/kernel/diag.c | 37 ++ + arch/s390/kvm/Makefile | 2 +- + arch/s390/kvm/diag.c | 5 + + arch/s390/kvm/gaccess.c | 152 ++++--- + arch/s390/kvm/guestdbg.c | 2 +- + arch/s390/kvm/intercept.c | 15 + + arch/s390/kvm/interrupt.c | 26 +- + arch/s390/kvm/kvm-s390.c | 265 +++++++++-- + arch/s390/kvm/kvm-s390.h | 9 + + arch/s390/kvm/priv.c | 217 +++++++-- + arch/s390/kvm/sthyi.c | 471 +++++++++++++++++++ + arch/s390/kvm/trace.h | 49 +- + arch/s390/mm/pgtable.c | 106 +++-- + arch/x86/include/asm/kvm_host.h | 5 + + arch/x86/include/asm/svm.h | 1 - + arch/x86/include/asm/virtext.h | 8 +- + arch/x86/kvm/Kconfig | 1 - + arch/x86/kvm/i8254.c | 4 +- + arch/x86/kvm/iommu.c | 2 - + arch/x86/kvm/lapic.c | 122 ++++- + arch/x86/kvm/lapic.h | 5 + + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/pmu_intel.c | 2 +- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/trace.h | 15 + + arch/x86/kvm/vmx.c | 199 ++++++++- + arch/x86/kvm/x86.c | 101 +++-- + drivers/s390/char/sclp_early.c | 12 +- + drivers/s390/char/sclp_ocf.c | 23 +- + include/linux/kvm_host.h | 14 +- + virt/kvm/Kconfig | 3 - + virt/kvm/kvm_main.c | 27 +- + 72 files changed, 3444 insertions(+), 1761 deletions(-) + create mode 100644 arch/mips/kvm/mmu.c + create mode 100644 arch/s390/kvm/sthyi.c +$ git am -3 ../patches/s390-fix-merge-conflict-in-arch-s390-kvm-kvm-s390.c.patch +Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/kvm/kvm-s390.c +$ git add -A . +$ git commit -v -a --amend +[master 5093c273868f] Merge remote-tracking branch 'kvm/linux-next' + Date: Mon Jun 20 14:10:51 2016 +1000 +$ git am -3 ../patches/0001-s390-merge-fix-up-for-__diag204-move.patch +Applying: s390: merge fix up for __diag204 move +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/kernel/diag.c +$ git add -A . +$ git commit -v -a --amend +[master 435d97e803ba] Merge remote-tracking branch 'kvm/linux-next' + Date: Mon Jun 20 14:10:51 2016 +1000 +Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state) +$ 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 (a7e19ab55ffd KVM: s390: handle missing storage-key facility) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/Makefile +Auto-merging drivers/of/fdt.c +Auto-merging arch/arm/kernel/setup.c +Merge made by the 'recursive' strategy. + 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 | 125 ++++++++++++---- + 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 | 111 +++++++++++++++ + arch/x86/xen/grant-table.c | 57 +------- + drivers/acpi/scan.c | 74 ++++++++++ + drivers/firmware/efi/arm-runtime.c | 5 + + drivers/firmware/efi/efi.c | 81 ++++++++--- + drivers/of/fdt.c | 13 ++ + drivers/xen/Kconfig | 2 +- + drivers/xen/Makefile | 1 + + drivers/xen/arm-device.c | 196 ++++++++++++++++++++++++++ + drivers/xen/balloon.c | 28 ++-- + drivers/xen/efi.c | 173 +++++------------------ + 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 +++-- + 25 files changed, 849 insertions(+), 263 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 +Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) +Merging drivers-x86/for-next (b740d2e9233c platform/x86: Add PMC Driver for Intel Core SoC) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (ea12c45f1b36 hsi: Only descend into hsi directory when CONFIG_HSI is set) +$ git merge hsi/for-next +Auto-merging drivers/hsi/hsi_core.c +Auto-merging drivers/Makefile +Auto-merging Documentation/DocBook/device-drivers.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/device-drivers.tmpl | 2 +- + drivers/Makefile | 2 +- + drivers/hsi/Makefile | 3 ++- + drivers/hsi/clients/cmt_speech.c | 4 ++-- + drivers/hsi/{hsi.c => hsi_core.c} | 8 ++++---- + 5 files changed, 10 insertions(+), 9 deletions(-) + rename drivers/hsi/{hsi.c => hsi_core.c} (98%) +Merging leds/for-next (ba6bc7dc4d39 leds: pca9532: Add device tree support) +$ git merge leds/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-pca9532.txt | 39 +++++++++++ + MAINTAINERS | 1 + + drivers/leds/leds-pca9532.c | 75 ++++++++++++++++++++-- + include/dt-bindings/leds/leds-pca9532.h | 18 ++++++ + include/linux/leds-pca9532.h | 9 ++- + 5 files changed, 133 insertions(+), 9 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-pca9532.txt + create mode 100644 include/dt-bindings/leds/leds-pca9532.h +Merging ipmi/for-next (4e80ad011c9c ipmi: Remove smi_msg from waiting_rcv_msgs list before handle_one_recv_msg()) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (5edb56491d48 Linux 4.7-rc3) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (5edb56491d48 Linux 4.7-rc3) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (76d15c8fba65 ehci-platform: Add support for shared reset controllers) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/atmel-usb.txt | 6 +- + Documentation/devicetree/bindings/usb/usb-ohci.txt | 2 +- + arch/arm/boot/dts/sama5d2.dtsi | 2 +- + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/host/ehci-platform.c | 37 +++++----- + drivers/usb/host/ohci-at91.c | 80 +++++++++++++++++++++- + drivers/usb/host/ohci-platform.c | 43 ++++++------ + drivers/usb/image/microtek.h | 6 +- + drivers/usb/misc/usb3503.c | 25 +++++++ + drivers/usb/usbip/usbip_common.h | 2 +- + drivers/usb/usbip/vudc_sysfs.c | 2 +- + include/soc/at91/at91_sfr.h | 29 ++++++++ + 12 files changed, 189 insertions(+), 47 deletions(-) + create mode 100644 include/soc/at91/at91_sfr.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 (af8c34ce6ae3 Linux 4.7-rc2) +$ 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 (0fd9da9a979a staging/android: sync_debug: unproxify debugfs files' fops) +$ git merge staging/staging-next +Resolved 'drivers/iio/industrialio-trigger.c' using previous resolution. +Auto-merging tools/iio/iio_generic_buffer.c +Auto-merging include/linux/iio/common/st_sensors.h +Auto-merging include/linux/fence.h +CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree. +Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +Removing drivers/staging/android/uapi/sw_sync.h +CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree. +Removing drivers/staging/android/sync.c +Removing drivers/staging/android/sw_sync.h +Auto-merging drivers/iio/proximity/as3935.c +Auto-merging drivers/iio/pressure/st_pressure_core.c +Auto-merging drivers/iio/pressure/bmp280.c +Auto-merging drivers/iio/magnetometer/st_magn_core.c +Auto-merging drivers/iio/industrialio-trigger.c +CONFLICT (content): Merge conflict in drivers/iio/industrialio-trigger.c +Auto-merging drivers/iio/imu/bmi160/bmi160_core.c +Auto-merging drivers/iio/humidity/am2315.c +Auto-merging drivers/iio/gyro/st_gyro_core.c +Auto-merging drivers/iio/common/st_sensors/st_sensors_core.c +Auto-merging drivers/iio/common/st_sensors/st_sensors_buffer.c +Auto-merging drivers/iio/accel/st_accel_core.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c +drivers/staging/lustre/lustre/llite/lloop.c: needs merge +rm 'drivers/staging/lustre/lustre/llite/lloop.c' +$ git rm -f drivers/staging/android/sync.h +drivers/staging/android/sync.h: needs merge +rm 'drivers/staging/android/sync.h' +$ git commit -v -a +[master 71b455b65a71] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-iio | 13 + + Documentation/ABI/testing/sysfs-bus-iio | 7 + + .../ABI/testing/sysfs-bus-iio-health-afe440x | 63 +- + .../bindings/iio/chemical/atlas,ec-sm.txt | 22 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + MAINTAINERS | 2 + + drivers/iio/Kconfig | 8 + + drivers/iio/Makefile | 1 + + drivers/iio/accel/Kconfig | 20 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/bma220_spi.c | 338 ++ + drivers/iio/accel/mma7660.c | 277 ++ + drivers/iio/accel/mma8452.c | 185 +- + drivers/iio/accel/st_accel_core.c | 12 +- + drivers/iio/adc/ad7266.c | 7 +- + drivers/iio/adc/ad7476.c | 11 +- + drivers/iio/adc/ad7791.c | 36 +- + drivers/iio/adc/ad7793.c | 32 +- + drivers/iio/adc/ad7887.c | 11 +- + drivers/iio/adc/ad7923.c | 11 +- + drivers/iio/adc/ad799x.c | 24 +- + drivers/iio/adc/mxs-lradc.c | 34 +- + drivers/iio/adc/nau7802.c | 19 + + drivers/iio/adc/ti-ads1015.c | 128 +- + drivers/iio/adc/ti_am335x_adc.c | 22 +- + drivers/iio/chemical/Kconfig | 8 +- + drivers/iio/chemical/atlas-ph-sensor.c | 267 +- + drivers/iio/common/st_sensors/st_sensors_buffer.c | 3 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 29 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 4 +- + drivers/iio/dummy/Kconfig | 1 + + drivers/iio/dummy/iio_simple_dummy.c | 102 +- + drivers/iio/gyro/st_gyro_core.c | 12 +- + drivers/iio/health/afe4403.c | 299 +- + drivers/iio/health/afe4404.c | 308 +- + drivers/iio/health/afe440x.h | 48 +- + drivers/iio/humidity/am2315.c | 1 + + drivers/iio/humidity/htu21.c | 1 + + drivers/iio/imu/bmi160/bmi160_core.c | 27 + + drivers/iio/industrialio-core.c | 1 + + drivers/iio/industrialio-sw-device.c | 182 + + drivers/iio/industrialio-trigger.c | 13 +- + drivers/iio/light/jsa1212.c | 3 - + drivers/iio/magnetometer/Kconfig | 2 + + drivers/iio/magnetometer/ak8975.c | 20 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 3 + + drivers/iio/magnetometer/bmc150_magn_spi.c | 3 + + drivers/iio/magnetometer/st_magn_core.c | 12 +- + drivers/iio/potentiometer/Kconfig | 11 + + drivers/iio/potentiometer/Makefile | 1 + + drivers/iio/potentiometer/max5487.c | 161 + + drivers/iio/potentiometer/tpl0102.c | 4 - + drivers/iio/pressure/Kconfig | 5 +- + drivers/iio/pressure/bmp280.c | 200 +- + drivers/iio/pressure/hp206c.c | 1 + + drivers/iio/pressure/ms5637.c | 1 + + drivers/iio/pressure/st_pressure.h | 1 + + drivers/iio/pressure/st_pressure_core.c | 105 +- + drivers/iio/pressure/st_pressure_i2c.c | 4 + + drivers/iio/pressure/st_pressure_spi.c | 1 + + drivers/iio/proximity/as3935.c | 1 - + drivers/iio/temperature/tsys02d.c | 1 + + drivers/iio/trigger/Kconfig | 12 + + drivers/iio/trigger/Makefile | 1 + + drivers/iio/trigger/iio-trig-loop.c | 143 + + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/android/Kconfig | 17 +- + drivers/staging/android/Makefile | 3 +- + drivers/staging/android/sw_sync.c | 341 +- + drivers/staging/android/sw_sync.h | 59 - + drivers/staging/android/sync.c | 221 -- + drivers/staging/android/sync.h | 155 - + drivers/staging/android/sync_debug.c | 165 +- + drivers/staging/android/sync_debug.h | 83 + + drivers/staging/android/trace/sync.h | 14 +- + drivers/staging/android/uapi/sw_sync.h | 32 - + drivers/staging/comedi/comedi.h | 2 +- + drivers/staging/comedi/comedi_fops.c | 21 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 187 -- + drivers/staging/comedi/drivers/addi_apci_1564.c | 305 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 8 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 209 +- + drivers/staging/comedi/drivers/comedi_bond.c | 10 +- + drivers/staging/comedi/drivers/daqboard2000.c | 380 ++- + drivers/staging/comedi/drivers/das16.c | 39 +- + drivers/staging/comedi/drivers/das16m1.c | 482 ++- + drivers/staging/comedi/drivers/das6402.c | 74 +- + drivers/staging/comedi/drivers/das800.c | 106 +- + drivers/staging/comedi/drivers/dmm32at.c | 98 +- + drivers/staging/comedi/drivers/dt2801.c | 95 +- + drivers/staging/comedi/drivers/dt2811.c | 852 +++-- + drivers/staging/comedi/drivers/dt2814.c | 72 +- + drivers/staging/comedi/drivers/dt2815.c | 140 +- + drivers/staging/comedi/drivers/dt2817.c | 64 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 87 +- + drivers/staging/comedi/drivers/jr3_pci.c | 36 +- + drivers/staging/comedi/drivers/me_daq.c | 2 +- + drivers/staging/comedi/drivers/mpc624.c | 4 +- + drivers/staging/comedi/drivers/ni_65xx.c | 18 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 4 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 8 +- + drivers/staging/comedi/drivers/pcmmio.c | 40 +- + drivers/staging/comedi/drivers/pcmuio.c | 2 +- + drivers/staging/comedi/drivers/plx9080.h | 957 +++--- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/comedi/drivers/rtd520.c | 15 +- + drivers/staging/comedi/drivers/s626.c | 8 +- + drivers/staging/comedi/drivers/s626.h | 356 +- + drivers/staging/comedi/drivers/serial2002.c | 7 +- + drivers/staging/ks7010/Kconfig | 10 + + drivers/staging/ks7010/Makefile | 5 + + drivers/staging/ks7010/TODO | 37 + + drivers/staging/ks7010/eap_packet.h | 129 + + drivers/staging/ks7010/ks7010_config.c | 500 +++ + drivers/staging/ks7010/ks7010_sdio.c | 1234 +++++++ + drivers/staging/ks7010/ks7010_sdio.h | 148 + + drivers/staging/ks7010/ks79xx.cfg | 116 + + drivers/staging/ks7010/ks_hostif.c | 2760 +++++++++++++++ + drivers/staging/ks7010/ks_hostif.h | 644 ++++ + drivers/staging/ks7010/ks_wlan.h | 503 +++ + drivers/staging/ks7010/ks_wlan_ioctl.h | 67 + + drivers/staging/ks7010/ks_wlan_net.c | 3544 ++++++++++++++++++++ + drivers/staging/ks7010/michael_mic.c | 139 + + drivers/staging/ks7010/michael_mic.h | 26 + + .../staging/lustre/include/linux/libcfs/curproc.h | 6 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_fail.h | 4 - + .../lustre/include/linux/libcfs/libcfs_hash.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_prim.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_string.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_time.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_workitem.h | 6 +- + .../lustre/include/linux/libcfs/linux/libcfs.h | 6 +- + .../lustre/include/linux/libcfs/linux/linux-time.h | 6 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 3 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 354 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 307 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 382 +-- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 8 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 308 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 209 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 200 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 40 +- + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 2 +- + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 68 +- + drivers/staging/lustre/lnet/libcfs/debug.c | 6 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 4 - + drivers/staging/lustre/lnet/libcfs/hash.c | 6 +- + drivers/staging/lustre/lnet/libcfs/libcfs_string.c | 6 +- + .../lustre/lnet/libcfs/linux/linux-crypto.c | 1 + + .../lustre/lnet/libcfs/linux/linux-curproc.c | 6 +- + .../staging/lustre/lnet/libcfs/linux/linux-debug.c | 6 +- + .../staging/lustre/lnet/libcfs/linux/linux-mem.c | 2 +- + .../lustre/lnet/libcfs/linux/linux-module.c | 6 +- + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 6 +- + .../lustre/lnet/libcfs/linux/linux-tracefile.c | 6 +- + drivers/staging/lustre/lnet/libcfs/module.c | 6 +- + drivers/staging/lustre/lnet/libcfs/prng.c | 6 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 6 +- + drivers/staging/lustre/lnet/libcfs/tracefile.h | 6 +- + drivers/staging/lustre/lnet/libcfs/workitem.c | 6 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 6 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 6 +- + drivers/staging/lustre/lnet/lnet/config.c | 6 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 6 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 6 +- + drivers/staging/lustre/lnet/lnet/lib-me.c | 6 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 6 +- + drivers/staging/lustre/lnet/lnet/lib-msg.c | 6 +- + drivers/staging/lustre/lnet/lnet/lo.c | 6 +- + drivers/staging/lustre/lnet/lnet/module.c | 6 +- + drivers/staging/lustre/lnet/lnet/net_fault.c | 4 +- + drivers/staging/lustre/lnet/lnet/nidstrings.c | 6 +- + drivers/staging/lustre/lnet/lnet/peer.c | 6 +- + drivers/staging/lustre/lnet/lnet/router.c | 9 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 6 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 6 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 6 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 6 +- + drivers/staging/lustre/lnet/selftest/console.c | 6 +- + drivers/staging/lustre/lnet/selftest/console.h | 6 +- + drivers/staging/lustre/lnet/selftest/framework.c | 6 +- + drivers/staging/lustre/lnet/selftest/module.c | 6 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 6 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 6 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 6 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 7 +- + drivers/staging/lustre/lnet/selftest/timer.c | 6 +- + drivers/staging/lustre/lnet/selftest/timer.h | 6 +- + drivers/staging/lustre/lustre/Kconfig | 6 - + drivers/staging/lustre/lustre/fid/fid_internal.h | 6 +- + drivers/staging/lustre/lustre/fid/fid_lib.c | 6 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 12 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 6 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 6 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 6 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 6 +- + drivers/staging/lustre/lustre/fld/lproc_fld.c | 6 +- + drivers/staging/lustre/lustre/include/cl_object.h | 6 +- + .../staging/lustre/lustre/include/interval_tree.h | 6 +- + .../lustre/lustre/include/linux/lustre_compat25.h | 6 +- + .../lustre/lustre/include/linux/lustre_lite.h | 6 +- + .../lustre/include/linux/lustre_patchless_compat.h | 6 +- + .../lustre/lustre/include/linux/lustre_user.h | 6 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 6 +- + drivers/staging/lustre/lustre/include/lu_object.h | 6 +- + .../lustre/lustre/include/lustre/ll_fiemap.h | 6 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 6 +- + .../lustre/lustre/include/lustre/lustre_user.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_acl.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_cfg.h | 6 +- + .../staging/lustre/lustre/include/lustre_debug.h | 6 +- + .../staging/lustre/lustre/include/lustre_disk.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 6 +- + .../staging/lustre/lustre/include/lustre_eacl.h | 6 +- + .../staging/lustre/lustre/include/lustre_export.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_fld.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_ha.h | 6 +- + .../staging/lustre/lustre/include/lustre_handles.h | 6 +- + .../staging/lustre/lustre/include/lustre_import.h | 6 +- + .../staging/lustre/lustre/include/lustre_intent.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 6 +- + .../staging/lustre/lustre/include/lustre_lite.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_log.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_mds.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 6 +- + .../staging/lustre/lustre/include/lustre_param.h | 6 +- + .../lustre/lustre/include/lustre_req_layout.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_sec.h | 6 +- + drivers/staging/lustre/lustre/include/obd.h | 6 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 6 +- + drivers/staging/lustre/lustre/include/obd_class.h | 6 +- + .../staging/lustre/lustre/include/obd_support.h | 6 +- + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 6 +- + drivers/staging/lustre/lustre/ldlm/l_lock.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 +- + .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 9 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 14 +- + drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 6 +- + drivers/staging/lustre/lustre/llite/Makefile | 3 - + drivers/staging/lustre/lustre/llite/dcache.c | 6 +- + drivers/staging/lustre/lustre/llite/dir.c | 18 +- + drivers/staging/lustre/lustre/llite/file.c | 16 +- + drivers/staging/lustre/lustre/llite/glimpse.c | 6 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 6 +- + drivers/staging/lustre/lustre/llite/lcommon_misc.c | 6 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 6 +- + .../staging/lustre/lustre/llite/llite_internal.h | 17 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 9 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 11 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 6 +- + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 6 +- + drivers/staging/lustre/lustre/llite/lloop.c | 883 ----- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 6 +- + drivers/staging/lustre/lustre/llite/namei.c | 9 +- + drivers/staging/lustre/lustre/llite/remote_perm.c | 6 +- + drivers/staging/lustre/lustre/llite/rw.c | 151 +- + drivers/staging/lustre/lustre/llite/rw26.c | 23 +- + drivers/staging/lustre/lustre/llite/statahead.c | 6 +- + drivers/staging/lustre/lustre/llite/super25.c | 6 +- + drivers/staging/lustre/lustre/llite/symlink.c | 6 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 14 +- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 6 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 15 +- + drivers/staging/lustre/lustre/llite/vvp_lock.c | 6 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 6 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 6 +- + drivers/staging/lustre/lustre/llite/vvp_req.c | 12 +- + drivers/staging/lustre/lustre/llite/xattr.c | 6 +- + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 6 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 6 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 6 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 9 +- + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 6 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 6 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 6 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_merge.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 15 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 6 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 6 +- + drivers/staging/lustre/lustre/lov/lovsub_io.c | 6 +- + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 6 +- + drivers/staging/lustre/lustre/lov/lovsub_object.c | 6 +- + drivers/staging/lustre/lustre/lov/lovsub_page.c | 6 +- + drivers/staging/lustre/lustre/lov/lproc_lov.c | 6 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 6 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 6 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 6 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 6 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 6 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 +- + drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 6 +- + drivers/staging/lustre/lustre/mgc/mgc_internal.h | 6 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 6 +- + drivers/staging/lustre/lustre/obdclass/acl.c | 6 +- + .../staging/lustre/lustre/obdclass/cl_internal.h | 6 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 6 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 6 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 6 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 6 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +- + drivers/staging/lustre/lustre/obdclass/debug.c | 6 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 6 +- + .../staging/lustre/lustre/obdclass/kernelcomm.c | 6 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 6 +- + .../lustre/lustre/obdclass/linux/linux-obdo.c | 6 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 12 +- + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 6 +- + .../staging/lustre/lustre/obdclass/llog_internal.h | 6 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 6 +- + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 6 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 6 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 6 +- + drivers/staging/lustre/lustre/obdclass/lu_ref.c | 6 +- + .../lustre/lustre/obdclass/lustre_handles.c | 6 +- + .../staging/lustre/lustre/obdclass/lustre_peer.c | 6 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 6 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 8 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +- + .../staging/lustre/lustre/obdclass/statfs_pack.c | 6 +- + drivers/staging/lustre/lustre/obdclass/uuid.c | 6 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 6 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 12 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 11 +- + drivers/staging/lustre/lustre/osc/osc_dev.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 6 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 18 +- + drivers/staging/lustre/lustre/osc/osc_lock.c | 9 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 28 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 12 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 12 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 6 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 6 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/pers.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 9 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 6 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 6 +- + drivers/staging/unisys/visorbus/iovmcall_gnuc.h | 4 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 12 +- + drivers/staging/unisys/visorbus/visorchipset.c | 2 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 394 +-- + drivers/staging/unisys/visorinput/visorinput.c | 2 +- + drivers/staging/unisys/visornic/visornic_main.c | 73 +- + include/linux/fence.h | 2 - + include/linux/iio/common/st_sensors.h | 4 +- + include/linux/iio/sw_device.h | 70 + + include/uapi/linux/iio/types.h | 1 + + tools/iio/Makefile | 21 +- + .../iio/{generic_buffer.c => iio_generic_buffer.c} | 261 +- + 392 files changed, 17242 insertions(+), 7099 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt + create mode 100644 drivers/iio/accel/bma220_spi.c + create mode 100644 drivers/iio/accel/mma7660.c + create mode 100644 drivers/iio/industrialio-sw-device.c + create mode 100644 drivers/iio/potentiometer/max5487.c + create mode 100644 drivers/iio/trigger/iio-trig-loop.c + delete mode 100644 drivers/staging/android/sw_sync.h + delete mode 100644 drivers/staging/android/sync.c + delete mode 100644 drivers/staging/android/sync.h + create mode 100644 drivers/staging/android/sync_debug.h + delete mode 100644 drivers/staging/android/uapi/sw_sync.h + delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c + create mode 100644 drivers/staging/ks7010/Kconfig + create mode 100644 drivers/staging/ks7010/Makefile + create mode 100644 drivers/staging/ks7010/TODO + create mode 100644 drivers/staging/ks7010/eap_packet.h + create mode 100644 drivers/staging/ks7010/ks7010_config.c + create mode 100644 drivers/staging/ks7010/ks7010_sdio.c + create mode 100644 drivers/staging/ks7010/ks7010_sdio.h + create mode 100644 drivers/staging/ks7010/ks79xx.cfg + create mode 100644 drivers/staging/ks7010/ks_hostif.c + create mode 100644 drivers/staging/ks7010/ks_hostif.h + create mode 100644 drivers/staging/ks7010/ks_wlan.h + create mode 100644 drivers/staging/ks7010/ks_wlan_ioctl.h + create mode 100644 drivers/staging/ks7010/ks_wlan_net.c + create mode 100644 drivers/staging/ks7010/michael_mic.c + create mode 100644 drivers/staging/ks7010/michael_mic.h + delete mode 100644 drivers/staging/lustre/lustre/llite/lloop.c + create mode 100644 include/linux/iio/sw_device.h + rename tools/iio/{generic_buffer.c => iio_generic_buffer.c} (76%) +$ git am -3 ../patches/0001-staging-android-merge-fix-up-for-sync.h-renaming.patch +Applying: staging/android: merge fix up for sync.h renaming +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/android/sync_debug.h +$ git add -A . +$ git commit -v -a --amend +[master c4e3f520d9b3] Merge remote-tracking branch 'staging/staging-next' + Date: Mon Jun 20 14:27:13 2016 +1000 +Merging char-misc/char-misc-next (c0ff9019ee64 mei: drop wr_msg from the mei_dev structure) +$ git merge char-misc/char-misc-next +Auto-merging drivers/misc/lkdtm_core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/misc/Makefile | 10 + + drivers/misc/lkdtm.h | 6 + + drivers/misc/{lkdtm.c => lkdtm_core.c} | 333 +++++++++++++++++++++++++++++++-- + drivers/misc/lkdtm_rodata.c | 10 + + drivers/misc/mei/hbm.c | 137 +++++++------- + drivers/misc/mei/mei_dev.h | 10 +- + 7 files changed, 409 insertions(+), 99 deletions(-) + create mode 100644 drivers/misc/lkdtm.h + rename drivers/misc/{lkdtm.c => lkdtm_core.c} (72%) + create mode 100644 drivers/misc/lkdtm_rodata.c +Merging extcon/extcon-next (4239b7f76be3 Merge branch 'ib-extcon-powersupply-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into extcon-next) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-arizona.txt | 3 +- + drivers/extcon/extcon-usb-gpio.c | 32 ++-- + drivers/extcon/extcon.c | 201 +++------------------ + drivers/power/axp288_charger.c | 77 +++++--- + include/linux/extcon.h | 80 +++----- + 5 files changed, 120 insertions(+), 273 deletions(-) +Merging cgroup/for-next (44fa3a451ffe Merge branch 'for-4.8' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) +Merging scsi/for-next (3236f0748964 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt | 26 ++ + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 4 +- + Documentation/scsi/scsi_eh.txt | 8 +- + MAINTAINERS | 7 + + drivers/ata/libata-eh.c | 2 +- + drivers/scsi/53c700.c | 4 +- + drivers/scsi/Kconfig | 2 +- + drivers/scsi/aacraid/commctrl.c | 7 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas.h | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 73 +++-- + drivers/scsi/libfc/fc_lport.c | 19 +- + drivers/scsi/libfc/fc_rport.c | 49 ++-- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 20 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 5 + + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/scsi_debug.c | 93 ++++-- + drivers/scsi/scsi_error.c | 4 +- + drivers/scsi/snic/snic_fwint.h | 2 +- + drivers/scsi/storvsc_drv.c | 2 + + drivers/scsi/ufs/Kconfig | 16 ++ + drivers/scsi/ufs/Makefile | 2 + + drivers/scsi/ufs/tc-dwc-g210-pci.c | 181 ++++++++++++ + drivers/scsi/ufs/tc-dwc-g210-pltfrm.c | 113 ++++++++ + drivers/scsi/ufs/tc-dwc-g210.c | 319 +++++++++++++++++++++ + drivers/scsi/ufs/tc-dwc-g210.h | 19 ++ + drivers/scsi/ufs/ufshcd-dwc.c | 154 ++++++++++ + drivers/scsi/ufs/ufshcd-dwc.h | 26 ++ + drivers/scsi/ufs/ufshcd-pltfrm.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 89 +++--- + drivers/scsi/ufs/ufshcd.h | 7 + + drivers/scsi/ufs/ufshci-dwc.h | 36 +++ + drivers/scsi/ufs/ufshci.h | 11 + + drivers/scsi/ufs/unipro.h | 39 +++ + 36 files changed, 1193 insertions(+), 163 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt + create mode 100644 drivers/scsi/ufs/tc-dwc-g210-pci.c + create mode 100644 drivers/scsi/ufs/tc-dwc-g210-pltfrm.c + create mode 100644 drivers/scsi/ufs/tc-dwc-g210.c + create mode 100644 drivers/scsi/ufs/tc-dwc-g210.h + create mode 100644 drivers/scsi/ufs/ufshcd-dwc.c + create mode 100644 drivers/scsi/ufs/ufshcd-dwc.h + create mode 100644 drivers/scsi/ufs/ufshci-dwc.h +Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging libata/for-next (da780c64d2b6 Merge branch 'for-4.7-fixes' into for-next) +$ git merge libata/for-next +Auto-merging drivers/ata/ahci_brcm.c +Auto-merging arch/arm/boot/dts/bcm-nsp.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/ata/brcm,sata-brcm.txt +Merge made by the 'recursive' strategy. + .../{brcm,sata-brcmstb.txt => brcm,sata-brcm.txt} | 9 +-- + .../devicetree/bindings/phy/brcm-sata-phy.txt | 4 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/bcm-nsp.dtsi | 42 +++++++++++ + arch/arm/boot/dts/bcm958625k.dts | 12 ++++ + drivers/ata/Kconfig | 8 +-- + drivers/ata/Makefile | 2 +- + drivers/ata/ahci.c | 2 +- + drivers/ata/{ahci_brcmstb.c => ahci_brcm.c} | 46 +++++++++--- + drivers/ata/ahci_seattle.c | 2 +- + drivers/ata/libata-transport.c | 9 +-- + drivers/ata/pata_atiixp.c | 4 +- + drivers/ata/pata_marvell.c | 2 +- + drivers/ata/sata_mv.c | 2 +- + drivers/phy/phy-brcm-sata.c | 81 ++++++++++++++++++++++ + 15 files changed, 196 insertions(+), 30 deletions(-) + rename Documentation/devicetree/bindings/ata/{brcm,sata-brcmstb.txt => brcm,sata-brcm.txt} (81%) + rename drivers/ata/{ahci_brcmstb.c => ahci_brcm.c} (91%) +Merging pinctrl/for-next (fe9f516997c6 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio_oxnas.txt | 47 + + .../devicetree/bindings/pinctrl/oxnas,pinctrl.txt | 57 ++ + .../bindings/pinctrl/pinctrl-max77620.txt | 127 +++ + drivers/gpio/gpio-tegra.c | 9 +- + drivers/pinctrl/Kconfig | 21 + + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 6 +- + drivers/pinctrl/core.c | 25 +- + drivers/pinctrl/core.h | 2 + + drivers/pinctrl/freescale/pinctrl-imx.c | 30 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 163 ++- + drivers/pinctrl/pinconf-generic.c | 14 +- + drivers/pinctrl/pinconf.c | 8 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 6 +- + drivers/pinctrl/pinctrl-digicolor.c | 2 + + drivers/pinctrl/pinctrl-max77620.c | 678 +++++++++++++ + drivers/pinctrl/pinctrl-oxnas.c | 846 ++++++++++++++++ + drivers/pinctrl/pinctrl-single.c | 3 + + drivers/pinctrl/pinmux.c | 16 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 1 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 1 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 31 +- + drivers/pinctrl/tegra/Makefile | 2 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra114.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra124.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra20.c | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra30.c | 4 +- + drivers/pinctrl/uniphier/Kconfig | 20 +- + drivers/pinctrl/uniphier/Makefile | 2 + + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 298 +++--- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 956 ++++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 1037 ++++++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 480 +++++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 595 +++++------ + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 787 ++++++++------- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 653 ++++++------ + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 581 +++++------ + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 441 +++++---- + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 59 +- + 43 files changed, 6119 insertions(+), 1929 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio_oxnas.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-max77620.txt + create mode 100644 drivers/pinctrl/pinctrl-max77620.c + create mode 100644 drivers/pinctrl/pinctrl-oxnas.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool) +$ git merge vhost/linux-next +Already up-to-date. +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 (ef583d362047 Merge branch 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + drivers/remoteproc/remoteproc_core.c | 15 +++++++++------ + 2 files changed, 11 insertions(+), 7 deletions(-) +Merging gpio/for-next (c35285cb1570 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/Makefile +Merge made by the 'recursive' strategy. + .../bindings/gpio/cirrus,clps711x-mctrl-gpio.txt | 4 +- + .../devicetree/bindings/gpio/gpio-clps711x.txt | 4 +- + .../devicetree/bindings/gpio/gpio-max77620.txt | 25 + + .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + Documentation/gpio/drivers-on-gpio.txt | 13 +- + arch/hexagon/Kconfig | 3 +- + arch/ia64/Kconfig | 1 - + arch/microblaze/Kconfig | 1 - + arch/openrisc/Kconfig | 2 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/platforms/40x/Kconfig | 2 +- + arch/powerpc/platforms/44x/Kconfig | 2 +- + arch/powerpc/platforms/512x/Kconfig | 1 - + arch/powerpc/platforms/83xx/Kconfig | 3 - + arch/powerpc/platforms/85xx/Kconfig | 4 +- + arch/powerpc/platforms/86xx/Kconfig | 7 +- + arch/powerpc/platforms/8xx/Kconfig | 2 +- + arch/powerpc/platforms/Kconfig | 8 +- + arch/sh/Kconfig | 11 +- + arch/sh/boards/Kconfig | 17 +- + arch/sh/boards/mach-highlander/Kconfig | 2 +- + arch/sh/boards/mach-rsk/Kconfig | 6 +- + arch/unicore32/Kconfig | 2 +- + drivers/Makefile | 2 +- + drivers/gpio/Kconfig | 11 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-104-idi-48.c | 1 + + drivers/gpio/gpio-clps711x.c | 10 +- + drivers/gpio/gpio-f7188x.c | 22 + + drivers/gpio/gpio-max77620.c | 312 +++++++++++++ + drivers/gpio/gpio-menz127.c | 1 - + drivers/gpio/gpio-mmio.c | 51 +- + drivers/gpio/gpio-palmas.c | 1 - + drivers/gpio/gpio-pca953x.c | 23 +- + drivers/gpio/gpio-pcf857x.c | 9 + + drivers/gpio/gpio-rdc321x.c | 1 - + drivers/gpio/gpio-sch311x.c | 1 - + drivers/gpio/gpio-stmpe.c | 18 +- + drivers/gpio/gpio-syscon.c | 4 +- + drivers/gpio/gpio-tc3589x.c | 1 - + drivers/gpio/gpio-tps6586x.c | 1 - + drivers/gpio/gpio-tps65910.c | 1 - + drivers/gpio/gpio-viperboard.c | 1 - + drivers/gpio/gpio-wm831x.c | 1 - + drivers/gpio/gpio-wm8350.c | 1 - + drivers/gpio/gpio-wm8994.c | 1 - + drivers/gpio/gpio-xilinx.c | 48 ++ + drivers/gpio/gpio-xlp.c | 52 ++- + drivers/gpio/gpiolib-acpi.c | 1 + + drivers/gpio/gpiolib-of.c | 1 + + drivers/gpio/gpiolib.c | 514 ++++++++++++++++++++- + drivers/pinctrl/pinctrl-xway.c | 5 +- + include/uapi/linux/gpio.h | 105 ++++- + tools/gpio/Makefile | 6 +- + tools/gpio/gpio-event-mon.c | 192 ++++++++ + tools/gpio/gpio-hammer.c | 189 ++++++++ + 56 files changed, 1597 insertions(+), 113 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-max77620.txt + create mode 100644 drivers/gpio/gpio-max77620.c + create mode 100644 tools/gpio/gpio-event-mon.c + create mode 100644 tools/gpio/gpio-hammer.c +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 (318480569156 pwm: lpss: pci: Enable PWM module on Intel Edison) +$ git merge pwm/for-next +Resolved 'Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt' using previous resolution. +Auto-merging Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 55ba7548d393] Merge remote-tracking branch 'pwm/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/pwm/pwm-lpss-pci.c | 1 + + drivers/pwm/pwm-lpss.c | 14 +++++++------- + drivers/pwm/pwm-tiecap.c | 9 +++++++++ + drivers/pwm/pwm-tiehrpwm.c | 9 +++++++++ + include/linux/pwm.h | 1 - + 5 files changed, 26 insertions(+), 8 deletions(-) +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 +++++++++++ + drivers/dma-buf/Kconfig | 15 ++++++++++++--- + 2 files changed, 23 insertions(+), 3 deletions(-) +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 (071a0cb66cc6 Merge commit 'f17a0dd1c2e0' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + drivers/clk/clk.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (1a695a905c18 Linux 4.7-rc1) +$ git merge kselftest/next +Already up-to-date. +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 (6436d4c1a83c x86/vdso: Fail the build if the vdso image has no dynamic section) +$ git merge luto-misc/next +Merge made by the 'recursive' strategy. + arch/x86/entry/vdso/vdso2c.h | 3 +++ + 1 file changed, 3 insertions(+) +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 (c95eca78d3c8 coresight: add PM runtime calls to coresight_simple_func()) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight.c +Auto-merging drivers/hwtracing/coresight/coresight-tmc-etr.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm4x.c | 8 ++++---- + drivers/hwtracing/coresight/coresight-priv.h | 3 +++ + drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 +- + drivers/hwtracing/coresight/coresight.c | 3 ++- + 4 files changed, 10 insertions(+), 6 deletions(-) +Merging rtc/rtc-next (c361db5c2c64 x86: include linux/ratelimit.h in nmi.c) +$ git merge rtc/rtc-next +Removing include/asm-generic/rtc.h +Removing drivers/char/genrtc.c +Removing arch/x86/include/asm/rtc.h +Removing arch/sh/include/asm/mc146818rtc.h +Auto-merging arch/powerpc/platforms/Kconfig +Removing arch/powerpc/include/asm/rtc.h +Auto-merging arch/parisc/kernel/time.c +Removing arch/parisc/include/asm/rtc.h +Removing arch/parisc/include/asm/mc146818rtc.h +Removing arch/m68k/include/asm/rtc.h +Removing arch/ia64/include/asm/mc146818rtc.h +Removing arch/h8300/include/asm/mc146818rtc.h +Removing arch/frv/include/asm/mc146818rtc.h +Removing arch/alpha/include/asm/rtc.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/alpha/include/asm/rtc.h | 1 - + arch/alpha/kernel/core_marvel.c | 1 - + arch/alpha/kernel/rtc.c | 6 +- + arch/frv/include/asm/mc146818rtc.h | 16 - + arch/h8300/include/asm/mc146818rtc.h | 9 - + arch/ia64/include/asm/mc146818rtc.h | 10 - + arch/m68k/amiga/config.c | 1 - + arch/m68k/apollo/config.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/hp300/config.c | 2 +- + arch/m68k/include/asm/rtc.h | 79 ---- + arch/m68k/kernel/time.c | 48 ++- + arch/m68k/mac/config.c | 3 +- + arch/m68k/mac/misc.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 2 +- + arch/m68k/sun3/config.c | 1 - + arch/m68k/sun3/intersil.c | 2 +- + arch/m68k/sun3x/time.c | 2 +- + arch/mips/sni/time.c | 1 - + arch/mn10300/include/asm/rtc.h | 2 - + arch/mn10300/kernel/rtc.c | 2 +- + arch/mn10300/proc-mn103e010/proc-init.c | 2 + + arch/mn10300/proc-mn2ws0050/proc-init.c | 1 + + arch/parisc/include/asm/mc146818rtc.h | 9 - + arch/parisc/include/asm/rtc.h | 131 ------- + arch/parisc/kernel/time.c | 36 +- + arch/powerpc/include/asm/rtc.h | 78 ---- + arch/powerpc/kernel/time.c | 29 +- + arch/powerpc/platforms/Kconfig | 11 + + arch/powerpc/platforms/ps3/time.c | 2 +- + arch/sh/include/asm/mc146818rtc.h | 7 - + arch/sh/include/asm/rtc.h | 11 - + arch/sh/kernel/time.c | 33 +- + arch/sparc/include/asm/io_32.h | 10 - + arch/x86/include/asm/mc146818rtc.h | 1 - + arch/x86/include/asm/rtc.h | 1 - + arch/x86/kernel/hpet.c | 3 +- + arch/x86/kernel/nmi.c | 1 + + arch/x86/kernel/rtc.c | 3 +- + arch/x86/platform/efi/efi.c | 1 - + arch/x86/platform/efi/efi_64.c | 1 + + arch/x86/platform/intel-mid/intel_mid_vrtc.c | 1 + + drivers/acpi/acpi_cmos_rtc.c | 2 +- + drivers/base/power/trace.c | 6 +- + drivers/char/Kconfig | 26 -- + drivers/char/Makefile | 1 - + drivers/char/genrtc.c | 539 --------------------------- + drivers/rtc/Kconfig | 12 + + drivers/rtc/Makefile | 1 + + drivers/rtc/interface.c | 28 +- + drivers/rtc/rtc-cmos.c | 12 +- + drivers/rtc/rtc-ds1685.c | 34 +- + drivers/rtc/rtc-efi.c | 6 + + drivers/rtc/rtc-generic.c | 36 +- + drivers/rtc/rtc-max6916.c | 164 ++++++++ + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 4 +- + include/asm-generic/rtc.h | 247 ------------ + include/linux/mc146818rtc.h | 194 ++++++++++ + 62 files changed, 605 insertions(+), 1275 deletions(-) + delete mode 100644 arch/alpha/include/asm/rtc.h + delete mode 100644 arch/frv/include/asm/mc146818rtc.h + delete mode 100644 arch/h8300/include/asm/mc146818rtc.h + delete mode 100644 arch/ia64/include/asm/mc146818rtc.h + delete mode 100644 arch/m68k/include/asm/rtc.h + delete mode 100644 arch/parisc/include/asm/mc146818rtc.h + delete mode 100644 arch/parisc/include/asm/rtc.h + delete mode 100644 arch/powerpc/include/asm/rtc.h + delete mode 100644 arch/sh/include/asm/mc146818rtc.h + delete mode 100644 arch/x86/include/asm/rtc.h + delete mode 100644 drivers/char/genrtc.c + create mode 100644 drivers/rtc/rtc-max6916.c + delete mode 100644 include/asm-generic/rtc.h +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 (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging akpm-current/current (dc87c36fac15 firmware-support-loading-into-a-pre-allocated-buffer-fix) +$ git merge --no-ff akpm-current/current +Resolved 'ipc/sem.c' using previous resolution. +Auto-merging net/unix/af_unix.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/task_work.c +Auto-merging kernel/futex.c +Auto-merging kernel/fork.c +Auto-merging ipc/sem.c +CONFLICT (content): Merge conflict in ipc/sem.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/nilfs2_ondisk.h +Auto-merging include/linux/fs.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging fs/orangefs/inode.c +Auto-merging fs/nilfs2/segbuf.c +Auto-merging fs/nilfs2/mdt.c +Auto-merging fs/nilfs2/gcinode.c +Auto-merging fs/nilfs2/btree.c +Auto-merging fs/nilfs2/btnode.c +Auto-merging fs/mpage.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/readpage.c +Auto-merging fs/cifs/file.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/block/zram/zram_drv.c +Removing drivers/block/zram/zcomp_lzo.h +Removing drivers/block/zram/zcomp_lzo.c +Removing drivers/block/zram/zcomp_lz4.h +Removing drivers/block/zram/zcomp_lz4.c +Auto-merging arch/x86/platform/efi/efi_64.c +Auto-merging arch/s390/configs/performance_defconfig +Auto-merging arch/s390/configs/gcov_defconfig +Auto-merging arch/s390/configs/default_defconfig +Auto-merging arch/powerpc/include/asm/book3s/64/pgalloc.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/configs/sunxi_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/keystone_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging arch/arm/boot/dts/keystone.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Auto-merging .mailmap +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cecd7e69029a] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 4 + + Documentation/blockdev/zram.txt | 82 +- + Documentation/filesystems/Locking | 4 + + Documentation/filesystems/nilfs2.txt | 3 +- + Documentation/filesystems/vfs.txt | 11 + + Documentation/ioctl/ioctl-number.txt | 2 +- + Documentation/kernel-parameters.txt | 6 +- + Documentation/vm/page_migration | 108 +- + MAINTAINERS | 3 +- + arch/alpha/include/asm/pgalloc.h | 4 +- + arch/arc/include/asm/pgalloc.h | 4 +- + arch/arm/boot/dts/keystone.dtsi | 8 + + arch/arm/configs/axm55xx_defconfig | 2 +- + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/bcm_defconfig | 2 +- + 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 | 2 +- + arch/arm/include/asm/kexec.h | 24 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgalloc.h | 4 +- + arch/arm/include/asm/tlb.h | 29 +- + arch/arm/kernel/machine_kexec.c | 2 +- + arch/arm/kernel/setup.c | 39 +- + arch/arm/mm/dma-mapping.c | 26 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm64/configs/defconfig | 2 +- + arch/arm64/include/asm/pgalloc.h | 2 +- + arch/arm64/mm/dma-mapping.c | 6 +- + arch/avr32/include/asm/pgalloc.h | 6 +- + arch/cris/include/asm/pgalloc.h | 4 +- + arch/frv/mm/pgalloc.c | 6 +- + arch/hexagon/include/asm/pgalloc.h | 4 +- + arch/ia64/include/asm/tlb.h | 31 +- + arch/ia64/kernel/machine_kexec.c | 2 +- + arch/m32r/kernel/m32r_ksyms.c | 3 + + arch/m32r/lib/Makefile | 4 +- + arch/m32r/lib/libgcc.h | 24 + + arch/m32r/lib/ucmpdi2.c | 17 + + arch/m68k/include/asm/mcf_pgalloc.h | 4 +- + arch/m68k/include/asm/motorola_pgalloc.h | 4 +- + arch/m68k/include/asm/sun3_pgalloc.h | 4 +- + arch/metag/include/asm/pgalloc.h | 5 +- + arch/microblaze/include/asm/pgalloc.h | 4 +- + arch/microblaze/mm/pgtable.c | 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/lemote2f_defconfig | 2 +- + arch/mips/configs/loongson3_defconfig | 2 +- + 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/pgalloc.h | 6 +- + arch/mn10300/mm/pgtable.c | 6 +- + arch/nios2/include/asm/pgalloc.h | 5 +- + arch/openrisc/include/asm/pgalloc.h | 2 +- + arch/openrisc/mm/ioremap.c | 2 +- + arch/parisc/configs/generic-64bit_defconfig | 2 +- + arch/parisc/include/asm/pgalloc.h | 7 +- + 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/pgalloc.h | 12 +- + arch/powerpc/include/asm/jump_label.h | 1 + + arch/powerpc/include/asm/nohash/64/pgalloc.h | 8 +- + arch/powerpc/include/asm/pgtable.h | 6 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 4 +- + arch/powerpc/mm/pgtable_64.c | 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/tlb.h | 22 +- + arch/s390/mm/pgalloc.c | 2 +- + arch/score/include/asm/pgalloc.h | 5 +- + arch/sh/configs/edosk7760_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 2 +- + arch/sh/configs/se7722_defconfig | 2 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- + arch/sh/configs/urquell_defconfig | 2 +- + arch/sh/include/asm/pgalloc.h | 4 +- + arch/sh/include/asm/tlb.h | 20 +- + arch/sh/mm/pgtable.c | 2 +- + arch/sparc/configs/sparc64_defconfig | 2 +- + arch/sparc/include/asm/pgalloc_64.h | 6 +- + arch/sparc/mm/init_64.c | 6 +- + arch/tile/mm/pgtable.c | 2 +- + arch/um/include/asm/tlb.h | 20 +- + arch/um/kernel/mem.c | 4 +- + arch/unicore32/include/asm/pgalloc.h | 2 +- + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/include/asm/pgalloc.h | 12 +- + arch/x86/kernel/espfix_64.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/mm/pgtable.c | 10 +- + arch/x86/platform/efi/efi_64.c | 2 +- + arch/x86/xen/p2m.c | 2 +- + arch/xtensa/configs/audio_kc705_defconfig | 2 +- + arch/xtensa/configs/generic_kc705_defconfig | 2 +- + arch/xtensa/configs/nommu_kc705_defconfig | 2 +- + arch/xtensa/configs/smp_lx200_defconfig | 2 +- + arch/xtensa/include/asm/pgalloc.h | 2 +- + block/genhd.c | 2 +- + drivers/base/firmware_class.c | 183 ++- + drivers/base/memory.c | 28 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/zram/Kconfig | 15 +- + drivers/block/zram/Makefile | 4 +- + drivers/block/zram/zcomp.c | 150 ++- + drivers/block/zram/zcomp.h | 36 +- + drivers/block/zram/zcomp_lz4.c | 56 - + drivers/block/zram/zcomp_lz4.h | 17 - + drivers/block/zram/zcomp_lzo.c | 56 - + drivers/block/zram/zcomp_lzo.h | 17 - + drivers/block/zram/zram_drv.c | 48 +- + drivers/block/zram/zram_drv.h | 5 +- + drivers/dax/dax.c | 8 +- + drivers/dax/pmem.c | 14 +- + drivers/memstick/core/ms_block.c | 17 +- + drivers/nvme/host/core.c | 16 +- + drivers/tty/sysrq.c | 1 + + drivers/virtio/virtio_balloon.c | 52 +- + drivers/w1/slaves/w1_ds2406.c | 14 +- + drivers/w1/slaves/w1_ds2408.c | 14 +- + drivers/w1/slaves/w1_ds2413.c | 14 +- + drivers/w1/slaves/w1_ds2423.c | 14 +- + drivers/w1/slaves/w1_ds2431.c | 14 +- + drivers/w1/slaves/w1_ds2433.c | 14 +- + drivers/w1/slaves/w1_ds2760.c | 43 +- + drivers/w1/slaves/w1_ds2780.c | 39 +- + drivers/w1/slaves/w1_ds2781.c | 40 +- + drivers/w1/slaves/w1_ds28e04.c | 14 +- + drivers/w1/w1_family.h | 12 + + drivers/xen/xen-selfballoon.c | 4 +- + fs/befs/befs.h | 12 - + fs/befs/linuxvfs.c | 38 +- + fs/befs/super.c | 2 +- + fs/btrfs/extent_io.c | 3 +- + fs/cifs/file.c | 2 +- + fs/exec.c | 9 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/readpage.c | 2 +- + fs/f2fs/data.c | 3 +- + fs/jbd2/journal.c | 32 +- + fs/mpage.c | 4 +- + fs/nilfs2/alloc.c | 45 +- + fs/nilfs2/bmap.c | 4 +- + fs/nilfs2/bmap.h | 2 +- + fs/nilfs2/btnode.c | 4 +- + fs/nilfs2/btree.c | 61 +- + fs/nilfs2/btree.h | 2 +- + fs/nilfs2/cpfile.c | 23 +- + fs/nilfs2/cpfile.h | 3 +- + fs/nilfs2/dat.c | 19 +- + fs/nilfs2/dat.h | 1 + + fs/nilfs2/dir.c | 60 +- + fs/nilfs2/direct.c | 10 +- + fs/nilfs2/direct.h | 10 - + fs/nilfs2/gcinode.c | 9 +- + fs/nilfs2/ifile.c | 7 +- + fs/nilfs2/ifile.h | 1 - + fs/nilfs2/inode.c | 36 +- + fs/nilfs2/ioctl.c | 48 +- + fs/nilfs2/mdt.c | 6 +- + fs/nilfs2/namei.c | 6 +- + fs/nilfs2/nilfs.h | 48 +- + fs/nilfs2/page.c | 45 +- + fs/nilfs2/recovery.c | 72 +- + fs/nilfs2/segbuf.c | 6 +- + fs/nilfs2/segment.c | 61 +- + fs/nilfs2/segment.h | 1 - + fs/nilfs2/sufile.c | 44 +- + fs/nilfs2/sufile.h | 1 - + fs/nilfs2/super.c | 206 +-- + fs/nilfs2/sysfs.c | 74 +- + fs/nilfs2/the_nilfs.c | 134 +- + fs/nilfs2/the_nilfs.h | 11 +- + fs/ocfs2/stack_user.c | 11 +- + fs/ocfs2/stackglue.c | 2 - + fs/orangefs/inode.c | 2 +- + fs/pipe.c | 32 +- + fs/proc/base.c | 7 +- + fs/reiserfs/ibalance.c | 3 +- + include/asm-generic/tlb.h | 59 +- + include/asm-generic/vmlinux.lds.h | 2 +- + include/linux/balloon_compaction.h | 52 +- + include/linux/compaction.h | 1 + + include/linux/cpumask.h | 2 +- + include/linux/crc64_ecma.h | 56 + + include/linux/debugobjects.h | 2 +- + include/linux/dma-attrs.h | 3 +- + include/linux/dynamic_debug.h | 60 +- + include/linux/export.h | 2 +- + include/linux/firmware.h | 8 + + include/linux/frontswap.h | 34 +- + include/linux/fs.h | 3 + + include/linux/gfp.h | 10 +- + include/linux/jump_label.h | 50 +- + include/linux/kasan.h | 11 +- + include/linux/kconfig.h | 31 +- + include/linux/kexec.h | 46 +- + include/linux/ksm.h | 3 +- + include/linux/memblock.h | 20 +- + include/linux/memcontrol.h | 103 +- + include/linux/memory_hotplug.h | 2 + + include/linux/migrate.h | 17 + + include/linux/mm.h | 4 +- + include/linux/mm_types.h | 73 +- + include/linux/mmdebug.h | 2 + + include/linux/mmzone.h | 4 +- + include/linux/oom.h | 10 +- + include/linux/page-flags.h | 109 +- + include/linux/page_ext.h | 4 +- + include/linux/page_owner.h | 12 +- + include/linux/pagemap.h | 6 +- + include/linux/sem.h | 1 + + include/linux/slab_def.h | 2 +- + include/linux/slub_def.h | 5 + + include/linux/timekeeping.h | 1 + + include/linux/vmstat.h | 6 + + include/trace/events/huge_memory.h | 38 +- + include/trace/events/zsmalloc.h | 56 + + include/uapi/linux/magic.h | 2 + + include/uapi/linux/nilfs2_api.h | 292 +++++ + .../nilfs2_fs.h => uapi/linux/nilfs2_ondisk.h} | 328 +---- + init/Kconfig | 4 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 +- + kernel/fork.c | 6 +- + kernel/futex.c | 2 + + kernel/jump_label.c | 48 + + kernel/kexec.c | 3 +- + kernel/kexec_core.c | 46 +- + kernel/ksysfs.c | 4 +- + kernel/printk/printk.c | 76 +- + kernel/task_work.c | 10 +- + kernel/time/timekeeping.c | 13 + + lib/Kconfig | 7 + + lib/Kconfig.debug | 20 +- + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++ + lib/dynamic_debug.c | 7 + + lib/iommu-helper.c | 3 +- + mm/balloon_compaction.c | 94 +- + mm/compaction.c | 118 +- + mm/filemap.c | 2 +- + mm/frontswap.c | 35 +- + mm/gup.c | 2 + + mm/huge_memory.c | 196 ++- + mm/hugetlb.c | 54 +- + mm/internal.h | 9 +- + mm/kasan/kasan.c | 6 +- + mm/ksm.c | 4 +- + mm/memblock.c | 3 + + mm/memcontrol.c | 134 +- + mm/memory.c | 60 +- + mm/memory_hotplug.c | 70 +- + mm/mempolicy.c | 2 + + mm/mempool.c | 12 +- + mm/migrate.c | 257 +++- + mm/mprotect.c | 2 +- + mm/mremap.c | 3 +- + mm/oom_kill.c | 70 +- + mm/page_alloc.c | 142 +- + mm/page_isolation.c | 7 +- + mm/page_owner.c | 159 ++- + mm/readahead.c | 13 +- + mm/shmem.c | 2 +- + mm/slab.c | 87 +- + mm/slab.h | 30 +- + mm/slab_common.c | 49 +- + mm/slub.c | 145 ++- + mm/swapfile.c | 2 +- + mm/util.c | 6 +- + mm/vmalloc.c | 6 +- + mm/vmscan.c | 2 +- + mm/vmstat.c | 16 +- + mm/zsmalloc.c | 1360 ++++++++++++++------ + net/unix/af_unix.c | 1 + + samples/kprobes/jprobe_example.c | 6 +- + samples/kprobes/kprobe_example.c | 29 +- + samples/kprobes/kretprobe_example.c | 14 +- + scripts/Makefile.lib | 2 +- + scripts/tags.sh | 3 + + .../selftests/rcutorture/configs/lock/CFcommon | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 +- + tools/testing/selftests/vm/compaction_test.c | 2 +- + tools/vm/page_owner_sort.c | 9 +- + 335 files changed, 5317 insertions(+), 3204 deletions(-) + create mode 100644 arch/m32r/lib/libgcc.h + create mode 100644 arch/m32r/lib/ucmpdi2.c + delete mode 100644 drivers/block/zram/zcomp_lz4.c + delete mode 100644 drivers/block/zram/zcomp_lz4.h + delete mode 100644 drivers/block/zram/zcomp_lzo.c + delete mode 100644 drivers/block/zram/zcomp_lzo.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/trace/events/zsmalloc.h + create mode 100644 include/uapi/linux/nilfs2_api.h + rename include/{linux/nilfs2_fs.h => uapi/linux/nilfs2_ondisk.h} (68%) + create mode 100644 lib/crc64_ecma.c +$ git am -3 ../patches/0001-mm-make-optimistic-check-for-swapin-readahead-fix.patch +Applying: mm: make optimistic check for swapin readahead fix +$ git reset HEAD^ +Unstaged changes after reset: +M mm/huge_memory.c +$ git add -A . +$ git commit -v -a --amend +[master 3743536b4ef4] Merge branch 'akpm-current/current' + Date: Mon Jun 20 15:29:48 2016 +1000 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: drivers/fpga/Kconfig: fix build failure +Applying: tree-wide: replace config_enabled() with IS_ENABLED() +Using index info to reconstruct a base tree... +M arch/x86/kernel/fpu/signal.c +M drivers/net/wireless/ath/ath10k/debug.c +M drivers/net/wireless/ath/ath10k/mac.c +M drivers/net/wireless/ath/ath10k/wmi.c +M drivers/pci/ecam.c +M include/linux/fence.h +M kernel/seccomp.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/seccomp.c +Auto-merging include/linux/fence.h +Auto-merging drivers/pci/ecam.c +Auto-merging drivers/net/wireless/ath/ath10k/wmi.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Auto-merging drivers/net/wireless/ath/ath10k/debug.c +Auto-merging arch/x86/kernel/fpu/signal.c +Applying: include/linux/bitmap.h: cleanup +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 5c26fb1bbb99...e80940b56fc8 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (e80940b56fc8 include/linux/bitmap.h: cleanup) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/mips/include/asm/mips-cm.h | 2 +- + arch/mips/include/asm/pgtable.h | 16 +++++------ + arch/mips/include/asm/seccomp.h | 4 +-- + arch/mips/include/asm/signal.h | 4 +-- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/include/asm/uaccess.h | 2 +- + arch/mips/jz4740/setup.c | 2 +- + arch/mips/kernel/cpu-bugs64.c | 6 ++--- + arch/mips/kernel/elf.c | 4 +-- + arch/mips/kernel/mips-cm.c | 2 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 34 ++++++++++++------------ + arch/mips/kernel/pm-cps.c | 4 +-- + arch/mips/kernel/signal.c | 10 +++---- + arch/mips/kernel/smp-cps.c | 4 +-- + arch/mips/kernel/unaligned.c | 10 +++---- + arch/mips/math-emu/cp1emu.c | 6 ++--- + arch/mips/mm/tlbex.c | 10 +++---- + arch/mips/mti-malta/malta-dtshim.c | 4 +-- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/mti-malta/malta-setup.c | 2 +- + arch/mips/net/bpf_jit.c | 4 +-- + arch/x86/include/asm/elf.h | 4 +-- + arch/x86/include/asm/fpu/internal.h | 16 +++++------ + arch/x86/include/asm/mmu_context.h | 2 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/fpu/signal.c | 12 ++++----- + arch/x86/kernel/signal.c | 14 +++++----- + drivers/firmware/broadcom/bcm47xx_sprom.c | 2 +- + drivers/fpga/Kconfig | 1 + + drivers/irqchip/irq-mips-gic.c | 2 +- + drivers/mtd/bcm47xxpart.c | 2 +- + drivers/net/wireless/ath/ath10k/debug.c | 12 ++++----- + drivers/net/wireless/ath/ath10k/mac.c | 10 +++---- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- + drivers/net/wireless/ath/ath9k/common-spectral.c | 6 ++--- + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 12 ++++----- + drivers/net/wireless/ath/ath9k/recv.c | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- + drivers/net/wireless/ath/regd.c | 4 +-- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + drivers/pci/ecam.c | 2 +- + drivers/tty/serial/ar933x_uart.c | 4 +-- + include/linux/bitmap.h | 7 +++-- + include/linux/fence.h | 2 +- + include/linux/ww_mutex.h | 4 +-- + kernel/ptrace.c | 4 +-- + kernel/seccomp.c | 6 ++--- + net/wireless/chan.c | 2 +- + 51 files changed, 140 insertions(+), 141 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..a0422af037bb --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.6 +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..bc96632931b3 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160620 |