diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-07-01 16:06:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-07-01 16:06:04 +1000 |
| commit | d936b5e461b9545fa9a8a3357a40eea17aea5e28 (patch) | |
| tree | 584eedc18a9597f60d0ebc6cf2dd1b7b9f87bac5 | |
| parent | 1c4018b3d3d3164d10cbbae86ff51c90372ef4a0 (diff) | |
| download | linux-next-d936b5e461b9545fa9a8a3357a40eea17aea5e28.tar.gz | |
Add linux-next specific files for 20160701next-20160701
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 238 | ||||
| -rw-r--r-- | Next/Trees | 240 | ||||
| -rw-r--r-- | Next/merge.log | 8849 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 9332 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..6db6944248dc --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,238 @@ +Name SHA1 +---- ---- +origin 1a0a02d1efa066001fd315c1b4df583d939fa2c4 +fixes 5edb56491d4812c42175980759da53388e5d86f5 +kbuild-current b36fad65d61fffe4b662d4bfb1ed673c455a36a2 +arc-current 9bd54517ee86cb164c734f72ea95aeba4804f10b +arm-current 56530f5d2ddc9b9fade7ef8db9cb886e9dc689b5 +m68k-current 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes 190ce8693c23eae09ba5f303a83bf2fbeb6478b1 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 6b15d6650c5301ce023d8df0cc3a60b1a76d377e +net 43daa96b166c3cf5ff30dfac0c5efa2620e4beab +ipsec d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a +ipvs 370a8107e7883634c2c333c0e1b4ebd62dcf9fe6 +wireless-drivers 034fdd4a17ff089c2428ece18efa65c5396810d2 +mac80211 c041778c966c92c964033f1cdfee60a9f2b5e465 +sound-current 62db7152c924e4c060e42b34a69cd39658e8a0dc +pci-current ef0dab4aae14e25efddf1577736f8450132800c5 +driver-core.current 33688abb2802ff3a230bd2441f765477b94cc89e +tty.current 5353ed8deedee9e5acb9f896e9032158f5d998de +usb.current ab2a4bf83902c170d29ba130a8abb5f9d90559e1 +usb-gadget-fixes 50c763f8c1bac0dc00f7788a75f227276c0efd54 +usb-serial-fixes 33688abb2802ff3a230bd2441f765477b94cc89e +usb-chipidea-fixes ea1d39a31d3b1b6060b6e83e5a29c069a124c68a +staging.current d839722131307eff1f3fe1636a5af839c90fbf96 +char-misc.current 33688abb2802ff3a230bd2441f765477b94cc89e +input-current caca925fca4fb30c67be88cacbe908eec6721e43 +crypto-current 055ddaace03580455a7b7dbea8e93d62acee61fc +ide 1993b176a8224e371e0732ffada7ab9eb3b0912b +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes ce7585f3c4d76bca1dff4b66ae1ea32552954f9e +kselftest-fixes f80eb4289491f6ddb0788636ce0bd6f5d3a2012a +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes ba4a1c28a92df55b9263e838068b92eaa80c7850 +drm-intel-fixes cab103274352721b77fc5923a631fc63350bef8e +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc 9bd54517ee86cb164c734f72ea95aeba4804f10b +arm f07617e99523965a18177fc833301014cab8256b +arm-perf 1a695a905c18548062509178b98bc91e67510864 +arm-soc fcfe0c8bf1fc9587086bd72369ab91861daf328b +amlogic 4d9b3db03bd42c672863c07956cbc32e940fd3d2 +at91 0f59c948faed3715331c2648b46d6d0033d86f5c +bcm2835 aa5c0a1e15c2e6a0e12cdb3719b4cc8ec56d487c +berlin 1a695a905c18548062509178b98bc91e67510864 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 63a404a3f177cc9127a05536580cab2b92752c1f +keystone eef6bb9fc17a5c7b8b624db8b81158b632740319 +mvebu 56454a34f5d65864f37a855afa293f52e7eddfbf +omap 2fe616ce3a64a7c183594af020b7bd111761ca6d +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 3af353d58ab18183626fb0f57170ef01f918333e +renesas b0b8da2c8b146f92a6200f9e3ff85936f6fe649c +rockchip 339c7e214a463b3079c7c2723b6274d0037655fb +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 13fc4c9001410e041799855c2313000b412ef61e +tegra 5f207c45290c9161911b49ba4afe59f3ba35fb1e +arm64 9fdc14c55cd6579d619ccd9d40982e0805e62b6d +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 70f4f9352317ed8bc70cd7fe2bf34a3f9f7f21e3 +m68k 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +m68knommu 33688abb2802ff3a230bd2441f765477b94cc89e +metag 592ddeeff8cb0ba7ae11dbd08f583280bd15f865 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 847e858f3d0eb4c3c29c046dc6aa82d3334a0917 +nios2 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f +parisc-hd 5975b2c0c10adbc7894a54ab7b30db4fbcdd8c41 +powerpc 43a1dd9b5fc64184e578ac1570d016d2862e00b2 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 1eef33bec12d7e46a58f12b3604556a80c362a0d +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 25d539c9a958faf092bc1b8736ebc30b49faeebc +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 893d66192c4682835322fb55d47c9410da6cbfef +uml a78ff1112263fdd871d3506dbcff44f6f12e8423 +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs c315ef8d9db7f1a0ebd023a395ebdfde1c68057e +btrfs-kdave 5027553b087e03dd2db08a38e53f96c480424e58 +ceph f6973c09490c919398fc87d9c6bec9c0b670c4c4 +cifs fbe601f7a34b395deb85a63ae5cddd0c084c8db1 +configfs f8608985f851c917b3884b692d8e326b0210d34e +ecryptfs 40f0fd372a623e8d32bae0b9361d2a7453ae7a2e +ext3 e008bb6134a6e68fd2c827a46b27d017d920de8f +ext4 f70749ca42943faa4d4dcce46dfdcaadb1d0c4b6 +f2fs a2481adac819f05d4e36cf29afbde7a5effc16bb +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 7879c4e58b7c884ee62b9306721dd1106e624b52 +gfs2 fd4c5748b8d3f7420e8932ed0bde3d53cc8acc9d +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs 050702c1004c2d8de1e616dd9a4fddd4b3e1eaaf +nfsd e2508e091694d4fc6356c70b11b559a5c0fb2bbc +orangefs 2dcd0af568b0cf583645c8a317dd12e344b1c72a +overlayfs 8ac3fc200667fb945182e1429284d0b00c5fff72 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 4ac1c17b2044a1b4b2fbed74451947e905fc2992 +xfs f477cedc4e79a3233847106a18bf67be9bdf20e9 +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 1eb82bc8e71279eea0cc6a9c9d591d8f706c4206 +pci e0af5a975e77a42c01570f1fb09b8e62d3a0680d +pstore 35da60941e44dbf57868e67686dd24cc1a33125a +hid 5f00f0b8d58b3d52592e4f6dc53e8f69a6721be2 +i2c d86a4c24d68e429dade0b3651eb891ef3073ba03 +jdelvare-hwmon 18c358ac5e32ad43e9a50b4e5f344a896b9d1dad +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging 4e6163e859cd572acb4bc2525e00714f6c1905c8 +v4l-dvb ed5883b778c80d2c2ca58d398591dbbc04ec8ea6 +pm 99199532a5697c4b7fee26d2c89ab0d847697971 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 2c5ce98e1e836184a45f4268a598a18a5a02af06 +thermal-soc ddc8fdc6e2f06aabdbb9dc4a5e01ca793cd2e285 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 5c93f56f770e69c4cf2dbaebecd6bcca205949f9 +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma f2e3db60d2a2c339f8c4ff93c97c64b9fb727c8e +net-next 6fde0e63eccbaf21fa278b240b8129fec14b864b +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 625b44fc15f829bf63a9aea8d62ec267c904b0a1 +wireless-drivers-next 535633a5ba4ea2504fa6c33176633becf0e59339 +bluetooth 92890252babdc2629ff6ac1949bad91f0934d97b +mac80211-next 59a7c828d7e7d5a1be224a0d68a41ca2302843ea +rdma fb92d8fb1b9c2de7d7d50c199e6d3020544702e8 +rdma-leon 33688abb2802ff3a230bd2441f765477b94cc89e +rdma-leon-test 33688abb2802ff3a230bd2441f765477b94cc89e +mtd becc7ae544c61395b5eba7b9913e14aa567ca07a +l2-mtd 95193796256cfce16e5d881318e15b6b04062c15 +nand f5f2894f18afd8deb87916178651a73d518e0ced +crypto c34252fd712c10da3a0b018b3b5dbe552ac1e7b9 +drm 2a3467063ae3b17264578626dec2377dd48cd1c3 +drm-panel f103b93d90c287e3680929b1852b36919cca3b37 +drm-intel 8d228911ffc08bfaa8224d160df8ca64e9dc8274 +drm-tegra 9e9d1315f4f46f430b3363df7362b438d0f8bc30 +drm-misc 2ae995887830b335f9bdab3040018071da54bcdb +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 2b669875332fbdff0a7ad559e8662e875e7a1526 +hdlcd f6c68b4bd4a98033d1e79479212bbd376e145728 +mali-dp 59ba2422b4308b02438506d35d5042df5d42c249 +sunxi b7e7559f439cd374fc5a52764d1a704cb3474604 +kbuild 7e01dad0469ba65e361e2161bf0a46053bc33352 +kspp 20f0992c935f80b0a4a8a0fd54a3c7b4368787a0 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 0bb2cf2620877ae34983d16f6f99f81e7c9c3747 +sound cf7d7edc7a120fd5001f6dcc1e9f2c8e9c09e6c9 +sound-asoc aad2aedc6b112bfac40b6c35dede7c21443ac765 +modules e2d1248432c4bc8b3e4cdfc13074acbce3a749cd +input fcd6eb50eadd83f857eac55f99316f1789707cdb +block e118e4be8a96c6b89307ee3d360d954249981b8f +lightnvm 2a65aee4011bd3a372ce23681ceb3a6960a96c8c +device-mapper 0b7dab201f0869c6e508c7fc3e0408a4044e5ac0 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh 466780648db4aed7722de91e9d9749c6c5969327 +md d787be4092e27728cb4c012bee9762098ef3c662 +mfd f37be01e6dc606f2fcc5e95c9933d948ce19bd35 +backlight 602553073892c18f723f8aa090153a23b1312a16 +battery eee1d077f0d74bcd411c18148a31a5d3aab42284 +omap_dss2 ab366b40b8513e7590858229ecbb5e1434a52b54 +regulator 306b3710d973b26c501fe98d8a784674d10b90b8 +security f786b752098216fedb73ba2905c8cce12358534a +integrity 544e1cea03e6674e3c12a3b8e8cc507c3dbeaf0c +keys 05638c9bc586a0c8897f7e909aaa0a3d1ff052e0 +selinux 3f09354ac84c6904787189d85fb306bf60f714b8 +tpmdd f786b752098216fedb73ba2905c8cce12358534a +watchdog 1a695a905c18548062509178b98bc91e67510864 +iommu e45a4c9d404194a0a8eb2273230bcff9b80d07aa +dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108 +vfio 9698cbf0bea6b9f5c3190ce97bdf8963c0148671 +jc_docs 19abdb15f3c781565f375db2e13d6c9f8bcbb561 +trivial 34df117414d73cb56d128bf7016a4c151f95c313 +audit 86b2efbe3a390e07dbba725ef700b0d143e9a385 +devicetree 15cc2ed6dcf91a8658e084be4e140147161819d7 +mailbox 9ac3e85a5c5c33ac99b6f093e886ecb8849919d2 +spi 13cfb01a032d9c78124e1aec540c139c34df372c +tip 907012b1ab028088ad5363066b7a668bb44f90d3 +clockevents 3d802c5c8cfa1d6adb30566764477167dfd783fc +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd a67adb32d9413fc6277851994481b9d400128c1c +irqchip 77d50b17c990ab55cae8e95b2475ed6427e22af4 +ftrace 97f8827a8c7963756ae7d3ee898675b4667eca73 +rcu 6fdb862130dd423e0047cf91756aae9cb87e0fb6 +kvm 8ff7b956471faadb0f874a49e8603d43cb1e55d5 +kvm-arm 35a2d58588f0992627e74b447ccab21570544c86 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus fd7bacbca47a86a6f418440d8a5d7b7edbb2f8f9 +kvms390 a411edf1320ed8fa3b4560902ac4e033c4a72bcf +xen-tip bdadcaf2a7c19d667c7c021da2ffc8fa18c44031 +percpu 6710e594f71ccaad8101bc64321152af7cd9ea28 +workqueues d945b5e9f0e35cb56a3783d849b5f0f37da0a7f1 +drivers-x86 ab9bb11ccbaa9e84be2534b677fe5350c2cc2014 +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 9c99e5e51988798af2a687ef9b1716dd79388550 +leds b1ae40a5db6191c42e2e45d726407096f030ee08 +ipmi 92cad0931b08226e71110380304ad28e12547dcb +driver-core 33688abb2802ff3a230bd2441f765477b94cc89e +tty 98f2082c3ac4042189723c120553310700b583bb +usb 215db9481814bfae69cde49d82865c74189e435f +usb-gadget 15e4292a2d21e9997fdb2b8c014cc461b3f268f0 +usb-serial 33688abb2802ff3a230bd2441f765477b94cc89e +usb-chipidea-next ebfad91c5da3b32d83aaad280d6918867aea501c +staging 3c9a6793bde1feb368cd6ef113c08a40a37f7517 +char-misc e2402b1d214e5d50e807773563d590115a161f45 +extcon af61f96109b73fefbe0589c320d2219567f4f660 +cgroup 1f22cd881c59955a9bd836123615bf238787f011 +scsi 09aa8c2f3963b93247bf735ee9a50d32b1d6d1e4 +target-updates 8f0dfb3d8b1120c61f6e2cc3729290db10772b2d +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata c76004f3756d955710ce7b2f00562c78e5bcfe40 +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +pinctrl 69fc8ca00b5dc1cd7d81795382c1ea257c8deb4f +vhost 139ab4d4e68b8cf2a611b06c006a2195dc6bedf1 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg c93c7c21fd2b7632a24b23c916e1b8a2ccbb4dc1 +gpio c35285cb1570b77d4c25d4ae6b8d6b20a575937a +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 8910a6a600ee91c7a70f0a8b15b485392b4eea9d +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns aad82892af261b9903cc11c55be3ecf5f0b0b4f8 +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk 6db8c762c807cb71163f8591b5521ab5fd850567 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest cde07f453bedd529c9ab7d57535e45f7e90a5c83 +y2038 4b277763c5b3ce6d60168797e6f38260416d9b13 +luto-misc 6436d4c1a83cbe083e54c53bb2b16efaab9b62f4 +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 6d9122078097233dbfc4ad3a45512393cddf8540 +coresight 5beb8787baefd55a578a42694f4dfe87d0963ce2 +rtc 803bb30145df3132f9c8c8704d11a9e6732340c7 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm a461529a988792290c31e43cdb8a096ade8a185e +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current 36ac8116836c823edb55ae062fd98834bdcd5b69 +akpm 49289c88bf97e4635cc8900137a368ab02a31c44 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..8f78b06fde91 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,240 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +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 +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +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 +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.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..fe789fa285b9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8849 @@ +$ date -R +Fri, 01 Jul 2016 09:33:38 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at e7bdea7750eb Merge tag 'nfs-for-4.7-2' of git://git.linux-nfs.org/projects/anna/linux-nfs +Merging origin/master (1a0a02d1efa0 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge origin/master +Updating e7bdea7750eb..1a0a02d1efa0 +Fast-forward + arch/arc/Makefile | 2 - + arch/arc/kernel/stacktrace.c | 2 +- + arch/arm/kvm/arm.c | 1 + + arch/x86/include/asm/pvclock.h | 25 ++--- + arch/x86/kernel/pvclock.c | 11 +- + arch/x86/kvm/lapic.c | 3 +- + arch/x86/kvm/vmx.c | 23 ++--- + arch/x86/kvm/x86.c | 6 -- + arch/x86/kvm/x86.h | 7 ++ + drivers/mfd/max77620.c | 2 + + drivers/phy/phy-stih407-usb.c | 2 +- + drivers/usb/dwc3/dwc3-st.c | 3 +- + drivers/usb/host/ehci-st.c | 6 +- + drivers/usb/host/ohci-st.c | 6 +- + include/kvm/arm_pmu.h | 4 +- + include/linux/mfd/da9052/da9052.h | 2 +- + include/linux/pwm.h | 16 +-- + include/linux/reset.h | 211 ++++++++++++++++++++++++++++++-------- + 18 files changed, 233 insertions(+), 99 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 +Already up-to-date. +Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) +$ 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 (190ce8693c23 powerpc/tm: Avoid SLB faults in treclaim/trecheckpoint when RI=0) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/process.c | 10 +++++++ + arch/powerpc/kernel/tm.S | 61 +++++++++++++++++++++++++++++----------- + 3 files changed, 55 insertions(+), 18 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 (43daa96b166c usbnet: Stop RX Q on MTU change) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/intel/e1000e/netdev.c | 21 +++++++++------------ + drivers/net/ethernet/intel/ixgbevf/mbx.c | 4 ++-- + drivers/net/usb/usbnet.c | 10 +++++++--- + include/net/ip.h | 5 ++--- + net/bridge/br_netfilter_hooks.c | 2 +- + net/ipv4/ip_output.c | 4 ++-- + 6 files changed, 23 insertions(+), 23 deletions(-) +Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) +$ git merge ipsec/master +Already up-to-date. +Merging ipvs/master (370a8107e788 ipvs: fix bind to link-local mcast IPv6 address in backup) +$ git merge ipvs/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_sync.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (c041778c966c cfg80211: fix proto in ieee80211_data_to_8023 for frames without LLC header) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (62db7152c924 ALSA: au88x0: Fix calculation in vortex_wtdma_bufshift()) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/au88x0/au88x0_core.c | 5 ++--- + sound/pci/echoaudio/echoaudio.c | 4 ++-- + sound/pci/hda/hda_generic.c | 2 ++ + sound/pci/hda/hda_intel.c | 6 +++++- + 4 files changed, 11 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (33688abb2802 Linux 4.7-rc4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (5353ed8deede devpts: fix null pointer dereference on failed memory allocation) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/pty.c | 7 +++++-- + drivers/tty/vt/vt.c | 1 + + 2 files changed, 6 insertions(+), 2 deletions(-) +Merging usb.current/usb-linus (ab2a4bf83902 USB: don't free bandwidth_mutex too early) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/phy/phy-bcm-ns-usb2.c | 4 ++-- + drivers/phy/phy-rcar-gen3-usb2.c | 14 +------------- + drivers/phy/phy-rockchip-dp.c | 2 +- + drivers/phy/phy-sun4i-usb.c | 14 +++++++------- + drivers/usb/common/usb-otg-fsm.c | 2 ++ + drivers/usb/core/hcd.c | 17 +++++++---------- + include/linux/usb/ehci_def.h | 4 ++-- + 7 files changed, 22 insertions(+), 35 deletions(-) +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 (33688abb2802 Linux 4.7-rc4) +$ 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 +Already up-to-date. +Merging staging.current/staging-linus (d83972213130 Merge tag 'iio-fixes-for-4.7c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/accel/kxsd9.c | 4 ++-- + drivers/iio/adc/ad7266.c | 7 +++++-- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 5 +++-- + drivers/staging/iio/accel/sca3000_core.c | 2 +- + drivers/staging/iio/adc/ad7606_spi.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 6 +++--- + 6 files changed, 15 insertions(+), 11 deletions(-) +Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (caca925fca4f Input: xpad - validate USB endpoint count during probe) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/xpad.c | 3 +++ + include/uapi/linux/input-event-codes.h | 1 + + 2 files changed, 4 insertions(+) +Merging crypto-current/master (055ddaace035 crypto: user - re-add size check for CRYPTO_MSG_GETALG) +$ git merge crypto-current/master +Already up-to-date. +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 (ba4a1c28a92d mfd: da9053: Fix compiler warning message for uninitialised variable) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (cab103274352 drm/i915: Fix missing unlock on error in i915_ppgtt_info()) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- + drivers/gpu/drm/i915/intel_display.c | 16 ++++++++-------- + drivers/gpu/drm/i915/intel_dp.c | 10 ++++++---- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 4 ++-- + include/drm/i915_pciids.h | 10 ++++------ + 5 files changed, 22 insertions(+), 22 deletions(-) +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 (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) +$ 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 (1a695a905c18 Linux 4.7-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (fcfe0c8bf1fc ARM: SoC: Document merges) +$ git merge arm-soc/for-next +Auto-merging include/linux/reset.h +Auto-merging drivers/soc/samsung/pm_domains.c +Removing drivers/soc/brcmstb/Kconfig +Auto-merging drivers/soc/bcm/brcmstb/biuctrl.c +Removing arch/arm/mach-exynos/s5p-dev-mfc.c +Removing arch/arm/mach-exynos/mfc.h +Removing arch/arm/configs/bcm_defconfig +Removing arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/arm/bcm/brcm,bcm11351-cpu-method.txt | 6 +- + .../bindings/arm/bcm/brcm,bcm23550-cpu-method.txt | 36 + + .../devicetree/bindings/arm/bcm/brcm,bcm23550.txt | 15 + + Documentation/devicetree/bindings/arm/cpus.txt | 2 + + Documentation/devicetree/bindings/arm/olimex.txt | 8 +- + .../bindings/arm/samsung/samsung-boards.txt | 1 + + .../devicetree/bindings/ata/ahci-platform.txt | 1 + + .../devicetree/bindings/media/s5p-mfc.txt | 39 +- + .../bindings/memory-controllers/atmel,ebi.txt | 136 + + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../bindings/reset/amlogic,meson-reset.txt | 18 + + Documentation/driver-model/devres.txt | 4 + + MAINTAINERS | 1 + + arch/arm/Kconfig | 34 +- + arch/arm/Kconfig.debug | 61 +- + arch/arm/arm-soc-for-next-contents.txt | 99 + + arch/arm/boot/dts/Makefile | 7 +- + arch/arm/boot/dts/aks-cdu.dts | 2 +- + arch/arm/boot/dts/animeo_ip.dts | 11 +- + arch/arm/boot/dts/armada-385-linksys.dtsi | 4 +- + 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/bcm-nsp.dtsi | 55 +- + arch/arm/boot/dts/bcm11351.dtsi | 2 +- + arch/arm/boot/dts/bcm21664.dtsi | 2 +- + arch/arm/boot/dts/bcm23550-sparrow.dts | 80 + + arch/arm/boot/dts/bcm23550.dtsi | 415 +++ + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 + + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 4 + + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 40 + + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 4 + + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 + + arch/arm/boot/dts/bcm5301x.dtsi | 42 + + arch/arm/boot/dts/bcm958525xmc.dts | 109 + + arch/arm/boot/dts/bcm958625hr.dts | 107 + + 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/exynos-mfc-reserved-memory.dtsi | 29 + + arch/arm/boot/dts/exynos4210-origen.dts | 4 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 34 +- + 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 | 20 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 4 +- + arch/arm/boot/dts/exynos5.dtsi | 215 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 4 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-spring.dts | 4 +- + 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-arndale-octa.dts | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 30 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 12 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 4 +- + arch/arm/boot/dts/exynos5420.dtsi | 2770 +++++++++----------- + arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 103 - + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 102 +- + 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 | 30 +- + arch/arm/boot/dts/ge863-pro3.dtsi | 9 - + arch/arm/boot/dts/meson8b.dtsi | 7 + + 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/bcm_defconfig | 141 - + arch/arm/configs/exynos_defconfig | 27 +- + arch/arm/configs/multi_v5_defconfig | 54 +- + arch/arm/configs/multi_v7_defconfig | 43 +- + arch/arm/include/debug/at91.S | 10 +- + arch/arm/mach-at91/Kconfig | 2 +- + arch/arm/mach-bcm/Kconfig | 19 +- + arch/arm/mach-bcm/Makefile | 5 +- + arch/arm/mach-bcm/board_bcm21664.c | 42 - + arch/arm/mach-bcm/board_bcm23550.c | 25 + + arch/arm/mach-bcm/kona_l2_cache.c | 1 + + arch/arm/mach-bcm/platsmp.c | 174 +- + arch/arm/mach-berlin/Kconfig | 2 +- + arch/arm/mach-digicolor/Kconfig | 2 +- + arch/arm/mach-exynos/Kconfig | 3 +- + arch/arm/mach-exynos/Makefile | 3 - + arch/arm/mach-exynos/exynos.c | 19 - + arch/arm/mach-exynos/mfc.h | 16 - + arch/arm/mach-exynos/s5p-dev-mfc.c | 93 - + 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-mvebu/coherency.c | 23 +- + 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-vexpress/hotplug.c | 2 + + arch/arm/mach-vexpress/spc.c | 6 +- + 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/arm/plat-versatile/platsmp.c | 2 + + arch/arm64/Kconfig.platforms | 6 + + .../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 | 159 +- + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 37 + + arch/arm64/boot/dts/broadcom/ns2.dtsi | 119 + + 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 | 5 +- + 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/memory/Kconfig | 11 + + drivers/memory/Makefile | 1 + + drivers/memory/atmel-ebi.c | 771 ++++++ + drivers/of/of_reserved_mem.c | 85 +- + drivers/power/reset/Kconfig | 10 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/brcm-kona-reset.c | 73 + + drivers/power/reset/vexpress-poweroff.c | 4 +- + 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/Kconfig | 1 - + drivers/soc/Makefile | 1 - + drivers/soc/bcm/Kconfig | 15 + + drivers/soc/bcm/Makefile | 1 + + drivers/soc/{ => bcm}/brcmstb/Makefile | 0 + drivers/soc/{ => bcm}/brcmstb/biuctrl.c | 1 + + drivers/soc/{ => bcm}/brcmstb/common.c | 0 + drivers/soc/brcmstb/Kconfig | 10 - + 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/of_reserved_mem.h | 25 +- + include/linux/reset-controller.h | 4 + + include/linux/reset.h | 4 +- + include/media/videobuf2-dma-contig.h | 2 + + 257 files changed, 9187 insertions(+), 4172 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt + 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/bcm23550-sparrow.dts + create mode 100644 arch/arm/boot/dts/bcm23550.dtsi + create mode 100644 arch/arm/boot/dts/bcm958525xmc.dts + create mode 100644 arch/arm/boot/dts/bcm958625hr.dts + create mode 100644 arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi + 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 + delete mode 100644 arch/arm/configs/bcm_defconfig + create mode 100644 arch/arm/mach-bcm/board_bcm23550.c + delete mode 100644 arch/arm/mach-exynos/mfc.h + delete mode 100644 arch/arm/mach-exynos/s5p-dev-mfc.c + 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/media/platform/s5p-mfc/s5p_mfc_iommu.h + create mode 100644 drivers/memory/atmel-ebi.c + create mode 100644 drivers/power/reset/brcm-kona-reset.c + create mode 100644 drivers/reset/reset-meson.c + rename drivers/soc/{ => bcm}/brcmstb/Makefile (100%) + rename drivers/soc/{ => bcm}/brcmstb/biuctrl.c (98%) + rename drivers/soc/{ => bcm}/brcmstb/common.c (100%) + delete mode 100644 drivers/soc/brcmstb/Kconfig + 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 (4d9b3db03bd4 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Removing drivers/clk/meson/clkc.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/mach-meson/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/clock/amlogic,gxbb-clkc.txt | 36 + + .../devicetree/bindings/rng/amlogic,meson-rng.txt | 14 + + arch/arm/mach-meson/Kconfig | 3 + + arch/arm64/Kconfig.platforms | 2 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 14 +- + arch/arm64/configs/defconfig | 2 + + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 2 +- + drivers/clk/meson/Kconfig | 19 + + drivers/clk/meson/Makefile | 5 +- + drivers/clk/meson/clk-cpu.c | 73 +- + drivers/clk/meson/clk-mpll.c | 94 ++ + drivers/clk/meson/clk-pll.c | 104 +-- + drivers/clk/meson/clkc.c | 249 ------ + drivers/clk/meson/clkc.h | 179 ++-- + drivers/clk/meson/gxbb.c | 954 +++++++++++++++++++++ + drivers/clk/meson/gxbb.h | 271 ++++++ + drivers/clk/meson/meson8b-clkc.c | 436 ++++++++-- + include/dt-bindings/clock/gxbb-clkc.h | 12 + + include/dt-bindings/clock/meson8b-clkc.h | 4 +- + 20 files changed, 1878 insertions(+), 596 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt + create mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt + create mode 100644 drivers/clk/meson/Kconfig + create mode 100644 drivers/clk/meson/clk-mpll.c + delete mode 100644 drivers/clk/meson/clkc.c + create mode 100644 drivers/clk/meson/gxbb.c + create mode 100644 drivers/clk/meson/gxbb.h + create mode 100644 include/dt-bindings/clock/gxbb-clkc.h +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 (1a695a905c18 Linux 4.7-rc1) +$ git merge berlin/berlin/for-next +Already up-to-date. +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 (63a404a3f177 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/pm-imx3.c +Removing arch/arm/mach-imx/eukrea-baseboards.h +Removing arch/arm/mach-imx/devices/platform-mxc_rnga.c +Auto-merging arch/arm/mach-imx/Kconfig +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 | 8 +- + 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-bx50v3.dtsi | 6 + + 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/imx7-colibri-eval-v3.dtsi | 148 ++++ + arch/arm/boot/dts/imx7-colibri.dtsi | 571 +++++++++++++ + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 1 - + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 66 ++ + arch/arm/boot/dts/imx7d-colibri.dtsi | 54 ++ + arch/arm/boot/dts/imx7d-nitrogen7.dts | 3 +- + arch/arm/boot/dts/imx7d-pinfunc.h | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 131 ++- + arch/arm/boot/dts/imx7d.dtsi | 923 ++------------------ + arch/arm/boot/dts/imx7s-colibri-eval-v3.dts | 51 ++ + arch/arm/boot/dts/imx7s-colibri.dtsi | 50 ++ + arch/arm/boot/dts/imx7s.dtsi | 933 +++++++++++++++++++++ + arch/arm/boot/dts/ls1021a.dtsi | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm/mach-imx/Kconfig | 4 - + arch/arm/mach-imx/Makefile | 4 +- + arch/arm/mach-imx/avic.c | 19 +- + arch/arm/mach-imx/common.h | 3 +- + arch/arm/mach-imx/cpu-imx5.c | 8 - + arch/arm/mach-imx/cpu.c | 2 - + arch/arm/mach-imx/cpuidle-imx6q.c | 20 + + arch/arm/mach-imx/devices/Kconfig | 4 - + arch/arm/mach-imx/devices/devices.c | 3 + + arch/arm/mach-imx/devices/platform-gpio-mxc.c | 1 + + arch/arm/mach-imx/devices/platform-mxc_rnga.c | 53 -- + arch/arm/mach-imx/eukrea-baseboards.h | 42 - + arch/arm/mach-imx/imx27-dt.c | 1 + + arch/arm/mach-imx/imx31-dt.c | 12 + + arch/arm/mach-imx/imx35-dt.c | 10 +- + arch/arm/mach-imx/irq-common.c | 6 +- + arch/arm/mach-imx/mach-imx50.c | 1 - + arch/arm/mach-imx/mach-imx51.c | 3 +- + arch/arm/mach-imx/mach-imx53.c | 1 - + arch/arm/mach-imx/mach-imx6q.c | 4 +- + arch/arm/mach-imx/mach-imx6sl.c | 2 + + arch/arm/mach-imx/mach-imx6sx.c | 2 + + arch/arm/mach-imx/mach-imx7d.c | 1 + + arch/arm/mach-imx/mm-imx1.c | 2 +- + arch/arm/mach-imx/mm-imx27.c | 2 + + arch/arm/mach-imx/mm-imx3.c | 32 +- + arch/arm/mach-imx/mxc.h | 101 --- + arch/arm/mach-imx/pm-imx27.c | 8 +- + arch/arm/mach-imx/pm-imx3.c | 38 - + arch/arm/mach-imx/system.c | 58 +- + arch/arm/mach-imx/tzic.c | 16 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 24 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 44 +- + 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 + + 120 files changed, 4147 insertions(+), 1720 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 + create mode 100644 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi + create mode 100644 arch/arm/boot/dts/imx7-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx7d-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx7s-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx7s-colibri.dtsi + create mode 100644 arch/arm/boot/dts/imx7s.dtsi + delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_rnga.c + delete mode 100644 arch/arm/mach-imx/eukrea-baseboards.h + delete mode 100644 arch/arm/mach-imx/pm-imx3.c + create mode 100644 include/soc/imx/cpuidle.h +Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' 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 +- + arch/arm/mach-keystone/pm_domain.c | 2 + + include/dt-bindings/pinctrl/keystone.h | 39 +++++++++ + 9 files changed, 221 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/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 + + 9 files changed, 12 insertions(+), 6 deletions(-) +Merging omap/for-next (2fe616ce3a64 Merge branch 'omap-for-v4.8/dt-v3' 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 | 12 +- + 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/am3517-craneboard.dts | 2 +- + arch/arm/boot/dts/am4372.dtsi | 111 ++++++++-- + arch/arm/boot/dts/am437x-gp-evm.dts | 6 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 1 + + arch/arm/boot/dts/am437x-sbc-t43.dts | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 8 + + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 2 +- + arch/arm/boot/dts/compulab-sb-som.dtsi | 2 +- + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 +- + arch/arm/boot/dts/dm814x.dtsi | 2 +- + arch/arm/boot/dts/dra7.dtsi | 242 ++++++++++++++++++++- + 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/logicpd-torpedo-37xx-devkit.dts | 4 +- + arch/arm/boot/dts/omap24xx-clocks.dtsi | 2 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 10 +- + arch/arm/boot/dts/omap3-beagle.dts | 10 +- + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 12 +- + arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-devkit8000-lcd43.dts | 2 +- + arch/arm/boot/dts/omap3-devkit8000-lcd70.dts | 2 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 72 +++++- + arch/arm/boot/dts/omap3-ha-lcd.dts | 2 +- + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 8 +- + arch/arm/boot/dts/omap3-n900.dts | 12 + + arch/arm/boot/dts/omap3-overo-common-dvi.dtsi | 8 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +- + arch/arm/boot/dts/omap3-pandora-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-sb-t35.dtsi | 8 +- + arch/arm/boot/dts/omap3-thunder.dts | 2 +- + arch/arm/boot/dts/omap3.dtsi | 10 + + arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- + arch/arm/boot/dts/omap4-duovero.dtsi | 5 + + arch/arm/boot/dts/omap4-panda-common.dtsi | 21 +- + arch/arm/boot/dts/omap4-sdp.dts | 13 +- + arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 2 +- + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 5 + + arch/arm/boot/dts/omap5-board-common.dtsi | 13 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 15 +- + arch/arm/mach-omap1/ams-delta-fiq.c | 2 +- + arch/arm/mach-omap1/include/mach/mtd-xip.h | 2 +- + arch/arm/mach-omap2/Makefile | 4 +- + 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/common.h | 8 +- + 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/io.c | 3 + + arch/arm/mach-omap2/mcbsp.c | 31 +-- + arch/arm/mach-omap2/mux34xx.c | 4 +- + arch/arm/mach-omap2/omap-headsmp.S | 18 +- + arch/arm/mach-omap2/omap-hotplug.c | 6 + + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 29 ++- + arch/arm/mach-omap2/omap-smp.c | 96 +++++--- + arch/arm/mach-omap2/omap4-common.c | 16 +- + 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 | 85 +------- + 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/omap_hwmod_81xx_data.c | 2 +- + arch/arm/mach-omap2/pdata-quirks.c | 18 ++ + arch/arm/mach-omap2/prcm43xx.h | 1 + + arch/arm/mach-omap2/prm33xx.h | 2 - + arch/arm/mach-omap2/sdrc.h | 4 +- + drivers/clk/ti/clk-33xx.c | 3 + + drivers/clk/ti/clk-43xx.c | 7 + + 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 +- + 92 files changed, 1031 insertions(+), 608 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 (3af353d58ab1 firmware: qcom_scm: Add missing is_available API) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +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/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 | 3 +- + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 626 +++++++++++++++++++++ + ...tsi => qcom-apq8064-arrow-sd-600eval-pins.dtsi} | 0 + ...b600c.dts => qcom-apq8064-arrow-sd-600eval.dts} | 10 +- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 6 - + 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 + + arch/arm/boot/dts/qcom-ipq4019.dtsi | 6 + + arch/arm/boot/dts/qcom-msm8660-surf.dts | 11 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 166 +++++- + .../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/arm/configs/qcom_defconfig | 8 + + arch/arm/mach-qcom/Kconfig | 4 + + arch/arm/mach-qcom/board.c | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 16 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 78 ++- + arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 303 ++++++++++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 103 +++- + arch/arm64/configs/defconfig | 4 + + drivers/firmware/Kconfig | 1 + + drivers/firmware/qcom_scm-32.c | 327 ++++++----- + drivers/firmware/qcom_scm-64.c | 307 +++++++++- + drivers/firmware/qcom_scm.c | 353 +++++++++++- + drivers/firmware/qcom_scm.h | 47 +- + 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 + + 40 files changed, 2829 insertions(+), 267 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt + create mode 100644 arch/arm/boot/dts/qcom-apq8060-dragonboard.dts + 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 arch/arm64/boot/dts/qcom/msm8996-pins.dtsi + create mode 100644 include/linux/soc/qcom/wcnss_ctrl.h +Merging renesas/next (b0b8da2c8b14 Merge branch 'heads/dt-for-v4.8' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/mach-shmobile/Kconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/shmobile.txt | 6 + + .../devicetree/bindings/power/renesas,apmu.txt | 31 ++ + MAINTAINERS | 1 - + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/emev2-kzm9d.dts | 8 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 4 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 8 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 6 +- + arch/arm/boot/dts/r8a7790-lager.dts | 10 +- + arch/arm/boot/dts/r8a7790.dtsi | 13 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 8 +- + arch/arm/boot/dts/r8a7791-porter.dts | 4 +- + arch/arm/boot/dts/r8a7791.dtsi | 7 + + arch/arm/boot/dts/r8a7792-blanche.dts | 66 ++++ + arch/arm/boot/dts/r8a7792.dtsi | 378 +++++++++++++++++++++ + arch/arm/boot/dts/r8a7793-gose.dts | 6 +- + arch/arm/boot/dts/r8a7793.dtsi | 15 + + arch/arm/boot/dts/r8a7794-alt.dts | 4 +- + arch/arm/boot/dts/r8a7794-silk.dts | 16 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 8 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/mach-shmobile/Kconfig | 4 + + arch/arm/mach-shmobile/Makefile | 1 + + arch/arm/mach-shmobile/common.h | 1 + + arch/arm/mach-shmobile/platsmp-apmu.c | 94 ++++- + arch/arm/mach-shmobile/platsmp.c | 6 + + arch/arm/mach-shmobile/pm-r8a7779.c | 6 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 6 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 1 + + arch/arm/mach-shmobile/setup-r8a7791.c | 1 + + arch/arm/mach-shmobile/setup-r8a7792.c | 35 ++ + arch/arm/mach-shmobile/setup-rcar-gen2.c | 45 +-- + arch/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/renesas/Makefile | 1 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 26 ++ + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 50 +++ + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 138 ++++++++ + arch/arm64/configs/defconfig | 1 + + 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 | 42 ++- + drivers/soc/renesas/rcar-sysc.h | 1 + + include/dt-bindings/clock/r8a7792-clock.h | 103 ++++++ + include/dt-bindings/clock/r8a7796-cpg-mssr.h | 69 ++++ + include/dt-bindings/power/r8a7792-sysc.h | 26 ++ + include/linux/soc/renesas/rcar-sysc.h | 2 +- + 52 files changed, 1225 insertions(+), 94 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/renesas,apmu.txt + 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 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a7796.dtsi + 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/clock/r8a7796-cpg-mssr.h + create mode 100644 include/dt-bindings/power/r8a7792-sysc.h +Merging rockchip/for-next (339c7e214a46 Merge branch 'v4.8-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Auto-merging arch/arm/boot/dts/rk322x.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 3 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/rk3228-evb.dts | 2 +- + arch/arm/boot/dts/rk3229-evb.dts | 90 ++++++ + arch/arm/boot/dts/{rk3228.dtsi => rk322x.dtsi} | 118 +++++++- + 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 | 313 ++++++++++++++++++++- + drivers/clk/rockchip/clk-rk3228.c | 125 ++++---- + drivers/clk/rockchip/clk-rk3399.c | 9 + + include/dt-bindings/clock/rk3228-cru.h | 15 + + 20 files changed, 844 insertions(+), 133 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3229-evb.dts + rename arch/arm/boot/dts/{rk3228.dtsi => rk322x.dtsi} (80%) + 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 (13fc4c900141 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 arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 35015d055419] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 +- + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 14 +++-- + 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 | 5 -- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 5 -- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 5 -- + arch/arm/boot/dts/exynos4412-origen.dts | 5 -- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 5 -- + arch/arm/boot/dts/exynos5250-arndale.dts | 4 -- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 -- + arch/arm/boot/dts/exynos5250-spring.dts | 4 -- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 -- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 -- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 4 -- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 -- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 -- + arch/arm/configs/exynos_defconfig | 2 + + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm/include/debug/exynos.S | 6 +- + arch/arm/include/debug/samsung.S | 8 +++ + arch/arm/mach-exynos/common.h | 5 +- + arch/arm/mach-exynos/exynos.c | 1 + + arch/arm/mach-exynos/firmware.c | 18 +++--- + arch/arm/mach-exynos/headsmp.S | 3 + + arch/arm/mach-exynos/platsmp.c | 4 +- + arch/arm/mach-exynos/pm.c | 6 +- + arch/arm/mach-exynos/suspend.c | 12 ++-- + arch/arm/plat-samsung/cpu.c | 8 +-- + arch/arm/plat-samsung/include/plat/cpu.h | 1 + + arch/arm/plat-samsung/pm-common.c | 8 +-- + drivers/cpufreq/s5pv210-cpufreq.c | 68 +++++++++++----------- + drivers/memory/samsung/exynos-srom.c | 39 ++++--------- + drivers/soc/samsung/pm_domains.c | 6 +- + 35 files changed, 115 insertions(+), 165 deletions(-) +Merging tegra/for-next (5f207c45290c 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. + .../bindings/bus/nvidia,tegra210-aconnect.txt | 45 ++ + Documentation/devicetree/bindings/i2c/i2c.txt | 8 + + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 2 +- + .../bindings/usb/nvidia,tegra124-xusb.txt | 8 +- + 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 | 18 +- + 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/arm/mach-tegra/tegra.c | 24 +- + 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 | 319 +++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 314 +++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 316 ++++++++++++- + arch/arm64/configs/defconfig | 25 + + drivers/bus/Kconfig | 13 + + drivers/bus/Makefile | 1 + + drivers/bus/tegra-aconnect.c | 112 +++++ + drivers/clk/tegra/clk-id.h | 1 - + drivers/clk/tegra/clk-pll.c | 505 +++++++++++++++++++++ + drivers/clk/tegra/clk-tegra-periph.c | 25 +- + drivers/clk/tegra/clk-tegra114.c | 156 +------ + drivers/clk/tegra/clk-tegra124.c | 156 +------ + drivers/clk/tegra/clk-tegra210.c | 295 +++--------- + drivers/clk/tegra/clk-tegra30.c | 113 +---- + drivers/clk/tegra/clk.h | 17 + + drivers/i2c/i2c-core.c | 10 +- + drivers/memory/tegra/mc.c | 10 +- + drivers/memory/tegra/tegra124-emc.c | 8 +- + drivers/pci/host/pci-tegra.c | 54 +-- + drivers/soc/tegra/pmc.c | 149 ++++-- + include/dt-bindings/clock/tegra210-car.h | 2 +- + include/soc/tegra/cpuidle.h | 2 +- + 54 files changed, 2269 insertions(+), 803 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.txt + create mode 100644 drivers/bus/tegra-aconnect.c +Merging arm64/for-next/core (9fdc14c55cd6 arm64: mm: fix location of _etext) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + Documentation/arm64/acpi_object_usage.txt | 343 ++++++++++++++++-------------- + Documentation/arm64/arm-acpi.txt | 40 ++-- + arch/arm64/Kconfig | 11 + + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/checksum.h | 51 +++++ + arch/arm64/include/asm/esr.h | 1 + + arch/arm64/include/asm/kexec.h | 48 +++++ + arch/arm64/include/asm/kvm_emulate.h | 2 +- + arch/arm64/include/asm/ptdump.h | 44 ++++ + arch/arm64/include/asm/uaccess.h | 25 ++- + arch/arm64/include/asm/virt.h | 5 + + arch/arm64/kernel/Makefile | 2 + + arch/arm64/kernel/arm64ksyms.c | 4 +- + arch/arm64/kernel/cpu-reset.S | 54 +++++ + arch/arm64/kernel/cpu-reset.h | 34 +++ + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/kernel/hyp-stub.S | 10 +- + arch/arm64/kernel/machine_kexec.c | 212 ++++++++++++++++++ + arch/arm64/kernel/relocate_kernel.S | 130 +++++++++++ + arch/arm64/kernel/setup.c | 2 +- + arch/arm64/kernel/traps.c | 33 ++- + arch/arm64/kernel/vmlinux.lds.S | 7 +- + arch/arm64/kvm/handle_exit.c | 4 +- + arch/arm64/kvm/hyp/Makefile | 4 + + arch/arm64/kvm/hyp/switch.c | 2 +- + arch/arm64/lib/copy_from_user.S | 4 +- + arch/arm64/lib/copy_to_user.S | 4 +- + arch/arm64/mm/dma-mapping.c | 15 +- + arch/arm64/mm/dump.c | 32 +-- + arch/arm64/mm/fault.c | 15 +- + arch/arm64/mm/init.c | 13 +- + arch/arm64/mm/mmu.c | 20 +- + include/uapi/linux/kexec.h | 1 + + 34 files changed, 928 insertions(+), 248 deletions(-) + create mode 100644 arch/arm64/include/asm/checksum.h + create mode 100644 arch/arm64/include/asm/kexec.h + create mode 100644 arch/arm64/include/asm/ptdump.h + create mode 100644 arch/arm64/kernel/cpu-reset.S + create mode 100644 arch/arm64/kernel/cpu-reset.h + create mode 100644 arch/arm64/kernel/machine_kexec.c + create mode 100644 arch/arm64/kernel/relocate_kernel.S +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 1f6e0a385cad] 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 (33688abb2802 Linux 4.7-rc4) +$ 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 (43a1dd9b5fc6 powerpc/powernv: Add driver for operator panel on FSP machines) +$ git merge powerpc/next +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Auto-merging arch/powerpc/mm/hash_native_64.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/kernel/eeh_driver.c +Auto-merging arch/powerpc/include/asm/book3s/64/mmu-hash.h +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a67fe0fac1d4] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/powerpc/opal/oppanel-opal.txt | 14 + + Documentation/devicetree/bindings/rtc/rtc-opal.txt | 2 +- + MAINTAINERS | 7 + + arch/powerpc/Kconfig | 3 +- + arch/powerpc/configs/powernv_defconfig | 1 + + arch/powerpc/crypto/aes-spe-regs.h | 2 +- + arch/powerpc/include/asm/asm-compat.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 | 4 +- + 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 | 23 +- + arch/powerpc/include/asm/opal.h | 20 +- + arch/powerpc/include/asm/pci-bridge.h | 2 + + arch/powerpc/include/asm/pmac_feature.h | 2 +- + arch/powerpc/include/asm/pnv-pci.h | 12 + + arch/powerpc/include/asm/ppc-opcode.h | 22 +- + arch/powerpc/include/asm/ppc-pci.h | 2 - + arch/powerpc/include/asm/ppc_asm.h | 4 +- + arch/powerpc/include/asm/processor.h | 5 +- + 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/reg.h | 5 + + 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_dev.c | 17 +- + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/entry_64.S | 2 +- + arch/powerpc/kernel/exceptions-64e.S | 2 +- + arch/powerpc/kernel/fadump.c | 5 +- + arch/powerpc/kernel/ftrace.c | 4 +- + arch/powerpc/kernel/head_64.S | 2 +- + arch/powerpc/kernel/kprobes.c | 17 +- + 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-common.c | 22 +- + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/pci_dn.c | 29 +- + arch/powerpc/kernel/process.c | 48 +- + arch/powerpc/kernel/rtas-proc.c | 2 +- + arch/powerpc/kernel/rtasd.c | 6 +- + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/signal_64.c | 11 +- + arch/powerpc/kernel/smp.c | 3 + + arch/powerpc/kernel/sysfs.c | 2 +- + arch/powerpc/kernel/traps.c | 13 +- + 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/net/Makefile | 4 + + arch/powerpc/net/bpf_jit.h | 235 ++--- + arch/powerpc/net/bpf_jit32.h | 139 +++ + arch/powerpc/net/bpf_jit64.h | 102 +++ + arch/powerpc/net/bpf_jit_asm.S | 2 +- + arch/powerpc/net/bpf_jit_asm64.S | 180 ++++ + arch/powerpc/net/bpf_jit_comp.c | 10 +- + arch/powerpc/net/bpf_jit_comp64.c | 954 +++++++++++++++++++++ + 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/maple/pci.c | 34 +- + arch/powerpc/platforms/pasemi/pci.c | 3 - + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- + arch/powerpc/platforms/powermac/pci.c | 38 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 49 +- + arch/powerpc/platforms/powernv/idle.c | 5 +- + .../powerpc/platforms/powernv/opal-memory-errors.c | 2 +- + arch/powerpc/platforms/powernv/opal-sensor.c | 2 +- + arch/powerpc/platforms/powernv/opal-sysparam.c | 4 +- + arch/powerpc/platforms/powernv/opal-tracepoints.c | 1 + + arch/powerpc/platforms/powernv/opal-wrappers.S | 5 + + arch/powerpc/platforms/powernv/opal.c | 5 + + arch/powerpc/platforms/powernv/pci-ioda.c | 507 ++++++++--- + arch/powerpc/platforms/powernv/pci.c | 124 ++- + arch/powerpc/platforms/powernv/pci.h | 10 +- + arch/powerpc/platforms/powernv/setup.c | 2 +- + 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 | 85 +- + arch/powerpc/platforms/pseries/smp.c | 31 +- + drivers/char/Kconfig | 14 + + drivers/char/Makefile | 1 + + drivers/char/powernv-op-panel.c | 223 +++++ + drivers/i2c/busses/i2c-opal.c | 2 +- + drivers/leds/leds-powernv.c | 2 +- + drivers/misc/cxl/Kconfig | 5 + + drivers/misc/cxl/api.c | 50 +- + drivers/misc/cxl/cxl.h | 38 +- + drivers/misc/cxl/debugfs.c | 35 +- + drivers/misc/cxl/file.c | 64 +- + 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 +- + drivers/mtd/devices/powernv_flash.c | 2 +- + drivers/pci/hotplug/Kconfig | 13 + + drivers/pci/hotplug/Makefile | 3 + + drivers/pci/hotplug/pnv_php.c | 733 ++++++++++++++++ + drivers/pci/setup-bus.c | 5 + + drivers/rtc/rtc-opal.c | 4 +- + include/linux/pci.h | 1 + + include/misc/cxl.h | 55 ++ + include/uapi/misc/cxl.h | 17 + + tools/testing/selftests/powerpc/pmu/ebb/.gitignore | 2 + + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 2 +- + tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c | 143 +++ + tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h | 39 + + .../selftests/powerpc/pmu/ebb/ebb_lmr_regs.c | 37 + + tools/testing/selftests/powerpc/reg.h | 5 + + 148 files changed, 4276 insertions(+), 917 deletions(-) + create mode 100644 Documentation/devicetree/bindings/powerpc/opal/oppanel-opal.txt + create mode 100644 arch/powerpc/include/asm/asm-prototypes.h + create mode 100644 arch/powerpc/net/bpf_jit32.h + create mode 100644 arch/powerpc/net/bpf_jit64.h + create mode 100644 arch/powerpc/net/bpf_jit_asm64.S + create mode 100644 arch/powerpc/net/bpf_jit_comp64.c + create mode 100644 drivers/char/powernv-op-panel.c + create mode 100644 drivers/pci/hotplug/pnv_php.c + create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.c + create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr.h + create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/ebb_lmr_regs.c +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (25d539c9a958 s390/ptrace: clarify bits in the per_struct) +$ git merge s390/features +Removing arch/s390/oprofile/op_counter.h +Removing arch/s390/oprofile/hwsampler.h +Removing arch/s390/oprofile/hwsampler.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kernel/ipl.c +Removing arch/s390/include/asm/sfp-util.h +Removing arch/s390/include/asm/sfp-machine.h +Removing arch/s390/include/asm/mathemu.h +Auto-merging arch/s390/include/asm/fpu/api.h +Removing arch/s390/include/asm/etr.h +Merge made by the 'recursive' strategy. + Documentation/cputopology.txt | 40 +- + Documentation/kernel-parameters.txt | 2 - + Documentation/s390/s390dbf.txt | 2 +- + arch/s390/Kconfig | 16 +- + arch/s390/boot/compressed/Makefile | 2 + + 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 | 14 +- + 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/cpu_mf.h | 17 +- + 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/kprobes.h | 4 +- + 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/perf_event.h | 12 - + 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/sigp.h | 17 +- + 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 | 65 +- + arch/s390/include/uapi/asm/ptrace.h | 6 +- + arch/s390/kernel/Makefile | 5 +- + arch/s390/kernel/cache.c | 7 +- + arch/s390/kernel/dis.c | 1 - + arch/s390/kernel/dumpstack.c | 12 +- + arch/s390/kernel/early.c | 22 + + arch/s390/kernel/entry.S | 1 - + arch/s390/kernel/fpu.c | 249 +++++++ + arch/s390/kernel/ipl.c | 25 +- + arch/s390/kernel/irq.c | 7 +- + arch/s390/kernel/machine_kexec.c | 55 +- + arch/s390/kernel/nmi.c | 13 +- + arch/s390/kernel/perf_cpum_sf.c | 5 - + arch/s390/kernel/perf_event.c | 30 - + arch/s390/kernel/processor.c | 113 ++- + arch/s390/kernel/setup.c | 18 +- + arch/s390/kernel/smp.c | 16 +- + arch/s390/kernel/sysinfo.c | 63 +- + arch/s390/kernel/time.c | 1053 ++------------------------- + arch/s390/kernel/topology.c | 89 +-- + arch/s390/kernel/vdso32/Makefile | 2 + + arch/s390/kernel/vdso64/Makefile | 2 + + arch/s390/kernel/vmlinux.lds.S | 21 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/lib/string.c | 50 +- + 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/page-states.c | 13 +- + arch/s390/mm/pageattr.c | 267 ++++++- + arch/s390/mm/pgtable.c | 54 +- + arch/s390/mm/vmem.c | 73 +- + arch/s390/numa/mode_emu.c | 25 +- + arch/s390/oprofile/Makefile | 1 - + arch/s390/oprofile/hwsampler.c | 1178 ------------------------------- + arch/s390/oprofile/hwsampler.h | 63 -- + arch/s390/oprofile/init.c | 489 ------------- + arch/s390/oprofile/op_counter.h | 21 - + arch/s390/pci/pci_dma.c | 4 +- + arch/s390/pci/pci_insn.c | 12 +- + 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/cmf.c | 15 +- + drivers/s390/cio/idset.h | 2 +- + drivers/s390/cio/ioasm.c | 91 ++- + drivers/s390/crypto/ap_bus.c | 77 +- + include/asm-generic/vmlinux.lds.h | 10 +- + include/linux/bitmap.h | 4 + + net/iucv/iucv.c | 36 +- + 99 files changed, 2539 insertions(+), 3837 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 + delete mode 100644 arch/s390/oprofile/hwsampler.c + delete mode 100644 arch/s390/oprofile/hwsampler.h + delete mode 100644 arch/s390/oprofile/op_counter.h +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 (893d66192c46 tile: support gcc 7 optimization to use __multi3) +$ 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 ++++++++++--- + arch/tile/lib/exports.c | 6 +++++- + 4 files changed, 42 insertions(+), 17 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 (5027553b087e Merge branch 'for-next-next-4.7-20160623' into for-next-20160623) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/delayed-inode.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/ctree.c +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/compression.c | 10 +- + fs/btrfs/ctree.c | 8 + + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 68 ++-- + fs/btrfs/delayed-ref.c | 9 +- + fs/btrfs/disk-io.c | 47 +-- + fs/btrfs/extent-tree.c | 756 ++++++++++++++++++++++++++++--------------- + fs/btrfs/extent_io.c | 35 +- + fs/btrfs/file.c | 12 +- + 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/sysfs.c | 2 + + fs/btrfs/tree-log.c | 85 ++++- + include/trace/events/btrfs.h | 404 +++++++++++++++-------- + 21 files changed, 1483 insertions(+), 585 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 (fbe601f7a34b Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (f8608985f851 configfs: Remove ppos increment in configfs_write_bin_file) +$ git merge configfs/for-next +Merge made by the 'recursive' strategy. + fs/configfs/file.c | 2 -- + 1 file changed, 2 deletions(-) +Merging ecryptfs/next (40f0fd372a62 ecryptfs: fix spelling mistakes) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 8 ++++---- + fs/ecryptfs/file.c | 4 ++-- + fs/ecryptfs/main.c | 3 +-- + 3 files changed, 7 insertions(+), 8 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 (f70749ca4294 ext4: check for extents that wrap around) +$ git merge ext4/dev +Auto-merging fs/jbd2/journal.c +Merge made by the 'recursive' strategy. + fs/ext4/balloc.c | 4 +++- + fs/ext4/ext4.h | 1 + + fs/ext4/ext4_jbd2.h | 10 +++++++++- + fs/ext4/extents.c | 8 ++++++-- + fs/ext4/fsync.c | 5 ++++- + fs/ext4/mballoc.c | 12 ++++++++++-- + fs/jbd2/commit.c | 2 +- + fs/jbd2/journal.c | 5 +++++ + fs/jbd2/transaction.c | 17 ++++++++--------- + include/linux/jbd2.h | 23 +++++++++++++++++++---- + 10 files changed, 66 insertions(+), 21 deletions(-) +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 freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Merge made by the 'recursive' strategy. + fs/freevxfs/Kconfig | 13 ++- + fs/freevxfs/vxfs.h | 185 +++++++++++++++++--------------- + fs/freevxfs/vxfs_bmap.c | 70 +++++++----- + fs/freevxfs/vxfs_dir.h | 17 +-- + fs/freevxfs/vxfs_extern.h | 10 +- + fs/freevxfs/vxfs_fshead.c | 37 +++---- + fs/freevxfs/vxfs_fshead.h | 29 ++--- + fs/freevxfs/vxfs_inode.c | 265 +++++++++++++++++++++------------------------- + fs/freevxfs/vxfs_inode.h | 146 +++++++++++++------------ + fs/freevxfs/vxfs_lookup.c | 226 +++++++++++++++++++-------------------- + fs/freevxfs/vxfs_olt.c | 15 ++- + fs/freevxfs/vxfs_olt.h | 70 ++++++------ + fs/freevxfs/vxfs_super.c | 162 +++++++++++++++++++--------- + 13 files changed, 661 insertions(+), 584 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 (7879c4e58b7c fuse: improve aio directIO write performance for size extending writes) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 4 ++++ + fs/fuse/file.c | 21 +++++++++------------ + fs/fuse/fuse_i.h | 10 ++++++++++ + fs/fuse/inode.c | 19 ++++++++++++++++++- + include/uapi/linux/fuse.h | 7 ++++++- + 5 files changed, 47 insertions(+), 14 deletions(-) +Merging gfs2/for-next (fd4c5748b8d3 gfs2: writeout truncated pages) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/dir.c +Merge made by the 'recursive' strategy. + fs/buffer.c | 3 +- + fs/gfs2/aops.c | 49 +++++++++++------ + fs/gfs2/dentry.c | 2 +- + fs/gfs2/dir.c | 3 +- + fs/gfs2/export.c | 11 ---- + fs/gfs2/file.c | 2 +- + fs/gfs2/glock.c | 11 +--- + fs/gfs2/glock.h | 10 ++++ + fs/gfs2/inode.c | 128 +++++++++++++++++++++++++++++--------------- + fs/gfs2/inode.h | 4 +- + fs/gfs2/main.c | 1 + + fs/gfs2/ops_fstype.c | 3 +- + fs/gfs2/quota.c | 2 +- + fs/gfs2/rgrp.c | 16 +++--- + fs/gfs2/super.c | 24 +++++---- + include/linux/buffer_head.h | 3 ++ + 16 files changed, 170 insertions(+), 102 deletions(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (050702c1004c Merge branch 'writeback') +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging fs/nfs/pnfs_nfs.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/direct.c +Auto-merging fs/nfs/dir.c +Merge made by the 'recursive' strategy. + fs/nfs/Makefile | 2 +- + fs/nfs/client.c | 22 +++-- + fs/nfs/dir.c | 52 +++++++----- + fs/nfs/direct.c | 93 +++++++-------------- + fs/nfs/file.c | 96 ++++++--------------- + fs/nfs/filelayout/filelayout.c | 12 +-- + fs/nfs/flexfilelayout/flexfilelayout.c | 23 +++--- + fs/nfs/inode.c | 110 ++++++++++++------------ + fs/nfs/internal.h | 57 +++++++++++-- + fs/nfs/io.c | 147 +++++++++++++++++++++++++++++++++ + fs/nfs/nfs3client.c | 8 +- + fs/nfs/nfs42proc.c | 21 ++++- + fs/nfs/nfs4_fs.h | 1 + + fs/nfs/nfs4client.c | 20 +++-- + fs/nfs/nfs4file.c | 14 +--- + fs/nfs/nfs4proc.c | 82 ++++++++++-------- + fs/nfs/nfstrace.h | 1 - + fs/nfs/pnfs_nfs.c | 7 ++ + fs/nfs/write.c | 48 ++++++++--- + include/linux/nfs_fs.h | 3 +- + include/linux/nfs_xdr.h | 5 +- + 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 ++++++++++++++----------- + 26 files changed, 635 insertions(+), 389 deletions(-) + create mode 100644 fs/nfs/io.c +Merging nfsd/nfsd-next (e2508e091694 SUNRPC: Remove unused callback xpo_adjust_wspace()) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/nfs_xdr.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 6 ++ + fs/lockd/svc.c | 13 +++- + 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 - + include/linux/sunrpc/svc.h | 1 + + include/linux/sunrpc/svc_xprt.h | 2 +- + include/trace/events/sunrpc.h | 118 ++++++++++++++++++++++++++++---- + net/sunrpc/auth_gss/svcauth_gss.c | 5 +- + net/sunrpc/cache.c | 2 +- + net/sunrpc/svc_xprt.c | 51 ++++++++++++-- + net/sunrpc/svcsock.c | 130 ++++++----------------------------- + 28 files changed, 666 insertions(+), 208 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 (8ac3fc200667 ovl: move some common code in a function) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 5 ++- + Documentation/filesystems/vfs.txt | 40 ++++++++++++------- + fs/dcache.c | 3 -- + fs/namei.c | 2 +- + fs/open.c | 8 ++-- + fs/overlayfs/dir.c | 20 ++++++---- + fs/overlayfs/inode.c | 84 +++++++++++++++++---------------------- + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/super.c | 21 +++++++--- + include/linux/dcache.h | 40 +++++++++---------- + include/linux/fs.h | 7 +--- + 11 files changed, 119 insertions(+), 113 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 (4ac1c17b2044 UBIFS: Implement ->migratepage()) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (f477cedc4e79 Merge branch 'xfs-4.8-misc-fixes-2' into for-next) +$ git merge xfs/for-next +Auto-merging fs/nfsd/blocklayout.c +Auto-merging fs/internal.h +Auto-merging fs/buffer.c +Merge made by the 'recursive' strategy. + fs/Kconfig | 3 + + fs/Makefile | 1 + + fs/buffer.c | 76 ++++++- + fs/internal.h | 3 + + fs/iomap.c | 497 +++++++++++++++++++++++++++++++++++++++++ + fs/nfsd/blocklayout.c | 1 + + fs/nfsd/blocklayoutxdr.c | 1 + + fs/xfs/Kconfig | 1 + + fs/xfs/libxfs/xfs_alloc.c | 101 +++++---- + fs/xfs/libxfs/xfs_alloc.h | 9 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 3 - + fs/xfs/libxfs/xfs_bmap.c | 51 ++--- + fs/xfs/libxfs/xfs_bmap.h | 18 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_btree.c | 19 ++ + fs/xfs/libxfs/xfs_btree.h | 2 + + fs/xfs/libxfs/xfs_fs.h | 8 +- + fs/xfs/libxfs/xfs_ialloc.c | 28 +-- + fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- + fs/xfs/xfs_aops.c | 283 ++--------------------- + fs/xfs/xfs_attr_inactive.c | 2 +- + fs/xfs/xfs_attr_list.c | 2 +- + fs/xfs/xfs_bmap_util.c | 381 +++++++++++++------------------ + fs/xfs/xfs_bmap_util.h | 3 - + fs/xfs/xfs_buf.c | 68 +++--- + fs/xfs/xfs_buf_item.c | 18 +- + fs/xfs/xfs_error.c | 3 + + fs/xfs/xfs_file.c | 193 +--------------- + fs/xfs/xfs_fsops.c | 105 +++++---- + fs/xfs/xfs_icache.c | 2 +- + fs/xfs/xfs_icache.h | 1 + + fs/xfs/xfs_inode.c | 16 +- + fs/xfs/xfs_inode.h | 10 +- + fs/xfs/xfs_iomap.c | 171 ++++++++++++++ + fs/xfs/xfs_iomap.h | 7 + + fs/xfs/xfs_iops.c | 113 ++-------- + fs/xfs/xfs_log.c | 8 +- + fs/xfs/xfs_log.h | 5 - + fs/xfs/xfs_ondisk.h | 25 ++- + fs/xfs/xfs_pnfs.c | 27 +-- + fs/xfs/xfs_rtalloc.h | 2 - + fs/xfs/xfs_super.c | 15 +- + fs/xfs/xfs_super.h | 2 - + fs/xfs/xfs_trace.h | 4 + + include/linux/exportfs.h | 16 +- + include/linux/iomap.h | 70 ++++++ + 46 files changed, 1327 insertions(+), 1051 deletions(-) + create mode 100644 fs/iomap.c + create mode 100644 include/linux/iomap.h +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 (e0af5a975e77 Merge branch 'pci/resource' into next) +$ git merge pci/next +Recorded preimage for 'drivers/pci/host/pci-tegra.c' +Resolved 'drivers/nvme/host/pci.c' using previous resolution. +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci-ecam.h +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/pci/setup-bus.c +Auto-merging drivers/pci/host/pci-tegra.c +CONFLICT (content): Merge conflict in drivers/pci/host/pci-tegra.c +Auto-merging drivers/nvme/host/pci.c +CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/atheros/alx/main.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/pci/host/pci-tegra.c'. +[master 1b0d50016482] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/pci/axis,artpec6-pcie.txt | 46 ++++ + Documentation/kernel-parameters.txt | 6 + + MAINTAINERS | 10 + + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/mach/pci.h | 1 + + arch/arm/kernel/bios32.c | 45 ++-- + arch/arm64/Kconfig | 6 +- + arch/arm64/kernel/pci.c | 159 ++++++++++-- + 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 | 19 +- + 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/unicore32/kernel/pci.c | 9 +- + arch/x86/pci/common.c | 2 +- + arch/x86/pci/vmd.c | 41 +-- + 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/misc/genwqe/card_base.c | 18 +- + drivers/net/ethernet/atheros/alx/main.c | 12 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 11 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 9 +- + drivers/net/ethernet/intel/igb/igb_main.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 9 +- + drivers/nvme/host/pci.c | 15 +- + drivers/pci/Kconfig | 2 +- + drivers/pci/bus.c | 31 ++- + drivers/pci/ecam.c | 6 +- + drivers/pci/host/Kconfig | 39 ++- + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-host-common.c | 44 ++-- + 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 | 15 +- + 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 | 272 ++++++++++++++++++-- + drivers/pci/pci.h | 11 + + drivers/pci/pcie/aspm.c | 2 +- + drivers/pci/pcie/pcie-dpc.c | 17 +- + 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/pci/setup-bus.c | 68 +++++ + drivers/scsi/lpfc/lpfc_init.c | 15 +- + 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 | 63 ++++- + 74 files changed, 1473 insertions(+), 558 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 (5f00f0b8d58b Merge branch 'for-4.7/upstream-fixes' into for-next) +$ git merge hid/for-next +Removing drivers/usb/misc/usbled.c +Removing drivers/hid/hid-thingm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/hid/hid-alps.txt | 139 +++++++++++ + MAINTAINERS | 5 - + drivers/hid/Kconfig | 29 ++- + drivers/hid/Makefile | 3 +- + drivers/hid/hid-alps.c | 506 +++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-core.c | 7 +- + drivers/hid/hid-ids.h | 5 + + drivers/hid/hid-led.c | 408 +++++++++++++++++++++++++++++++++ + drivers/hid/hid-thingm.c | 263 --------------------- + drivers/hid/i2c-hid/i2c-hid.c | 11 +- + drivers/hid/uhid.c | 33 ++- + drivers/usb/misc/Kconfig | 9 - + drivers/usb/misc/Makefile | 1 - + drivers/usb/misc/usbled.c | 273 ---------------------- + 14 files changed, 1123 insertions(+), 569 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/hid/hid-thingm.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 +Auto-merging drivers/i2c/i2c-core.c +Auto-merging Documentation/devicetree/bindings/i2c/i2c.txt +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 (4e6163e859cd hwmon: (tmp102) Drop FSF address) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/abituguru | 2 +- + Documentation/hwmon/ina3221 | 35 ++ + Documentation/hwmon/jc42 | 3 +- + Documentation/hwmon/max1668 | 2 +- + Documentation/hwmon/sht3x | 72 ++++ + Documentation/hwmon/submitting-patches | 40 +- + Documentation/hwmon/tmp401 | 14 +- + drivers/hwmon/Kconfig | 28 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/ad7314.c | 48 +-- + drivers/hwmon/ads7871.c | 65 +-- + drivers/hwmon/dell-smm-hwmon.c | 41 +- + drivers/hwmon/emc6w201.c | 2 +- + drivers/hwmon/ina3221.c | 445 ++++++++++++++++++++ + drivers/hwmon/jc42.c | 4 + + drivers/hwmon/jz4740-hwmon.c | 65 +-- + drivers/hwmon/sht3x.c | 725 +++++++++++++++++++++++++++++++++ + drivers/hwmon/tmp102.c | 58 +-- + drivers/hwmon/tmp401.c | 35 +- + include/linux/platform_data/sht3x.h | 25 ++ + 20 files changed, 1507 insertions(+), 204 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 (ed5883b778c8 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. + Documentation/DocBook/device-drivers.tmpl | 3 + + Documentation/DocBook/media/Makefile | 2 + + Documentation/DocBook/media/v4l/biblio.xml | 10 + + Documentation/DocBook/media/v4l/cec-api.xml | 75 + + Documentation/DocBook/media/v4l/cec-func-close.xml | 64 + + Documentation/DocBook/media/v4l/cec-func-ioctl.xml | 78 + + Documentation/DocBook/media/v4l/cec-func-open.xml | 104 ++ + Documentation/DocBook/media/v4l/cec-func-poll.xml | 94 + + .../DocBook/media/v4l/cec-ioc-adap-g-caps.xml | 151 ++ + .../DocBook/media/v4l/cec-ioc-adap-g-log-addrs.xml | 329 ++++ + .../DocBook/media/v4l/cec-ioc-adap-g-phys-addr.xml | 86 + + .../DocBook/media/v4l/cec-ioc-dqevent.xml | 202 +++ + Documentation/DocBook/media/v4l/cec-ioc-g-mode.xml | 255 +++ + .../DocBook/media/v4l/cec-ioc-receive.xml | 274 +++ + Documentation/DocBook/media_api.tmpl | 6 +- + Documentation/cec.txt | 267 +++ + .../devicetree/bindings/media/mediatek-vpu.txt | 31 + + .../devicetree/bindings/media/renesas,fcp.txt | 32 + + .../devicetree/bindings/media/renesas,vsp1.txt | 5 + + .../devicetree/bindings/media/s5p-cec.txt | 31 + + Documentation/video4linux/vivid.txt | 36 +- + MAINTAINERS | 51 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 45 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 2 + + drivers/media/Kconfig | 3 + + drivers/media/Makefile | 2 + + drivers/media/cec-edid.c | 168 ++ + 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/dib0090.c | 6 + + drivers/media/dvb-frontends/drx39xyj/drxj.c | 3 + + 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/Kconfig | 24 + + drivers/media/i2c/adv7511.c | 401 ++++- + drivers/media/i2c/adv7604.c | 378 +++- + drivers/media/i2c/adv7842.c | 371 +++- + drivers/media/i2c/mt9t001.c | 17 +- + drivers/media/i2c/mt9v032.c | 279 ++- + drivers/media/i2c/smiapp/smiapp-core.c | 4 +- + drivers/media/media-device.c | 47 +- + drivers/media/media-devnode.c | 149 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx18/cx18-driver.h | 6 +- + drivers/media/pci/cx18/cx18-ioctl.c | 2 +- + drivers/media/pci/cx18/cx18-streams.c | 12 +- + drivers/media/pci/cx18/cx18-vbi.c | 6 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 2 +- + 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/pci/solo6x10/solo6x10-v4l2.c | 34 +- + drivers/media/pci/tw686x/Kconfig | 2 + + drivers/media/pci/tw686x/tw686x-audio.c | 92 +- + drivers/media/pci/tw686x/tw686x-core.c | 56 +- + drivers/media/pci/tw686x/tw686x-regs.h | 9 + + drivers/media/pci/tw686x/tw686x-video.c | 492 +++-- + drivers/media/pci/tw686x/tw686x.h | 41 +- + drivers/media/pci/zoran/zr36016.c | 4 - + drivers/media/platform/Kconfig | 15 + + drivers/media/platform/Makefile | 3 + + drivers/media/platform/exynos4-is/mipi-csis.c | 17 - + drivers/media/platform/rcar-fcp.c | 181 ++ + 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 | 874 +++++++++ + drivers/media/platform/rcar-vin/rcar-vin.h | 165 ++ + 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/platform/sti/bdisp/bdisp-filter.h | 304 ---- + drivers/media/platform/sti/bdisp/bdisp-hw.c | 305 ++++ + drivers/media/platform/vivid/Kconfig | 8 + + drivers/media/platform/vivid/Makefile | 4 + + drivers/media/platform/vivid/vivid-cec.c | 255 +++ + drivers/media/platform/vivid/vivid-cec.h | 33 + + drivers/media/platform/vivid/vivid-core.c | 118 +- + drivers/media/platform/vivid/vivid-core.h | 27 + + drivers/media/platform/vivid/vivid-kthread-cap.c | 13 + + drivers/media/platform/vivid/vivid-sdr-cap.c | 2 - + drivers/media/platform/vivid/vivid-vid-cap.c | 26 +- + drivers/media/platform/vivid/vivid-vid-common.c | 7 + + drivers/media/platform/vsp1/vsp1.h | 6 +- + drivers/media/platform/vsp1/vsp1_drm.c | 68 +- + drivers/media/platform/vsp1/vsp1_drv.c | 120 +- + drivers/media/platform/vsp1/vsp1_entity.c | 88 +- + drivers/media/platform/vsp1/vsp1_entity.h | 12 +- + drivers/media/platform/vsp1/vsp1_pipe.c | 4 +- + drivers/media/platform/vsp1/vsp1_pipe.h | 2 + + drivers/media/platform/vsp1/vsp1_rpf.c | 7 +- + drivers/media/platform/vsp1/vsp1_video.c | 4 +- + drivers/media/platform/vsp1/vsp1_video.h | 1 - + drivers/media/radio/radio-aztech.c | 1 - + drivers/media/radio/radio-maxiradio.c | 1 + + drivers/media/rc/rc-main.c | 1 + + drivers/media/tuners/mt2063.c | 30 +- + drivers/media/tuners/r820t.c | 29 +- + 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-dvb.c | 11 - + drivers/media/usb/em28xx/em28xx-i2c.c | 5 +- + drivers/media/usb/gspca/m5602/m5602_bridge.h | 15 - + drivers/media/usb/gspca/m5602/m5602_core.c | 15 + + drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 144 ++ + drivers/media/usb/gspca/m5602/m5602_mt9m111.h | 144 -- + drivers/media/usb/gspca/m5602/m5602_ov7660.c | 153 ++ + drivers/media/usb/gspca/m5602/m5602_ov7660.h | 153 -- + drivers/media/usb/gspca/m5602/m5602_ov9650.c | 152 ++ + drivers/media/usb/gspca/m5602/m5602_ov9650.h | 150 -- + drivers/media/usb/gspca/m5602/m5602_po1030.c | 104 ++ + drivers/media/usb/gspca/m5602/m5602_po1030.h | 104 -- + drivers/media/usb/gspca/m5602/m5602_s5k4aa.c | 199 +++ + drivers/media/usb/gspca/m5602/m5602_s5k4aa.h | 197 -- + drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 124 ++ + drivers/media/usb/gspca/m5602/m5602_s5k83a.h | 124 -- + drivers/media/usb/stk1160/stk1160-v4l.c | 3 + + drivers/media/usb/usbvision/usbvision-core.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 | 14 +- + drivers/staging/media/Makefile | 7 +- + drivers/staging/media/cec/Kconfig | 14 + + drivers/staging/media/cec/Makefile | 3 + + drivers/staging/media/cec/TODO | 27 + + drivers/staging/media/cec/cec-adap.c | 1627 +++++++++++++++++ + drivers/staging/media/cec/cec-api.c | 578 ++++++ + drivers/staging/media/cec/cec-core.c | 409 +++++ + drivers/staging/media/cec/cec-priv.h | 56 + + 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/s5p-cec/Kconfig | 9 + + drivers/staging/media/s5p-cec/Makefile | 2 + + drivers/staging/media/s5p-cec/TODO | 3 + + drivers/staging/media/s5p-cec/exynos_hdmi_cec.h | 38 + + .../staging/media/s5p-cec/exynos_hdmi_cecctrl.c | 209 +++ + drivers/staging/media/s5p-cec/regs-cec.h | 96 + + drivers/staging/media/s5p-cec/s5p_cec.c | 294 +++ + drivers/staging/media/s5p-cec/s5p_cec.h | 76 + + drivers/staging/media/timb/Kconfig | 11 - + drivers/staging/media/timb/Makefile | 1 - + drivers/staging/media/timb/timblogiw.c | 870 --------- + fs/compat_ioctl.c | 12 + + include/linux/cec-funcs.h | 1881 ++++++++++++++++++++ + include/linux/cec.h | 993 +++++++++++ + include/media/cec-edid.h | 104 ++ + include/media/cec.h | 232 +++ + include/media/i2c/adv7511.h | 6 +- + include/media/media-device.h | 5 +- + include/media/media-devnode.h | 46 +- + include/media/rc-map.h | 5 +- + include/media/rcar-fcp.h | 37 + + include/media/v4l2-ctrls.h | 24 +- + include/media/vsp1.h | 29 +- + 193 files changed, 18770 insertions(+), 8381 deletions(-) + create mode 100644 Documentation/DocBook/media/v4l/cec-api.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-func-close.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-func-ioctl.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-func-open.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-func-poll.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-adap-g-caps.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-adap-g-log-addrs.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-adap-g-phys-addr.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-dqevent.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-g-mode.xml + create mode 100644 Documentation/DocBook/media/v4l/cec-ioc-receive.xml + create mode 100644 Documentation/cec.txt + create mode 100644 Documentation/devicetree/bindings/media/mediatek-vpu.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,fcp.txt + create mode 100644 Documentation/devicetree/bindings/media/s5p-cec.txt + create mode 100644 drivers/media/cec-edid.c + 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-fcp.c + 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 + create mode 100644 drivers/media/platform/vivid/vivid-cec.c + create mode 100644 drivers/media/platform/vivid/vivid-cec.h + create mode 100644 drivers/staging/media/cec/Kconfig + create mode 100644 drivers/staging/media/cec/Makefile + create mode 100644 drivers/staging/media/cec/TODO + create mode 100644 drivers/staging/media/cec/cec-adap.c + create mode 100644 drivers/staging/media/cec/cec-api.c + create mode 100644 drivers/staging/media/cec/cec-core.c + create mode 100644 drivers/staging/media/cec/cec-priv.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 + create mode 100644 drivers/staging/media/s5p-cec/Kconfig + create mode 100644 drivers/staging/media/s5p-cec/Makefile + create mode 100644 drivers/staging/media/s5p-cec/TODO + create mode 100644 drivers/staging/media/s5p-cec/exynos_hdmi_cec.h + create mode 100644 drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c + create mode 100644 drivers/staging/media/s5p-cec/regs-cec.h + create mode 100644 drivers/staging/media/s5p-cec/s5p_cec.c + create mode 100644 drivers/staging/media/s5p-cec/s5p_cec.h + 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 + create mode 100644 include/linux/cec-funcs.h + create mode 100644 include/linux/cec.h + create mode 100644 include/media/cec-edid.h + create mode 100644 include/media/cec.h + create mode 100644 include/media/rcar-fcp.h +Merging pm/linux-next (99199532a569 Merge branch 'pm-sleep-fixes' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/cpufreq/s5pv210-cpufreq.c +Auto-merging drivers/acpi/Makefile +Auto-merging drivers/acpi/Kconfig +Auto-merging arch/arm64/kernel/setup.c +Auto-merging arch/arm64/kernel/Makefile +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/cpu-freq/core.txt | 4 +- + Documentation/cpu-freq/cpu-drivers.txt | 10 +- + Documentation/kernel-parameters.txt | 3 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/acpi.h | 10 + + arch/arm64/include/asm/numa.h | 2 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/acpi_numa.c | 112 +++++++ + arch/arm64/kernel/setup.c | 6 +- + 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/Kconfig | 1 + + arch/x86/include/asm/acpi.h | 3 +- + arch/x86/include/asm/topology.h | 12 +- + arch/x86/kernel/cpu/intel.c | 7 +- + arch/x86/kernel/setup.c | 9 +- + arch/x86/mm/numa.c | 2 +- + arch/x86/mm/srat.c | 116 +------ + arch/x86/platform/atom/punit_atom_debug.c | 5 +- + arch/x86/power/hibernate_64.c | 97 +++++- + arch/x86/power/hibernate_asm_64.S | 55 ++- + drivers/acpi/Kconfig | 15 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_lpss.c | 5 +- + drivers/acpi/acpi_video.c | 3 + + drivers/acpi/apei/Makefile | 2 +- + drivers/acpi/apei/apei-internal.h | 2 +- + drivers/acpi/apei/bert.c | 150 +++++++++ + drivers/acpi/apei/einj.c | 57 ++-- + drivers/acpi/bus.c | 19 +- + drivers/acpi/button.c | 149 ++++++--- + drivers/acpi/cppc_acpi.c | 24 +- + drivers/acpi/numa.c | 226 ++++++++++--- + drivers/acpi/pci_link.c | 2 +- + drivers/acpi/pci_slot.c | 35 +- + drivers/acpi/pmic/intel_pmic.c | 80 ++++- + drivers/acpi/pmic/intel_pmic.h | 4 +- + drivers/acpi/pmic/intel_pmic_bxtwc.c | 424 ++++++++++++++++++++++++ + drivers/acpi/pmic/intel_pmic_crc.c | 5 +- + drivers/acpi/processor_core.c | 26 +- + drivers/acpi/sleep.c | 29 +- + drivers/acpi/tables.c | 23 +- + drivers/acpi/thermal.c | 3 +- + drivers/acpi/video_detect.c | 8 + + drivers/base/power/clock_ops.c | 45 +++ + drivers/base/power/domain.c | 301 +++-------------- + drivers/base/power/runtime.c | 11 +- + drivers/cpufreq/Kconfig | 13 +- + drivers/cpufreq/amd_freq_sensitivity.c | 10 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 7 +- + drivers/cpufreq/cpufreq.c | 193 ++++++----- + 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 | 93 ++++-- + 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/gpu/drm/amd/amdgpu/amdgpu_acp.c | 23 -- + drivers/idle/intel_idle.c | 147 ++++---- + 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 | 157 ++++++--- + drivers/thermal/cpu_cooling.c | 24 +- + drivers/thermal/intel_soc_dts_thermal.c | 4 +- + include/acpi/acpi_numa.h | 4 + + include/acpi/cppc_acpi.h | 7 +- + include/acpi/pcc.h | 29 ++ + include/acpi/processor.h | 1 + + include/acpi/video.h | 2 +- + include/linux/acpi.h | 26 +- + include/linux/cpufreq.h | 41 ++- + include/linux/pm_clock.h | 1 + + include/linux/pm_domain.h | 10 +- + include/linux/suspend.h | 5 +- + kernel/power/Makefile | 2 + + kernel/power/console.c | 8 +- + kernel/power/hibernate.c | 20 +- + kernel/power/main.c | 11 +- + kernel/power/power.h | 2 + + kernel/power/suspend.c | 10 +- + kernel/power/user.c | 14 +- + kernel/sched/cpufreq_schedutil.c | 43 +-- + tools/power/acpi/Makefile.config | 7 +- + tools/power/x86/turbostat/Makefile | 4 +- + 101 files changed, 2250 insertions(+), 1529 deletions(-) + create mode 100644 arch/arm64/kernel/acpi_numa.c + create mode 100644 drivers/acpi/apei/bert.c + create mode 100644 drivers/acpi/pmic/intel_pmic_bxtwc.c + create mode 100644 include/acpi/pcc.h +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/hwmon/tmp102.c' using previous resolution. +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 +Auto-merging drivers/hwmon/tmp102.c +CONFLICT (content): Merge conflict in drivers/hwmon/tmp102.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cdf9de878e34] 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 (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 7 +++++++ + fs/dlm/config.h | 1 + + fs/dlm/dlm_internal.h | 10 +++++++++- + fs/dlm/lowcomms.c | 3 +-- + 4 files changed, 18 insertions(+), 3 deletions(-) +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 (f2e3db60d2a2 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/amba-pl08x.c | 10 +- + drivers/dma/at_xdmac.c | 8 +- + drivers/dma/bcm2835-dma.c | 2 +- + drivers/dma/bestcomm/bestcomm.c | 2 - + drivers/dma/coh901318.c | 2 +- + drivers/dma/edma.c | 31 ++--- + drivers/dma/fsl-edma.c | 25 +++- + drivers/dma/fsldma.c | 2 - + drivers/dma/k3dma.c | 10 +- + drivers/dma/mmp_tdma.c | 5 +- + drivers/dma/moxart-dma.c | 4 +- + drivers/dma/mv_xor.c | 2 +- + drivers/dma/nbpfaxi.c | 5 +- + drivers/dma/pl330.c | 5 +- + drivers/dma/ppc4xx/adma.c | 2 - + drivers/dma/s3c24xx-dma.c | 11 +- + drivers/dma/sh/rcar-dmac.c | 2 +- + drivers/dma/sh/shdmac.c | 9 +- + drivers/dma/sh/sudmac.c | 9 +- + drivers/dma/sirf-dma.c | 11 +- + drivers/dma/ste_dma40.c | 6 +- + drivers/dma/ste_dma40_ll.c | 2 +- + drivers/dma/sun6i-dma.c | 2 +- + drivers/dma/tegra20-apb-dma.c | 49 +++---- + drivers/dma/ti-dma-crossbar.c | 2 +- + drivers/dma/timb_dma.c | 8 +- + drivers/dma/xilinx/xilinx_vdma.c | 271 ++++++++++++++++++++++++++++++++++----- + 27 files changed, 329 insertions(+), 168 deletions(-) +Merging net-next/master (6fde0e63eccb be2net: signedness bug in be_msix_enable()) +$ git merge net-next/master +Resolved 'arch/arm64/boot/dts/broadcom/ns2-svk.dts' using previous resolution. +Resolved 'arch/arm64/boot/dts/broadcom/ns2.dtsi' using previous resolution. +Resolved 'drivers/net/ethernet/freescale/fec.h' using previous resolution. +Auto-merging net/rxrpc/skbuff.c +Auto-merging net/rxrpc/security.c +Auto-merging net/rxrpc/recvmsg.c +Auto-merging net/rxrpc/proc.c +Auto-merging net/rxrpc/output.c +Auto-merging net/rxrpc/key.c +Auto-merging net/rxrpc/input.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-transport.c +Removing net/rxrpc/ar-peer.c +Removing net/rxrpc/ar-local.c +Removing net/rxrpc/ar-error.c +Removing net/rxrpc/ar-connection.c +Auto-merging net/ipv4/ip_output.c +Auto-merging include/linux/acpi.h +Removing drivers/net/wireless/broadcom/b43/phy_a.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/freescale/fec.h +CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec.h +Auto-merging drivers/net/dsa/mv88e6xxx/mv88e6xxx.h +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging arch/arm64/boot/dts/broadcom/ns2.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi +Auto-merging arch/arm64/boot/dts/broadcom/ns2-svk.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts +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 +[master 03f904afbf76] 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 | 96 + + .../devicetree/bindings/net/cirrus,cs89x0.txt | 13 + + Documentation/devicetree/bindings/net/cpsw.txt | 1 - + .../devicetree/bindings/net/davinci-mdio.txt | 5 +- + Documentation/devicetree/bindings/net/dsa/b53.txt | 88 + + Documentation/devicetree/bindings/net/dsa/dsa.txt | 278 +- + .../devicetree/bindings/net/keystone-netcp.txt | 2 +- + Documentation/devicetree/bindings/net/mdio-mux.txt | 3 +- + .../devicetree/bindings/net/rockchip-dwmac.txt | 3 +- + Documentation/devicetree/bindings/net/stmmac.txt | 3 + + .../bindings/phy/brcm,mdio-mux-bus-pci.txt | 27 + + Documentation/networking/can.txt | 25 +- + Documentation/networking/gen_stats.txt | 2 +- + Documentation/networking/stmmac.txt | 1 + + MAINTAINERS | 39 +- + arch/arm/boot/dts/am33xx.dtsi | 3 +- + arch/arm/boot/dts/am4372.dtsi | 3 +- + arch/arm/boot/dts/dm814x.dtsi | 1 - + arch/arm/boot/dts/dra7.dtsi | 3 +- + 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 | 1858 ++++ + drivers/net/can/sja1000/tscan1.c | 12 +- + drivers/net/can/slcan.c | 4 +- + drivers/net/can/spi/mcp251x.c | 7 +- + drivers/net/can/usb/gs_usb.c | 141 +- + drivers/net/dsa/Kconfig | 12 +- + drivers/net/dsa/Makefile | 4 +- + 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 | 274 + + 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/Kconfig | 7 + + drivers/net/dsa/mv88e6xxx/Makefile | 1 + + drivers/net/dsa/{mv88e6xxx.c => mv88e6xxx/chip.c} | 1838 ++-- + drivers/net/dsa/{ => mv88e6xxx}/mv88e6xxx.h | 47 +- + drivers/net/ethernet/8390/ax88796.c | 40 +- + drivers/net/ethernet/agere/et131x.c | 60 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 54 +- + drivers/net/ethernet/altera/altera_tse.h | 1 - + drivers/net/ethernet/altera/altera_tse_ethtool.c | 26 +- + drivers/net/ethernet/altera/altera_tse_main.c | 16 +- + 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 | 152 +- + drivers/net/ethernet/broadcom/bgmac.h | 5 +- + 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/cadence/macb.c | 54 +- + drivers/net/ethernet/cadence/macb.h | 1 - + .../net/ethernet/cavium/liquidio/cn66xx_device.c | 39 +- + .../net/ethernet/cavium/liquidio/cn66xx_device.h | 3 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 938 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 1105 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 383 +- + .../net/ethernet/cavium/liquidio/octeon_config.h | 12 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 171 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 45 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 171 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 21 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 82 +- + drivers/net/ethernet/cavium/liquidio/octeon_main.h | 23 +- + .../net/ethernet/cavium/liquidio/octeon_network.h | 240 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 55 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.h | 154 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 217 +- + .../ethernet/cavium/liquidio/response_manager.c | 11 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 82 +- + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 8 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 10 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 55 + + drivers/net/ethernet/cirrus/cs89x0.c | 12 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 28 +- + drivers/net/ethernet/dnet.c | 48 +- + drivers/net/ethernet/dnet.h | 1 - + drivers/net/ethernet/emulex/benet/Kconfig | 8 - + drivers/net/ethernet/emulex/benet/be.h | 58 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 160 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 16 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 66 +- + drivers/net/ethernet/emulex/benet/be_main.c | 326 +- + drivers/net/ethernet/emulex/benet/be_roce.c | 2 +- + drivers/net/ethernet/emulex/benet/be_roce.h | 2 +- + drivers/net/ethernet/freescale/fec.h | 2 + + drivers/net/ethernet/freescale/fec_main.c | 34 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/hisilicon/Kconfig | 2 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 44 +- + drivers/net/ethernet/hisilicon/hns/hnae.c | 19 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 11 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 59 +- + 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 | 295 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 45 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 294 +- + 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 | 7 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 21 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 10 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 158 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 49 +- + 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.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_common.c | 56 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 359 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 + + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 6 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 8 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 57 +- + drivers/net/ethernet/lantiq_etop.c | 1 - + drivers/net/ethernet/marvell/mvpp2.c | 48 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 174 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 16 +- + drivers/net/ethernet/mellanox/mlx4/Kconfig | 7 - + drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 277 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 25 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 70 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 1 + + drivers/net/ethernet/mellanox/mlx4/fw.h | 1 + + drivers/net/ethernet/mellanox/mlx4/main.c | 1 + + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 28 +- + drivers/net/ethernet/mellanox/mlx4/port.c | 12 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 73 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 476 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 201 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 335 + + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 10 + + drivers/net/ethernet/mellanox/mlx5/core/port.c | 48 +- + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 209 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 852 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 62 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 362 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 22 +- + drivers/net/ethernet/nxp/lpc_eth.c | 44 +- + drivers/net/ethernet/qlogic/Kconfig | 30 - + drivers/net/ethernet/qlogic/qed/qed.h | 17 +- + 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 | 646 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 55 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 10948 +++++++++++-------- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 55 +- + 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_int.c | 75 +- + drivers/net/ethernet/qlogic/qed/qed_int.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_l2.c | 115 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 61 +- + 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 | 43 +- + 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 | 57 + + 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/rdc/r6040.c | 32 +- + drivers/net/ethernet/renesas/ravb_main.c | 8 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 1 - + drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 31 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 32 +- + 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/common.h | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 165 +- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 86 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 147 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 43 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 96 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 - + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 60 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 50 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h | 159 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 10 +- + drivers/net/ethernet/synopsys/dwc_eth_qos.c | 69 +- + drivers/net/ethernet/ti/cpsw.c | 97 +- + drivers/net/ethernet/ti/cpsw.h | 1 - + drivers/net/ethernet/ti/davinci_cpdma.c | 137 +- + drivers/net/ethernet/ti/davinci_cpdma.h | 1 + + drivers/net/ethernet/ti/davinci_mdio.c | 169 +- + drivers/net/ethernet/ti/tlan.c | 1 - + drivers/net/ethernet/toshiba/tc35815.c | 10 +- + drivers/net/ethernet/wiznet/w5100.c | 3 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 4 +- + 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 | 23 + + drivers/net/phy/Makefile | 5 +- + drivers/net/phy/fixed_phy.c | 153 +- + 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/phy/swphy.c | 179 + + drivers/net/phy/swphy.h | 9 + + 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 | 561 +- + drivers/net/vxlan.c | 85 +- + drivers/net/wan/Kconfig | 22 + + drivers/net/wan/Makefile | 2 + + drivers/net/wan/fsl_ucc_hdlc.c | 1192 ++ + drivers/net/wan/fsl_ucc_hdlc.h | 147 + + drivers/net/wan/slic_ds26522.c | 255 + + drivers/net/wan/slic_ds26522.h | 134 + + 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/mac80211_hwsim.c | 97 +- + 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 +- + drivers/of/Kconfig | 1 + + drivers/of/of_mdio.c | 2 - + 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/mlx4/device.h | 2 + + include/linux/mlx5/device.h | 4 + + include/linux/mlx5/driver.h | 27 + + include/linux/mlx5/mlx5_ifc.h | 275 +- + include/linux/mlx5/port.h | 16 +- + include/linux/netdev_features.h | 7 +- + include/linux/netdevice.h | 91 +- + include/linux/of_mdio.h | 8 +- + 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 | 182 +- + 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 | 21 +- + include/linux/skb_array.h | 169 + + include/linux/skbuff.h | 8 + + include/linux/stmmac.h | 3 + + 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/codel_qdisc.h | 1 + + 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/rtnetlink.h | 5 +- + include/net/sch_generic.h | 158 +- + include/net/sctp/sctp.h | 4 + + include/net/sctp/structs.h | 5 + + include/net/tc_act/tc_defact.h | 4 +- + include/net/tcp.h | 4 +- + 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/bpf.h | 25 +- + include/uapi/linux/can/bcm.h | 1 + + include/uapi/linux/ethtool.h | 3 +- + include/uapi/linux/fib_rules.h | 1 + + include/uapi/linux/icmp.h | 1 + + include/uapi/linux/if_bridge.h | 26 + + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/if_tunnel.h | 1 + + include/uapi/linux/inet_diag.h | 1 + + include/uapi/linux/netlink_diag.h | 1 + + include/uapi/linux/nl80211.h | 14 +- + include/uapi/linux/openvswitch.h | 8 + + include/uapi/linux/pkt_cls.h | 7 +- + include/uapi/linux/tcp.h | 10 + + include/uapi/linux/virtio_net.h | 9 +- + include/uapi/linux/wireless.h | 63 +- + kernel/bpf/arraymap.c | 116 +- + kernel/bpf/core.c | 3 +- + kernel/bpf/helpers.c | 2 +- + kernel/bpf/syscall.c | 13 +- + kernel/trace/bpf_trace.c | 46 +- + 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/bridge/br_device.c | 10 +- + net/bridge/br_forward.c | 13 +- + net/bridge/br_if.c | 9 +- + net/bridge/br_input.c | 3 + + net/bridge/br_multicast.c | 217 +- + net/bridge/br_netlink.c | 148 +- + net/bridge/br_private.h | 41 +- + net/bridge/br_sysfs_br.c | 25 + + net/caif/chnl_net.c | 1 - + net/can/Makefile | 3 +- + net/can/af_can.c | 22 +- + net/can/bcm.c | 309 +- + net/can/proc.c | 3 +- + net/core/dev.c | 59 +- + net/core/ethtool.c | 1 + + net/core/fib_rules.c | 82 +- + net/core/filter.c | 312 +- + net/core/gen_estimator.c | 24 +- + net/core/gen_stats.c | 35 +- + net/core/pktgen.c | 1 - + net/core/rtnetlink.c | 72 +- + net/core/skbuff.c | 46 +- + net/core/utils.c | 8 +- + 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_diag.c | 25 + + 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.c | 57 + + 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/conntrack.c | 69 +- + net/openvswitch/datapath.c | 42 +- + 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 | 297 +- + net/rxrpc/ar-connection.c | 927 -- + net/rxrpc/ar-error.c | 230 - + net/rxrpc/ar-internal.h | 423 +- + net/rxrpc/ar-local.c | 415 - + net/rxrpc/ar-peer.c | 303 - + net/rxrpc/ar-transport.c | 284 - + net/rxrpc/{ar-accept.c => call_accept.c} | 46 +- + net/rxrpc/{ar-ack.c => call_event.c} | 37 +- + net/rxrpc/{ar-call.c => call_object.c} | 367 +- + net/rxrpc/conn_client.c | 94 + + net/rxrpc/{ar-connevent.c => conn_event.c} | 33 +- + net/rxrpc/conn_object.c | 686 ++ + net/rxrpc/{ar-input.c => input.c} | 69 +- + net/rxrpc/{ar-key.c => key.c} | 6 +- + net/rxrpc/local_event.c | 116 + + net/rxrpc/local_object.c | 387 + + net/rxrpc/misc.c | 6 + + net/rxrpc/{ar-output.c => output.c} | 233 +- + net/rxrpc/peer_event.c | 281 + + net/rxrpc/peer_object.c | 315 + + net/rxrpc/{ar-proc.c => proc.c} | 39 +- + net/rxrpc/{ar-recvmsg.c => recvmsg.c} | 10 +- + net/rxrpc/rxkad.c | 76 +- + net/rxrpc/{ar-security.c => security.c} | 8 +- + net/rxrpc/{ar-skbuff.c => skbuff.c} | 2 + + net/rxrpc/sysctl.c | 12 +- + 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 | 33 +- + net/sched/sch_blackhole.c | 5 +- + net/sched/sch_cbq.c | 305 +- + net/sched/sch_choke.c | 41 +- + net/sched/sch_codel.c | 10 +- + net/sched/sch_drr.c | 38 +- + net/sched/sch_dsmark.c | 27 +- + net/sched/sch_fifo.c | 18 +- + net/sched/sch_fq.c | 29 +- + net/sched/sch_fq_codel.c | 64 +- + net/sched/sch_generic.c | 90 +- + net/sched/sch_gred.c | 42 +- + net/sched/sch_hfsc.c | 44 +- + net/sched/sch_hhf.c | 24 +- + net/sched/sch_htb.c | 68 +- + net/sched/sch_mq.c | 2 +- + net/sched/sch_mqprio.c | 11 +- + net/sched/sch_multiq.c | 32 +- + net/sched/sch_netem.c | 73 +- + net/sched/sch_pie.c | 7 +- + net/sched/sch_plug.c | 19 +- + net/sched/sch_prio.c | 27 +- + net/sched/sch_qfq.c | 63 +- + net/sched/sch_red.c | 28 +- + net/sched/sch_sfb.c | 7 +- + net/sched/sch_sfq.c | 11 +- + net/sched/sch_tbf.c | 34 +- + net/sched/sch_teql.c | 4 +- + 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/discover.c | 5 +- + net/tipc/link.c | 51 +- + net/tipc/monitor.c | 651 ++ + net/tipc/monitor.h | 73 + + net/tipc/node.c | 48 +- + net/tipc/server.c | 3 +- + net/tipc/udp_media.c | 24 +- + 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 +- + samples/bpf/sockex2_user.c | 3 + + samples/bpf/sockex3_user.c | 3 + + tools/virtio/ringtest/Makefile | 5 +- + tools/virtio/ringtest/ptr_ring.c | 192 + + 701 files changed, 53144 insertions(+), 20372 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/dsa/mv88e6xxx/Kconfig + create mode 100644 drivers/net/dsa/mv88e6xxx/Makefile + rename drivers/net/dsa/{mv88e6xxx.c => mv88e6xxx/chip.c} (55%) + rename drivers/net/dsa/{ => mv88e6xxx}/mv88e6xxx.h (94%) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/rl.c + create mode 100644 drivers/net/ethernet/qlogic/qede/qede_dcbnl.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h + 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/phy/swphy.c + create mode 100644 drivers/net/phy/swphy.h + create mode 100644 drivers/net/wan/fsl_ucc_hdlc.c + create mode 100644 drivers/net/wan/fsl_ucc_hdlc.h + create mode 100644 drivers/net/wan/slic_ds26522.c + create mode 100644 drivers/net/wan/slic_ds26522.h + delete mode 100644 drivers/net/wireless/broadcom/b43/phy_a.c + 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-connection.c + delete mode 100644 net/rxrpc/ar-error.c + delete mode 100644 net/rxrpc/ar-local.c + delete mode 100644 net/rxrpc/ar-peer.c + delete mode 100644 net/rxrpc/ar-transport.c + rename net/rxrpc/{ar-accept.c => call_accept.c} (93%) + rename net/rxrpc/{ar-ack.c => call_event.c} (97%) + rename net/rxrpc/{ar-call.c => call_object.c} (79%) + create mode 100644 net/rxrpc/conn_client.c + rename net/rxrpc/{ar-connevent.c => conn_event.c} (92%) + create mode 100644 net/rxrpc/conn_object.c + rename net/rxrpc/{ar-input.c => input.c} (94%) + 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} (82%) + create mode 100644 net/rxrpc/peer_event.c + create mode 100644 net/rxrpc/peer_object.c + rename net/rxrpc/{ar-proc.c => proc.c} (85%) + rename net/rxrpc/{ar-recvmsg.c => recvmsg.c} (97%) + rename net/rxrpc/{ar-security.c => security.c} (94%) + rename net/rxrpc/{ar-skbuff.c => skbuff.c} (98%) + 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 (535633a5ba4e wlcore: reconfigure sta rates on authorization) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +Merge made by the 'recursive' strategy. + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 37 +++++------- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 31 +++++----- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 6 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 4 +- + drivers/net/wireless/cisco/airo.c | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/marvell/libertas/cmdresp.c | 4 ++ + drivers/net/wireless/marvell/libertas_tf/main.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 11 ++++ + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 40 +------------ + drivers/net/wireless/marvell/mwifiex/init.c | 2 +- + drivers/net/wireless/marvell/mwifiex/ioctl.h | 2 + + drivers/net/wireless/marvell/mwifiex/join.c | 12 ++++ + drivers/net/wireless/marvell/mwifiex/main.h | 1 + + drivers/net/wireless/marvell/mwifiex/scan.c | 26 +++++++++ + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 4 ++ + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 30 +++++++++- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 9 +-- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 9 +-- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 9 +-- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 14 ++++- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 4 +- + drivers/net/wireless/realtek/rtlwifi/rc.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 4 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.h | 2 +- + .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 4 +- + .../wireless/realtek/rtlwifi/rtl8192c/phy_common.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.h | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.h | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 10 ++-- + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.h | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.h | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.h | 8 +-- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 48 +++++++-------- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 12 ++-- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 10 ++-- + drivers/net/wireless/realtek/rtlwifi/stats.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/stats.h | 4 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 68 +++++++++++----------- + drivers/net/wireless/ti/wlcore/cmd.c | 7 +++ + drivers/net/wireless/ti/wlcore/main.c | 5 ++ + drivers/net/wireless/ti/wlcore/sdio.c | 1 - + 63 files changed, 297 insertions(+), 240 deletions(-) +Merging bluetooth/master (92890252babd ieee802154: allow netns create of lowpan interface) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btusb.c | 1 + + include/net/cfg802154.h | 13 ++++++++ + include/net/nl802154.h | 9 ++++-- + net/6lowpan/ndisc.c | 6 +++- + net/bluetooth/smp.c | 67 +++++++++++++++++------------------------ + net/ieee802154/6lowpan/core.c | 3 +- + net/ieee802154/core.c | 70 ++++++++++++++++++++++++++++++++++++++++++- + net/ieee802154/core.h | 2 ++ + net/ieee802154/nl802154.c | 54 +++++++++++++++++++++++++++++---- + 9 files changed, 175 insertions(+), 50 deletions(-) +Merging mac80211-next/master (59a7c828d7e7 mac80211: fix fq lockdep warnings) +$ git merge mac80211-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 92 ++++++++++++++++++++++++------ + include/linux/ieee80211.h | 32 ++++++++++- + net/mac80211/mesh.c | 20 +------ + net/mac80211/mesh_plink.c | 16 ++++-- + net/mac80211/rx.c | 7 ++- + net/mac80211/tdls.c | 1 + + net/mac80211/tx.c | 10 +++- + net/wireless/nl80211.c | 104 ++++++++++++++++++++++++---------- + 8 files changed, 210 insertions(+), 72 deletions(-) +Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8) +$ git merge rdma/for-next +Auto-merging include/linux/mlx5/qp.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx4/main.c +Auto-merging drivers/infiniband/hw/i40iw/i40iw_verbs.c +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/device.c | 9 + + drivers/infiniband/core/sysfs.c | 15 +- + drivers/infiniband/core/uverbs.h | 13 + + drivers/infiniband/core/uverbs_cmd.c | 535 +++++++++++++++- + drivers/infiniband/core/uverbs_main.c | 38 ++ + drivers/infiniband/core/verbs.c | 163 ++++- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 27 +- + drivers/infiniband/hw/cxgb4/cm.c | 181 ++++-- + drivers/infiniband/hw/cxgb4/cq.c | 42 +- + drivers/infiniband/hw/cxgb4/device.c | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 22 + + drivers/infiniband/hw/cxgb4/mem.c | 111 ++-- + drivers/infiniband/hw/cxgb4/provider.c | 31 +- + drivers/infiniband/hw/cxgb4/qp.c | 10 +- + drivers/infiniband/hw/hfi1/hfi.h | 2 + + drivers/infiniband/hw/hfi1/verbs.c | 15 + + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 24 +- + drivers/infiniband/hw/mlx4/main.c | 24 +- + drivers/infiniband/hw/mlx5/cq.c | 87 ++- + drivers/infiniband/hw/mlx5/main.c | 429 ++++++++++++- + 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/mthca/mthca_provider.c | 24 +- + drivers/infiniband/hw/nes/nes_verbs.c | 33 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 19 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 16 + + drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 17 - + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 + + 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 | 102 ++- + include/uapi/rdma/ib_user_verbs.h | 95 +++ + 40 files changed, 2888 insertions(+), 481 deletions(-) +Merging rdma-leon/rdma-next (33688abb2802 Linux 4.7-rc4) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (33688abb2802 Linux 4.7-rc4) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +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 (f5f2894f18af mtd: nand: sunxi: add reset line support) +$ 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 +- + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 160 ++ + .../devicetree/bindings/mtd/sunxi-nand.txt | 6 + + drivers/mtd/nand/Kconfig | 8 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/brcmnand/brcmnand.c | 171 ++- + drivers/mtd/nand/mtk_ecc.c | 530 +++++++ + drivers/mtd/nand/mtk_ecc.h | 50 + + drivers/mtd/nand/mtk_nand.c | 1526 ++++++++++++++++++++ + drivers/mtd/nand/nand_ids.c | 1 + + drivers/mtd/nand/omap2.c | 7 +- + drivers/mtd/nand/sunxi_nand.c | 397 ++++- + drivers/mtd/nand/xway_nand.c | 231 +-- + drivers/mtd/tests/nandbiterrs.c | 2 +- + include/linux/mtd/nand.h | 1 + + 17 files changed, 2979 insertions(+), 122 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/mtk-nand.txt + create mode 100644 drivers/mtd/nand/mtk_ecc.c + create mode 100644 drivers/mtd/nand/mtk_ecc.h + create mode 100644 drivers/mtd/nand/mtk_nand.c +Merging crypto/master (c34252fd712c crypto: authenc - Remove redundant sg_init_table call.) +$ git merge crypto/master +Auto-merging drivers/usb/misc/Kconfig +Auto-merging crypto/crypto_user.c +Auto-merging arch/x86/crypto/sha1-mb/sha1_mb_mgr_init_avx2.c +Auto-merging arch/x86/crypto/sha1-mb/sha1_mb_ctx.h +Auto-merging arch/x86/crypto/sha1-mb/sha1_mb.c +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +Auto-merging arch/arm/boot/dts/bcm-nsp.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 2 +- + .../devicetree/bindings/rng/brcm,bcm2835.txt | 8 +- + MAINTAINERS | 5 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 5 + + arch/arm/crypto/ghash-ce-glue.c | 40 +- + 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/Makefile | 4 +- + arch/x86/crypto/aesni-intel_glue.c | 18 +- + arch/x86/crypto/chacha20_glue.c | 2 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 40 +- + arch/x86/crypto/{sha-mb => sha1-mb}/Makefile | 0 + arch/x86/crypto/{sha-mb => sha1-mb}/sha1_mb.c | 286 +++--- + .../{sha-mb/sha_mb_ctx.h => sha1-mb/sha1_mb_ctx.h} | 2 +- + .../{sha-mb/sha_mb_mgr.h => sha1-mb/sha1_mb_mgr.h} | 0 + .../{sha-mb => sha1-mb}/sha1_mb_mgr_datastruct.S | 0 + .../{sha-mb => sha1-mb}/sha1_mb_mgr_flush_avx2.S | 0 + .../{sha-mb => sha1-mb}/sha1_mb_mgr_init_avx2.c | 2 +- + .../{sha-mb => sha1-mb}/sha1_mb_mgr_submit_avx2.S | 0 + arch/x86/crypto/{sha-mb => sha1-mb}/sha1_x8_avx2.S | 0 + arch/x86/crypto/sha1_ssse3_glue.c | 6 + + arch/x86/crypto/sha256-mb/Makefile | 11 + + arch/x86/crypto/sha256-mb/sha256_mb.c | 1027 +++++++++++++++++++ + arch/x86/crypto/sha256-mb/sha256_mb_ctx.h | 136 +++ + arch/x86/crypto/sha256-mb/sha256_mb_mgr.h | 108 ++ + .../crypto/sha256-mb/sha256_mb_mgr_datastruct.S | 304 ++++++ + .../crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S | 304 ++++++ + .../x86/crypto/sha256-mb/sha256_mb_mgr_init_avx2.c | 65 ++ + .../crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S | 215 ++++ + arch/x86/crypto/sha256-mb/sha256_x8_avx2.S | 593 +++++++++++ + arch/x86/crypto/sha256_ssse3_glue.c | 10 + + arch/x86/crypto/sha512-mb/Makefile | 11 + + arch/x86/crypto/sha512-mb/sha512_mb.c | 1043 ++++++++++++++++++++ + arch/x86/crypto/sha512-mb/sha512_mb_ctx.h | 130 +++ + arch/x86/crypto/sha512-mb/sha512_mb_mgr.h | 104 ++ + .../crypto/sha512-mb/sha512_mb_mgr_datastruct.S | 281 ++++++ + .../crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S | 291 ++++++ + .../x86/crypto/sha512-mb/sha512_mb_mgr_init_avx2.c | 67 ++ + .../crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S | 222 +++++ + arch/x86/crypto/sha512-mb/sha512_x4_avx2.S | 529 ++++++++++ + arch/x86/crypto/sha512_ssse3_glue.c | 6 + + crypto/Kconfig | 66 ++ + crypto/Makefile | 10 + + crypto/ablk_helper.c | 6 +- + crypto/ablkcipher.c | 1 - + crypto/authenc.c | 7 +- + crypto/cryptd.c | 132 ++- + crypto/crypto_user.c | 20 + + crypto/dh.c | 189 ++++ + crypto/dh_helper.c | 95 ++ + crypto/drbg.c | 269 +++-- + crypto/ecc.c | 1018 +++++++++++++++++++ + crypto/ecc.h | 83 ++ + crypto/ecc_curve_defs.h | 57 ++ + crypto/ecdh.c | 151 +++ + crypto/ecdh_helper.c | 86 ++ + crypto/gcm.c | 4 +- + crypto/jitterentropy-kcapi.c | 22 +- + crypto/kpp.c | 123 +++ + crypto/mcryptd.c | 132 ++- + crypto/rsa.c | 105 +- + crypto/rsa_helper.c | 111 +-- + crypto/sha3_generic.c | 300 ++++++ + crypto/tcrypt.c | 183 +++- + crypto/testmgr.c | 194 ++++ + crypto/testmgr.h | 448 +++++++++ + drivers/char/hw_random/Kconfig | 16 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/bcm2835-rng.c | 47 +- + drivers/char/hw_random/exynos-rng.c | 4 +- + drivers/char/hw_random/meson-rng.c | 131 +++ + drivers/char/hw_random/omap-rng.c | 16 +- + drivers/char/hw_random/stm32-rng.c | 10 +- + drivers/crypto/caam/Kconfig | 6 +- + drivers/crypto/caam/Makefile | 2 +- + 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/marvell/cesa.c | 142 ++- + drivers/crypto/marvell/cesa.h | 120 ++- + drivers/crypto/marvell/cipher.c | 157 +-- + drivers/crypto/marvell/hash.c | 150 ++- + drivers/crypto/marvell/tdma.c | 130 ++- + drivers/crypto/omap-aes.c | 20 +- + drivers/crypto/omap-sham.c | 23 +- + 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/crypto/ux500/cryp/Makefile | 6 +- + drivers/crypto/ux500/hash/Makefile | 2 +- + 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/cryptd.h | 5 + + include/crypto/dh.h | 29 + + include/crypto/drbg.h | 12 + + include/crypto/ecdh.h | 30 + + include/crypto/internal/hash.h | 12 +- + include/crypto/internal/kpp.h | 64 ++ + include/crypto/internal/rsa.h | 22 +- + include/crypto/kpp.h | 330 +++++++ + include/crypto/mcryptd.h | 8 +- + include/crypto/sha3.h | 29 + + include/linux/crypto.h | 11 +- + include/linux/mpi.h | 1 - + include/uapi/linux/cryptouser.h | 5 + + lib/digsig.c | 16 +- + lib/mpi/mpicoder.c | 126 +-- + security/keys/big_key.c | 30 +- + 120 files changed, 11510 insertions(+), 1355 deletions(-) + rename arch/x86/crypto/{sha-mb => sha1-mb}/Makefile (100%) + rename arch/x86/crypto/{sha-mb => sha1-mb}/sha1_mb.c (81%) + rename arch/x86/crypto/{sha-mb/sha_mb_ctx.h => sha1-mb/sha1_mb_ctx.h} (99%) + rename arch/x86/crypto/{sha-mb/sha_mb_mgr.h => sha1-mb/sha1_mb_mgr.h} (100%) + rename arch/x86/crypto/{sha-mb => sha1-mb}/sha1_mb_mgr_datastruct.S (100%) + rename arch/x86/crypto/{sha-mb => sha1-mb}/sha1_mb_mgr_flush_avx2.S (100%) + rename arch/x86/crypto/{sha-mb => sha1-mb}/sha1_mb_mgr_init_avx2.c (99%) + rename arch/x86/crypto/{sha-mb => sha1-mb}/sha1_mb_mgr_submit_avx2.S (100%) + rename arch/x86/crypto/{sha-mb => sha1-mb}/sha1_x8_avx2.S (100%) + create mode 100644 arch/x86/crypto/sha256-mb/Makefile + create mode 100644 arch/x86/crypto/sha256-mb/sha256_mb.c + create mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_ctx.h + create mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr.h + create mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr_datastruct.S + create mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr_flush_avx2.S + create mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr_init_avx2.c + create mode 100644 arch/x86/crypto/sha256-mb/sha256_mb_mgr_submit_avx2.S + create mode 100644 arch/x86/crypto/sha256-mb/sha256_x8_avx2.S + create mode 100644 arch/x86/crypto/sha512-mb/Makefile + create mode 100644 arch/x86/crypto/sha512-mb/sha512_mb.c + create mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_ctx.h + create mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr.h + create mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr_datastruct.S + create mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr_flush_avx2.S + create mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr_init_avx2.c + create mode 100644 arch/x86/crypto/sha512-mb/sha512_mb_mgr_submit_avx2.S + create mode 100644 arch/x86/crypto/sha512-mb/sha512_x4_avx2.S + create mode 100644 crypto/dh.c + create mode 100644 crypto/dh_helper.c + create mode 100644 crypto/ecc.c + create mode 100644 crypto/ecc.h + create mode 100644 crypto/ecc_curve_defs.h + create mode 100644 crypto/ecdh.c + create mode 100644 crypto/ecdh_helper.c + create mode 100644 crypto/kpp.c + create mode 100644 crypto/sha3_generic.c + create mode 100644 drivers/char/hw_random/meson-rng.c + create mode 100644 include/crypto/dh.h + create mode 100644 include/crypto/ecdh.h + create mode 100644 include/crypto/internal/kpp.h + create mode 100644 include/crypto/kpp.h + create mode 100644 include/crypto/sha3.h +Merging drm/drm-next (2a3467063ae3 Merge tag 'mediatek-drm-2016-06-20' of git://git.pengutronix.de/git/pza/linux into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/sti/sti_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/sun4i/sun4i_drv.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/sun4i/sun4i_rgb.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/sti/sti_drv.c +CONFLICT (content): Merge conflict in 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/msm/msm_drv.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_fbc.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 +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +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/drm_atomic.c +Auto-merging drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.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 +Removing Documentation/DocBook/gpu.tmpl +Auto-merging Documentation/DocBook/device-drivers.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e3f87b945da7] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/.gitignore | 1 + + Documentation/DocBook/Makefile | 9 +- + Documentation/DocBook/device-drivers.tmpl | 4 + + Documentation/DocBook/gpu.tmpl | 3540 -------------------- + Documentation/Makefile.sphinx | 63 + + Documentation/conf.py | 414 +++ + .../devicetree/bindings/display/arm,malidp.txt | 65 + + .../devicetree/bindings/display/bridge/sii902x.txt | 35 + + .../bindings/display/connector/hdmi-connector.txt | 1 + + .../bindings/display/mediatek/mediatek,hdmi.txt | 148 + + .../bindings/display/panel/panel-dpi.txt | 2 + + Documentation/dmaengine/provider.txt | 2 +- + Documentation/gpu/drm-internals.rst | 378 +++ + Documentation/gpu/drm-kms-helpers.rst | 260 ++ + Documentation/gpu/drm-kms.rst | 656 ++++ + Documentation/gpu/drm-mm.rst | 454 +++ + Documentation/gpu/drm-uapi.rst | 111 + + Documentation/gpu/i915.rst | 347 ++ + Documentation/gpu/index.rst | 14 + + Documentation/gpu/introduction.rst | 51 + + Documentation/gpu/kms-properties.csv | 128 + + Documentation/gpu/vga-switcheroo.rst | 102 + + Documentation/index.rst | 24 + + 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 | 31 +- + 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/char/agp/intel-gtt.c | 8 + + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf.c | 44 +- + 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 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 - + 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 | 52 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 18 - + drivers/gpu/drm/arc/arcpgu_sim.c | 128 + + drivers/gpu/drm/arm/Kconfig | 16 + + drivers/gpu/drm/arm/Makefile | 2 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 19 - + drivers/gpu/drm/arm/hdlcd_drv.c | 10 +- + 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 + + drivers/gpu/drm/armada/armada_crtc.c | 14 +- + drivers/gpu/drm/armada/armada_drv.c | 3 +- + drivers/gpu/drm/armada/armada_overlay.c | 1 + + 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 | 19 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 12 - + drivers/gpu/drm/bochs/bochs_drv.c | 2 +- + drivers/gpu/drm/bridge/Kconfig | 8 + + drivers/gpu/drm/bridge/Makefile | 1 + + 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/bridge/sii902x.c | 467 +++ + 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_auth.c | 285 +- + drivers/gpu/drm/drm_bridge.c | 2 +- + drivers/gpu/drm/drm_bufs.c | 8 +- + drivers/gpu/drm/drm_crtc.c | 618 ++-- + drivers/gpu/drm/drm_crtc_helper.c | 36 +- + drivers/gpu/drm/drm_crtc_internal.h | 88 +- + drivers/gpu/drm/drm_debugfs.c | 3 - + drivers/gpu/drm/drm_dp_helper.c | 56 +- + drivers/gpu/drm/drm_drv.c | 241 +- + drivers/gpu/drm/drm_edid_load.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 28 +- + drivers/gpu/drm/drm_fb_helper.c | 56 +- + drivers/gpu/drm/drm_fops.c | 149 +- + drivers/gpu/drm/drm_fourcc.c | 320 ++ + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_info.c | 117 +- + drivers/gpu/drm/drm_internal.h | 21 +- + drivers/gpu/drm/drm_ioctl.c | 124 +- + drivers/gpu/drm/drm_irq.c | 215 +- + drivers/gpu/drm/drm_legacy.h | 8 +- + drivers/gpu/drm/drm_lock.c | 240 +- + 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_pci.c | 51 - + drivers/gpu/drm/drm_plane_helper.c | 38 +- + drivers/gpu/drm/drm_platform.c | 18 - + drivers/gpu/drm/drm_prime.c | 10 +- + drivers/gpu/drm/drm_probe_helper.c | 21 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 206 ++ + drivers/gpu/drm/drm_sysfs.c | 71 - + drivers/gpu/drm/drm_vm.c | 54 - + drivers/gpu/drm/drm_vma_manager.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 - + 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 | 11 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 9 - + 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_kms.c | 13 +- + 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 | 11 +- + drivers/gpu/drm/i915/Kconfig | 22 + + drivers/gpu/drm/i915/Makefile | 8 + + 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 | 53 +- + drivers/gpu/drm/i915/i915_debugfs.c | 175 +- + drivers/gpu/drm/i915/i915_dma.c | 171 +- + drivers/gpu/drm/i915/i915_drv.c | 136 +- + drivers/gpu/drm/i915/i915_drv.h | 456 ++- + drivers/gpu/drm/i915/i915_gem.c | 777 +++-- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 6 +- + drivers/gpu/drm/i915/i915_gem_context.c | 500 +-- + drivers/gpu/drm/i915/i915_gem_dmabuf.h | 45 + + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 30 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 14 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 310 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 44 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 45 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 48 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 10 +- + 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 | 521 +-- + drivers/gpu/drm/i915/i915_irq.c | 522 ++- + drivers/gpu/drm/i915/i915_params.c | 23 +- + drivers/gpu/drm/i915/i915_params.h | 5 +- + drivers/gpu/drm/i915/i915_pvinfo.h | 113 + + drivers/gpu/drm/i915/i915_reg.h | 76 +- + drivers/gpu/drm/i915/i915_sysfs.c | 11 +- + drivers/gpu/drm/i915/i915_trace.h | 48 +- + drivers/gpu/drm/i915/i915_vgpu.c | 44 +- + drivers/gpu/drm/i915/i915_vgpu.h | 92 +- + 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 | 5 +- + drivers/gpu/drm/i915/intel_csr.c | 30 +- + drivers/gpu/drm/i915/intel_ddi.c | 216 +- + drivers/gpu/drm/i915/intel_display.c | 1908 ++++++----- + drivers/gpu/drm/i915/intel_dp.c | 490 +-- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 172 + + drivers/gpu/drm/i915/intel_dp_mst.c | 6 +- + 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 | 238 +- + drivers/gpu/drm/i915/intel_dsi.c | 60 +- + 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 | 21 +- + drivers/gpu/drm/i915/intel_fbc.c | 46 +- + drivers/gpu/drm/i915/intel_fbdev.c | 41 +- + drivers/gpu/drm/i915/intel_guc.h | 45 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 3 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 200 +- + drivers/gpu/drm/i915/intel_gvt.c | 100 + + drivers/gpu/drm/i915/intel_gvt.h | 45 + + drivers/gpu/drm/i915/intel_hdmi.c | 357 +- + drivers/gpu/drm/i915/intel_hotplug.c | 13 +- + drivers/gpu/drm/i915/intel_lrc.c | 828 +++-- + drivers/gpu/drm/i915/intel_lrc.h | 24 +- + drivers/gpu/drm/i915/intel_lvds.c | 7 +- + drivers/gpu/drm/i915/intel_mocs.c | 12 +- + drivers/gpu/drm/i915/intel_opregion.c | 109 +- + drivers/gpu/drm/i915/intel_overlay.c | 147 +- + drivers/gpu/drm/i915/intel_panel.c | 21 +- + drivers/gpu/drm/i915/intel_pm.c | 1244 ++++--- + drivers/gpu/drm/i915/intel_psr.c | 53 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 627 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 41 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 199 +- + drivers/gpu/drm/i915/intel_sdvo.c | 29 +- + drivers/gpu/drm/i915/intel_sprite.c | 57 +- + drivers/gpu/drm/i915/intel_tv.c | 5 +- + drivers/gpu/drm/i915/intel_uncore.c | 221 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 6 + + drivers/gpu/drm/imx/imx-drm-core.c | 1 - + drivers/gpu/drm/mediatek/Kconfig | 9 +- + drivers/gpu/drm/mediatek/Makefile | 7 + + drivers/gpu/drm/mediatek/mtk_cec.c | 265 ++ + drivers/gpu/drm/mediatek/mtk_cec.h | 26 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 13 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + + drivers/gpu/drm/mediatek/mtk_dsi.c | 9 - + drivers/gpu/drm/mediatek/mtk_hdmi.c | 1828 ++++++++++ + drivers/gpu/drm/mediatek/mtk_hdmi.h | 23 + + drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 358 ++ + drivers/gpu/drm/mediatek/mtk_hdmi_regs.h | 238 ++ + drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 515 +++ + 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_drv.c | 9 - + 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 | 13 +- + 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 | 16 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 14 - + drivers/gpu/drm/omapdrm/omap_fb.c | 16 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 8 +- + 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 | 17 +- + 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_regs.h | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 - + drivers/gpu/drm/rockchip/Kconfig | 1 + + 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 | 203 +- + 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 | 69 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 +- + drivers/gpu/drm/sis/sis_mm.c | 2 +- + drivers/gpu/drm/sti/sti_compositor.c | 20 + + drivers/gpu/drm/sti/sti_compositor.h | 3 + + drivers/gpu/drm/sti/sti_crtc.c | 12 + + drivers/gpu/drm/sti/sti_cursor.c | 39 +- + drivers/gpu/drm/sti/sti_drv.c | 148 +- + drivers/gpu/drm/sti/sti_drv.h | 1 + + drivers/gpu/drm/sti/sti_dvo.c | 42 +- + drivers/gpu/drm/sti/sti_gdp.c | 46 +- + drivers/gpu/drm/sti/sti_hda.c | 43 +- + drivers/gpu/drm/sti/sti_hdmi.c | 57 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 39 +- + drivers/gpu/drm/sti/sti_mixer.c | 12 +- + drivers/gpu/drm/sti/sti_mixer.h | 2 + + drivers/gpu/drm/sti/sti_plane.c | 24 +- + drivers/gpu/drm/sti/sti_plane.h | 7 +- + drivers/gpu/drm/sti/sti_tvout.c | 43 +- + drivers/gpu/drm/sti/sti_vid.c | 12 +- + drivers/gpu/drm/sti/sti_vid.h | 2 + + drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 12 +- + 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 | 3 +- + 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 | 15 +- + 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 | 4 +- + drivers/gpu/drm/via/via_mm.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 181 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 10 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 150 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 + + 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 | 94 +- + include/drm/drm_atomic.h | 82 +- + include/drm/drm_atomic_helper.h | 42 +- + include/drm/drm_auth.h | 59 + + include/drm/drm_crtc.h | 625 +++- + include/drm/drm_crtc_helper.h | 3 - + include/drm/drm_dp_helper.h | 2 + + include/drm/drm_fb_helper.h | 11 - + include/drm/drm_fourcc.h | 37 + + include/drm/drm_legacy.h | 2 + + include/drm/drm_mipi_dsi.h | 3 + + include/drm/drm_modes.h | 2 + + include/drm/drm_modeset_helper_vtables.h | 49 +- + include/drm/drm_plane_helper.h | 1 + + include/drm/drm_simple_kms_helper.h | 94 + + include/drm/i915_drm.h | 3 + + include/drm/intel-gtt.h | 3 + + include/linux/dma-buf.h | 2 - + 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 - + 480 files changed, 24643 insertions(+), 14007 deletions(-) + create mode 100644 Documentation/.gitignore + delete mode 100644 Documentation/DocBook/gpu.tmpl + create mode 100644 Documentation/Makefile.sphinx + create mode 100644 Documentation/conf.py + create mode 100644 Documentation/devicetree/bindings/display/arm,malidp.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/sii902x.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,hdmi.txt + create mode 100644 Documentation/gpu/drm-internals.rst + create mode 100644 Documentation/gpu/drm-kms-helpers.rst + create mode 100644 Documentation/gpu/drm-kms.rst + create mode 100644 Documentation/gpu/drm-mm.rst + create mode 100644 Documentation/gpu/drm-uapi.rst + create mode 100644 Documentation/gpu/i915.rst + create mode 100644 Documentation/gpu/index.rst + create mode 100644 Documentation/gpu/introduction.rst + create mode 100644 Documentation/gpu/kms-properties.csv + create mode 100644 Documentation/gpu/vga-switcheroo.rst + 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/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 + create mode 100644 drivers/gpu/drm/bridge/sii902x.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/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_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 drivers/gpu/drm/i915/intel_gvt.c + create mode 100644 drivers/gpu/drm/i915/intel_gvt.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_cec.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_cec.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_hdmi_regs.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c + create mode 100644 include/drm/drm_auth.h + 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 (8d228911ffc0 drm/i915: Trim some if-else braces) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/intel_fbc.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_fbc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.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 +Removing drivers/gpu/drm/i915/i915_dma.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aad49fd8701f] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Kconfig.debug | 1 + + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 107 +- + drivers/gpu/drm/i915/i915_dma.c | 1692 -------------------- + drivers/gpu/drm/i915/i915_drv.c | 2326 +++++++++++++++++++++------- + drivers/gpu/drm/i915/i915_drv.h | 95 +- + drivers/gpu/drm/i915/i915_gem.c | 63 +- + drivers/gpu/drm/i915/i915_gem_context.c | 54 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 55 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 29 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 40 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 5 +- + drivers/gpu/drm/i915/i915_params.c | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 504 ++++++ + drivers/gpu/drm/i915/i915_sysfs.c | 7 - + drivers/gpu/drm/i915/intel_crt.c | 21 +- + drivers/gpu/drm/i915/intel_csr.c | 29 +- + drivers/gpu/drm/i915/intel_ddi.c | 5 +- + drivers/gpu/drm/i915/intel_display.c | 99 +- + drivers/gpu/drm/i915/intel_dp.c | 421 +++-- + drivers/gpu/drm/i915/intel_dp_mst.c | 10 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 6 +- + drivers/gpu/drm/i915/intel_drv.h | 80 +- + drivers/gpu/drm/i915/intel_dsi.c | 35 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 13 +- + drivers/gpu/drm/i915/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/intel_fbc.c | 42 +- + drivers/gpu/drm/i915/intel_fbdev.c | 41 +- + drivers/gpu/drm/i915/intel_guc.h | 7 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 7 +- + drivers/gpu/drm/i915/intel_gvt.c | 10 +- + drivers/gpu/drm/i915/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/intel_i2c.c | 10 +- + drivers/gpu/drm/i915/intel_lrc.c | 258 ++- + drivers/gpu/drm/i915/intel_lvds.c | 31 +- + drivers/gpu/drm/i915/intel_opregion.c | 96 +- + drivers/gpu/drm/i915/intel_panel.c | 15 +- + drivers/gpu/drm/i915/intel_pm.c | 64 +- + drivers/gpu/drm/i915/intel_psr.c | 29 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 479 +++--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 12 - + drivers/gpu/drm/i915/intel_runtime_pm.c | 50 +- + drivers/gpu/drm/i915/intel_sdvo.c | 34 +- + drivers/gpu/drm/i915/intel_sideband.c | 32 +- + drivers/gpu/drm/i915/intel_tv.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 103 +- + 47 files changed, 3736 insertions(+), 3295 deletions(-) + delete mode 100644 drivers/gpu/drm/i915/i915_dma.c + create mode 100644 drivers/gpu/drm/i915/i915_pci.c +Merging drm-tegra/drm/tegra/for-next (9e9d1315f4f4 drm/tegra: sor: Make XBAR configurable per SoC) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/sor.c +Auto-merging drivers/gpu/drm/tegra/output.c +Auto-merging drivers/gpu/drm/tegra/hdmi.c +Auto-merging drivers/gpu/drm/tegra/dsi.c +Auto-merging drivers/gpu/drm/tegra/drm.h +Auto-merging drivers/gpu/drm/tegra/drm.c +Merge made by the 'recursive' strategy. + .../display/tegra/nvidia,tegra20-host1x.txt | 13 +- + .../pinctrl/nvidia,tegra124-dpaux-padctl.txt | 60 ++ + drivers/gpu/drm/tegra/dc.c | 176 +++-- + drivers/gpu/drm/tegra/dpaux.c | 257 +++++-- + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/drm/tegra/drm.h | 2 - + drivers/gpu/drm/tegra/dsi.c | 235 ++++--- + drivers/gpu/drm/tegra/hdmi.c | 507 ++++++++++---- + drivers/gpu/drm/tegra/hdmi.h | 21 +- + drivers/gpu/drm/tegra/output.c | 1 + + drivers/gpu/drm/tegra/sor.c | 737 ++++++++++++++------- + drivers/gpu/drm/tegra/sor.h | 3 + + drivers/gpu/host1x/cdma.c | 42 +- + drivers/gpu/host1x/channel.c | 5 +- + drivers/gpu/host1x/debug.c | 38 +- + drivers/gpu/host1x/dev.c | 16 +- + drivers/gpu/host1x/dev.h | 38 +- + drivers/gpu/host1x/hw/cdma_hw.c | 23 +- + drivers/gpu/host1x/hw/channel_hw.c | 5 +- + drivers/gpu/host1x/hw/debug_hw.c | 36 +- + drivers/gpu/host1x/hw/intr_hw.c | 30 +- + drivers/gpu/host1x/hw/syncpt_hw.c | 10 +- + drivers/gpu/host1x/intr.c | 16 +- + drivers/gpu/host1x/intr.h | 4 +- + drivers/gpu/host1x/job.c | 8 +- + drivers/gpu/host1x/syncpt.c | 58 +- + drivers/gpu/host1x/syncpt.h | 8 +- + drivers/pinctrl/pinconf-generic.c | 8 + + include/linux/pinctrl/pinconf-generic.h | 2 + + 29 files changed, 1645 insertions(+), 716 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-dpaux-padctl.txt +Merging drm-misc/topic/drm-misc (2ae995887830 drm: Fix a typo in drm_ioctl.c) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 12 +++++-- + drivers/gpu/drm/drm_crtc.c | 53 ++++++++++++++++++++++++++---- + drivers/gpu/drm/drm_ioctl.c | 2 +- + drivers/gpu/drm/drm_irq.c | 4 +-- + drivers/gpu/drm/i2c/ch7006_drv.c | 9 ++--- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 10 ------ + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 9 ++--- + drivers/gpu/drm/nouveau/nouveau_display.c | 1 + + drivers/gpu/drm/nouveau/nouveau_drm.c | 6 +++- + drivers/gpu/drm/radeon/radeon_device.c | 4 +++ + drivers/gpu/drm/radeon/radeon_display.c | 1 + + drivers/gpu/drm/radeon/radeon_kms.c | 5 ++- + include/drm/drm_crtc.h | 2 ++ + 14 files changed, 80 insertions(+), 39 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 +Already up-to-date. +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 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 - + 30 files changed, 1457 insertions(+), 439 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 (7e01dad0469b Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging include/asm-generic/vmlinux.lds.h +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 + + include/asm-generic/vmlinux.lds.h | 2 +- + include/linux/export.h | 2 +- + include/linux/kconfig.h | 31 +- + 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/coccicheck | 4 +- + scripts/coccinelle/misc/noderef.cocci | 18 +- + 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 + + scripts/setlocalversion | 2 +- + 35 files changed, 2244 insertions(+), 32 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 a846ef7a8444] Merge remote-tracking branch 'kbuild/for-next' + Date: Fri Jul 1 12:05:28 2016 +1000 +Merging kspp/for-next/kspp (20f0992c935f latent_entropy: Add the extra_latent_entropy kernel parameter) +$ git merge kspp/for-next/kspp +Auto-merging net/core/dev.c +Auto-merging mm/page_alloc.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/fork.c +Auto-merging init/main.c +Auto-merging fs/namespace.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 5 + + Makefile | 7 - + arch/Kconfig | 23 + + 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/powerpc/kernel/Makefile | 4 + + 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 +- + block/blk-softirq.c | 2 +- + drivers/char/random.c | 6 +- + fs/namespace.c | 1 + + include/linux/compiler-gcc.h | 5 + + include/linux/compiler.h | 4 + + include/linux/fdtable.h | 2 +- + include/linux/genhd.h | 2 +- + include/linux/init.h | 5 +- + include/linux/random.h | 15 +- + init/main.c | 1 + + kernel/fork.c | 7 +- + kernel/rcu/tiny.c | 1 + + kernel/rcu/tree.c | 1 + + kernel/sched/fair.c | 2 +- + kernel/softirq.c | 4 +- + kernel/time/timer.c | 2 +- + lib/irq_poll.c | 2 +- + lib/random32.c | 2 +- + mm/page_alloc.c | 32 ++ + net/core/dev.c | 4 +- + scripts/Kbuild.include | 10 +- + scripts/Makefile.gcc-plugins | 44 +- + scripts/gcc-plugin.sh | 14 + + scripts/gcc-plugins/Makefile | 1 + + scripts/gcc-plugins/latent_entropy_plugin.c | 639 ++++++++++++++++++++++++++++ + 59 files changed, 862 insertions(+), 93 deletions(-) + create mode 100644 scripts/gcc-plugins/latent_entropy_plugin.c +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (0bb2cf262087 Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/i2c', '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-i2c.c | 2 +- + drivers/base/regmap/regmap-irq.c | 15 +++++++++++---- + drivers/base/regmap/regmap.c | 31 ++++++++++++++++++++++++++++--- + include/linux/regmap.h | 10 ++++++++++ + 5 files changed, 51 insertions(+), 8 deletions(-) +Merging sound/for-next (cf7d7edc7a12 ALSA: riptide: Use DIV_ROUND_UP) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/hda_generic.c +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/pci/riptide/riptide.c | 2 +- + sound/sh/aica.c | 16 +++------------- + sound/usb/mixer_maps.c | 6 ++++-- + 26 files changed, 134 insertions(+), 203 deletions(-) +Merging sound-asoc/for-next (aad2aedc6b11 Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/wm8731', 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/samsung/odroidx2_max98090.c +Removing sound/soc/mediatek/mtk-afe-common.h +Auto-merging sound/soc/mediatek/mt8173/mt8173-rt5650.c +Auto-merging sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +Auto-merging sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +Auto-merging sound/soc/mediatek/mt8173/mt8173-max98090.c +Auto-merging sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +Auto-merging include/linux/acpi.h +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/cs35l33.txt | 126 ++ + .../devicetree/bindings/sound/cs53l30.txt | 44 + + .../devicetree/bindings/sound/designware-i2s.txt | 4 + + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 +- + .../devicetree/bindings/sound/max98504.txt | 44 + + .../devicetree/bindings/sound/max9860.txt | 28 + + .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 150 ++ + .../devicetree/bindings/sound/mt2701-cs42448.txt | 43 + + .../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 + + Documentation/devicetree/bindings/sound/rt5514.txt | 5 + + .../bindings/sound/samsung,odroidx2-max98090.txt | 35 - + .../devicetree/bindings/sound/sgtl5000.txt | 18 +- + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 20 +- + .../devicetree/bindings/sound/sun4i-i2s.txt | 34 + + Documentation/sound/alsa/soc/machine.txt | 2 +- + MAINTAINERS | 11 +- + drivers/base/property.c | 28 + + include/acpi/acpi_bus.h | 7 + + include/linux/acpi.h | 6 + + include/linux/mfd/arizona/core.h | 10 + + include/linux/of.h | 14 +- + include/linux/property.h | 3 + + include/sound/compress_driver.h | 5 + + include/sound/cs35l33.h | 48 + + include/sound/hdmi-codec.h | 13 +- + include/sound/simple_card_utils.h | 21 + + 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 | 43 +- + sound/soc/codecs/Makefile | 14 + + 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/cs35l33.c | 1308 +++++++++++++++++ + sound/soc/codecs/cs35l33.h | 221 +++ + sound/soc/codecs/cs47l24.c | 19 + + sound/soc/codecs/cs53l30.c | 1139 +++++++++++++++ + sound/soc/codecs/cs53l30.h | 459 ++++++ + sound/soc/codecs/cx20442.c | 1 + + sound/soc/codecs/da7219-aad.c | 103 +- + sound/soc/codecs/da7219.c | 34 +- + sound/soc/codecs/hdac_hdmi.c | 26 +- + sound/soc/codecs/hdmi-codec.c | 15 +- + sound/soc/codecs/max98504.c | 383 +++++ + sound/soc/codecs/max98504.h | 59 + + sound/soc/codecs/max9860.c | 753 ++++++++++ + sound/soc/codecs/max9860.h | 162 +++ + sound/soc/codecs/max9867.c | 0 + sound/soc/codecs/max9867.h | 0 + sound/soc/codecs/max9877.h | 2 - + 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 | 460 ++++++ + sound/soc/codecs/rt5514-spi.h | 38 + + sound/soc/codecs/rt5514.c | 168 ++- + sound/soc/codecs/rt5514.h | 7 + + sound/soc/codecs/rt5670.c | 5 +- + 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/tpa6130a2.c | 394 ++--- + sound/soc/codecs/tpa6130a2.h | 14 +- + sound/soc/codecs/wm5102.c | 3 +- + sound/soc/codecs/wm5110.c | 20 + + sound/soc/codecs/wm8731.c | 5 +- + sound/soc/codecs/wm8753.c | 3 +- + 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 | 34 +- + 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 | 4 +- + sound/soc/dwc/designware_i2s.c | 231 ++- + sound/soc/dwc/designware_pcm.c | 225 +++ + sound/soc/dwc/local.h | 128 ++ + sound/soc/fsl/Kconfig | 1 + + sound/soc/fsl/fsl_spdif.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 12 +- + sound/soc/generic/Kconfig | 3 + + sound/soc/generic/Makefile | 2 + + sound/soc/generic/simple-card-utils.c | 54 + + sound/soc/generic/simple-card.c | 204 +-- + sound/soc/intel/Kconfig | 55 +- + sound/soc/intel/atom/sst-mfld-platform-compress.c | 9 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 460 ++++++ + sound/soc/intel/boards/bxt_rt298.c | 118 ++ + 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/common/sst-dsp.c | 2 +- + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/bxt-sst.c | 202 ++- + sound/soc/intel/skylake/skl-messages.c | 47 +- + 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 | 260 +++- + sound/soc/intel/skylake/skl-sst-dsp.h | 102 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 4 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 18 + + sound/soc/intel/skylake/skl-sst-utils.c | 256 ++++ + sound/soc/intel/skylake/skl-sst.c | 124 +- + sound/soc/intel/skylake/skl-topology.c | 217 ++- + sound/soc/intel/skylake/skl-topology.h | 6 +- + sound/soc/intel/skylake/skl.c | 22 +- + sound/soc/intel/skylake/skl.h | 10 + + sound/soc/mediatek/Kconfig | 16 +- + sound/soc/mediatek/Makefile | 9 +- + sound/soc/mediatek/common/Makefile | 16 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 379 +++++ + sound/soc/mediatek/common/mtk-afe-fe-dai.h | 45 + + .../soc/mediatek/common/mtk-afe-platform-driver.c | 90 ++ + .../soc/mediatek/common/mtk-afe-platform-driver.h | 23 + + sound/soc/mediatek/common/mtk-base-afe.h | 104 ++ + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 464 ++++++ + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 38 + + sound/soc/mediatek/mt2701/mt2701-afe-common.h | 181 +++ + sound/soc/mediatek/mt2701/mt2701-reg.h | 186 +++ + sound/soc/mediatek/mt8173/Makefile | 7 + + sound/soc/mediatek/mt8173/mt8173-afe-common.h | 73 + + .../{mtk-afe-pcm.c => mt8173/mt8173-afe-pcm.c} | 925 ++++++------ + sound/soc/mediatek/{ => mt8173}/mt8173-max98090.c | 2 +- + .../mediatek/{ => mt8173}/mt8173-rt5650-rt5514.c | 2 +- + .../mediatek/{ => mt8173}/mt8173-rt5650-rt5676.c | 4 +- + sound/soc/mediatek/{ => mt8173}/mt8173-rt5650.c | 47 +- + sound/soc/mediatek/mtk-afe-common.h | 101 -- + sound/soc/omap/Kconfig | 3 +- + sound/soc/omap/omap-mcpdm.c | 74 +- + sound/soc/omap/rx51.c | 46 +- + 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/samsung/s3c-i2s-v2.c | 2 +- + 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-compress.c | 5 +- + sound/soc/soc-dapm.c | 60 +- + sound/soc/soc-pcm.c | 43 +- + sound/soc/sti/uniperif_player.c | 4 +- + sound/soc/sunxi/Kconfig | 9 + + sound/soc/sunxi/Makefile | 2 +- + sound/soc/sunxi/sun4i-i2s.c | 703 +++++++++ + 181 files changed, 16741 insertions(+), 2720 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/cs35l33.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs53l30.txt + create mode 100644 Documentation/devicetree/bindings/sound/max98504.txt + create mode 100644 Documentation/devicetree/bindings/sound/max9860.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt2701-cs42448.txt + delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt + create mode 100644 Documentation/devicetree/bindings/sound/sun4i-i2s.txt + create mode 100644 include/sound/cs35l33.h + create mode 100644 include/sound/simple_card_utils.h + 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/cs35l33.c + create mode 100644 sound/soc/codecs/cs35l33.h + create mode 100644 sound/soc/codecs/cs53l30.c + create mode 100644 sound/soc/codecs/cs53l30.h + create mode 100644 sound/soc/codecs/max98504.c + create mode 100644 sound/soc/codecs/max98504.h + create mode 100644 sound/soc/codecs/max9860.c + create mode 100644 sound/soc/codecs/max9860.h + mode change 100755 => 100644 sound/soc/codecs/max9867.c + mode change 100755 => 100644 sound/soc/codecs/max9867.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/generic/simple-card-utils.c + create mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c + create mode 100644 sound/soc/intel/skylake/skl-sst-utils.c + create mode 100644 sound/soc/mediatek/common/Makefile + create mode 100644 sound/soc/mediatek/common/mtk-afe-fe-dai.c + create mode 100644 sound/soc/mediatek/common/mtk-afe-fe-dai.h + create mode 100644 sound/soc/mediatek/common/mtk-afe-platform-driver.c + create mode 100644 sound/soc/mediatek/common/mtk-afe-platform-driver.h + create mode 100644 sound/soc/mediatek/common/mtk-base-afe.h + create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c + create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h + create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-common.h + create mode 100644 sound/soc/mediatek/mt2701/mt2701-reg.h + create mode 100644 sound/soc/mediatek/mt8173/Makefile + create mode 100644 sound/soc/mediatek/mt8173/mt8173-afe-common.h + rename sound/soc/mediatek/{mtk-afe-pcm.c => mt8173/mt8173-afe-pcm.c} (51%) + rename sound/soc/mediatek/{ => mt8173}/mt8173-max98090.c (99%) + rename sound/soc/mediatek/{ => mt8173}/mt8173-rt5650-rt5514.c (99%) + rename sound/soc/mediatek/{ => mt8173}/mt8173-rt5650-rt5676.c (99%) + rename sound/soc/mediatek/{ => mt8173}/mt8173-rt5650.c (87%) + delete mode 100644 sound/soc/mediatek/mtk-afe-common.h + delete mode 100644 sound/soc/samsung/odroidx2_max98090.c + create mode 100644 sound/soc/sunxi/sun4i-i2s.c +$ git am -3 ../patches/drm-mediatek-fix-prototypes-after-API-change.patch +Applying: drm: mediatek: fix prototypes after API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/mediatek/mtk_hdmi.c +$ git add -A . +$ git commit -v -a --amend +[master a77ac0d4e72b] Merge remote-tracking branch 'sound-asoc/for-next' + Date: Fri Jul 1 12:25:58 2016 +1000 +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 (fcd6eb50eadd Input: add powerkey driver for HISI 65xx SoC) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/mouse/elantech.c +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/keyboard/tegra-kbc.c | 2 +- + drivers/input/misc/Kconfig | 23 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/apanel.c | 2 +- + drivers/input/misc/atmel_captouch.c | 290 +++++ + drivers/input/misc/hisi_powerkey.c | 142 +++ + drivers/input/misc/regulator-haptic.c | 2 +- + drivers/input/mouse/elantech.c | 2 +- + drivers/input/mouse/lifebook.c | 2 +- + drivers/input/rmi4/rmi_f01.c | 22 +- + drivers/input/serio/ams_delta_serio.c | 2 +- + 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 +- + 26 files changed, 2662 insertions(+), 28 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/misc/hisi_powerkey.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 (e118e4be8a96 Merge branch 'for-4.8/core' into for-next) +$ git merge block/for-next +Resolved 'block/blk-lib.c' using previous resolution. +Resolved 'fs/btrfs/compression.c' using previous resolution. +Resolved 'fs/btrfs/extent_io.c' using previous resolution. +Resolved 'fs/f2fs/data.c' using previous resolution. +Resolved 'fs/f2fs/segment.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/ocfs2/buffer_head_io.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/jbd2/commit.c +Auto-merging fs/gfs2/quota.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/dir.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/ext4/balloc.c +Auto-merging fs/buffer.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/compression.c +CONFLICT (content): Merge conflict in fs/btrfs/compression.c +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 +[master a71ecca8f223] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/queue-sysfs.txt | 2 +- + 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 | 417 ++++++++++------- + block/deadline-iosched.c | 5 +- + 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 | 9 +- + 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 | 66 +-- + 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 +- + 209 files changed, 3219 insertions(+), 1886 deletions(-) + create mode 100644 include/linux/bvec.h +Merging lightnvm/for-next (d1f5522352ea lightnvm: expose gennvm target type through sysfs) +$ git merge lightnvm/for-next +Auto-merging drivers/nvme/host/core.c +Merge made by the 'recursive' strategy. + block/blk-mq-sysfs.c | 13 +- + block/blk-sysfs.c | 4 +- + drivers/block/null_blk.c | 128 +++++++----- + drivers/lightnvm/Kconfig | 10 +- + drivers/lightnvm/Makefile | 2 +- + drivers/lightnvm/core.c | 296 ++++++++------------------- + drivers/lightnvm/gennvm.c | 463 ++++++++++++++++++++++++++++++------------- + drivers/lightnvm/gennvm.h | 10 +- + drivers/lightnvm/lightnvm.h | 35 ++++ + drivers/lightnvm/rrpc.c | 145 +++++++------- + drivers/lightnvm/rrpc.h | 13 +- + drivers/lightnvm/sysblk.c | 8 +- + drivers/lightnvm/sysfs.c | 195 ++++++++++++++++++ + drivers/md/dm.c | 2 +- + drivers/nvme/host/core.c | 157 +++++++++------ + drivers/nvme/host/lightnvm.c | 36 +++- + drivers/nvme/host/nvme.h | 26 ++- + include/linux/blk-mq.h | 4 +- + include/linux/lightnvm.h | 62 +++--- + 19 files changed, 1001 insertions(+), 608 deletions(-) + create mode 100644 drivers/lightnvm/lightnvm.h + create mode 100644 drivers/lightnvm/sysfs.c +$ git reset --hard HEAD^ +HEAD is now at a71ecca8f223 Merge remote-tracking branch 'block/for-next' +Merging next-20160629 version of lightnvm +$ git merge -m next-20160629/lightnvm 2a65aee4011bd3a372ce23681ceb3a6960a96c8c +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (0b7dab201f08 Merge branch 'dm-4.8' into for-next) +$ 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-crypt.c | 4 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm-ioctl.c | 7 +- + 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-verity-fec.c | 4 +- + drivers/md/dm.c | 1125 +----------- + drivers/md/dm.h | 35 +- + include/linux/device-mapper.h | 16 + + 20 files changed, 3963 insertions(+), 1761 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 (466780648db4 mmc: sh_mmcif: Use a 10s timeout in the error recovery path) +$ git merge mmc-uh/next +Removing drivers/mmc/host/sdhci-bcm2835.c +Auto-merging drivers/mmc/card/block.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.txt | 35 +- + .../devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt | 18 -- + .../devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt | 36 +++ + Documentation/devicetree/bindings/mmc/mmc.txt | 1 + + .../devicetree/bindings/phy/rockchip-emmc-phy.txt | 9 + + MAINTAINERS | 8 + + drivers/mmc/card/block.c | 13 +- + drivers/mmc/core/bus.c | 3 +- + drivers/mmc/core/core.c | 30 +- + drivers/mmc/core/debugfs.c | 3 +- + drivers/mmc/core/host.c | 2 + + drivers/mmc/core/mmc.c | 234 +++++++++----- + drivers/mmc/core/mmc_ops.c | 27 +- + drivers/mmc/core/quirks.c | 2 + + drivers/mmc/host/Kconfig | 22 +- + drivers/mmc/host/Makefile | 2 +- + drivers/mmc/host/dw_mmc.c | 3 +- + drivers/mmc/host/mxcmmc.c | 2 +- + drivers/mmc/host/sdhci-bcm-kona.c | 6 +- + drivers/mmc/host/sdhci-bcm2835.c | 204 ------------ + drivers/mmc/host/sdhci-brcmstb.c | 143 +++++++++ + drivers/mmc/host/sdhci-msm.c | 2 +- + drivers/mmc/host/sdhci-of-arasan.c | 351 +++++++++++++++++++-- + drivers/mmc/host/sdhci-of-at91.c | 2 +- + drivers/mmc/host/sdhci-pci-core.c | 8 + + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/sdhci-st.c | 2 +- + drivers/mmc/host/sdhci.c | 119 +++---- + drivers/mmc/host/sh_mmcif.c | 53 +--- + drivers/mmc/host/sh_mobile_sdhi.c | 14 +- + drivers/mmc/host/tmio_mmc.h | 2 +- + drivers/mmc/host/tmio_mmc_pio.c | 2 +- + drivers/phy/phy-rockchip-emmc.c | 216 ++++++++++--- + include/linux/mmc/card.h | 36 ++- + include/linux/mmc/host.h | 13 + + include/linux/mmc/mmc.h | 3 + + 36 files changed, 1094 insertions(+), 533 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt + delete mode 100644 drivers/mmc/host/sdhci-bcm2835.c + create mode 100644 drivers/mmc/host/sdhci-brcmstb.c +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 ac1a4adfb0e8] 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 (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mfd/max77620.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/rn5t618.txt | 19 ++- + Documentation/devicetree/bindings/mfd/twl6040.txt | 4 +- + MAINTAINERS | 11 ++ + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 1 + + drivers/mfd/Kconfig | 24 ++- + drivers/mfd/Makefile | 2 + + drivers/mfd/altera-a10sr.c | 169 ++++++++++++++++++++++ + drivers/mfd/arizona-core.c | 4 +- + drivers/mfd/arizona-irq.c | 16 +- + drivers/mfd/axp20x.c | 17 +++ + drivers/mfd/dm355evm_msp.c | 7 +- + drivers/mfd/hi655x-pmic.c | 59 +++++--- + drivers/mfd/kempld-core.c | 16 ++ + 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 | 57 ++++++-- + drivers/mfd/rn5t618.c | 70 +++++++-- + drivers/mfd/si476x-i2c.c | 2 +- + drivers/mfd/smsc-ece1099.c | 11 +- + drivers/mfd/stmpe.c | 40 +++-- + drivers/mfd/ti_am335x_tscadc.c | 135 +++++++---------- + drivers/mfd/tps6507x.c | 4 +- + drivers/mfd/twl-core.c | 28 ++-- + drivers/mfd/twl6040.c | 41 ++++-- + drivers/regulator/Kconfig | 5 +- + drivers/regulator/rn5t618-regulator.c | 40 ++++- + include/linux/mfd/altera-a10sr.h | 85 +++++++++++ + include/linux/mfd/arizona/registers.h | 6 - + include/linux/mfd/hi655x-pmic.h | 25 +++- + include/linux/mfd/rn5t618.h | 13 ++ + include/linux/mfd/stmpe.h | 22 +-- + include/linux/mfd/ti_am335x_tscadc.h | 2 +- + include/linux/mfd/twl6040.h | 5 +- + 38 files changed, 761 insertions(+), 353 deletions(-) + create mode 100644 drivers/mfd/altera-a10sr.c + create mode 100644 include/linux/mfd/altera-a10sr.h +Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator) +$ git merge backlight/for-backlight-next +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 (eee1d077f0d7 power: qcom_smbb: Make an extcon for usb cable detection) +$ git merge battery/master +Auto-merging drivers/power/reset/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/max8903-charger.txt | 25 ++ + .../{ => power}/reset/brcm,bcm21664-resetmgr.txt | 0 + .../bindings/power_supply/axp20x_usb_power.txt | 3 +- + MAINTAINERS | 2 + + drivers/extcon/extcon.c | 201 ++------------- + drivers/power/Kconfig | 1 + + drivers/power/axp20x_usb_power.c | 92 +++++-- + drivers/power/axp288_charger.c | 77 ++++-- + drivers/power/bq27xxx_battery.c | 284 ++++++++++----------- + drivers/power/bq27xxx_battery_i2c.c | 2 +- + drivers/power/max8903_charger.c | 239 ++++++++++++----- + drivers/power/qcom_smbb.c | 21 ++ + drivers/power/reset/Kconfig | 3 +- + drivers/power/reset/syscon-poweroff.c | 2 +- + include/linux/extcon.h | 80 ++---- + include/linux/power/max8903_charger.h | 6 +- + 16 files changed, 539 insertions(+), 499 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/max8903-charger.txt + 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 (306b3710d973 Merge remote-tracking branch 'regulator/topic/twl' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/axp20x.txt | 6 + + .../devicetree/bindings/regulator/da9211.txt | 47 ++++++- + .../bindings/regulator/pwm-regulator.txt | 7 +- + .../bindings/regulator/qcom,spmi-regulator.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/da9211-regulator.c | 13 +- + drivers/regulator/da9211-regulator.h | 3 +- + drivers/regulator/fixed.c | 14 +- + drivers/regulator/lp873x-regulator.c | 14 +- + drivers/regulator/max77620-regulator.c | 7 +- + drivers/regulator/max8973-regulator.c | 16 +-- + drivers/regulator/mt6397-regulator.c | 95 +++++++++++-- + drivers/regulator/of_regulator.c | 3 + + 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 | 31 ++++- + drivers/regulator/qcom_smd-regulator.c | 1 - + drivers/regulator/qcom_spmi-regulator.c | 7 +- + drivers/regulator/tps65217-regulator.c | 69 ++++++++-- + drivers/regulator/tps65218-regulator.c | 76 +++++++++-- + drivers/regulator/twl-regulator.c | 2 +- + include/linux/mfd/tps65217.h | 1 + + include/linux/mfd/tps65218.h | 2 + + include/linux/regulator/consumer.h | 6 - + include/linux/regulator/da9211.h | 5 +- + 30 files changed, 467 insertions(+), 168 deletions(-) +Merging security/next (f786b7520982 tpm_crb: fix address space of the return pointer in crb_map_res()) +$ git merge security/next +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution. +Auto-merging arch/powerpc/kernel/ptrace.c +Auto-merging MAINTAINERS +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 +[master 750f0e38201c] Merge remote-tracking branch 'security/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 ++ + 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 - + 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/capability.h | 5 + + include/linux/platform_data/st33zp24.h | 2 +- + include/linux/seccomp.h | 14 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/vtpm_proxy.h | 36 + + 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 ++++- + 57 files changed, 3409 insertions(+), 1698 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 integrity/next (544e1cea03e6 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 (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Auto-merging Documentation/crypto/asymmetric-keys.txt +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/rxrpc-type.h | 2 +- + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + scripts/sign-file.c | 34 +++- + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + security/keys/persistent.c | 2 +- + security/keys/request_key.c | 2 +- + 37 files changed, 1613 insertions(+), 63 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.) +$ git merge selinux/next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging net/iucv/af_iucv.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv6/ipv6_sockglue.c +Auto-merging net/ipv6/exthdrs.c +Auto-merging net/ipv6/af_inet6.c +Auto-merging net/ipv6/Makefile +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/ipv4/cipso_ipv4.c +Auto-merging net/dccp/ipv6.c +Auto-merging include/net/ipv6.h +Merge made by the 'recursive' strategy. + include/net/calipso.h | 91 +++ + include/net/inet_sock.h | 7 +- + include/net/ipv6.h | 10 +- + include/net/netlabel.h | 101 ++- + include/uapi/linux/audit.h | 2 + + include/uapi/linux/in6.h | 1 + + net/dccp/ipv6.c | 12 +- + net/ipv4/cipso_ipv4.c | 88 +-- + net/ipv4/tcp_input.c | 3 + + net/ipv6/Makefile | 1 + + net/ipv6/af_inet6.c | 9 +- + net/ipv6/calipso.c | 1473 +++++++++++++++++++++++++++++++++++ + net/ipv6/exthdrs.c | 76 ++ + net/ipv6/exthdrs_core.c | 2 +- + net/ipv6/ipv6_sockglue.c | 1 - + net/ipv6/sysctl_net_ipv6.c | 19 + + net/ipv6/tcp_ipv6.c | 12 +- + net/iucv/af_iucv.c | 5 +- + net/netlabel/Kconfig | 1 + + net/netlabel/Makefile | 2 +- + net/netlabel/netlabel_calipso.c | 740 ++++++++++++++++++ + net/netlabel/netlabel_calipso.h | 151 ++++ + net/netlabel/netlabel_domainhash.c | 293 +++++-- + net/netlabel/netlabel_domainhash.h | 17 +- + net/netlabel/netlabel_kapi.c | 394 +++++++++- + net/netlabel/netlabel_mgmt.c | 85 +- + net/netlabel/netlabel_mgmt.h | 27 +- + net/netlabel/netlabel_unlabeled.c | 5 +- + net/netlabel/netlabel_user.c | 5 + + security/selinux/hooks.c | 21 +- + security/selinux/include/netlabel.h | 4 +- + security/selinux/netlabel.c | 36 +- + security/selinux/selinuxfs.c | 2 +- + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/services.c | 70 +- + security/smack/smack_lsm.c | 2 +- + 36 files changed, 3511 insertions(+), 259 deletions(-) + create mode 100644 include/net/calipso.h + create mode 100644 net/ipv6/calipso.c + create mode 100644 net/netlabel/netlabel_calipso.c + create mode 100644 net/netlabel/netlabel_calipso.h +Merging tpmdd/next (f786b7520982 tpm_crb: fix address space of the return pointer in crb_map_res()) +$ git merge tpmdd/next +Already up-to-date. +Merging watchdog/master (1a695a905c18 Linux 4.7-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (e45a4c9d4041 Merge branches 'iommu/fixes', 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek' and 'arm/msm' into next) +$ git merge iommu/next +Resolved 'drivers/iommu/mtk_iommu.c' using previous resolution. +Auto-merging drivers/iommu/mtk_iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c +Removing drivers/iommu/msm_iommu_dev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e0191136081a] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iommu/mediatek,iommu.txt | 13 +- + .../devicetree/bindings/iommu/msm,iommu-v0.txt | 64 ++ + .../memory-controllers/mediatek,smi-common.txt | 21 +- + .../memory-controllers/mediatek,smi-larb.txt | 4 +- + drivers/iommu/Kconfig | 20 +- + drivers/iommu/Makefile | 3 +- + drivers/iommu/amd_iommu.c | 4 + + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/iommu/amd_iommu_v2.c | 2 +- + drivers/iommu/dmar.c | 16 +- + drivers/iommu/exynos-iommu.c | 107 ++- + drivers/iommu/intel-iommu.c | 6 +- + drivers/iommu/iova.c | 8 +- + drivers/iommu/msm_iommu.c | 870 +++++++++++---------- + drivers/iommu/msm_iommu.h | 73 +- + drivers/iommu/msm_iommu_dev.c | 381 --------- + drivers/iommu/mtk_iommu.c | 49 +- + drivers/iommu/mtk_iommu.h | 77 ++ + drivers/iommu/mtk_iommu_v1.c | 727 +++++++++++++++++ + drivers/memory/mtk-smi.c | 167 +++- + include/dt-bindings/memory/mt2701-larb-port.h | 85 ++ + 21 files changed, 1733 insertions(+), 966 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/msm,iommu-v0.txt + delete mode 100644 drivers/iommu/msm_iommu_dev.c + create mode 100644 drivers/iommu/mtk_iommu.h + create mode 100644 drivers/iommu/mtk_iommu_v1.c + create mode 100644 include/dt-bindings/memory/mt2701-larb-port.h +Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (9698cbf0bea6 vfio: platform: support No-IOMMU mode) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/platform/vfio_platform_common.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging jc_docs/docs-next (19abdb15f3c7 Add .pyc files to .gitignore) +$ git merge jc_docs/docs-next +Resolved 'Documentation/index.rst' using previous resolution. +Auto-merging Makefile +Auto-merging Documentation/index.rst +CONFLICT (content): Merge conflict in Documentation/index.rst +Auto-merging Documentation/DocBook/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8c61bda2768e] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/.gitignore | 1 + + Documentation/DocBook/Makefile | 4 +- + Documentation/Makefile.sphinx | 8 + + Documentation/bcache.txt | 197 ++++++++- + Documentation/conf.py | 2 +- + Documentation/index.rst | 4 +- + Documentation/kernel-documentation.rst | 648 +++++++++++++++++++++++++++++ + Documentation/md.txt | 2 +- + Documentation/sphinx/kernel-doc.py | 18 +- + Documentation/sphinx/rstFlatTable.py | 365 ++++++++++++++++ + Documentation/thermal/intel_powerclamp.txt | 2 +- + Documentation/usb/gadget_multi.txt | 2 +- + Makefile | 2 + + scripts/kernel-doc | 88 ++-- + 14 files changed, 1294 insertions(+), 49 deletions(-) + create mode 100644 Documentation/kernel-documentation.rst + create mode 100644 Documentation/sphinx/rstFlatTable.py +Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries) +$ git merge trivial/for-next +Auto-merging init/Kconfig +Auto-merging fs/ocfs2/xattr.c +Auto-merging drivers/media/usb/dvb-usb/dw2102.c +Auto-merging arch/arm/include/asm/io.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/io.h | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 40 +++++++++++++++++++------------------- + drivers/scsi/qla2xxx/qla_nx.h | 1 - + fs/fat/inode.c | 4 ++-- + fs/ocfs2/xattr.c | 2 +- + init/Kconfig | 4 ++-- + 6 files changed, 26 insertions(+), 27 deletions(-) +Merging audit/next (86b2efbe3a39 audit: add fields to exclude filter by reusing user filter) +$ git merge audit/next +Resolved 'arch/s390/kernel/ptrace.c' using previous resolution. +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +Auto-merging arch/s390/kernel/ptrace.c +CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a72c2bb0dcb3] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + arch/s390/kernel/ptrace.c | 11 +++- + include/linux/audit.h | 2 - + kernel/audit.c | 4 +- + kernel/audit.h | 2 + + kernel/auditfilter.c | 147 +++++++++++++++++----------------------------- + kernel/auditsc.c | 8 ++- + 6 files changed, 71 insertions(+), 103 deletions(-) +Merging devicetree/for-next (15cc2ed6dcf9 of/irq: Mark initialised interrupt controllers as populated) +$ git merge devicetree/for-next +Resolved 'arch/arm/mach-bcm/board_bcm21664.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mach-imx51.c' using previous resolution. +Auto-merging drivers/memory/omap-gpmc.c +Removing arch/c6x/platforms/platform.c +Auto-merging arch/arm64/kernel/setup.c +Auto-merging arch/arm/mach-tegra/tegra.c +Auto-merging arch/arm/mach-mvebu/kirkwood.c +Auto-merging arch/arm/mach-imx/mach-imx7d.c +Auto-merging arch/arm/mach-imx/mach-imx6ul.c +Auto-merging arch/arm/mach-imx/mach-imx6sx.c +Auto-merging arch/arm/mach-imx/mach-imx6sl.c +Auto-merging arch/arm/mach-imx/mach-imx6q.c +Auto-merging arch/arm/mach-imx/mach-imx53.c +Auto-merging arch/arm/mach-imx/mach-imx51.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx51.c +Auto-merging arch/arm/mach-exynos/exynos.c +Auto-merging arch/arm/mach-bcm/board_bcm21664.c +CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c +Auto-merging arch/arm/kernel/setup.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a08eac2d7141] Merge remote-tracking branch 'devicetree/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arc/kernel/setup.c | 7 ------- + arch/arm/kernel/setup.c | 8 +------- + arch/arm/mach-artpec/board-artpec6.c | 3 --- + arch/arm/mach-at91/at91rm9200.c | 2 +- + arch/arm/mach-at91/at91sam9.c | 2 +- + arch/arm/mach-at91/sama5.c | 2 +- + arch/arm/mach-bcm/board_bcm21664.c | 3 --- + arch/arm/mach-bcm/board_bcm281xx.c | 2 -- + arch/arm/mach-bcm/board_bcm2835.c | 10 ---------- + arch/arm/mach-cns3xxx/core.c | 3 +-- + arch/arm/mach-exynos/exynos.c | 3 --- + arch/arm/mach-highbank/highbank.c | 3 --- + arch/arm/mach-imx/mach-imx51.c | 2 -- + arch/arm/mach-imx/mach-imx53.c | 2 -- + arch/arm/mach-imx/mach-imx6q.c | 2 +- + arch/arm/mach-imx/mach-imx6sl.c | 2 +- + arch/arm/mach-imx/mach-imx6sx.c | 2 +- + arch/arm/mach-imx/mach-imx6ul.c | 1 - + arch/arm/mach-imx/mach-imx7d.c | 1 - + arch/arm/mach-integrator/integrator_ap.c | 3 +-- + arch/arm/mach-integrator/integrator_cp.c | 3 +-- + arch/arm/mach-keystone/keystone.c | 1 - + arch/arm/mach-lpc32xx/phy3250.c | 3 +-- + arch/arm/mach-mvebu/board-v7.c | 3 --- + arch/arm/mach-mvebu/dove.c | 2 -- + arch/arm/mach-mvebu/kirkwood.c | 2 +- + arch/arm/mach-mxs/mach-mxs.c | 3 +-- + arch/arm/mach-nspire/nspire.c | 3 +-- + arch/arm/mach-orion5x/board-dt.c | 3 +-- + arch/arm/mach-picoxcell/common.c | 2 -- + arch/arm/mach-rockchip/rockchip.c | 1 - + arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 -- + arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 3 --- + arch/arm/mach-shmobile/setup-r8a7740.c | 3 --- + arch/arm/mach-shmobile/setup-sh73a0.c | 2 -- + arch/arm/mach-spear/spear1310.c | 2 -- + arch/arm/mach-spear/spear1340.c | 1 - + arch/arm/mach-spear/spear300.c | 3 +-- + arch/arm/mach-spear/spear310.c | 3 +-- + arch/arm/mach-spear/spear320.c | 3 +-- + arch/arm/mach-spear/spear6xx.c | 3 +-- + arch/arm/mach-tegra/tegra.c | 2 +- + arch/arm/mach-u300/core.c | 3 +-- + arch/arm/mach-versatile/versatile_dt.c | 3 +-- + arch/arm/mach-vt8500/vt8500.c | 3 --- + arch/arm/mach-zynq/common.c | 2 +- + arch/arm64/kernel/setup.c | 15 --------------- + arch/c6x/platforms/Makefile | 2 +- + arch/c6x/platforms/platform.c | 17 ----------------- + arch/cris/kernel/setup.c | 8 -------- + arch/metag/kernel/setup.c | 5 +---- + arch/mips/ath79/setup.c | 3 --- + arch/mips/jz4740/setup.c | 8 -------- + arch/mips/mti-sead3/sead3-setup.c | 8 -------- + arch/mips/pic32/pic32mzda/init.c | 3 +-- + arch/mips/pistachio/init.c | 13 ------------- + arch/mips/xilfpga/init.c | 13 ------------- + arch/nios2/platform/platform.c | 4 +--- + arch/sh/boards/of-generic.c | 16 ---------------- + arch/xtensa/kernel/setup.c | 11 ----------- + arch/xtensa/kernel/time.c | 2 ++ + drivers/bus/imx-weim.c | 5 ++--- + drivers/bus/uniphier-system-bus.c | 3 +-- + drivers/iommu/of_iommu.c | 5 ++++- + drivers/memory/omap-gpmc.c | 3 +-- + drivers/of/base.c | 30 +++++++++++++++++++++--------- + drivers/of/dynamic.c | 2 +- + drivers/of/irq.c | 2 ++ + drivers/of/of_private.h | 3 +++ + drivers/of/platform.c | 21 +++++++++++++++++++-- + drivers/of/unittest.c | 5 ++--- + include/linux/of_iommu.h | 2 -- + 72 files changed, 85 insertions(+), 251 deletions(-) + delete mode 100644 arch/c6x/platforms/platform.c +Merging mailbox/mailbox-for-next (9ac3e85a5c5c mailbox: pl320: remove __raw IO) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/mailbox-test.c | 1 + + drivers/mailbox/pl320-ipc.c | 46 +++++++++++++++++++++--------------------- + 2 files changed, 24 insertions(+), 23 deletions(-) +Merging spi/for-next (13cfb01a032d Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/sunxi' and 'spi/topic/ti-qspi' 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 +- + Documentation/devicetree/bindings/spi/spi-bus.txt | 35 ++-- + .../devicetree/bindings/spi/spi-davinci.txt | 2 +- + .../devicetree/bindings/spi/spi-orion.txt | 49 +++++- + .../devicetree/bindings/spi/spi-rockchip.txt | 11 +- + .../devicetree/bindings/spi/spi-samsung.txt | 3 + + Documentation/devicetree/bindings/spi/ti_qspi.txt | 2 +- + MAINTAINERS | 1 + + drivers/spi/spi-imx.c | 191 ++++++++++----------- + drivers/spi/spi-loopback-test.c | 2 +- + drivers/spi/spi-orion.c | 88 ++++++++++ + drivers/spi/spi-pxa2xx-dma.c | 170 ++++-------------- + drivers/spi/spi-pxa2xx.c | 43 +++-- + drivers/spi/spi-pxa2xx.h | 9 - + drivers/spi/spi-rockchip.c | 7 +- + drivers/spi/spi-s3c64xx.c | 106 ++++++------ + drivers/spi/spi-sh-msiof.c | 18 +- + drivers/spi/spi-sun4i.c | 31 +++- + drivers/spi/spi-sun6i.c | 17 +- + drivers/spi/spi-ti-qspi.c | 9 +- + drivers/spi/spi.c | 28 +++ + include/linux/platform_data/spi-s3c64xx.h | 1 + + include/linux/spi/spi.h | 4 + + 23 files changed, 475 insertions(+), 357 deletions(-) +Merging tip/auto-latest (907012b1ab02 Merge branch 'x86/platform') +$ git merge tip/auto-latest +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/power/hibernate.c +Auto-merging kernel/events/core.c +Auto-merging include/linux/random.h +Auto-merging include/linux/efi.h +Auto-merging include/linux/compiler.h +Auto-merging drivers/irqchip/Kconfig +Auto-merging arch/x86/pci/vmd.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/include/asm/fpu/xstate.h +Auto-merging arch/x86/entry/vdso/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +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 | 16 +- + Makefile | 2 +- + 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 | 99 +- + arch/arc/include/asm/spinlock.h | 7 +- + arch/arm/include/asm/atomic.h | 106 +- + arch/arm/include/asm/efi.h | 4 +- + 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/arm64/include/asm/efi.h | 4 +- + 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 | 44 +- + 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 | 74 +- + 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/include/asm/futex.h | 14 +- + arch/tile/lib/atomic_32.c | 50 +- + arch/tile/lib/atomic_asm_32.S | 27 +- + 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/eboot.c | 2 - + 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 | 201 ++- + arch/x86/events/intel/cstate.c | 47 +- + arch/x86/events/intel/lbr.c | 124 +- + 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 | 12 + + 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/efi.h | 9 +- + 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/head_64.S | 1 + + arch/x86/kernel/i386_ksyms_32.c | 2 + + 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/pci/vmd.c | 2 +- + arch/x86/platform/atom/punit_atom_debug.c | 15 +- + arch/x86/platform/efi/efi.c | 15 - + arch/x86/platform/efi/efi_64.c | 21 +- + 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/platform/uv/bios_uv.c | 3 +- + arch/x86/xen/enlighten.c | 4 +- + arch/xtensa/include/asm/atomic.h | 52 +- + arch/xtensa/include/asm/spinlock.h | 10 +- + drivers/firmware/efi/efibc.c | 4 +- + drivers/firmware/efi/runtime-wrappers.c | 53 +- + drivers/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/exynos-combiner.c | 14 +- + 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-common.c | 4 +- + drivers/irqchip/irq-gic-pm.c | 184 +++ + drivers/irqchip/irq-gic-v2m.c | 1 + + drivers/irqchip/irq-gic-v3-its.c | 404 +++-- + drivers/irqchip/irq-gic.c | 134 +- + drivers/irqchip/irq-mips-gic.c | 3 + + drivers/irqchip/irq-omap-intc.c | 2 + + drivers/irqchip/irq-s3c24xx.c | 36 +- + drivers/irqchip/irq-sirfsoc.c | 11 +- + drivers/irqchip/irq-tegra.c | 4 +- + drivers/irqchip/irq-vic.c | 5 +- + 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/alarmtimer.h | 6 +- + include/linux/atomic.h | 627 ++++++-- + include/linux/compiler.h | 21 +- + include/linux/efi.h | 69 +- + include/linux/irq.h | 5 + + 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 | 8 +- + include/linux/spinlock_up.h | 10 +- + include/linux/time.h | 15 +- + 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/irq/chip.c | 83 + + kernel/irq/handle.c | 18 +- + kernel/irq/internals.h | 2 + + kernel/irq/irqdomain.c | 66 +- + 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 | 88 +- + 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 | 119 +- + kernel/sched/cputime.c | 16 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 293 ++-- + kernel/sched/idle.c | 4 +- + kernel/sched/sched.h | 23 +- + kernel/smp.c | 2 +- + kernel/task_work.c | 1 - + kernel/time/alarmtimer.c | 1 - + kernel/time/clocksource.c | 8 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/test_udelay.c | 16 +- + kernel/time/timeconv.c | 11 +- + kernel/time/timekeeping.c | 10 +- + kernel/time/timer.c | 8 +- + kernel/time/timer_stats.c | 6 +- + 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-record.txt | 7 + + tools/perf/Documentation/perf-script.txt | 31 +- + tools/perf/Documentation/perf-stat.txt | 32 + + tools/perf/Makefile.perf | 3 +- + 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/tests/perf-time-to-tsc.c | 6 +- + tools/perf/arch/x86/util/Build | 3 +- + tools/perf/arch/x86/util/auxtrace.c | 2 +- + tools/perf/arch/x86/util/group.c | 27 + + tools/perf/arch/x86/util/intel-bts.c | 8 +- + tools/perf/arch/x86/util/intel-pt.c | 10 +- + tools/perf/arch/x86/util/tsc.c | 2 + + tools/perf/arch/x86/util/unwind-libunwind.c | 6 +- + tools/perf/builtin-annotate.c | 4 +- + tools/perf/builtin-buildid-cache.c | 13 +- + tools/perf/builtin-config.c | 21 +- + tools/perf/builtin-diff.c | 29 +- + tools/perf/builtin-evlist.c | 2 +- + tools/perf/builtin-help.c | 2 +- + tools/perf/builtin-inject.c | 8 +- + tools/perf/builtin-kmem.c | 4 +- + tools/perf/builtin-kvm.c | 8 +- + tools/perf/builtin-mem.c | 1 + + tools/perf/builtin-probe.c | 5 +- + tools/perf/builtin-record.c | 19 +- + tools/perf/builtin-report.c | 15 +- + tools/perf/builtin-script.c | 136 +- + tools/perf/builtin-stat.c | 187 ++- + tools/perf/builtin-top.c | 12 +- + tools/perf/builtin-trace.c | 10 +- + tools/perf/config/Makefile | 57 +- + tools/perf/perf.c | 40 +- + tools/perf/scripts/python/bin/stackcollapse-record | 8 + + tools/perf/scripts/python/bin/stackcollapse-report | 3 + + tools/perf/scripts/python/stackcollapse.py | 125 ++ + tools/perf/tests/backward-ring-buffer.c | 2 +- + tools/perf/tests/event-times.c | 3 +- + tools/perf/tests/evsel-roundtrip-name.c | 2 +- + tools/perf/tests/fdarray.c | 8 +- + tools/perf/tests/hists_filter.c | 4 +- + tools/perf/tests/hists_link.c | 8 +- + tools/perf/tests/mmap-basic.c | 2 +- + tools/perf/tests/parse-events.c | 8 +- + tools/perf/tests/parse-no-sample-id-all.c | 3 +- + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/ui/browser.c | 2 +- + tools/perf/ui/browsers/annotate.c | 1 + + tools/perf/ui/browsers/hists.c | 148 +- + tools/perf/ui/browsers/hists.h | 32 + + tools/perf/ui/gtk/hists.c | 4 +- + tools/perf/ui/hist.c | 13 +- + tools/perf/ui/stdio/hist.c | 133 +- + tools/perf/util/Build | 3 + + tools/perf/util/alias.c | 1 + + tools/perf/util/auxtrace.h | 2 + + tools/perf/util/bpf-loader.c | 132 +- + tools/perf/util/build-id.c | 112 +- + tools/perf/util/build-id.h | 4 + + tools/perf/util/cache.h | 20 - + tools/perf/util/callchain.h | 1 + + tools/perf/util/cgroup.c | 4 +- + tools/perf/util/color.c | 1 + + tools/perf/util/config.c | 160 +- + tools/perf/util/config.h | 40 + + tools/perf/util/data-convert-bt.c | 4 +- + tools/perf/util/db-export.c | 13 +- + tools/perf/util/dso.h | 5 + + tools/perf/util/evlist.c | 107 +- + tools/perf/util/evlist.h | 42 +- + tools/perf/util/evsel.c | 67 +- + tools/perf/util/evsel.h | 4 + + tools/perf/util/group.h | 7 + + tools/perf/util/header.c | 18 +- + tools/perf/util/help-unknown-cmd.c | 1 + + tools/perf/util/hist.c | 40 +- + tools/perf/util/hist.h | 21 +- + tools/perf/util/intel-bts.c | 24 +- + tools/perf/util/intel-pt.c | 26 +- + tools/perf/util/intlist.h | 8 +- + tools/perf/util/jitdump.c | 2 +- + tools/perf/util/libunwind/arm64.c | 40 + + tools/perf/util/libunwind/x86_32.c | 43 + + tools/perf/util/llvm-utils.c | 43 + + tools/perf/util/llvm-utils.h | 5 + + tools/perf/util/machine.c | 20 +- + tools/perf/util/mem-events.c | 17 +- + tools/perf/util/mem-events.h | 1 + + tools/perf/util/parse-events.c | 12 +- + tools/perf/util/parse-events.h | 1 + + tools/perf/util/parse-events.l | 2 + + tools/perf/util/path.c | 65 +- + tools/perf/util/probe-event.c | 140 +- + tools/perf/util/probe-event.h | 5 + + tools/perf/util/probe-file.c | 337 ++++- + tools/perf/util/probe-file.h | 20 + + tools/perf/util/python.c | 2 +- + tools/perf/util/rb_resort.h | 4 +- + tools/perf/util/record.c | 8 +- + tools/perf/util/session.c | 14 +- + tools/perf/util/sort.c | 28 +- + tools/perf/util/stat-shadow.c | 162 ++ + tools/perf/util/stat.c | 11 +- + tools/perf/util/stat.h | 5 + + tools/perf/util/strlist.h | 4 +- + tools/perf/util/symbol.c | 73 +- + tools/perf/util/thread-stack.c | 7 + + tools/perf/util/thread-stack.h | 1 + + tools/perf/util/thread.c | 24 +- + tools/perf/util/thread.h | 11 +- + tools/perf/util/thread_map.c | 4 +- + tools/perf/util/unwind-libunwind-local.c | 699 +++++++++ + tools/perf/util/unwind-libunwind.c | 688 +-------- + tools/perf/util/unwind.h | 31 +- + tools/perf/util/util.c | 13 +- + tools/perf/util/vdso.c | 40 +- + 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 + + 387 files changed, 12291 insertions(+), 3952 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 100755 tools/perf/scripts/python/bin/stackcollapse-record + create mode 100755 tools/perf/scripts/python/bin/stackcollapse-report + create mode 100755 tools/perf/scripts/python/stackcollapse.py + create mode 100644 tools/perf/ui/browsers/hists.h + 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 (3d802c5c8cfa 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 d71ef0d1368d] 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 | 12 +- + 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 | 53 +++- + 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 | 86 ++++-- + 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, 1604 insertions(+), 615 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 (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry) +$ git merge edac-amd/for-next +Auto-merging arch/arm/boot/dts/socfpga_arria10.dtsi +Merge made by the 'recursive' strategy. + .../bindings/arm/altera/socfpga-eccmgr.txt | 38 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 16 + + drivers/edac/Kconfig | 7 + + drivers/edac/altera_edac.c | 492 ++++++++++++++++++--- + drivers/edac/altera_edac.h | 17 +- + drivers/edac/amd64_edac.c | 4 +- + drivers/edac/edac_mc_sysfs.c | 20 +- + 7 files changed, 519 insertions(+), 75 deletions(-) +Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Auto-merging drivers/irqchip/Makefile +Merge made by the 'recursive' strategy. + .../interrupt-controller/aspeed,ast2400-vic.txt | 22 ++ + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-aspeed-vic.c | 230 +++++++++++++++++++++ + 3 files changed, 253 insertions(+) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-vic.txt + create mode 100644 drivers/irqchip/irq-aspeed-vic.c +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 (6fdb862130dd fixup! rcu: Consolidate expedited grace period machinery) +$ 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 e6666236c065] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++ + .../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 +++++++++++ + .../Expedited-Grace-Periods.html | 1477 ++++++++++++++++++++ + .../RCU/Design/Requirements/Requirements.html | 35 + + Documentation/RCU/stallwarn.txt | 2 +- + Documentation/RCU/torture.txt | 15 - + 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 | 592 +------- + kernel/rcu/tree.h | 15 + + kernel/rcu/tree_exp.h | 652 +++++++++ + kernel/rcu/tree_plugin.h | 96 +- + kernel/rcu/update.c | 7 +- + kernel/rcu/waketorture.c | 537 +++++++ + kernel/sysctl.c | 11 + + kernel/torture.c | 203 +-- + 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 + + 38 files changed, 4809 insertions(+), 827 deletions(-) + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg + create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html + create mode 100644 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 0ff3b1af01f7] Merge remote-tracking branch 'rcu/rcu/next' + Date: Fri Jul 1 13:50:11 2016 +1000 +Merging kvm/linux-next (8ff7b956471f Merge tag 'kvm-s390-next-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ 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/kvm/lapic.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/mm/pgalloc.c +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kvm/intercept.c +Auto-merging arch/s390/include/asm/processor.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/include/asm/page.h +Auto-merging arch/s390/include/asm/mmu_context.h +Auto-merging arch/s390/include/asm/mmu.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 +Auto-merging arch/arm/kvm/arm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 03558469e847] 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 | 377 ++--- + arch/s390/include/asm/cpacf.h | 10 + + arch/s390/include/asm/diag.h | 149 ++ + arch/s390/include/asm/gmap.h | 82 +- + arch/s390/include/asm/kvm_host.h | 31 +- + arch/s390/include/asm/mmu.h | 11 +- + arch/s390/include/asm/mmu_context.h | 3 +- + arch/s390/include/asm/page.h | 9 +- + arch/s390/include/asm/pgalloc.h | 2 + + arch/s390/include/asm/pgtable.h | 17 +- + arch/s390/include/asm/processor.h | 2 + + arch/s390/include/asm/sclp.h | 23 +- + arch/s390/include/uapi/asm/kvm.h | 41 + + 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 | 387 ++++- + arch/s390/kvm/gaccess.h | 3 + + arch/s390/kvm/guestdbg.c | 2 +- + arch/s390/kvm/intercept.c | 15 + + arch/s390/kvm/interrupt.c | 31 +- + arch/s390/kvm/kvm-s390.c | 376 ++++- + arch/s390/kvm/kvm-s390.h | 19 +- + arch/s390/kvm/priv.c | 218 ++- + arch/s390/kvm/sigp.c | 10 +- + arch/s390/kvm/sthyi.c | 471 ++++++ + arch/s390/kvm/trace.h | 49 +- + arch/s390/kvm/vsie.c | 1091 +++++++++++++ + arch/s390/mm/fault.c | 2 + + arch/s390/mm/gmap.c | 1602 ++++++++++++++++++-- + arch/s390/mm/pgalloc.c | 39 +- + arch/s390/mm/pgtable.c | 209 ++- + 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 +- + include/linux/page_ref.h | 9 + + virt/kvm/Kconfig | 3 - + virt/kvm/kvm_main.c | 27 +- + 84 files changed, 6666 insertions(+), 1907 deletions(-) + create mode 100644 arch/mips/kvm/mmu.c + create mode 100644 arch/s390/kvm/sthyi.c + create mode 100644 arch/s390/kvm/vsie.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 9f9adce6b89b] Merge remote-tracking branch 'kvm/linux-next' + Date: Fri Jul 1 13:59:02 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 fcc4fd427102] Merge remote-tracking branch 'kvm/linux-next' + Date: Fri Jul 1 13:59:02 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 (fd7bacbca47a KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Resolved 'arch/powerpc/kernel/traps.c' using previous resolution. +Auto-merging arch/powerpc/platforms/powernv/opal-wrappers.S +Auto-merging arch/powerpc/kernel/traps.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6c252f1e40ba] Merge remote-tracking branch 'kvm-ppc-paulus/kvm-ppc-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/include/asm/hmi.h | 45 +++++++ + arch/powerpc/include/asm/paca.h | 6 + + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 4 +- + arch/powerpc/kernel/hmi.c | 56 ++++++++ + arch/powerpc/kernel/idle_power7.S | 5 +- + arch/powerpc/kernel/traps.c | 5 + + arch/powerpc/kvm/book3s_hv.c | 37 ++++++ + arch/powerpc/kvm/book3s_hv_ras.c | 176 +++++++++++++++++++++++++ + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 65 ++++++++- + arch/powerpc/kvm/book3s_pr.c | 12 +- + arch/powerpc/kvm/emulate.c | 1 - + arch/powerpc/platforms/powernv/opal-wrappers.S | 2 - + 13 files changed, 407 insertions(+), 9 deletions(-) + create mode 100644 arch/powerpc/include/asm/hmi.h + create mode 100644 arch/powerpc/kernel/hmi.c +Merging kvms390/next (a411edf1320e KVM: s390: vsie: add module parameter "nested") +$ 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/arm64/kernel/setup.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/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 +++-- + 24 files changed, 836 insertions(+), 248 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 (ab9bb11ccbaa dell-wmi: Add a WMI event code for display on/off) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/dell-wmi.c | 293 +++++++++++++++++++++++----------------- + 1 file changed, 169 insertions(+), 124 deletions(-) +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe) +$ 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/clients/ssi_protocol.c | 110 +++++++++------ + drivers/hsi/controllers/omap_ssi.h | 18 +-- + drivers/hsi/controllers/omap_ssi_core.c | 46 +++--- + drivers/hsi/controllers/omap_ssi_port.c | 226 +++++++++++++++++------------- + drivers/hsi/{hsi.c => hsi_core.c} | 16 +-- + include/linux/hsi/hsi.h | 2 +- + 10 files changed, 239 insertions(+), 190 deletions(-) + rename drivers/hsi/{hsi.c => hsi_core.c} (97%) +Merging leds/for-next (b1ae40a5db61 leds: Only descend into leds directory when CONFIG_NEW_LEDS is set) +$ git merge leds/for-next +Auto-merging drivers/leds/trigger/ledtrig-disk.c +Auto-merging drivers/ide/ide-disk.c +Auto-merging drivers/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/common.txt | 4 +- + .../devicetree/bindings/leds/leds-gpio.txt | 4 +- + .../devicetree/bindings/leds/leds-pca9532.txt | 39 +++++++++++ + Documentation/laptops/asus-laptop.txt | 2 +- + Documentation/leds/leds-class.txt | 2 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/am57xx-beagle-x15.dts | 2 +- + arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +- + arch/arm/boot/dts/kirkwood-topkick.dts | 2 +- + arch/arm/configs/collie_defconfig | 2 +- + arch/arm/configs/ixp4xx_defconfig | 2 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-omap1/board-osk.c | 2 +- + arch/arm/mach-pxa/spitz.c | 2 +- + arch/mips/configs/malta_qemu_32r6_defconfig | 2 +- + arch/mips/configs/maltaaprp_defconfig | 2 +- + arch/mips/configs/maltasmvp_eva_defconfig | 2 +- + arch/mips/configs/maltaup_defconfig | 2 +- + arch/mips/configs/rbtx49xx_defconfig | 2 +- + arch/mips/txx9/generic/setup.c | 2 +- + arch/mips/txx9/rbtx4939/setup.c | 2 +- + arch/parisc/configs/generic-32bit_defconfig | 2 +- + arch/parisc/configs/generic-64bit_defconfig | 2 +- + arch/powerpc/boot/dts/mpc8315erdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8377_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8378_rdb.dts | 2 +- + arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 +- + arch/powerpc/configs/pmac32_defconfig | 2 +- + arch/powerpc/configs/ppc6xx_defconfig | 2 +- + arch/unicore32/configs/unicore32_defconfig | 2 +- + arch/unicore32/kernel/gpio.c | 2 +- + drivers/Makefile | 2 +- + drivers/ata/libata-core.c | 4 ++ + drivers/ide/ide-disk.c | 2 +- + drivers/leds/leds-hp6xx.c | 2 +- + drivers/leds/leds-pca9532.c | 75 ++++++++++++++++++++-- + drivers/leds/trigger/Kconfig | 8 +-- + drivers/leds/trigger/Makefile | 2 +- + .../trigger/{ledtrig-ide-disk.c => ledtrig-disk.c} | 19 ++++-- + drivers/macintosh/Kconfig | 13 ++-- + drivers/macintosh/via-pmu-led.c | 4 +- + include/dt-bindings/leds/leds-pca9532.h | 18 ++++++ + include/linux/leds-pca9532.h | 9 ++- + include/linux/leds.h | 14 +++- + 44 files changed, 208 insertions(+), 66 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-pca9532.txt + rename drivers/leds/trigger/{ledtrig-ide-disk.c => ledtrig-disk.c} (55%) + create mode 100644 include/dt-bindings/leds/leds-pca9532.h +Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_si_intf.c | 73 ---------------------------------------- + 1 file changed, 73 deletions(-) +Merging driver-core/driver-core-next (33688abb2802 Linux 4.7-rc4) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (98f2082c3ac4 tty/serial: atmel: enforce tasklet init and termination sequences) +$ git merge tty/tty-next +Auto-merging drivers/tty/vt/vt.c +Removing drivers/tty/serial/msm_serial.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/serial/8250.txt | 19 + + .../bindings/serial/renesas,sci-serial.txt | 6 + + MAINTAINERS | 1 + + arch/frv/include/asm/serial.h | 4 - + arch/xtensa/platforms/xt2000/setup.c | 1 - + drivers/dma/hsu/hsu.c | 90 ++++- + drivers/dma/hsu/pci.c | 11 +- + drivers/tty/cyclades.c | 4 - + drivers/tty/ipwireless/tty.c | 11 +- + drivers/tty/mxser.c | 1 - + drivers/tty/serial/8250/8250.h | 51 ++- + drivers/tty/serial/8250/8250_core.c | 19 +- + drivers/tty/serial/8250/8250_dma.c | 1 + + drivers/tty/serial/8250/8250_early.c | 1 + + drivers/tty/serial/8250/8250_fintek.c | 36 +- + drivers/tty/serial/8250/8250_ingenic.c | 2 - + drivers/tty/serial/8250/8250_mid.c | 24 +- + drivers/tty/serial/8250/8250_mtk.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 35 +- + drivers/tty/serial/8250/8250_pci.c | 28 +- + drivers/tty/serial/8250/8250_port.c | 71 ++-- + drivers/tty/serial/8250/8250_uniphier.c | 2 +- + drivers/tty/serial/8250/Kconfig | 6 +- + drivers/tty/serial/Kconfig | 3 +- + drivers/tty/serial/amba-pl011.c | 8 +- + drivers/tty/serial/atmel_serial.c | 143 ++++--- + drivers/tty/serial/bcm63xx_uart.c | 8 +- + drivers/tty/serial/fsl_lpuart.c | 8 +- + drivers/tty/serial/m32r_sio.c | 23 +- + drivers/tty/serial/max310x.c | 176 +++++---- + drivers/tty/serial/mps2-uart.c | 29 +- + drivers/tty/serial/msm_serial.c | 197 +++++++++- + drivers/tty/serial/msm_serial.h | 184 --------- + drivers/tty/serial/mvebu-uart.c | 2 + + drivers/tty/serial/pic32_uart.c | 1 - + drivers/tty/serial/pmac_zilog.c | 2 +- + drivers/tty/serial/pxa.c | 30 +- + drivers/tty/serial/samsung.c | 38 +- + drivers/tty/serial/samsung.h | 38 +- + drivers/tty/serial/serial-tegra.c | 7 +- + drivers/tty/serial/serial_core.c | 8 +- + drivers/tty/serial/serial_mctrl_gpio.c | 36 ++ + drivers/tty/serial/serial_mctrl_gpio.h | 15 +- + drivers/tty/serial/sh-sci.c | 196 ++++++++-- + drivers/tty/serial/sh-sci.h | 25 +- + drivers/tty/serial/sirfsoc_uart.h | 4 +- + drivers/tty/serial/vt8500_serial.c | 30 +- + drivers/tty/serial/xilinx_uartps.c | 30 +- + drivers/tty/vt/consolemap.c | 13 +- + drivers/tty/vt/keyboard.c | 16 +- + drivers/tty/vt/vt.c | 431 ++++++++++----------- + drivers/tty/vt/vt_ioctl.c | 8 +- + drivers/usb/misc/sisusbvga/sisusb.c | 28 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 87 +---- + drivers/usb/misc/sisusbvga/sisusb_init.h | 2 +- + drivers/video/console/dummycon.c | 3 - + drivers/video/console/fbcon.c | 53 ++- + drivers/video/console/mdacon.c | 45 --- + drivers/video/console/newport_con.c | 42 -- + drivers/video/console/sticon.c | 29 -- + drivers/video/console/vgacon.c | 29 +- + include/linux/console.h | 13 +- + include/linux/console_struct.h | 38 +- + include/linux/dma/hsu.h | 14 +- + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 8 +- + include/linux/vt_kern.h | 7 +- + net/irda/ircomm/ircomm_tty_ioctl.c | 8 - + 68 files changed, 1398 insertions(+), 1144 deletions(-) + delete mode 100644 drivers/tty/serial/msm_serial.h +Merging usb/usb-next (215db9481814 Merge tag 'usb-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next) +$ git merge usb/usb-next +Removing include/linux/usb/xhci_pdriver.h +Removing include/linux/usb/msm_hsusb.h +Removing drivers/usb/gadget/udc/udc-core.c +Removing drivers/usb/dwc3/platform_data.h +Auto-merging drivers/power/Kconfig +Auto-merging drivers/phy/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/usb-ohci.txt | 2 +- + arch/arm/boot/dts/sama5d2.dtsi | 2 +- + drivers/phy/Kconfig | 1 + + drivers/power/Kconfig | 1 + + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/common/common.c | 26 +- + drivers/usb/dwc2/Kconfig | 1 + + drivers/usb/dwc2/core.h | 8 +- + drivers/usb/dwc2/gadget.c | 574 ++++++-- + drivers/usb/dwc2/hcd_queue.c | 3 +- + drivers/usb/dwc2/hw.h | 14 + + drivers/usb/dwc3/core.c | 388 ++--- + drivers/usb/dwc3/core.h | 59 +- + drivers/usb/dwc3/debug.h | 140 +- + drivers/usb/dwc3/debugfs.c | 191 +-- + drivers/usb/dwc3/dwc3-omap.c | 53 +- + drivers/usb/dwc3/dwc3-pci.c | 161 ++- + drivers/usb/dwc3/ep0.c | 26 +- + drivers/usb/dwc3/gadget.c | 863 ++++++----- + drivers/usb/dwc3/gadget.h | 4 +- + drivers/usb/dwc3/host.c | 18 +- + drivers/usb/dwc3/io.h | 7 +- + drivers/usb/dwc3/platform_data.h | 53 - + drivers/usb/dwc3/trace.h | 96 +- + drivers/usb/early/ehci-dbgp.c | 4 +- + drivers/usb/gadget/Kconfig | 2 +- + drivers/usb/gadget/config.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 192 ++- + drivers/usb/gadget/function/f_mass_storage.c | 22 +- + drivers/usb/gadget/function/u_serial.c | 3 +- + drivers/usb/gadget/legacy/g_ffs.c | 15 +- + drivers/usb/gadget/udc/Kconfig | 4 +- + drivers/usb/gadget/udc/Makefile | 5 + + drivers/usb/gadget/udc/amd5536udc.c | 9 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 2 + + drivers/usb/gadget/udc/bdc/bdc_cmd.c | 3 - + drivers/usb/gadget/udc/bdc/bdc_ep.c | 6 +- + drivers/usb/gadget/udc/core.c | 1523 ++++++++++++++++++++ + drivers/usb/gadget/udc/dummy_hcd.c | 5 - + drivers/usb/gadget/udc/m66592-udc.c | 24 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 23 +- + drivers/usb/gadget/udc/mv_udc_core.c | 9 +- + drivers/usb/gadget/udc/net2272.c | 4 - + drivers/usb/gadget/udc/net2280.c | 51 +- + drivers/usb/gadget/udc/net2280.h | 1 + + drivers/usb/gadget/udc/pch_udc.c | 36 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 9 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 24 +- + drivers/usb/gadget/udc/trace.c | 18 + + drivers/usb/gadget/udc/trace.h | 298 ++++ + drivers/usb/gadget/udc/udc-core.c | 800 ---------- + drivers/usb/gadget/udc/udc-xilinx.c | 3 - + drivers/usb/host/Kconfig | 2 +- + drivers/usb/host/ehci-platform.c | 37 +- + drivers/usb/host/ohci-platform.c | 43 +- + drivers/usb/host/xhci-mem.c | 74 +- + drivers/usb/host/xhci-plat.c | 8 +- + drivers/usb/host/xhci-ring.c | 457 +++--- + drivers/usb/host/xhci.c | 5 +- + drivers/usb/host/xhci.h | 10 +- + drivers/usb/image/microtek.h | 6 +- + drivers/usb/misc/usb3503.c | 25 + + drivers/usb/phy/Kconfig | 11 +- + drivers/usb/phy/phy-am335x.c | 2 +- + drivers/usb/phy/phy-msm-usb.c | 178 ++- + drivers/usb/phy/phy-omap-otg.c | 2 +- + drivers/usb/renesas_usbhs/common.c | 2 +- + drivers/usb/renesas_usbhs/fifo.c | 18 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 9 +- + drivers/usb/renesas_usbhs/rcar3.c | 2 +- + drivers/usb/usbip/usbip_common.h | 2 +- + drivers/usb/usbip/vudc_sysfs.c | 2 +- + include/linux/usb/gadget.h | 589 +------- + include/linux/usb/msm_hsusb.h | 200 --- + include/linux/usb/of.h | 4 +- + include/linux/usb/xhci_pdriver.h | 27 - + 76 files changed, 4418 insertions(+), 3087 deletions(-) + delete mode 100644 drivers/usb/dwc3/platform_data.h + create mode 100644 drivers/usb/gadget/udc/core.c + create mode 100644 drivers/usb/gadget/udc/trace.c + create mode 100644 drivers/usb/gadget/udc/trace.h + delete mode 100644 drivers/usb/gadget/udc/udc-core.c + delete mode 100644 include/linux/usb/msm_hsusb.h + delete mode 100644 include/linux/usb/xhci_pdriver.h +Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable()) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (33688abb2802 Linux 4.7-rc4) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (ebfad91c5da3 dt-bindings: ci-hdrc-usb2: s/gadget-itc-setting/itc-setting in example) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 2 +- + drivers/usb/chipidea/Kconfig | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging staging/staging-next (3c9a6793bde1 Merge tag 'iio-for-4.8b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) +$ git merge staging/staging-next +Auto-merging tools/iio/iio_generic_buffer.c +Auto-merging include/linux/fence.h +Removing drivers/staging/wilc1000/wilc_msgqueue.h +Removing drivers/staging/wilc1000/wilc_msgqueue.c +Removing drivers/staging/lustre/lustre/obdclass/acl.c +Removing drivers/staging/lustre/lustre/llite/remote_perm.c +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. +Removing drivers/staging/lustre/lustre/llite/llite_rmtacl.c +Auto-merging drivers/staging/iio/accel/sca3000_core.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/adc/ad7266.c +Auto-merging MAINTAINERS +Auto-merging .mailmap +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c drivers/staging/android/sync.h +drivers/staging/android/sync.h: needs merge +drivers/staging/lustre/lustre/llite/lloop.c: needs merge +rm 'drivers/staging/android/sync.h' +rm 'drivers/staging/lustre/lustre/llite/lloop.c' +$ git commit -v -a +[master 7aa436db469a] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 3 + + 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/dac/ad5755.txt | 124 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + MAINTAINERS | 2 + + drivers/iio/Kconfig | 8 + + drivers/iio/Makefile | 1 + + drivers/iio/accel/Kconfig | 24 +- + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/bma220_spi.c | 338 ++ + drivers/iio/accel/mma7660.c | 277 ++ + drivers/iio/accel/mma8452.c | 209 +- + 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-adc081c.c | 26 +- + drivers/iio/adc/ti-ads1015.c | 128 +- + drivers/iio/adc/ti_am335x_adc.c | 22 +- + drivers/iio/buffer/industrialio-buffer-dma.c | 4 +- + 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/dac/Kconfig | 9 +- + drivers/iio/dac/ad5755.c | 188 +- + drivers/iio/dac/stx104.c | 125 +- + 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 | 35 +- + drivers/iio/light/gp2ap020a00f.c | 18 +- + drivers/iio/light/isl29125.c | 10 +- + drivers/iio/light/jsa1212.c | 3 - + drivers/iio/light/tcs3414.c | 12 +- + drivers/iio/light/tcs3472.c | 13 +- + 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 | 13 +- + 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 | 12 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 14 +- + 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/fsl-mc/bus/dpbp.c | 132 +- + drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 86 +- + drivers/staging/fsl-mc/bus/dpmcp.c | 89 +- + drivers/staging/fsl-mc/bus/dpmng-cmd.h | 12 +- + drivers/staging/fsl-mc/bus/dpmng.c | 15 +- + drivers/staging/fsl-mc/bus/dprc-cmd.h | 379 ++- + drivers/staging/fsl-mc/bus/dprc-driver.c | 20 +- + drivers/staging/fsl-mc/bus/dprc.c | 715 ++-- + drivers/staging/fsl-mc/bus/mc-allocator.c | 2 +- + drivers/staging/fsl-mc/bus/mc-bus.c | 71 +- + drivers/staging/fsl-mc/bus/mc-msi.c | 17 +- + drivers/staging/fsl-mc/bus/mc-sys.c | 46 +- + drivers/staging/fsl-mc/include/dpbp-cmd.h | 125 +- + drivers/staging/fsl-mc/include/mc-cmd.h | 91 +- + drivers/staging/fsl-mc/include/mc.h | 21 +- + drivers/staging/iio/accel/sca3000_core.c | 2 + + drivers/staging/ks7010/Kconfig | 10 + + drivers/staging/ks7010/Makefile | 4 + + drivers/staging/ks7010/TODO | 36 + + drivers/staging/ks7010/eap_packet.h | 129 + + drivers/staging/ks7010/ks7010_sdio.c | 1236 +++++++ + drivers/staging/ks7010/ks7010_sdio.h | 147 + + drivers/staging/ks7010/ks_hostif.c | 2760 +++++++++++++++ + drivers/staging/ks7010/ks_hostif.h | 644 ++++ + drivers/staging/ks7010/ks_wlan.h | 505 +++ + drivers/staging/ks7010/ks_wlan_ioctl.h | 67 + + drivers/staging/ks7010/ks_wlan_net.c | 3528 ++++++++++++++++++++ + 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-dlc.h | 2 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 3 +- + drivers/staging/lustre/include/linux/lnet/types.h | 4 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 354 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 307 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 384 +-- + .../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 | 204 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 40 +- + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 2 +- + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 74 +- + drivers/staging/lustre/lnet/libcfs/debug.c | 8 +- + 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 | 8 +- + 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 | 8 +- + 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 | 16 +- + .../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 | 8 +- + .../lustre/lustre/include/lustre/ll_fiemap.h | 6 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 50 +- + .../lustre/lustre/include/lustre/lustre_user.h | 21 +- + 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 | 24 +- + .../staging/lustre/lustre/include/lustre_eacl.h | 17 +- + .../staging/lustre/lustre/include/lustre_export.h | 19 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 8 +- + 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 | 36 +- + 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 | 9 +- + drivers/staging/lustre/lustre/include/lustre_mds.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 421 ++- + .../staging/lustre/lustre/include/lustre_param.h | 6 +- + .../lustre/lustre/include/lustre_req_layout.h | 8 +- + drivers/staging/lustre/lustre/include/lustre_sec.h | 12 +- + drivers/staging/lustre/lustre/include/obd.h | 17 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 6 +- + drivers/staging/lustre/lustre/include/obd_class.h | 16 +- + .../staging/lustre/lustre/include/obd_support.h | 9 +- + 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 | 15 +- + .../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 | 22 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 19 +- + 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 | 12 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 8 +- + drivers/staging/lustre/lustre/llite/Makefile | 6 +- + drivers/staging/lustre/lustre/llite/dcache.c | 47 +- + drivers/staging/lustre/lustre/llite/dir.c | 55 +- + drivers/staging/lustre/lustre/llite/file.c | 97 +- + 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 | 14 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 6 +- + .../staging/lustre/lustre/llite/llite_internal.h | 132 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 125 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 18 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 24 +- + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 299 -- + drivers/staging/lustre/lustre/llite/lloop.c | 883 ----- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 18 +- + drivers/staging/lustre/lustre/llite/namei.c | 34 +- + drivers/staging/lustre/lustre/llite/remote_perm.c | 324 -- + drivers/staging/lustre/lustre/llite/rw.c | 151 +- + drivers/staging/lustre/lustre/llite/rw26.c | 23 +- + drivers/staging/lustre/lustre/llite/statahead.c | 16 +- + drivers/staging/lustre/lustre/llite/super25.c | 25 +- + drivers/staging/lustre/lustre/llite/symlink.c | 6 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 16 +- + 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 | 103 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 16 +- + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 6 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 32 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 6 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 39 +- + 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 | 22 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 10 +- + 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 | 18 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 120 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 8 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 88 +- + 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 | 14 +- + drivers/staging/lustre/lustre/obdclass/Makefile | 3 +- + drivers/staging/lustre/lustre/obdclass/acl.c | 415 --- + .../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 | 12 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 52 +- + 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 | 12 +- + 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 | 21 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 13 +- + 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 | 27 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 36 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 24 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 167 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 36 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 12 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 18 +- + 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 | 10 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 26 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 2 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 19 +- + drivers/staging/lustre/lustre/ptlrpc/pers.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 9 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 49 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 22 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 10 +- + 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 | 13 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 24 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 54 +- + drivers/staging/lustre/sysfs-fs-lustre | 8 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 54 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 34 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 6 +- + drivers/staging/rtl8192u/r8180_93cx6.c | 30 +- + drivers/staging/rtl8192u/r8180_93cx6.h | 2 +- + drivers/staging/rtl8192u/r8192U.h | 11 +- + drivers/staging/rtl8192u/r8192U_core.c | 198 +- + drivers/staging/rtl8192u/r8192U_wx.c | 80 +- + 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 +- + drivers/staging/wilc1000/Makefile | 1 - + drivers/staging/wilc1000/TODO | 5 + + drivers/staging/wilc1000/host_interface.c | 474 ++- + drivers/staging/wilc1000/host_interface.h | 4 - + drivers/staging/wilc1000/linux_wlan.c | 37 +- + drivers/staging/wilc1000/wilc_msgqueue.c | 144 - + drivers/staging/wilc1000/wilc_msgqueue.h | 28 - + drivers/staging/wilc1000/wilc_sdio.c | 2 +- + drivers/staging/wilc1000/wilc_spi.c | 2 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 3 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 10 +- + drivers/staging/wilc1000/wilc_wlan.c | 34 +- + include/linux/fence.h | 2 - + include/linux/iio/common/st_sensors.h | 4 +- + include/linux/iio/sw_device.h | 70 + + include/linux/mod_devicetable.h | 16 + + include/uapi/linux/iio/types.h | 1 + + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 12 + + tools/iio/Makefile | 21 +- + .../iio/{generic_buffer.c => iio_generic_buffer.c} | 261 +- + 448 files changed, 19732 insertions(+), 10666 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ad5755.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_sdio.c + create mode 100644 drivers/staging/ks7010/ks7010_sdio.h + 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/llite_rmtacl.c + delete mode 100644 drivers/staging/lustre/lustre/llite/lloop.c + delete mode 100644 drivers/staging/lustre/lustre/llite/remote_perm.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/acl.c + delete mode 100644 drivers/staging/wilc1000/wilc_msgqueue.c + delete mode 100644 drivers/staging/wilc1000/wilc_msgqueue.h + 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 9aff7978ef28] Merge remote-tracking branch 'staging/staging-next' + Date: Fri Jul 1 14:21:43 2016 +1000 +Merging char-misc/char-misc-next (e2402b1d214e nvmem: imx-ocotp: Fix assignment warning.) +$ 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 +- + drivers/nvmem/Kconfig | 4 +- + drivers/nvmem/imx-ocotp.c | 17 +- + drivers/nvmem/mtk-efuse.c | 47 +++-- + drivers/nvmem/mxs-ocotp.c | 83 +++----- + include/linux/nvmem-consumer.h | 2 +- + 12 files changed, 481 insertions(+), 180 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 (af61f96109b7 extcon: link devres into core module) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-arizona.txt | 3 +- + drivers/extcon/Makefile | 3 +- + drivers/extcon/devres.c | 216 +++++++++++++++++++++ + drivers/extcon/extcon-usb-gpio.c | 32 +-- + drivers/extcon/extcon.c | 141 +++----------- + include/linux/extcon.h | 39 ++-- + 6 files changed, 280 insertions(+), 154 deletions(-) + create mode 100644 drivers/extcon/devres.c +Merging cgroup/for-next (1f22cd881c59 Merge branch 'for-4.7-fixes' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 12 ++++-------- + kernel/cgroup_pids.c | 34 +++++++++++++++++++++++++++++++++- + 2 files changed, 37 insertions(+), 9 deletions(-) +Merging scsi/for-next (09aa8c2f3963 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 +- + MAINTAINERS | 11 +- + drivers/scsi/53c700.c | 2 +- + drivers/scsi/53c700.h | 14 +- + 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/cxlflash/main.c | 98 ++++++- + drivers/scsi/cxlflash/main.h | 2 + + drivers/scsi/cxlflash/sislite.h | 6 + + 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 | 24 +- + 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/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 +++ + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/scsi/vmw_pvscsi.h | 2 +- + drivers/scsi/wd7000.c | 6 +- + 40 files changed, 1289 insertions(+), 190 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 (c76004f3756d Merge branch 'for-4.8' 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/libata-transport.c | 9 +-- + drivers/ata/pata_arasan_cf.c | 2 +- + drivers/ata/pata_atiixp.c | 4 +- + drivers/ata/pata_marvell.c | 2 +- + drivers/phy/phy-brcm-sata.c | 81 ++++++++++++++++++++++ + 14 files changed, 195 insertions(+), 29 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 binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Auto-merging fs/open.c +Auto-merging fs/internal.h +Merge made by the 'recursive' strategy. + Documentation/binfmt_misc.txt | 7 +++++++ + fs/binfmt_misc.c | 41 +++++++++++++++++++++++++++++++++++++++-- + fs/internal.h | 1 + + fs/open.c | 20 ++++++++++++++++++++ + 4 files changed, 67 insertions(+), 2 deletions(-) +Merging pinctrl/for-next (69fc8ca00b5d 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 +++ + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 1 + + Documentation/pinctrl.txt | 24 +- + drivers/pinctrl/Kconfig | 26 +- + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 6 +- + drivers/pinctrl/core.c | 25 +- + drivers/pinctrl/core.h | 2 + + drivers/pinctrl/devicetree.c | 7 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 28 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 2 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 25 +- + drivers/pinctrl/intel/pinctrl-broxton.c | 43 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 155 ++- + drivers/pinctrl/intel/pinctrl-intel.c | 47 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 163 ++- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 96 -- + drivers/pinctrl/pinconf-generic.c | 14 +- + drivers/pinctrl/pinconf.c | 8 +- + drivers/pinctrl/pinctrl-amd.c | 23 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 26 +- + drivers/pinctrl/pinctrl-at91.c | 13 +- + drivers/pinctrl/pinctrl-digicolor.c | 16 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 20 +- + drivers/pinctrl/pinctrl-max77620.c | 673 +++++++++++++ + drivers/pinctrl/pinctrl-oxnas.c | 846 ++++++++++++++++ + drivers/pinctrl/pinctrl-rockchip.c | 4 +- + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/pinctrl-u300.c | 2 +- + drivers/pinctrl/pinctrl-xway.c | 72 +- + drivers/pinctrl/pinctrl-zynq.c | 13 +- + drivers/pinctrl/pinmux.c | 16 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 1 + + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 1 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 1 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 31 +- + 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 | 793 ++++++++------- + 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 +- + 58 files changed, 6370 insertions(+), 2252 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 (c93c7c21fd2b Merge branch 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 137 +++ + MAINTAINERS | 3 +- + drivers/remoteproc/Kconfig | 14 + + drivers/remoteproc/Makefile | 2 + + drivers/remoteproc/qcom_mdt_loader.c | 179 ++++ + drivers/remoteproc/qcom_mdt_loader.h | 13 + + drivers/remoteproc/qcom_q6v5_pil.c | 916 +++++++++++++++++++++ + drivers/remoteproc/remoteproc_core.c | 15 +- + 8 files changed, 1272 insertions(+), 7 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt + create mode 100644 drivers/remoteproc/qcom_mdt_loader.c + create mode 100644 drivers/remoteproc/qcom_mdt_loader.h + create mode 100644 drivers/remoteproc/qcom_q6v5_pil.c +Merging gpio/for-next (c35285cb1570 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging drivers/pinctrl/pinctrl-xway.c +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/Makefile +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/ia64/Kconfig +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-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 | 493 +++++++++++++++++++++ + 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 ++++++++ + 55 files changed, 1578 insertions(+), 110 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 (8910a6a600ee 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 c9e1cbc66217] 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 (aad82892af26 selinux: Add support for unprivileged mounts from user namespaces) +$ git merge userns/for-next +Resolved 'fs/proc/root.c' using previous resolution. +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/hooks.c +Auto-merging include/linux/fs.h +Auto-merging fs/proc/root.c +CONFLICT (content): Merge conflict in fs/proc/root.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6c9e40d021bf] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/block_dev.c | 2 +- + fs/devpts/inode.c | 3 +- + fs/exec.c | 2 +- + fs/kernfs/mount.c | 5 ++- + fs/namei.c | 8 +++- + fs/namespace.c | 99 ++++++++++++++++++++---------------------- + fs/nfsd/nfsctl.c | 13 ++---- + fs/proc/inode.c | 8 +++- + fs/proc/internal.h | 3 +- + fs/proc/root.c | 61 +++----------------------- + fs/super.c | 69 +++++++++++++++++++++++++---- + fs/sysfs/mount.c | 5 +-- + include/linux/fs.h | 24 ++++++++-- + include/linux/mount.h | 1 + + include/linux/user_namespace.h | 6 +++ + ipc/mqueue.c | 20 ++++----- + ipc/namespace.c | 5 ++- + kernel/user_namespace.c | 14 ++++++ + net/sunrpc/rpc_pipe.c | 8 ++-- + security/commoncap.c | 10 ++++- + security/selinux/hooks.c | 25 ++++++++++- + security/smack/smack.h | 8 +++- + security/smack/smack_lsm.c | 34 +++++++++++++-- + 23 files changed, 271 insertions(+), 162 deletions(-) +$ git am -3 ../patches/0001-proc-fixup-for-prevent-stacking-filesystems-on-top.patch +Applying: proc: fixup for "prevent stacking filesystems on top" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/proc/inode.c +$ git add -A . +$ git commit -v -a --amend +[master 31c508155dd2] Merge remote-tracking branch 'userns/for-next' + Date: Fri Jul 1 14:44:22 2016 +1000 +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (6db8c762c807 Merge tag 'imx-clk-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/clk.h +Auto-merging drivers/clk/rockchip/clk-rk3399.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 7 +- + .../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + + .../clock/renesas,rcar-gen2-cpg-clocks.txt | 1 + + drivers/clk/at91/clk-generated.c | 2 +- + drivers/clk/bcm/clk-iproc-armpll.c | 11 +- + drivers/clk/bcm/clk-iproc-asiu.c | 27 +- + drivers/clk/bcm/clk-iproc-pll.c | 32 +- + drivers/clk/clk-fixed-rate.c | 11 + + drivers/clk/clk-highbank.c | 9 +- + drivers/clk/clk-multiplier.c | 20 +- + drivers/clk/clk-nomadik.c | 48 +-- + drivers/clk/clk-oxnas.c | 4 +- + drivers/clk/clk-s2mps11.c | 21 +- + drivers/clk/clk-stm32f4.c | 12 +- + drivers/clk/clk-u300.c | 59 +-- + drivers/clk/clk-vt8500.c | 99 +++-- + drivers/clk/clk.c | 15 +- + drivers/clk/hisilicon/clk-hi3519.c | 116 +++++- + drivers/clk/hisilicon/clk-hi6220.c | 2 + + drivers/clk/hisilicon/clk.c | 89 ++++- + drivers/clk/hisilicon/clk.h | 34 +- + drivers/clk/hisilicon/clkdivider-hi6220.c | 2 + + drivers/clk/hisilicon/reset.c | 19 +- + drivers/clk/hisilicon/reset.h | 5 +- + drivers/clk/qcom/gcc-msm8996.c | 16 - + drivers/clk/renesas/Kconfig | 2 + + drivers/clk/renesas/Makefile | 4 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 374 +----------------- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 192 +++++++++ + drivers/clk/renesas/rcar-gen3-cpg.c | 359 +++++++++++++++++ + drivers/clk/renesas/rcar-gen3-cpg.h | 43 ++ + drivers/clk/renesas/renesas-cpg-mssr.c | 6 + + drivers/clk/renesas/renesas-cpg-mssr.h | 1 + + drivers/clk/rockchip/clk-cpu.c | 4 +- + drivers/clk/rockchip/clk-mmc-phase.c | 12 +- + drivers/clk/rockchip/clk-rk3399.c | 8 +- + drivers/clk/samsung/clk-cpu.c | 131 ++++++- + drivers/clk/samsung/clk-cpu.h | 4 +- + drivers/clk/samsung/clk-exynos-clkout.c | 2 + + drivers/clk/samsung/clk-exynos3250.c | 41 +- + drivers/clk/samsung/clk-exynos4.c | 64 ++- + drivers/clk/samsung/clk-exynos4415.c | 30 +- + drivers/clk/samsung/clk-exynos5250.c | 27 +- + drivers/clk/samsung/clk-exynos5260.c | 114 +++--- + drivers/clk/samsung/clk-exynos5410.c | 58 ++- + drivers/clk/samsung/clk-exynos5420.c | 40 +- + drivers/clk/samsung/clk-exynos5433.c | 432 +++++++++++++-------- + drivers/clk/samsung/clk-exynos5440.c | 12 +- + drivers/clk/samsung/clk-exynos7.c | 119 +++--- + drivers/clk/samsung/clk-pll.c | 122 +++--- + drivers/clk/samsung/clk-s3c2410-dclk.c | 5 +- + drivers/clk/samsung/clk-s3c2410.c | 2 - + drivers/clk/samsung/clk-s3c2412.c | 2 - + drivers/clk/samsung/clk-s3c2443.c | 2 - + drivers/clk/samsung/clk-s3c64xx.c | 2 - + drivers/clk/samsung/clk-s5pv210.c | 2 - + drivers/clk/samsung/clk.c | 14 +- + drivers/clk/samsung/clk.h | 22 +- + drivers/clk/st/clk-flexgen.c | 4 +- + drivers/clk/st/clkgen-fsyn.c | 10 +- + drivers/clk/st/clkgen-pll.c | 27 +- + include/dt-bindings/clock/exynos5433.h | 3 +- + include/dt-bindings/clock/hi6220-clock.h | 5 +- + include/linux/clk-provider.h | 1 + + include/linux/clk.h | 16 +- + 65 files changed, 1860 insertions(+), 1120 deletions(-) + create mode 100644 drivers/clk/renesas/r8a7796-cpg-mssr.c + create mode 100644 drivers/clk/renesas/rcar-gen3-cpg.c + create mode 100644 drivers/clk/renesas/rcar-gen3-cpg.h +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (cde07f453bed selftests: media_tests - Add media_device_open to .gitignore) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/vm/compaction_test.c +Merge made by the 'recursive' strategy. + tools/testing/selftests/lib/printf.sh | 0 + tools/testing/selftests/media_tests/.gitignore | 1 + + tools/testing/selftests/media_tests/Makefile | 4 +- + .../selftests/media_tests/bind_unbind_sample.sh | 12 ++++ + .../selftests/media_tests/media_device_open.c | 81 ++++++++++++++++++++++ + .../selftests/media_tests/media_device_test.c | 19 +++-- + .../selftests/media_tests/open_loop_test.sh | 10 +++ + .../selftests/media_tests/regression_test.txt | 43 ++++++++++++ + tools/testing/selftests/vm/compaction_test.c | 8 +-- + tools/testing/selftests/vm/on-fault-limit.c | 2 +- + 10 files changed, 167 insertions(+), 13 deletions(-) + mode change 100644 => 100755 tools/testing/selftests/lib/printf.sh + create mode 100755 tools/testing/selftests/media_tests/bind_unbind_sample.sh + create mode 100644 tools/testing/selftests/media_tests/media_device_open.c + create mode 100755 tools/testing/selftests/media_tests/open_loop_test.sh + create mode 100644 tools/testing/selftests/media_tests/regression_test.txt +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 (5beb8787baef coresight: add PM runtime calls to coresight_simple_func()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/coresight.txt | 35 +++++++++++---- + drivers/hwtracing/coresight/coresight-etb10.c | 6 +-- + drivers/hwtracing/coresight/coresight-etm4x.c | 30 +++---------- + drivers/hwtracing/coresight/coresight-priv.h | 8 +++- + drivers/hwtracing/coresight/coresight-stm.c | 22 ++++++++++ + drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 + + drivers/hwtracing/coresight/coresight-tmc-etr.c | 12 +++-- + drivers/hwtracing/coresight/coresight-tmc.c | 51 ++++++++++------------ + drivers/hwtracing/coresight/coresight-tmc.h | 4 +- + drivers/hwtracing/coresight/coresight.c | 27 +++++++----- + drivers/hwtracing/coresight/of_coresight.c | 2 +- + 11 files changed, 117 insertions(+), 82 deletions(-) +Merging rtc/rtc-next (803bb30145df rtc: m48t86: move m48t86.h to platform_data) +$ git merge rtc/rtc-next +Removing include/linux/ds17287rtc.h +Auto-merging drivers/rtc/rtc-mc146818-lib.c +Removing drivers/char/genrtc.c +Auto-merging drivers/char/Makefile +Auto-merging drivers/char/Kconfig +Auto-merging arch/x86/platform/efi/efi_64.c +Auto-merging arch/x86/platform/efi/efi.c +Removing arch/x86/include/asm/rtc.h +Auto-merging arch/x86/Kconfig +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/arm/mach-ep93xx/ts72xx.c | 2 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + 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/Kconfig | 4 +- + arch/mn10300/include/asm/rtc-regs.h | 4 +- + arch/mn10300/include/asm/rtc.h | 2 - + arch/mn10300/kernel/rtc.c | 104 +--- + arch/mn10300/proc-mn103e010/proc-init.c | 3 + + 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/Kconfig | 1 + + 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 | 28 +- + drivers/char/Makefile | 1 - + drivers/char/genrtc.c | 539 --------------------- + drivers/rtc/Kconfig | 20 +- + drivers/rtc/Makefile | 2 + + drivers/rtc/interface.c | 28 +- + drivers/rtc/rtc-cmos.c | 14 +- + drivers/rtc/rtc-ds1685.c | 34 +- + drivers/rtc/rtc-ds2404.c | 2 +- + drivers/rtc/rtc-efi.c | 6 + + drivers/rtc/rtc-generic.c | 36 +- + drivers/rtc/rtc-m48t86.c | 2 +- + drivers/rtc/rtc-max6916.c | 164 +++++++ + .../rtc.h => drivers/rtc/rtc-mc146818-lib.c | 69 +-- + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 4 +- + drivers/rtc/rtc-rv8803.c | 6 +- + include/linux/ds17287rtc.h | 66 --- + include/linux/mc146818rtc.h | 5 + + include/linux/{ => platform_data}/rtc-ds2404.h | 0 + .../linux/{m48t86.h => platform_data/rtc-m48t86.h} | 0 + tools/testing/selftests/timers/rtctest.c | 13 +- + 74 files changed, 468 insertions(+), 1263 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 + rename include/asm-generic/rtc.h => drivers/rtc/rtc-mc146818-lib.c (76%) + delete mode 100644 include/linux/ds17287rtc.h + rename include/linux/{ => platform_data}/rtc-ds2404.h (100%) + rename include/linux/{m48t86.h => platform_data/rtc-m48t86.h} (100%) +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 (a461529a9887 Merge branch 'for-4.8/mm' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Merge made by the 'recursive' strategy. + Documentation/nvdimm/btt.txt | 28 ++++++------------ + drivers/acpi/nfit.c | 23 ++++++++------- + drivers/acpi/nfit.h | 14 +++++---- + drivers/acpi/utils.c | 6 ++-- + drivers/nvdimm/blk.c | 11 +++---- + drivers/nvdimm/bus.c | 6 ++-- + drivers/nvdimm/claim.c | 5 ++-- + drivers/nvdimm/pfn_devs.c | 51 ++++++++++++++++++++++++++------- + drivers/nvdimm/pmem.c | 32 ++++++--------------- + drivers/nvdimm/pmem.h | 24 ++++++++++++++++ + fs/dax.c | 7 ++++- + include/linux/memremap.h | 2 +- + include/linux/pfn_t.h | 5 +++- + include/uapi/linux/ndctl.h | 1 + + kernel/memremap.c | 14 --------- + mm/Kconfig | 2 +- + tools/testing/nvdimm/Kbuild | 5 +++- + tools/testing/nvdimm/config_check.c | 1 + + tools/testing/nvdimm/pmem-dax.c | 54 +++++++++++++++++++++++++++++++++++ + tools/testing/nvdimm/test/iomap.c | 19 +++++++++++- + tools/testing/nvdimm/test/nfit.c | 48 ++++--------------------------- + tools/testing/nvdimm/test/nfit_test.h | 2 ++ + 22 files changed, 213 insertions(+), 147 deletions(-) + create mode 100644 drivers/nvdimm/pmem.h + create mode 100644 tools/testing/nvdimm/pmem-dax.c +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +$ git am -3 ../patches/0001-powerpc-fadump-add-missing-semicolon.patch +Applying: powerpc/fadump: add missing semicolon +Merging akpm-current/current (36ac8116836c ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'fs/ext4/fsync.c' +Resolved 'arch/arm64/mm/dma-mapping.c' using previous resolution. +Resolved 'ipc/sem.c' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/Kconfig +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/time/timekeeping.c +Auto-merging kernel/task_work.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/fork.c +Auto-merging ipc/sem.c +CONFLICT (content): Merge conflict in ipc/sem.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/nilfs2_ondisk.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/init.h +Auto-merging include/linux/fs.h +Auto-merging fs/super.c +Auto-merging fs/orangefs/inode.c +Auto-merging fs/ocfs2/aops.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/f2fs/data.c +Auto-merging fs/ext4/readpage.c +Auto-merging fs/ext4/fsync.c +CONFLICT (content): Merge conflict in fs/ext4/fsync.c +Auto-merging fs/exec.c +Auto-merging fs/cifs/file.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/iommu/amd_iommu_v2.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/mm/init.c +Auto-merging arch/s390/mm/fault.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/parisc/configs/generic-64bit_defconfig +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/mm/dma-mapping.c +CONFLICT (content): Merge conflict in arch/arm64/mm/dma-mapping.c +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/shmobile_defconfig +Auto-merging arch/arm/configs/qcom_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 +CONFLICT (modify/delete): arch/arm/configs/bcm_defconfig deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/arm/configs/bcm_defconfig left in tree. +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 +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/configs/bcm_defconfig +arch/arm/configs/bcm_defconfig: needs merge +rm 'arch/arm/configs/bcm_defconfig' +$ git commit -v -a +Recorded resolution for 'fs/ext4/fsync.c'. +[master ad375df72a85] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/blockdev/zram.txt | 82 +- + Documentation/filesystems/Locking | 14 +- + Documentation/filesystems/nilfs2.txt | 3 +- + Documentation/filesystems/proc.txt | 9 + + Documentation/filesystems/vfs.txt | 11 + + Documentation/ioctl/ioctl-number.txt | 2 +- + Documentation/kernel-parameters.txt | 6 +- + Documentation/vm/page_migration | 108 +- + Documentation/vm/transhuge.txt | 128 +- + Documentation/vm/unevictable-lru.txt | 21 + + MAINTAINERS | 3 +- + arch/alpha/kernel/machvec_impl.h | 2 +- + arch/alpha/mm/fault.c | 2 +- + arch/arc/mm/fault.c | 2 +- + arch/arc/mm/init.c | 2 +- + arch/arm/boot/dts/keystone.dtsi | 8 + + arch/arm/configs/axm55xx_defconfig | 2 +- + arch/arm/configs/bcm2835_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 | 2 +- + arch/arm/include/asm/tlb.h | 29 +- + arch/arm/kernel/machine_kexec.c | 2 +- + arch/arm/kernel/setup.c | 39 +- + arch/arm/mach-integrator/impd1.c | 4 +- + arch/arm/mach-mv78xx0/common.c | 2 +- + arch/arm/mm/dma-mapping.c | 26 +- + arch/arm/mm/fault.c | 2 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm64/configs/defconfig | 2 +- + arch/arm64/mm/dma-mapping.c | 6 +- + arch/arm64/mm/fault.c | 2 +- + arch/avr32/mm/fault.c | 2 +- + arch/blackfin/mm/init.c | 2 +- + arch/cris/mm/fault.c | 2 +- + arch/frv/mm/fault.c | 2 +- + arch/hexagon/mm/init.c | 2 +- + arch/hexagon/mm/vm_fault.c | 2 +- + arch/ia64/include/asm/tlb.h | 31 +- + arch/ia64/kernel/machine_kexec.c | 2 +- + arch/ia64/kernel/mca.c | 2 +- + arch/ia64/mm/fault.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/m32r/mm/fault.c | 2 +- + arch/m68k/mm/fault.c | 2 +- + arch/metag/mm/fault.c | 2 +- + arch/microblaze/mm/fault.c | 2 +- + arch/microblaze/mm/init.c | 4 +- + arch/microblaze/mm/pgtable.c | 2 +- + 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/mm/fault.c | 2 +- + arch/mips/mm/init.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + arch/mn10300/mm/fault.c | 2 +- + arch/nios2/mm/fault.c | 2 +- + arch/nios2/mm/init.c | 2 +- + arch/openrisc/mm/fault.c | 2 +- + arch/openrisc/mm/ioremap.c | 4 +- + arch/parisc/configs/generic-64bit_defconfig | 2 +- + arch/parisc/mm/fault.c | 2 +- + 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/pgtable.h | 6 +- + arch/powerpc/lib/alloc.c | 2 +- + arch/powerpc/mm/copro_fault.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/platforms/powermac/setup.c | 4 +- + arch/powerpc/platforms/ps3/device-init.c | 2 +- + arch/powerpc/sysdev/msi_bitmap.c | 2 +- + 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/fault.c | 2 +- + arch/score/mm/fault.c | 2 +- + arch/score/mm/init.c | 2 +- + 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/drivers/pci/pci.c | 4 +- + arch/sh/include/asm/tlb.h | 20 +- + arch/sh/mm/fault.c | 2 +- + arch/sh/mm/ioremap.c | 2 +- + arch/sparc/configs/sparc64_defconfig | 2 +- + arch/sparc/mm/fault_32.c | 4 +- + arch/sparc/mm/fault_64.c | 2 +- + arch/tile/mm/fault.c | 2 +- + arch/um/include/asm/tlb.h | 20 +- + arch/um/kernel/trap.c | 2 +- + arch/unicore32/mm/fault.c | 2 +- + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/include/asm/pgalloc.h | 12 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/init.c | 4 +- + arch/x86/mm/pgtable.c | 10 +- + arch/x86/platform/efi/early_printk.c | 4 +- + 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/mm/fault.c | 2 +- + block/genhd.c | 2 +- + drivers/acpi/osl.c | 5 +- + drivers/base/firmware_class.c | 183 +- + drivers/base/memory.c | 28 +- + drivers/base/node.c | 15 +- + 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/char/mem.c | 24 + + drivers/clk/clkdev.c | 4 +- + drivers/dax/dax.c | 8 +- + drivers/dax/pmem.c | 14 +- + drivers/iommu/amd_iommu_v2.c | 3 +- + drivers/iommu/intel-svm.c | 2 +- + drivers/memstick/core/ms_block.c | 17 +- + drivers/nvme/host/core.c | 16 +- + drivers/pci/xen-pcifront.c | 2 +- + drivers/tty/sysrq.c | 1 + + drivers/video/logo/logo.c | 4 +- + 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/datastream.c | 6 +- + fs/befs/io.c | 24 - + fs/befs/io.h | 2 - + fs/befs/linuxvfs.c | 40 +- + fs/befs/super.c | 2 +- + fs/btrfs/extent_io.c | 3 +- + fs/cifs/file.c | 2 +- + fs/compat.c | 14 - + fs/exec.c | 9 +- + fs/ext4/readpage.c | 2 +- + fs/f2fs/data.c | 3 +- + fs/fs-writeback.c | 111 +- + fs/inode.c | 2 + + 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/alloc.c | 37 + + fs/ocfs2/alloc.h | 2 + + fs/ocfs2/aops.c | 37 - + fs/ocfs2/dlmglue.c | 4 +- + fs/ocfs2/journal.c | 41 +- + fs/ocfs2/stack_user.c | 11 +- + fs/ocfs2/stackglue.c | 2 - + fs/ocfs2/suballoc.c | 17 +- + fs/orangefs/inode.c | 2 +- + fs/pipe.c | 32 +- + fs/proc/base.c | 192 +- + fs/proc/meminfo.c | 7 +- + fs/proc/stat.c | 10 +- + fs/proc/task_mmu.c | 10 +- + fs/reiserfs/ibalance.c | 3 +- + fs/super.c | 2 + + fs/userfaultfd.c | 22 +- + include/acpi/acpi_io.h | 2 +- + include/asm-generic/tlb.h | 59 +- + include/linux/balloon_compaction.h | 51 +- + include/linux/compaction.h | 1 + + include/linux/compat.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/firmware.h | 8 + + include/linux/frontswap.h | 34 +- + include/linux/fs.h | 7 + + include/linux/gfp.h | 10 +- + include/linux/huge_mm.h | 36 +- + include/linux/init.h | 6 - + include/linux/kexec.h | 46 +- + include/linux/khugepaged.h | 5 + + include/linux/ksm.h | 3 +- + include/linux/memblock.h | 20 +- + include/linux/memcontrol.h | 172 +- + include/linux/memory_hotplug.h | 2 + + include/linux/migrate.h | 17 + + include/linux/mm.h | 63 +- + include/linux/mm_types.h | 73 +- + include/linux/mmdebug.h | 2 + + include/linux/mmzone.h | 8 +- + include/linux/oom.h | 36 +- + include/linux/page-flags.h | 128 +- + include/linux/page_ext.h | 4 +- + include/linux/page_owner.h | 12 +- + include/linux/pagemap.h | 6 +- + include/linux/printk.h | 48 +- + include/linux/radix-tree.h | 1 + + include/linux/rmap.h | 2 +- + include/linux/sched.h | 27 + + include/linux/sem.h | 1 + + include/linux/shmem_fs.h | 45 +- + include/linux/slab_def.h | 13 +- + include/linux/slub_def.h | 20 +- + include/linux/timekeeping.h | 1 + + include/linux/userfaultfd_k.h | 8 +- + include/linux/vm_event_item.h | 7 + + include/linux/writeback.h | 3 + + include/net/net_namespace.h | 2 +- + include/trace/events/huge_memory.h | 39 +- + include/trace/events/writeback.h | 22 +- + 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 | 5 +- + init/main.c | 8 +- + ipc/msg.c | 5 +- + ipc/sem.c | 149 +- + ipc/shm.c | 10 +- + kernel/fork.c | 6 +- + kernel/futex.c | 2 + + kernel/kexec.c | 3 +- + kernel/kexec_core.c | 46 +- + kernel/ksysfs.c | 4 +- + kernel/printk/internal.h | 16 +- + kernel/printk/nmi.c | 13 +- + kernel/printk/printk.c | 129 +- + kernel/sysctl.c | 10 - + kernel/task_work.c | 10 +- + kernel/time/timekeeping.c | 13 + + lib/Kconfig | 7 + + lib/Kconfig.debug | 20 +- + lib/Kconfig.kasan | 4 +- + lib/Makefile | 1 + + lib/crc32.c | 16 +- + lib/crc64_ecma.c | 341 ++++ + lib/iommu-helper.c | 3 +- + lib/radix-tree.c | 84 +- + mm/Kconfig | 8 + + mm/Makefile | 2 +- + mm/balloon_compaction.c | 94 +- + mm/compaction.c | 125 +- + mm/filemap.c | 217 ++- + mm/frontswap.c | 35 +- + mm/gup.c | 9 +- + mm/huge_memory.c | 2011 ++++---------------- + mm/hugetlb.c | 54 +- + mm/internal.h | 4 + + mm/kasan/Makefile | 3 +- + mm/kasan/kasan.c | 61 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/report.c | 8 +- + mm/khugepaged.c | 1913 +++++++++++++++++++ + mm/ksm.c | 28 +- + mm/memblock.c | 3 + + mm/memcontrol.c | 262 ++- + mm/memory.c | 887 +++++---- + mm/memory_hotplug.c | 70 +- + mm/mempolicy.c | 4 +- + mm/migrate.c | 262 ++- + mm/mmap.c | 26 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 3 +- + mm/nommu.c | 3 +- + mm/oom_kill.c | 263 ++- + mm/page-writeback.c | 19 + + mm/page_alloc.c | 172 +- + mm/page_isolation.c | 7 +- + mm/page_owner.c | 153 +- + mm/readahead.c | 13 +- + mm/rmap.c | 78 +- + mm/shmem.c | 918 ++++++++- + mm/slab.c | 100 +- + mm/slab.h | 39 +- + mm/slab_common.c | 53 +- + mm/slub.c | 221 ++- + mm/sparse-vmemmap.c | 2 +- + mm/sparse.c | 2 +- + mm/swap.c | 2 + + mm/swapfile.c | 2 +- + mm/truncate.c | 28 +- + mm/util.c | 12 +- + mm/vmalloc.c | 6 +- + mm/vmscan.c | 8 +- + mm/vmstat.c | 8 +- + mm/workingset.c | 10 +- + 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/bloat-o-meter | 4 +- + scripts/tags.sh | 3 + + .../selftests/rcutorture/configs/lock/CFcommon | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 +- + tools/vm/page_owner_sort.c | 9 +- + 401 files changed, 10138 insertions(+), 5927 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 + create mode 100644 mm/khugepaged.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: 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() +Applying: include/linux/bitmap.h: cleanup +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 49a4f2700220...49289c88bf97 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (49289c88bf97 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..89391cc7f5fa --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160701 |