diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-02-26 17:33:55 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-02-26 17:33:55 +1100 |
| commit | 4639ea604f53d9804b19ec75d13648c8be3698da (patch) | |
| tree | 19ee53e7319ccf99428f6db36a66f4b7edb30730 | |
| parent | 2a4ee11d9d4efb92893c2d529a0cc5184124c9dc (diff) | |
| download | linux-next-20160226.tar.gz linux-next-20160226.tar.xz | |
Add linux-next specific files for 20160226next-20160226
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 241 | ||||
| -rw-r--r-- | Next/Trees | 243 | ||||
| -rw-r--r-- | Next/merge.log | 8717 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 9206 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ec668b5a775e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,241 @@ +Name SHA1 +---- ---- +origin 6dc390ad61ac8dfca5fa9b0823981fb6f7ec17a0 +fixes 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current 9ef2d8be55652804205a34dcbfec78b933c0ea30 +arm-current c7edd7f99cdaec65e9303b4c9edc19bb595564ed +m68k-current daf670bc9d36ba8b03e010f4bf798bebe08659fe +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-fixes 9ab3ac233a8b4ffcc27c8475b83dee49fc46bc76 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc ca0bb0798022732773752fee97bb633c6f3623d2 +net ee50c130c82175eaa0820c96b6d3763928af2241 +ipsec 3ed01df4ff79daba9f32a5b739aa504e9acadaea +ipvs 5acaf89f88b97849d550d6fbb10362e3d84b5082 +wireless-drivers c699404db182836498bd9d9a36ef044de2cab4fd +mac80211 b86071528f3261ab592fad5b9b1a02aea3dcabf3 +sound-current 2ae955774f29bbd7d16149cb0ae8d0319bf2ecc4 +pci-current 0a61cb947a5a2251c3b215493cc35ffb87b7347c +driver-core.current 18558cae0272f8fd9647e69d3fec1565a7949865 +tty.current 18558cae0272f8fd9647e69d3fec1565a7949865 +usb.current 428b315a2475d614d6efbdbeaa13f3977416b21a +usb-gadget-fixes 3b2435192fe917a826c91c8b34032428d6efdfc7 +usb-serial-fixes d061c1caa31d4d9792cfe48a2c6b309a0e01ef46 +usb-chipidea-fixes 8c0614ca312c847ca5409ea11c39434dec69631d +staging.current 7a64cd887fdb97f074c3fda03bee0bfb9faceac3 +char-misc.current 18558cae0272f8fd9647e69d3fec1565a7949865 +input-current ff84dabe3c6ebba517086e1161145d70ff129665 +crypto-current 8a3978ad55fb4c0564d285fb2f6cdee2313fce01 +ide e04a2bd6d8c95608cbb2c803ee2875cebfd89f52 +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes 16ab8a5cbea463e4d14bf0ce698f11fa64b70ae1 +kselftest-fixes 92e963f50fc74041b5e9e744c330dca48e04f08d +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes 9b18572e83bfd5378b3fcff3acf123f7bddf558a +asm-generic 040b323b5012b5503561ec7fe15cccd6a4bcaec2 +arc e75daf55992d74c25247460637ab6a1f2fbd879b +arm 113b44c6c25bee50fc98847aa73218610e6fceb9 +arm-perf 94085fe570e7b87597d4695e6fa77d4256efd29e +arm-soc 4455d3de7d77340f354ab36ab709e0ea37d3a6b9 +at91 799da647446d937431603c486cb19e9feabfd276 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +bcm2835-dt 1305141d1a7254b53b35303ee84f4c4948007bd0 +bcm2835-soc 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-drivers 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-defconfig 0a05d3b71ada526ef93019fb3fbd6a95561a8a5f +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 655f2d0d2295d7a7f7499d0ce442985478dd060e +keystone 8fdbbde4a16c8c14af47d74a5106664dc0cc2914 +mvebu 5be603bdf1a7b4c9ee619f201264d90384232d55 +omap 601052bca4737f07df0af3d9d76a89da5eff0ef3 +omap-pending 8fe097a3d99e22355fb8e3bcee59542bf3f46b2d +qcom 5b19b3012f3b0033399fc01fd31a2b3885b523e1 +renesas fd5c290b7efdaba5e77a1380ae3a8889e40a3dcd +rockchip 2def4fc4fc2d41ac434cc8dd2bfc75c294d17772 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 341080b4d9b4e660b7e7544d99f764b08ddcd6c6 +sunxi 73e5379b04422fa3639ef5076abedd317b2c0ebc +tegra 6af0a1cda78275b77e053f13e175ca1fdaef7082 +arm64 cac4b8cdf5a20a11d1725b832350c044d9e13d29 +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 11943fdd17d2333240c45c366d6b6b43fb2ad795 +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 7e26e9ff0a9301398bd7cf8d896536da3a54aa9a +m68k a9c9d9aca4e7cf75d09faa098785ed991db41c65 +m68knommu 0cdfea013ee86d983bfb4cb27c0d142b461ad122 +metag c8b6ad8b3f873ff5b971523f439f4b5a1ac75842 +microblaze c937adb7ec914b8ac66cdf6c00992537f4432860 +mips 606aab63d453b3d16879822650702e4e5030b512 +nios2 8e3d7c834ba0f79f200c155cf0647eacd39f2fbe +parisc-hd afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +powerpc c3ab300ea55541014348561e7690c41c79966ac6 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 44451d4d8f0e35153b3e7e3d40e198f2cf9ac36a +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 993e0681084c8e84dd870bffedec9410778dfa87 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile f1c3418ed4e686a7e7cf0ea4572b098ebfd7f59f +uml 288b31a382d2579ce4435742095a9c2af8577a14 +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa bb2f3486041aa126cb7ce4929f1e45ede85f0051 +btrfs 988f1f576d4f7531cb2175ee1b7cb7afd6d95d22 +btrfs-kdave b7364eb223db7e531377ee052e61e448605de13a +ceph cd8140c673d9ba9be3591220e1b2226d9e1e40d3 +cifs 6dc390ad61ac8dfca5fa9b0823981fb6f7ec17a0 +configfs 1609bac8af31f4a21bf330583c8a447e6f3d6155 +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 6332b9b5e79769b3e9d79d664896b872d7ba6a66 +ext4 d89b5f6318c2e4500ee89b7cc84a2ab72da4792e +f2fs 362977b0dbc624697a9dfbe557d62f17422852c6 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 0b5da8db145bfd44266ac964a2636a0cf8d7c286 +gfs2 a63be4e6d0e9bb7bf434f0202f277c930d730053 +jfs 26456955719b79cc4a011b18221aa68f599f6b6c +nfs 9fd4b9fc7695a4da1363a0b439853f88fb6a034f +nfsd b7052cd7bcf3c1478796e93e3dff2b44c9e82943 +orangefs c1223ca48baa867e9abc77fbb7f97500dc2a0cf8 +overlayfs 84889d49335627bc770b32787c1ef9ebad1da232 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 4fdd1d51ad5d059548c6539ac9d281f74d24bcbe +xfs e15c65b384619b2ca9e587b24e79d1fd36199046 +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 6f3925248b752402e147776aabb7ec87fb0eb4fe +pci a314966fad613dbe644066d34eee9edc8afd6258 +hid c2781579ce25b90ebb674b18eb5eab966a2bcafa +i2c 33f5ccc343b7d15ea53f29be21dded7e38dd6c2d +jdelvare-hwmon f02de116250d4ac6137cd3255be7d1f5678ac460 +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging e1370715b20e6e0f107b9582e17649872029f0ac +v4l-dvb 0d8f3357897d20fbbfce1531c5e93a24f9904f3e +kbuild c2fd1465f32935649022937ce998ab1b240956dd +kconfig c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a +libata 8490bda29ad107af9cd9518e87da1cafd1099ecc +pm 154b7d22e48085543b47bdfc85b477de33294ade +idle 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 98d94507e10c3c0a5cfc1c3ac4df23e761f1b874 +thermal-soc eb4fc33eb2680750e6dc06bd40bf6a203e7ad312 +ieee1394 5759139469899ea402c5953a8a38dd4f4c345b3c +dlm b81171cb6869111dbaf9fb642f4434514c21d696 +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 7a02d9b6888e50f392faa6490e1db59ddd1138db +net-next 619b17452a388d6be69a7b28dc92310ea3f5aa65 +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next f6ca9f46f6615c3a87529550058d1b468c0cad89 +wireless-drivers-next 0a44b22009d52f93b10f14bb4765915e8bafb6a5 +bluetooth 395174bb07c1dce58fbf2baa3a01bb69f5103c59 +mac80211-next b573213927c53d0711882cf6cd4221789ac7e334 +rdma 18558cae0272f8fd9647e69d3fec1565a7949865 +mtd 44248affb5d82d32cdb58a92a94ce191d4ddee60 +l2-mtd 46f0ba976663556c877f8ebc95a9449dcafe3aa8 +crypto 49abc0d2e19b28e90f443334fb6cd66f275713e6 +drm 0041ee4d3642f9ad80a479fbe51a4bc7f3cd8294 +drm-panel abf08d5efee4f96c9dec3905770d6b34aa190dd1 +drm-intel 032b612e055ecc52dc67aaf04dace8534d94ac80 +drm-tegra d50bbe33efb5b4ac113b53ce0df946683cfa61f0 +drm-misc a6ddd2f1b99f1c00b4e00289b13c3e451c7130b0 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 3932f008e3eb2f3fbf4033d6ac788e288e5f8342 +hdlcd 8bb912e606b7cd7bace02e9902f67f4efe1f864c +drm-vc4 fc04023fafecf19ebd09278d8d67dc5ed1f68b46 +sound 956dea9e911253e34fa1773da07a6c4044e20817 +sound-asoc 7135909be57e46b166990ccad743a97279a583dd +modules b37a05c083c85c2657dca9bbe1f5d79dccf756d5 +input 6ccb1d8f78bd349a8a5b2aa228d3c8b35ee704a8 +block ab3d8b3ecf770fa2655adce669cf7407321f0886 +device-mapper 01dd954e0fd8afb3846c444cff606907ee027344 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh af3d6866825fed999ef267adabf62d376ccdbdd5 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 93ac96deff4c1137f52d7a156d1432f44641771b +mfd 103d8a7bb8a2d1a71bcc426771019a0c88a22b0d +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 5c0e09e03fb5bc25ecb6a90c2bf89e0abc9f920f +omap_dss2 f059c4b220b821f8ed7b1b12387cce86373f666e +regulator 3c030f0deff79aedef26f705921ca25faa862a4b +security 602094428090ea17321afcb5edc572544b7ee368 +integrity 95ee08fa373b9ede1059c2f384cfeafe10dcd6bb +selinux 9090a2d5e3e6f1f1f1aabd44f9335ff873239b60 +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog 1926e54f115725a9248d0c4c65c22acaf94de4c4 +iommu fd6b6b40c17ec4192f7f01738bd2f97a05bb2574 +dwmw2-iommu 46924008273ed03bd11dbb32136e3da4cfe056e1 +vfio a13b64591747e8a4ab2df24540a17fca34de2d34 +jc_docs 510e64fb04231d8b723925bcc89d54324696e1e8 +trivial d00cd819d7dfb1a24d814457f47ff4d6c7be152c +audit fd97646b05957348e01be3d9de5c3d979b25c819 +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh 6338b8a12d0a2b8d990a58f9063c17924828c813 +mailbox be9c09bcca039d6df9ec736989cdafc68c93fed4 +spi 4483631212ee4bc70ef413665f80f90fb20b1b7e +tip 9d102a2e20020b971077af1f81d267ddbfa6e7f5 +clockevents 23cb25d0f407e83be10747258092843e8e20d535 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 7cc5a5d3cd4cca0a3852d1500e8c50fe191bcc9d +irqchip 95d4f352d26821ad2621351808c548c77278e77a +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace 7fd13615992ae0fc132c9abb24511be43f3b5d9d +rcu 2863b4e3dd92a9d697dd66b219710e478e0a4531 +kvm 433da86023f866820e9bcd7f0889d944005d311c +kvm-arm 67aaab4cff18a54fcb52ae4e971158c1bfea3d06 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus d3695aa4f452bc09c834a5010484f65fca37d87c +kvms390 1763f8d09d522b3ac998229dcf038476e88b78fc +xen-tip a4cdb556cae05cd3e7b602b3a44c01420c4e2258 +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues 23217b443b4b0439c8b55d3be0482d3cd7fbc5ac +drivers-x86 2d905b3e74adf1f8b108bb2cc1d3c675a9a3e8cf +chrome-platform ebaf31c46cce0dc8a6ed690b5456b295aa7586a6 +regmap 10c43341ac8429f320f6dc9b993f902fe1656203 +hsi 87d99063be016ceee90723a13365a40b21eec0d9 +leds 94b0580b6768f96115798f6815ccae7faccbcd8c +ipmi 42a018c63aee41d93962cf39e536c6f31fc023c1 +driver-core 112d125a89479519efc437b2961b8d4a98761c1b +tty a3f0b77f36ca5c5871fb8daf7e66fa409abe1ed5 +usb a057c3259ab6ecab477379d23e27ea0afdb219e6 +usb-gadget 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 +usb-serial 18558cae0272f8fd9647e69d3fec1565a7949865 +usb-chipidea-next 01b8479400abdd61b026df37a3a19de7b8df32f5 +staging c4e315884ed8524a4d4660bf4d9f37cfb750959a +char-misc 35bf7692e765c2275bf93fe573f7ca868ab73453 +extcon 0331966df0a288236bea6489420a35a0ca1e9043 +cgroup 468de7d807073649c7a7ee5cef8dd77508c27be4 +scsi 3f84575f934a4154e7ea3460cb4f39bbb18c1293 +target-updates fab683eb12e71ac6057dc42dc7d1e5e71e5cba5e +target-merge bc0195aad0daa2ad5b0d76cce22b167bc3435590 +pinctrl 683072c71ff13ab7c90e61da3a3b1f020e1d2c45 +vhost b91608c87c59f36a995ce6679abd8073a27a3727 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 531dd08c87bde251d493304832e835f5ae9b50b0 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm ff01c944cfa939f3474c28d88223213494aedf0b +dma-buf 0cbb0b92689a1c4e0ac55f6188be563a813ac808 +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest b953c0d234bc72e8489d3bf51a276c5c4ec85345 +clk 023bd7166be0595d18220dfd5c9765b3970f6ef3 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 6a81013efc4013555c5de34c01530b805f45c92c +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 3d6dee7af7fe11c2cea3d9ae70faedf2987ccf96 +y2038 477b8541b31fd4d32168514203a8da8b73884d90 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 +livepatching 4c5e6154516b636b9b8e7e145cacd02675a74afb +coresight 37fe87dbde1645471209f50461e7286029a3e77e +rtc ef1654006c2fac5934e5a9dc4035a5cef5a64914 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 +akpm-current c27b54512f7589fc48fd63ee941da2c39cbb34f8 +akpm 8404c72206cba1480a2c697cfc78f7bb0784ee10 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..208741a3448f --- /dev/null +++ b/Next/Trees @@ -0,0 +1,243 @@ +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://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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 +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-next +bcm2835-dt git git://github.com/anholt/linux.git#bcm2835-dt-next +bcm2835-soc git git://github.com/anholt/linux.git#bcm2835-soc-next +bcm2835-drivers git git://github.com/anholt/linux.git#bcm2835-drivers-next +bcm2835-defconfig git git://github.com/anholt/linux.git#bcm2835-defconfig-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +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 +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-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 +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +drm-vc4 git git://github.com/anholt/linux.git#drm-vc4-next +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 +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 git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.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 +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +jc_docs git git://git.lwn.net/linux.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/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 +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.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 +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://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +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 +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..49ce42023101 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8717 @@ +$ date -R +Fri, 26 Feb 2016 07:57:53 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 84e54c46b2f4 Merge tag 'dm-4.5-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm +Merging origin/master (6dc390ad61ac Merge tag 'arc-4.5-rc6-fixes-upd' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc) +$ git merge origin/master +Updating 84e54c46b2f4..6dc390ad61ac +Fast-forward + arch/arc/Kconfig | 18 ------- + arch/arc/Makefile | 4 -- + arch/arc/configs/axs101_defconfig | 4 +- + arch/arc/configs/axs103_defconfig | 10 +--- + arch/arc/configs/axs103_smp_defconfig | 10 +--- + arch/arc/configs/nsim_700_defconfig | 5 +- + arch/arc/configs/nsim_hs_defconfig | 3 +- + arch/arc/configs/nsim_hs_smp_defconfig | 6 +-- + arch/arc/configs/nsimosci_defconfig | 2 +- + arch/arc/configs/nsimosci_hs_defconfig | 3 +- + arch/arc/configs/nsimosci_hs_smp_defconfig | 12 +---- + arch/arc/configs/tb10x_defconfig | 18 +++---- + arch/arc/include/asm/arcregs.h | 32 +++++++----- + arch/arc/include/asm/irq.h | 2 - + arch/arc/include/asm/irqflags-arcv2.h | 11 ++++ + arch/arc/kernel/entry-arcv2.S | 11 ++-- + arch/arc/kernel/intc-compact.c | 3 -- + arch/arc/kernel/mcip.c | 60 +++++++++++----------- + arch/arc/kernel/setup.c | 80 +++++++++++++++++++----------- + arch/arc/kernel/smp.c | 3 -- + fs/affs/file.c | 5 +- + fs/pnode.c | 9 +++- + fs/read_write.c | 3 +- + fs/xattr.c | 6 +-- + mm/huge_memory.c | 9 ++-- + 25 files changed, 153 insertions(+), 176 deletions(-) +Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (9ef2d8be5565 arc: SMP: CONFIG_ARC_IPI_DBG cleanup) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (c7edd7f99cda ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/Makefile | 2 ++ + arch/arm/kernel/Makefile | 1 + + 2 files changed, 3 insertions(+) +Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1) +$ 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 mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) +$ git merge mips-fixes/mips-fixes +Already up-to-date. +Merging powerpc-fixes/fixes (9ab3ac233a8b powerpc/mm/hash: Clear the invalid slot information correctly) +$ git merge powerpc-fixes/fixes +Auto-merging arch/powerpc/kernel/eeh_driver.c +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/eeh_driver.c | 3 +-- + arch/powerpc/mm/hash64_64k.c | 8 +++++++- + arch/powerpc/mm/hugepage-hash64.c | 12 +++++++++++- + 3 files changed, 19 insertions(+), 4 deletions(-) +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver) +$ git merge sparc/master +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'recursive' strategy. + Documentation/watchdog/watchdog-parameters.txt | 4 + + arch/sparc/include/uapi/asm/unistd.h | 3 +- + arch/sparc/kernel/entry.S | 17 +++ + arch/sparc/kernel/hvcalls.S | 3 +- + arch/sparc/kernel/sparc_ksyms_64.c | 1 + + arch/sparc/kernel/syscalls.S | 36 +++++ + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + drivers/watchdog/Kconfig | 11 ++ + drivers/watchdog/Makefile | 1 + + drivers/watchdog/sun4v_wdt.c | 191 +++++++++++++++++++++++++ + 11 files changed, 268 insertions(+), 5 deletions(-) + create mode 100644 drivers/watchdog/sun4v_wdt.c +Merging net/master (ee50c130c821 net: jme: fix suspend/resume on JMC260) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/aurora/nb8800.c | 14 ++++++++- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +- + drivers/net/ethernet/jme.c | 3 +- + drivers/net/usb/qmi_wwan.c | 1 + + include/net/iw_handler.h | 6 ++++ + include/uapi/linux/bpf.h | 3 ++ + net/core/filter.c | 6 ++-- + net/ipv4/ip_output.c | 5 ++- + net/ipv4/ip_tunnel.c | 3 +- + net/ipv4/tcp_metrics.c | 2 +- + net/ipv4/udp_tunnel.c | 2 ++ + net/ipv6/ip6_gre.c | 2 ++ + net/ipv6/ip6_tunnel.c | 2 ++ + net/mac80211/agg-rx.c | 2 +- + net/mac80211/rc80211_minstrel.c | 2 +- + net/mac80211/rc80211_minstrel_ht.c | 14 +++++---- + net/wireless/core.c | 2 ++ + net/wireless/nl80211.c | 2 +- + net/wireless/sme.c | 6 ++++ + net/wireless/wext-core.c | 52 ++++++++++++++++++++++++------- + 20 files changed, 104 insertions(+), 28 deletions(-) +Merging ipsec/master (3ed01df4ff79 xfrm: Reset encapsulation field of the skb before transformation) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 1 + + net/core/flow.c | 14 +++++++++++++- + net/ipv4/ip_vti.c | 13 +++++++++++++ + net/xfrm/xfrm_output.c | 3 +++ + 4 files changed, 30 insertions(+), 1 deletion(-) +Merging ipvs/master (5acaf89f88b9 netfilter: ipvs: handle ip_vs_fill_iph_skb_off failure) +$ git merge ipvs/master +Merge made by the 'recursive' strategy. + include/net/ip_vs.h | 17 +++++++++++++++++ + net/netfilter/ipvs/ip_vs_core.c | 38 +++++++++++++++++++++++++++++--------- + net/netfilter/ipvs/ip_vs_pe_sip.c | 4 ++-- + 3 files changed, 48 insertions(+), 11 deletions(-) +Merging wireless-drivers/master (c699404db182 Merge tag 'iwlwifi-for-kalle-2016-02-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (b86071528f32 cfg80211: stop critical protocol session upon disconnect event) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (2ae955774f29 ALSA: hda - Fixup speaker pass-through control for nid 0x14 on ALC225) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_intel.c | 16 +++++++--------- + sound/pci/hda/patch_realtek.c | 31 +++++++++++++++++++++++++++++-- + 2 files changed, 36 insertions(+), 11 deletions(-) +Merging pci-current/for-linus (0a61cb947a5a Merge branch 'pci/host-hv' into for-linus) +$ git merge pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/x86/include/asm/pci.h | 15 + + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/pci/common.c | 26 +- + arch/x86/pci/intel_mid_pci.c | 9 +- + arch/x86/pci/irq.c | 23 +- + drivers/acpi/pci_irq.c | 17 +- + drivers/pci/Kconfig | 7 + + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-hyperv.c | 2346 ++++++++++++++++++++++++++++++++++++++++ + drivers/pci/probe.c | 15 + + include/linux/pci.h | 21 +- + 12 files changed, 2436 insertions(+), 47 deletions(-) + create mode 100644 drivers/pci/host/pci-hyperv.c +Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (428b315a2475 Merge tag 'fixes-for-v4.5-rc6' of http://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) +$ git merge usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 ++-- + drivers/usb/chipidea/ci_hdrc_pci.c | 4 +-- + drivers/usb/chipidea/debug.c | 3 ++ + drivers/usb/core/hub.c | 8 ++--- + drivers/usb/dwc2/Kconfig | 1 + + drivers/usb/dwc2/core.c | 6 ++++ + drivers/usb/dwc2/hcd_ddma.c | 23 ++++++------ + drivers/usb/dwc2/hcd_intr.c | 8 +++++ + drivers/usb/dwc3/core.h | 1 - + drivers/usb/dwc3/ep0.c | 5 --- + drivers/usb/dwc3/gadget.c | 70 +++++++++++++++++++++++++++---------- + drivers/usb/gadget/legacy/inode.c | 7 ++-- + drivers/usb/gadget/udc/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/udc/net2280.h | 15 ++++++-- + drivers/usb/gadget/udc/udc-core.c | 3 +- + drivers/usb/musb/musb_host.c | 8 ++--- + drivers/usb/phy/phy-msm-usb.c | 20 +++-------- + drivers/usb/serial/cp210x.c | 2 ++ + drivers/usb/serial/option.c | 9 +++++ + 19 files changed, 127 insertions(+), 75 deletions(-) +Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (d061c1caa31d USB: option: add "4G LTE usb-modem U901") +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (8c0614ca312c usb: chipidea: fix return value check in ci_hdrc_pci_probe()) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (7a64cd887fdb drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging char-misc.current/char-misc-linus (18558cae0272 Linux 4.5-rc4) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init()) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (16ab8a5cbea4 vfio/noiommu: Don't use iommu_present() to track fake groups) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (9b18572e83bf drm/i915/gen9: Verify and enforce dc6 state writes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_debugfs.c | 28 ++++-- + drivers/gpu/drm/i915/i915_drv.h | 1 + + drivers/gpu/drm/i915/intel_crt.c | 13 ++- + drivers/gpu/drm/i915/intel_csr.c | 2 + + drivers/gpu/drm/i915/intel_ddi.c | 112 +++++++++++++++++------- + drivers/gpu/drm/i915/intel_display.c | 86 ++++++++++++------ + drivers/gpu/drm/i915/intel_dp.c | 18 +++- + drivers/gpu/drm/i915/intel_drv.h | 3 + + drivers/gpu/drm/i915/intel_dsi.c | 13 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 14 ++- + drivers/gpu/drm/i915/intel_lvds.c | 14 ++- + drivers/gpu/drm/i915/intel_pm.c | 7 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 149 +++++++++++++++++++++++++++++--- + 13 files changed, 367 insertions(+), 93 deletions(-) +Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (e75daf55992d ARC: clockevent: Prepare for DT based probe) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 3 ++- + arch/arc/include/asm/irq.h | 4 --- + arch/arc/kernel/intc-compact.c | 3 ++- + arch/arc/kernel/irq.c | 41 ---------------------------- + arch/arc/kernel/setup.c | 2 -- + arch/arc/kernel/smp.c | 17 +++++++++--- + arch/arc/kernel/time.c | 61 ++++++++++++++++++++++++++++++++---------- + 7 files changed, 65 insertions(+), 66 deletions(-) +Merging arm/for-next (113b44c6c25b Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next) +$ git merge arm/for-next +Removing arch/arm/boot/compressed/piggy.xzkern.S +Removing arch/arm/boot/compressed/piggy.lzo.S +Removing arch/arm/boot/compressed/piggy.lzma.S +Removing arch/arm/boot/compressed/piggy.lz4.S +Auto-merging arch/arm/boot/compressed/piggy.S +Merge made by the 'recursive' strategy. + Documentation/DMA-attributes.txt | 26 ++ + Documentation/driver-model/porting.txt | 6 +- + arch/arm/Kconfig | 5 +- + arch/arm/Makefile | 1 - + arch/arm/boot/Makefile | 10 +- + arch/arm/boot/compressed/.gitignore | 6 +- + arch/arm/boot/compressed/Makefile | 31 +- + arch/arm/boot/compressed/{piggy.gzip.S => piggy.S} | 2 +- + arch/arm/boot/compressed/piggy.lz4.S | 6 - + arch/arm/boot/compressed/piggy.lzma.S | 6 - + arch/arm/boot/compressed/piggy.lzo.S | 6 - + arch/arm/boot/compressed/piggy.xzkern.S | 6 - + arch/arm/common/sa1111.c | 2 +- + arch/arm/include/asm/Kbuild | 1 - + arch/arm/include/asm/div64.h | 14 +- + arch/arm/include/asm/memory.h | 35 +-- + arch/arm/include/asm/mmu_context.h | 14 +- + arch/arm/include/asm/sections.h | 8 + + arch/arm/include/asm/sparsemem.h | 7 +- + arch/arm/kernel/entry-armv.S | 8 +- + arch/arm/kernel/hibernate.c | 4 +- + arch/arm/kernel/hyp-stub.S | 24 ++ + arch/arm/kernel/irq.c | 2 +- + arch/arm/kernel/machine_kexec.c | 16 +- + arch/arm/kernel/module.c | 2 +- + arch/arm/kernel/reboot.c | 2 +- + arch/arm/kernel/topology.c | 4 +- + arch/arm/kernel/vmlinux-xip.lds.S | 316 +++++++++++++++++++++ + arch/arm/kernel/vmlinux.lds.S | 60 ++-- + arch/arm/mach-davinci/include/mach/uncompress.h | 2 +- + arch/arm/mach-footbridge/Kconfig | 1 - + arch/arm/mach-keystone/keystone.c | 2 +- + arch/arm/mach-ks8695/include/mach/uncompress.h | 2 +- + arch/arm/mach-netx/include/mach/uncompress.h | 2 +- + arch/arm/mach-omap1/include/mach/uncompress.h | 2 +- + arch/arm/mach-rpc/include/mach/uncompress.h | 2 +- + arch/arm/mach-sa1100/include/mach/uncompress.h | 2 +- + arch/arm/mach-w90x900/include/mach/uncompress.h | 2 +- + arch/arm/mm/Kconfig | 36 +-- + arch/arm/mm/cache-tauros2.c | 32 ++- + arch/arm/mm/dma-mapping.c | 38 ++- + arch/arm/mm/idmap.c | 2 +- + arch/arm/mm/init.c | 24 +- + arch/arm/mm/mmu.c | 8 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/plat-orion/time.c | 13 + + arch/arm64/kernel/psci.c | 99 +------ + drivers/base/dd.c | 24 +- + drivers/clk/clkdev.c | 31 +- + drivers/firmware/psci.c | 120 ++++++++ + drivers/media/v4l2-core/videobuf2-dma-contig.c | 33 ++- + drivers/nvdimm/bus.c | 2 +- + include/linux/clkdev.h | 3 +- + include/linux/device.h | 7 +- + include/linux/dma-attrs.h | 1 + + include/linux/psci.h | 3 + + include/media/videobuf2-dma-contig.h | 11 +- + 57 files changed, 795 insertions(+), 341 deletions(-) + rename arch/arm/boot/compressed/{piggy.gzip.S => piggy.S} (67%) + delete mode 100644 arch/arm/boot/compressed/piggy.lz4.S + delete mode 100644 arch/arm/boot/compressed/piggy.lzma.S + delete mode 100644 arch/arm/boot/compressed/piggy.lzo.S + delete mode 100644 arch/arm/boot/compressed/piggy.xzkern.S + create mode 100644 arch/arm/include/asm/sections.h + create mode 100644 arch/arm/kernel/vmlinux-xip.lds.S +Merging arm-perf/for-next/perf (94085fe570e7 arm64: dts: Add Cavium ThunderX specific PMU) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/pmu.txt | 11 +++ + arch/arm/kernel/perf_event_v7.c | 13 ++- + arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 5 ++ + arch/arm64/kernel/perf_event.c | 120 +++++++++++++++++++++----- + drivers/perf/arm_pmu.c | 15 +++- + include/linux/perf/arm_pmu.h | 1 + + 6 files changed, 141 insertions(+), 24 deletions(-) +Merging arm-soc/for-next (4455d3de7d77 ARM: SoC: document merges) +$ git merge arm-soc/for-next +Removing drivers/rtc/rtc-max77802.c +Removing arch/arm/plat-versatile/clock.c +Removing arch/arm/mach-zynq/Makefile.boot +Removing arch/arm/mach-ux500/Makefile.boot +Removing arch/arm/mach-u300/Makefile.boot +Removing arch/arm/mach-spear/Makefile.boot +Removing arch/arm/mach-s3c64xx/Makefile.boot +Removing arch/arm/mach-realview/Makefile.boot +Removing arch/arm/mach-prima2/Makefile.boot +Removing arch/arm/mach-orion5x/Makefile.boot +Removing arch/arm/mach-omap2/Makefile.boot +Removing arch/arm/mach-nspire/Makefile.boot +Removing arch/arm/mach-mv78xx0/Makefile.boot +Removing arch/arm/mach-mmp/Makefile.boot +Removing arch/arm/mach-lpc32xx/timer.c +Removing arch/arm/mach-lpc32xx/clock.c +Removing arch/arm/mach-keystone/Makefile.boot +Removing arch/arm/mach-integrator/Makefile.boot +Removing arch/arm/mach-exynos/Makefile.boot +Removing arch/arm/mach-cns3xxx/Makefile.boot +Removing arch/arm/include/asm/clkdev.h +Auto-merging arch/arm/include/asm/Kbuild +Removing arch/arm/configs/realview-smp_defconfig +Removing arch/arm/boot/dts/kirkwood-lswxl.dts +Removing arch/arm/boot/dts/kirkwood-lswvl.dts +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/marvell/marvell,kirkwood.txt +Merge made by the 'recursive' strategy. + Documentation/arm/Marvell/README | 13 + + Documentation/devicetree/bindings/arm/arm-boards | 1 + + Documentation/devicetree/bindings/arm/axis.txt | 29 + + .../arm/{ => marvell}/armada-370-xp-pmsu.txt | 0 + .../bindings/arm/{ => marvell}/armada-370-xp.txt | 0 + .../bindings/arm/{ => marvell}/armada-375.txt | 0 + .../bindings/arm/marvell/armada-37xx.txt | 16 + + .../{ => marvell}/armada-380-mpcore-soc-ctrl.txt | 0 + .../bindings/arm/{ => marvell}/armada-38x.txt | 0 + .../bindings/arm/{ => marvell}/armada-39x.txt | 0 + .../arm/{ => marvell}/armada-cpu-reset.txt | 0 + .../arm/{ => marvell}/coherency-fabric.txt | 0 + .../bindings/arm/{ => marvell}/kirkwood.txt | 0 + .../bindings/arm/{ => marvell}/marvell,berlin.txt | 0 + .../bindings/arm/{ => marvell}/marvell,dove.txt | 0 + .../arm/{ => marvell}/marvell,kirkwood.txt | 7 +- + .../arm/{ => marvell}/mvebu-cpu-config.txt | 0 + .../arm/{ => marvell}/mvebu-system-controller.txt | 0 + .../devicetree/bindings/arm/{ => nxp}/lpc32xx.txt | 0 + .../devicetree/bindings/ata/ahci-platform.txt | 1 + + .../devicetree/bindings/display/arm,hdlcd.txt | 79 ++ + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 2 + + .../devicetree/bindings/pci/layerscape-pci.txt | 2 +- + .../pinctrl/marvell,armada-370-pinctrl.txt | 5 +- + .../devicetree/bindings/regulator/tps65217.txt | 10 - + .../bindings/reset/img,pistachio-reset.txt | 55 + + .../bindings/soc/rockchip/power_domain.txt | 21 + + MAINTAINERS | 32 +- + arch/arm/Kconfig | 12 +- + arch/arm/Kconfig.debug | 9 + + arch/arm/Makefile | 1 + + arch/arm/arm-soc-for-next-contents.txt | 135 ++ + arch/arm/boot/dts/Makefile | 9 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 14 +- + arch/arm/boot/dts/am335x-chilisom.dtsi | 14 +- + arch/arm/boot/dts/am335x-nano.dts | 14 +- + arch/arm/boot/dts/am335x-pepper.dts | 14 +- + arch/arm/boot/dts/am335x-shc.dts | 4 +- + arch/arm/boot/dts/am335x-sl50.dts | 13 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 4 + + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- + arch/arm/boot/dts/arm-realview-pb1176.dts | 118 ++ + arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 2 +- + arch/arm/boot/dts/armada-388-gp.dts | 36 +- + arch/arm/boot/dts/artpec6-devboard.dts | 64 + + arch/arm/boot/dts/artpec6.dtsi | 236 ++++ + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 22 + + arch/arm/boot/dts/cros-ec-keyboard.dtsi | 1 + + arch/arm/boot/dts/emev2.dtsi | 39 +- + arch/arm/boot/dts/exynos3250-monk.dts | 6 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 6 +- + arch/arm/boot/dts/exynos4.dtsi | 5 + + arch/arm/boot/dts/exynos4210-origen.dts | 10 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- + arch/arm/boot/dts/exynos4210-trats.dts | 2 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- + arch/arm/boot/dts/exynos4412-origen.dts | 2 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 4 +- + arch/arm/boot/dts/exynos5.dtsi | 5 + + arch/arm/boot/dts/exynos5250-arndale.dts | 12 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-spring.dts | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 2 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 406 +++++++ + arch/arm/boot/dts/exynos5410-smdk5410.dts | 41 + + arch/arm/boot/dts/exynos5410.dtsi | 47 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 11 +- + arch/arm/boot/dts/exynos5420-cpus.dtsi | 102 ++ + arch/arm/boot/dts/exynos5420-peach-pit.dts | 13 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 9 + + arch/arm/boot/dts/exynos5420.dtsi | 170 ++- + arch/arm/boot/dts/exynos5422-cpus.dtsi | 140 ++- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 8 + + arch/arm/boot/dts/exynos5800-peach-pi.dts | 13 +- + arch/arm/boot/dts/exynos5800.dtsi | 108 ++ + arch/arm/boot/dts/imx6qdl.dtsi | 1 - + arch/arm/boot/dts/kirkwood-ds112.dts | 2 +- + arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 192 +++ + .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 186 +++ + arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts | 135 ++ + arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 + + arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 + + arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 ++ + arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 ++ + arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 +++ + arch/arm/boot/dts/kirkwood-lswvl.dts | 302 ----- + arch/arm/boot/dts/kirkwood-lswxl.dts | 302 ----- + arch/arm/boot/dts/kirkwood-openrd-client.dts | 6 +- + arch/arm/boot/dts/kirkwood-openrd.dtsi | 41 +- + arch/arm/boot/dts/kirkwood.dtsi | 2 +- + arch/arm/boot/dts/lpc32xx.dtsi | 150 ++- + arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 31 + + arch/arm/boot/dts/phy3250.dts | 32 + + arch/arm/boot/dts/r7s72100.dtsi | 177 +-- + arch/arm/boot/dts/r8a73a4.dtsi | 224 ++-- + arch/arm/boot/dts/r8a7740.dtsi | 161 +-- + arch/arm/boot/dts/r8a7778-bockw.dts | 13 + + arch/arm/boot/dts/r8a7778.dtsi | 144 ++- + arch/arm/boot/dts/r8a7779-marzen.dts | 13 + + arch/arm/boot/dts/r8a7779.dtsi | 135 +- + arch/arm/boot/dts/r8a7790-lager.dts | 13 + + arch/arm/boot/dts/r8a7790.dtsi | 441 +++---- + arch/arm/boot/dts/r8a7791-koelsch.dts | 13 + + arch/arm/boot/dts/r8a7791-porter.dts | 165 +++ + arch/arm/boot/dts/r8a7791.dtsi | 514 ++++---- + arch/arm/boot/dts/r8a7793-gose.dts | 304 +++++ + arch/arm/boot/dts/r8a7793.dtsi | 758 +++++++++--- + arch/arm/boot/dts/r8a7794-alt.dts | 59 + + arch/arm/boot/dts/r8a7794-silk.dts | 122 ++ + arch/arm/boot/dts/r8a7794.dtsi | 362 +++--- + arch/arm/boot/dts/rk3036-kylin.dts | 104 ++ + arch/arm/boot/dts/rk3036.dtsi | 69 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 19 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 16 + + arch/arm/boot/dts/rk3066a-rayeager.dts | 18 +- + arch/arm/boot/dts/rk3066a.dtsi | 24 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 2 +- + arch/arm/boot/dts/rk3188.dtsi | 2 + + arch/arm/boot/dts/rk3288-evb.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 26 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 2 +- + arch/arm/boot/dts/rk3288-r89.dts | 2 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 26 + + arch/arm/boot/dts/rk3288-rock2-square.dts | 48 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 7 +- + arch/arm/boot/dts/rk3288.dtsi | 48 + + arch/arm/boot/dts/rk3xxx.dtsi | 3 + + arch/arm/boot/dts/s5pv210-aquila.dts | 4 +- + arch/arm/boot/dts/s5pv210-goni.dts | 4 +- + arch/arm/boot/dts/s5pv210-smdkv210.dts | 2 +- + arch/arm/boot/dts/sama5d2-pinfunc.h | 2 +- + arch/arm/boot/dts/sama5d2.dtsi | 18 +- + arch/arm/boot/dts/sh73a0.dtsi | 186 +-- + arch/arm/boot/dts/spear1310-evb.dts | 2 +- + arch/arm/boot/dts/spear1340-evb.dts | 2 +- + arch/arm/boot/dts/spear320-hmi.dts | 4 +- + arch/arm/boot/dts/stm32429i-eval.dts | 21 +- + arch/arm/boot/dts/stm32f429-disco.dts | 13 + + arch/arm/boot/dts/stm32f429.dtsi | 143 +++ + arch/arm/boot/dts/tps65217.dtsi | 56 + + arch/arm/configs/exynos_defconfig | 10 +- + arch/arm/configs/mini2440_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 5 +- + arch/arm/configs/mvebu_v5_defconfig | 1 + + arch/arm/configs/mvebu_v7_defconfig | 1 + + arch/arm/configs/realview-smp_defconfig | 105 -- + arch/arm/configs/realview_defconfig | 5 + + arch/arm/configs/s3c2410_defconfig | 1 + + arch/arm/configs/sama5_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 3 +- + arch/arm/configs/socfpga_defconfig | 2 +- + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/clkdev.h | 31 - + arch/arm/include/debug/palmchip.S | 11 + + arch/arm/mach-artpec/Kconfig | 20 + + arch/arm/mach-artpec/Makefile | 1 + + arch/arm/mach-artpec/board-artpec6.c | 72 ++ + arch/arm/mach-at91/Kconfig | 1 + + arch/arm/mach-at91/at91rm9200.c | 2 - + arch/arm/mach-at91/at91sam9.c | 2 - + arch/arm/mach-at91/generic.h | 13 +- + arch/arm/mach-at91/pm.c | 70 +- + arch/arm/mach-at91/sama5.c | 2 +- + arch/arm/mach-cns3xxx/Makefile.boot | 3 - + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-exynos/Makefile.boot | 2 - + arch/arm/mach-integrator/Kconfig | 6 - + arch/arm/mach-integrator/Makefile.boot | 4 - + arch/arm/mach-keystone/Makefile.boot | 1 - + arch/arm/mach-lpc32xx/Makefile | 3 +- + arch/arm/mach-lpc32xx/clock.c | 1284 -------------------- + arch/arm/mach-lpc32xx/phy3250.c | 53 - + arch/arm/mach-lpc32xx/serial.c | 3 - + arch/arm/mach-lpc32xx/timer.c | 144 --- + arch/arm/mach-mmp/Makefile.boot | 1 - + arch/arm/mach-mv78xx0/Kconfig | 3 +- + arch/arm/mach-mv78xx0/Makefile.boot | 3 - + arch/arm/mach-mvebu/Kconfig | 6 +- + arch/arm/mach-netx/Kconfig | 3 - + arch/arm/mach-nspire/Makefile.boot | 0 + arch/arm/mach-omap2/Makefile.boot | 3 - + arch/arm/mach-omap2/board-generic.c | 22 +- + arch/arm/mach-omap2/gpmc-onenand.c | 6 +- + arch/arm/mach-omap2/omap_device.c | 14 +- + arch/arm/mach-orion5x/Makefile.boot | 3 - + arch/arm/mach-prima2/Makefile.boot | 3 - + arch/arm/mach-realview/Makefile.boot | 9 - + arch/arm/mach-s3c24xx/Kconfig | 6 +- + arch/arm/mach-s3c24xx/mach-gta02.c | 2 + + arch/arm/mach-s3c64xx/Makefile.boot | 2 - + arch/arm/mach-s3c64xx/mach-smdk6410.c | 38 +- + arch/arm/mach-shmobile/common.h | 1 - + arch/arm/mach-shmobile/cpufreq.c | 2 + + arch/arm/mach-shmobile/headsmp-scu.S | 8 +- + arch/arm/mach-shmobile/headsmp.S | 28 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 1 - + arch/arm/mach-shmobile/platsmp-scu.c | 4 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 7 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 2 - + arch/arm/mach-shmobile/suspend.c | 2 + + arch/arm/mach-shmobile/timer.c | 2 + + arch/arm/mach-spear/Makefile.boot | 3 - + arch/arm/mach-u300/Makefile.boot | 4 - + arch/arm/mach-ux500/Makefile.boot | 3 - + arch/arm/mach-versatile/Kconfig | 3 + + arch/arm/mach-versatile/versatile_dt.c | 15 - + arch/arm/mach-zynq/Makefile.boot | 3 - + arch/arm/plat-versatile/Kconfig | 3 - + arch/arm/plat-versatile/Makefile | 1 - + arch/arm/plat-versatile/clock.c | 74 -- + arch/arm64/Kconfig.platforms | 7 + + arch/arm64/boot/dts/amd/Makefile | 4 +- + arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 87 ++ + arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts | 91 ++ + arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 104 +- + arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi | 117 ++ + arch/arm64/boot/dts/amd/husky.dts | 83 ++ + arch/arm64/boot/dts/arm/Makefile | 4 +- + arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts | 30 + + arch/arm64/boot/dts/arm/foundation-v8.dts | 227 +--- + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 228 ++++ + arch/arm64/boot/dts/arm/juno-base.dtsi | 68 +- + arch/arm64/boot/dts/arm/juno-r1.dts | 25 +- + arch/arm64/boot/dts/arm/juno-r2.dts | 183 +++ + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 12 +- + arch/arm64/boot/dts/marvell/Makefile | 4 + + arch/arm64/boot/dts/marvell/armada-371x.dtsi | 53 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 86 ++ + arch/arm64/boot/dts/marvell/armada-372x.dtsi | 63 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 131 ++ + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 16 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 249 +++- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 +- + arch/arm64/configs/defconfig | 18 + + drivers/clk/at91/clk-generated.c | 95 +- + drivers/clk/at91/clk-h32mx.c | 40 +- + drivers/clk/at91/clk-main.c | 324 +++-- + drivers/clk/at91/clk-master.c | 94 +- + drivers/clk/at91/clk-peripheral.c | 137 ++- + drivers/clk/at91/clk-pll.c | 150 +-- + drivers/clk/at91/clk-plldiv.c | 44 +- + drivers/clk/at91/clk-programmable.c | 96 +- + drivers/clk/at91/clk-slow.c | 35 +- + drivers/clk/at91/clk-smd.c | 56 +- + drivers/clk/at91/clk-system.c | 96 +- + drivers/clk/at91/clk-usb.c | 123 +- + drivers/clk/at91/clk-utmi.c | 80 +- + drivers/clk/at91/pmc.c | 426 +------ + drivers/clk/at91/pmc.h | 98 +- + drivers/cpufreq/s5pv210-cpufreq.c | 2 - + drivers/firmware/arm_scpi.c | 17 +- + drivers/hwmon/scpi-hwmon.c | 14 +- + drivers/irqchip/Kconfig | 5 + + drivers/irqchip/Makefile | 2 +- + drivers/irqchip/irq-armada-370-xp.c | 156 +-- + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 10 +- + drivers/reset/hisilicon/hi6220_reset.c | 6 +- + drivers/reset/reset-ath79.c | 2 +- + drivers/reset/reset-berlin.c | 5 +- + drivers/reset/reset-lpc18xx.c | 2 +- + drivers/reset/reset-pistachio.c | 154 +++ + drivers/reset/reset-socfpga.c | 2 +- + drivers/reset/reset-sunxi.c | 2 +- + drivers/reset/reset-zynq.c | 2 +- + drivers/reset/sti/reset-syscfg.c | 2 +- + drivers/rtc/Kconfig | 10 - + drivers/rtc/Makefile | 1 - + drivers/rtc/rtc-max77686.c | 362 ++++-- + drivers/rtc/rtc-max77802.c | 502 -------- + drivers/soc/rockchip/pm_domains.c | 34 + + drivers/usb/gadget/udc/atmel_usba_udc.c | 20 +- + drivers/usb/gadget/udc/atmel_usba_udc.h | 2 + + include/dt-bindings/clock/r8a7793-clock.h | 2 + + include/dt-bindings/clock/rk3188-cru-common.h | 1 + + include/dt-bindings/pinctrl/stm32f429-pinfunc.h | 1239 +++++++++++++++++++ + include/dt-bindings/power/rk3368-power.h | 28 + + include/dt-bindings/reset/pistachio-resets.h | 36 + + include/linux/clk/at91_pmc.h | 12 - + include/linux/reset-controller.h | 2 +- + include/linux/scpi_protocol.h | 3 +- + 290 files changed, 10808 insertions(+), 6390 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/axis.txt + rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-370-xp-pmsu.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-370-xp.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-375.txt (100%) + create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt + rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-380-mpcore-soc-ctrl.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-38x.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-39x.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-cpu-reset.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/coherency-fabric.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/kirkwood.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/marvell,berlin.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/marvell,dove.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/marvell,kirkwood.txt (94%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/mvebu-cpu-config.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => marvell}/mvebu-system-controller.txt (100%) + rename Documentation/devicetree/bindings/arm/{ => nxp}/lpc32xx.txt (100%) + create mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.txt + create mode 100644 Documentation/devicetree/bindings/reset/img,pistachio-reset.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/artpec6-devboard.dts + create mode 100644 arch/arm/boot/dts/artpec6.dtsi + create mode 100644 arch/arm/boot/dts/exynos5410-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/exynos5420-cpus.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts + create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts + create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts + create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts + create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts + create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi + delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts + delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts + create mode 100644 arch/arm/boot/dts/tps65217.dtsi + delete mode 100644 arch/arm/configs/realview-smp_defconfig + delete mode 100644 arch/arm/include/asm/clkdev.h + create mode 100644 arch/arm/include/debug/palmchip.S + create mode 100644 arch/arm/mach-artpec/Kconfig + create mode 100644 arch/arm/mach-artpec/Makefile + create mode 100644 arch/arm/mach-artpec/board-artpec6.c + delete mode 100644 arch/arm/mach-cns3xxx/Makefile.boot + delete mode 100644 arch/arm/mach-exynos/Makefile.boot + delete mode 100644 arch/arm/mach-integrator/Makefile.boot + delete mode 100644 arch/arm/mach-keystone/Makefile.boot + delete mode 100644 arch/arm/mach-lpc32xx/clock.c + delete mode 100644 arch/arm/mach-lpc32xx/timer.c + delete mode 100644 arch/arm/mach-mmp/Makefile.boot + delete mode 100644 arch/arm/mach-mv78xx0/Makefile.boot + delete mode 100644 arch/arm/mach-nspire/Makefile.boot + delete mode 100644 arch/arm/mach-omap2/Makefile.boot + delete mode 100644 arch/arm/mach-orion5x/Makefile.boot + delete mode 100644 arch/arm/mach-prima2/Makefile.boot + delete mode 100644 arch/arm/mach-realview/Makefile.boot + delete mode 100644 arch/arm/mach-s3c64xx/Makefile.boot + delete mode 100644 arch/arm/mach-spear/Makefile.boot + delete mode 100644 arch/arm/mach-u300/Makefile.boot + delete mode 100644 arch/arm/mach-ux500/Makefile.boot + delete mode 100644 arch/arm/mach-zynq/Makefile.boot + delete mode 100644 arch/arm/plat-versatile/clock.c + create mode 100644 arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts + create mode 100644 arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts + create mode 100644 arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi + create mode 100644 arch/arm64/boot/dts/amd/husky.dts + create mode 100644 arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts + create mode 100644 arch/arm64/boot/dts/arm/foundation-v8.dtsi + create mode 100644 arch/arm64/boot/dts/arm/juno-r2.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-371x.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-db.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-372x.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-37xx.dtsi + create mode 100644 drivers/reset/reset-pistachio.c + delete mode 100644 drivers/rtc/rtc-max77802.c + create mode 100644 include/dt-bindings/pinctrl/stm32f429-pinfunc.h + create mode 100644 include/dt-bindings/power/rk3368-power.h + create mode 100644 include/dt-bindings/reset/pistachio-resets.h +Merging at91/at91-next (799da647446d Merge tag 'at91-ab-4.6-dt' 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 (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to DT) +$ git merge bcm2835-dt/bcm2835-dt-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm2835-rpi-a.dts | 24 +++++++++++++++++++++ + arch/arm/boot/dts/bcm2835-rpi.dtsi | 16 ++++++++++++++ + arch/arm/boot/dts/bcm283x.dtsi | 43 +++++++++++++++++++++++++++++++++++-- + 4 files changed, 82 insertions(+), 2 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a.dts +Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/configs/bcm2835_defconfig | 11 +++++------ + arch/arm/configs/multi_v7_defconfig | 12 ++++++++++++ + 2 files changed, 17 insertions(+), 6 deletions(-) +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (655f2d0d2295 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 7 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 +- + arch/arm/boot/dts/imx25.dtsi | 29 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 4 +- + arch/arm/boot/dts/imx28-tx28.dts | 4 +- + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 2 +- + arch/arm/boot/dts/imx51-babbage.dts | 2 +- + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +- + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 2 +- + arch/arm/boot/dts/imx53-ard.dts | 6 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 4 +- + arch/arm/boot/dts/imx53-tx53-x03x.dts | 2 +- + arch/arm/boot/dts/imx53-tx53-x13x.dts | 42 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 2 +- + arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 272 ++++++ + arch/arm/boot/dts/imx6q-evi.dts | 502 +++++++++++ + arch/arm/boot/dts/imx6q-gk802.dts | 2 +- + arch/arm/boot/dts/imx6q-icore-rqs.dts | 78 ++ + arch/arm/boot/dts/imx6q-tbs2910.dts | 318 ++++--- + arch/arm/boot/dts/imx6q-tx6q-1110.dts | 2 +- + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6q.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 984 +++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 15 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 411 +++++++++ + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 57 ++ + arch/arm/boot/dts/imx6qdl.dtsi | 8 +- + arch/arm/boot/dts/imx6qp-sabreauto.dts | 93 ++ + arch/arm/boot/dts/imx6qp-sabresd.dts | 93 ++ + arch/arm/boot/dts/imx6qp.dtsi | 86 ++ + arch/arm/boot/dts/imx6sl-warp.dts | 2 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 18 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 4 +- + arch/arm/boot/dts/imx7d-sbc-imx7.dts | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 2 +- + arch/arm/boot/dts/imx7d.dtsi | 9 + + arch/arm/boot/dts/ls1021a.dtsi | 44 + + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 94 +- + arch/arm/boot/dts/vf-colibri.dtsi | 76 +- + arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 40 +- + arch/arm/boot/dts/vf500-colibri.dtsi | 40 +- + arch/arm/boot/dts/vf500.dtsi | 49 +- + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 42 +- + arch/arm/boot/dts/vf610-colibri.dtsi | 40 +- + arch/arm/boot/dts/vf610-twr.dts | 44 +- + arch/arm/boot/dts/vf610.dtsi | 40 +- + arch/arm/boot/dts/vfxxx.dtsi | 84 +- + arch/arm/configs/imx_v4_v5_defconfig | 4 + + arch/arm/configs/imx_v6_v7_defconfig | 23 +- + arch/arm/configs/mxs_defconfig | 2 + + arch/arm/include/debug/imx.S | 3 + + arch/arm/mach-imx/3ds_debugboard.c | 30 +- + arch/arm/mach-imx/Kconfig | 2 + + arch/arm/mach-imx/Makefile | 2 +- + arch/arm/mach-imx/anatop.c | 18 +- + arch/arm/mach-imx/avic.c | 30 +- + arch/arm/mach-imx/common.h | 1 + + arch/arm/mach-imx/cpu-imx27.c | 3 +- + arch/arm/mach-imx/cpu-imx31.c | 2 +- + arch/arm/mach-imx/cpu-imx35.c | 2 +- + arch/arm/mach-imx/cpu.c | 16 +- + arch/arm/mach-imx/epit.c | 22 +- + arch/arm/mach-imx/headsmp.S | 2 + + arch/arm/mach-imx/iomux-imx31.c | 12 +- + arch/arm/mach-imx/iomux-v1.c | 4 +- + arch/arm/mach-imx/iomux-v3.c | 6 +- + arch/arm/mach-imx/mach-armadillo5x0.c | 4 +- + arch/arm/mach-imx/mach-imx25.c | 1 + + arch/arm/mach-imx/mach-imx51.c | 5 +- + arch/arm/mach-imx/mach-imx6q.c | 8 +- + arch/arm/mach-imx/mach-mx27ads.c | 6 +- + arch/arm/mach-imx/mach-mx31ads.c | 16 +- + arch/arm/mach-imx/mach-mx31moboard.c | 2 +- + arch/arm/mach-imx/mach-qong.c | 6 +- + arch/arm/mach-imx/mxc.h | 5 + + arch/arm/mach-imx/pm-imx25.c | 37 + + arch/arm/mach-imx/pm-imx27.c | 4 +- + arch/arm/mach-imx/pm-imx3.c | 4 +- + arch/arm/mach-imx/pm-imx5.c | 26 +- + arch/arm/mach-imx/pm-imx6.c | 8 +- + arch/arm/mach-imx/system.c | 6 +- + arch/arm/mach-imx/tzic.c | 34 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 + + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 + + drivers/clk/imx/clk-imx6q.c | 132 ++- + drivers/clk/imx/clk-imx6ul.c | 2 +- + include/dt-bindings/clock/imx6qdl-clock.h | 16 +- + 103 files changed, 3764 insertions(+), 469 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts + create mode 100644 arch/arm/boot/dts/imx6q-evi.dts + create mode 100644 arch/arm/boot/dts/imx6q-icore-rqs.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-sabreauto.dts + create mode 100644 arch/arm/boot/dts/imx6qp-sabresd.dts + create mode 100644 arch/arm/boot/dts/imx6qp.dtsi + create mode 100644 arch/arm/mach-imx/pm-imx25.c +Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next) +$ git merge keystone/next +Auto-merging arch/arm/mach-keystone/keystone.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/keystone/keystone.txt | 5 ++ + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/k2g-evm.dts | 32 ++++++++ + arch/arm/boot/dts/k2g.dtsi | 89 ++++++++++++++++++++++ + arch/arm/mach-keystone/keystone.c | 1 + + 5 files changed, 129 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/k2g-evm.dts + create mode 100644 arch/arm/boot/dts/k2g.dtsi +Merging mvebu/for-next (5be603bdf1a7 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/arm/Marvell/README | 158 +++++++++++--- + .../bindings/arm/marvell/armada-7k-8k.txt | 24 ++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-370-db.dts | 27 +++ + arch/arm/boot/dts/armada-375.dtsi | 2 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 3 + + arch/arm/boot/dts/armada-38x.dtsi | 30 ++- + arch/arm/boot/dts/armada-xp-db.dts | 28 +++ + arch/arm/boot/dts/mvebu-linkstation-fan.dtsi | 72 ++++++ + .../boot/dts/mvebu-linkstation-gpio-simple.dtsi | 105 +++++++++ + arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 87 ++++++++ + arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 243 ++++----------------- + arch/arm/boot/dts/orion5x-linkstation.dtsi | 180 +++++++++++++++ + arch/arm/configs/mvebu_v7_defconfig | 1 + + arch/arm/mach-dove/Kconfig | 2 +- + arch/arm/mach-mv78xx0/common.c | 5 +- + arch/arm/mach-mvebu/coherency.c | 2 +- + arch/arm/mach-mvebu/platsmp.c | 1 + + arch/arm/mach-orion5x/Kconfig | 18 +- + arch/arm64/Kconfig.platforms | 11 +- + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/armada-7020.dtsi | 54 +++++ + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 92 ++++++++ + arch/arm64/boot/dts/marvell/armada-7040.dtsi | 54 +++++ + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 54 +++++ + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 54 +++++ + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 71 ++++++ + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 84 +++++++ + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 237 ++++++++++++++++++++ + 29 files changed, 1446 insertions(+), 255 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt + create mode 100644 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi + create mode 100644 arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi + create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts + create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-7020.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-7040-db.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-7040.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-8020.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-8040.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-ap806.dtsi +Merging omap/for-next (601052bca473 Merge branch 'omap-for-v4.6/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/configs/omap2plus_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/omap.txt | 2 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 171 +++++++++++++ + arch/arm/boot/dts/am335x-sl50.dts | 24 +- + arch/arm/boot/dts/am4372.dtsi | 16 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 5 + + arch/arm/boot/dts/dm8148-evm.dts | 56 +++++ + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 +- + arch/arm/boot/dts/dm814x.dtsi | 12 + + arch/arm/boot/dts/dra62x-j5eco-evm.dts | 56 +++++ + arch/arm/boot/dts/dra7-dspeve-thermal.dtsi | 27 +++ + arch/arm/boot/dts/dra7-iva-thermal.dtsi | 27 +++ + arch/arm/boot/dts/dra7.dtsi | 80 ++---- + arch/arm/boot/dts/dra74x.dtsi | 1 - + arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 268 +++++++++++++++++++++ + arch/arm/boot/dts/logicpd-som-lv.dtsi | 265 ++++++++++++++++++++ + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 163 ++++++++++--- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 43 ++++ + arch/arm/boot/dts/omap3-igep.dtsi | 4 + + arch/arm/boot/dts/omap3-igep0030-common.dtsi | 41 ++++ + arch/arm/boot/dts/omap3-n9.dts | 4 + + arch/arm/boot/dts/omap3-n900.dts | 44 ++-- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 93 +++++++ + arch/arm/boot/dts/omap3-n950.dts | 33 +++ + arch/arm/boot/dts/omap34xx.dtsi | 6 + + arch/arm/boot/dts/omap36xx.dtsi | 6 + + arch/arm/boot/dts/omap5.dtsi | 27 +-- + arch/arm/configs/omap2plus_defconfig | 12 +- + arch/arm/mach-omap1/dma.c | 45 ++++ + arch/arm/mach-omap2/cpuidle34xx.c | 69 +++++- + arch/arm/mach-omap2/dma.c | 117 +++++++++ + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 18 +- + arch/arm/mach-omap2/prm7xx.h | 1 + + arch/arm/mach-omap2/soc.h | 23 +- + 35 files changed, 1617 insertions(+), 161 deletions(-) + create mode 100644 arch/arm/boot/dts/dra7-dspeve-thermal.dtsi + create mode 100644 arch/arm/boot/dts/dra7-iva-thermal.dtsi + create mode 100644 arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts + create mode 100644 arch/arm/boot/dts/logicpd-som-lv.dtsi +Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (5b19b3012f3b ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/for-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Makefile +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6736e51fcc64] Merge remote-tracking branch 'qcom/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/qcom.txt | 51 ++++ + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + MAINTAINERS | 2 + + arch/arm/Makefile | 3 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 276 +++++++++++++++++++++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 7 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 14 ++ + arch/arm/boot/dts/qcom-ipq8064.dtsi | 12 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 20 ++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 146 ++++++++++- + arch/arm/boot/dts/qcom-pm8841.dtsi | 4 +- + arch/arm/boot/dts/qcom-pm8941.dtsi | 20 +- + arch/arm/mach-qcom/Kconfig | 17 +- + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 132 +++++++++- + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 22 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 19 +- + arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 21 ++ + arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 30 +++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 269 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/pm8004.dtsi | 19 ++ + arch/arm64/boot/dts/qcom/pm8916.dtsi | 10 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 62 +++++ + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 19 ++ + drivers/firmware/qcom_scm-32.c | 82 ++++++ + drivers/firmware/qcom_scm-64.c | 25 ++ + drivers/firmware/qcom_scm.c | 271 +++++++++++++++++++- + drivers/firmware/qcom_scm.h | 12 + + drivers/soc/qcom/smd.c | 229 ++++++++++++----- + drivers/soc/qcom/spm.c | 8 +- + drivers/spmi/spmi-pmic-arb.c | 153 ++++++++---- + include/linux/qcom_scm.h | 6 + + include/linux/soc/qcom/smd.h | 8 +- + include/linux/soc/qcom/smem_state.h | 35 +++ + 36 files changed, 1875 insertions(+), 157 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/qcom.txt + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8996.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8004.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8994.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmi8994.dtsi +Merging renesas/next (fd5c290b7efd Merge branches 'heads/sh-drivers-fixes-for-v4.5', 'heads/arm64-defconfig-for-v4.6', 'heads/arm64-dt-for-v4.6', 'heads/defconfig-for-v4.6' and 'heads/dt-for-v4.6' into next) +$ git merge renesas/next +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cf2c539b4eef] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/r8a73a4.dtsi | 17 ++ + arch/arm/boot/dts/r8a7790-lager.dts | 32 ++- + arch/arm/boot/dts/r8a7790.dtsi | 57 ++++- + arch/arm/boot/dts/r8a7791-porter.dts | 4 +- + arch/arm/boot/dts/r8a7791.dtsi | 40 ++- + arch/arm/boot/dts/r8a7793-gose.dts | 22 +- + arch/arm/boot/dts/r8a7793.dtsi | 33 ++- + arch/arm/boot/dts/r8a7794.dtsi | 31 ++- + arch/arm/configs/shmobile_defconfig | 3 + + arch/arm/mach-shmobile/Kconfig | 15 +- + arch/arm/mach-shmobile/common.h | 5 +- + arch/arm/mach-shmobile/emev2.h | 6 + + arch/arm/mach-shmobile/platsmp-scu.c | 10 +- + arch/arm/mach-shmobile/setup-emev2.c | 22 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 39 +-- + arch/arm/mach-shmobile/smp-emev2.c | 5 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 3 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 3 +- + arch/arm64/Kconfig.platforms | 4 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 123 +++++++++ + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 282 ++++++++++++++++----- + arch/arm64/configs/defconfig | 1 + + drivers/sh/pm_runtime.c | 2 +- + include/dt-bindings/clock/r8a7794-clock.h | 1 + + 24 files changed, 590 insertions(+), 170 deletions(-) + create mode 100644 arch/arm/mach-shmobile/emev2.h +Merging rockchip/for-next (2def4fc4fc2d Merge branch 'v4.6-clk/next' into for-next) +$ git merge rockchip/for-next +Auto-merging drivers/clk/rockchip/clk-rk3368.c +Auto-merging drivers/clk/rockchip/clk-rk3036.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 4 +- + drivers/clk/rockchip/clk-cpu.c | 8 ++-- + drivers/clk/rockchip/clk-inverter.c | 8 +--- + drivers/clk/rockchip/clk-mmc-phase.c | 8 +--- + drivers/clk/rockchip/clk-pll.c | 5 ++ + drivers/clk/rockchip/clk-rk3036.c | 33 +++---------- + drivers/clk/rockchip/clk-rk3188.c | 27 ++++------- + drivers/clk/rockchip/clk-rk3228.c | 38 ++++----------- + drivers/clk/rockchip/clk-rk3288.c | 38 ++++----------- + drivers/clk/rockchip/clk-rk3368.c | 82 +++++++++++++------------------- + drivers/clk/rockchip/clk.c | 64 ++++++++++++++++++++++++- + drivers/clk/rockchip/clk.h | 28 +++++++++++ + drivers/soc/rockchip/pm_domains.c | 4 ++ + 14 files changed, 178 insertions(+), 171 deletions(-) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (341080b4d9b4 Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging include/linux/soc/samsung/exynos-regs-pmu.h +Auto-merging include/linux/soc/samsung/exynos-pmu.h +Auto-merging drivers/clk/rockchip/clk.c +Auto-merging drivers/clk/clk-gpio.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Removing arch/arm/mach-exynos/pmu.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/xgene.txt | 2 + + MAINTAINERS | 1 + + arch/arm/boot/dts/exynos-syscon-restart.dtsi | 27 + + arch/arm/boot/dts/exynos3250.dtsi | 15 +- + arch/arm/boot/dts/exynos4.dtsi | 15 +- + arch/arm/boot/dts/exynos5.dtsi | 15 +- + arch/arm/boot/dts/exynos5410.dtsi | 15 +- + arch/arm/mach-exynos/Kconfig | 4 +- + arch/arm/mach-exynos/Makefile | 2 +- + arch/arm/mach-exynos/common.h | 1 - + arch/arm/mach-exynos/exynos.c | 17 +- + arch/arm/mach-exynos/firmware.c | 2 - + arch/arm/mach-exynos/include/mach/map.h | 14 +- + arch/arm/mach-exynos/mcpm-exynos.c | 2 +- + arch/arm/mach-exynos/platsmp.c | 3 +- + arch/arm/mach-exynos/pm.c | 8 +- + arch/arm/mach-exynos/pmu.c | 967 --------------------- + arch/arm/mach-exynos/s5p-dev-mfc.c | 1 - + arch/arm/mach-exynos/suspend.c | 4 +- + arch/arm/mach-s3c24xx/Kconfig | 1 + + arch/arm/mach-s3c24xx/include/mach/map.h | 11 - + arch/arm/mach-s3c64xx/Kconfig | 3 +- + arch/arm/plat-samsung/adc.c | 6 +- + arch/arm/plat-samsung/include/plat/map-s3c.h | 4 - + arch/arm/plat-samsung/include/plat/map-s5p.h | 5 - + arch/arm64/Kconfig.platforms | 11 +- + arch/arm64/boot/dts/exynos/Makefile | 2 +- + arch/arm64/configs/defconfig | 2 +- + drivers/clk/Kconfig | 8 +- + drivers/clk/clk-composite.c | 2 - + drivers/clk/clk-divider.c | 13 +- + drivers/clk/clk-fixed-factor.c | 2 - + drivers/clk/clk-fixed-rate.c | 2 - + drivers/clk/clk-fractional-divider.c | 2 - + drivers/clk/clk-gate.c | 2 - + drivers/clk/clk-gpio.c | 2 - + drivers/clk/clk-multiplier.c | 2 - + drivers/clk/clk-mux.c | 2 - + drivers/clk/clk-s2mps11.c | 108 +-- + drivers/clk/clk-xgene.c | 105 ++- + drivers/clk/imx/clk-busy.c | 4 +- + drivers/clk/imx/clk-fixup-div.c | 5 +- + drivers/clk/imx/clk-fixup-mux.c | 2 - + drivers/clk/imx/clk-gate-exclusive.c | 2 +- + drivers/clk/mediatek/clk-gate.c | 8 +- + drivers/clk/mediatek/clk-gate.h | 2 +- + drivers/clk/mediatek/clk-mtk.c | 6 +- + drivers/clk/mvebu/common.c | 2 - + drivers/clk/mvebu/kirkwood.c | 2 - + drivers/clk/mxs/clk-div.c | 2 +- + drivers/clk/nxp/clk-lpc18xx-ccu.c | 4 +- + drivers/clk/rockchip/clk.c | 4 +- + drivers/clk/samsung/Kconfig | 19 +- + drivers/clk/samsung/Makefile | 4 +- + drivers/clk/st/clkgen-mux.c | 9 +- + drivers/clk/ti/composite.c | 2 - + drivers/clk/ti/divider.c | 2 - + drivers/clk/ti/gate.c | 2 - + drivers/clk/ti/mux.c | 2 - + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/samsung/Kconfig | 13 + + drivers/soc/samsung/Makefile | 2 + + drivers/soc/samsung/exynos-pmu.c | 141 +++ + drivers/soc/samsung/exynos-pmu.h | 44 + + drivers/soc/samsung/exynos3250-pmu.c | 175 ++++ + drivers/soc/samsung/exynos4-pmu.c | 222 +++++ + drivers/soc/samsung/exynos5250-pmu.c | 195 +++++ + drivers/soc/samsung/exynos5420-pmu.c | 280 ++++++ + include/linux/clk-provider.h | 19 + + .../linux/soc/samsung}/exynos-pmu.h | 6 +- + .../linux/soc/samsung/exynos-regs-pmu.h | 6 +- + 72 files changed, 1308 insertions(+), 1290 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos-syscon-restart.dtsi + delete mode 100644 arch/arm/mach-exynos/pmu.c + create mode 100644 drivers/soc/samsung/Kconfig + create mode 100644 drivers/soc/samsung/Makefile + create mode 100644 drivers/soc/samsung/exynos-pmu.c + create mode 100644 drivers/soc/samsung/exynos-pmu.h + create mode 100644 drivers/soc/samsung/exynos3250-pmu.c + create mode 100644 drivers/soc/samsung/exynos4-pmu.c + create mode 100644 drivers/soc/samsung/exynos5250-pmu.c + create mode 100644 drivers/soc/samsung/exynos5420-pmu.c + rename {arch/arm/mach-exynos => include/linux/soc/samsung}/exynos-pmu.h (81%) + rename arch/arm/mach-exynos/regs-pmu.h => include/linux/soc/samsung/exynos-regs-pmu.h (99%) +Merging sunxi/sunxi/for-next (73e5379b0442 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/config64-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Recorded preimage for 'arch/arm64/configs/defconfig' +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm64/configs/defconfig'. +[master fbe031368c4c] Merge remote-tracking branch 'sunxi/sunxi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/sunxi/README | 1 - + Documentation/devicetree/bindings/arm/sunxi.txt | 1 + + Documentation/devicetree/bindings/clock/sunxi.txt | 4 + + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 10 + + arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 34 + + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 + + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 9 + + .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 86 +- + arch/arm/boot/dts/sun4i-a10-mk802.dts | 33 + + arch/arm/boot/dts/sun5i-r8-chip.dts | 4 + + arch/arm/boot/dts/sun6i-a31.dtsi | 10 + + arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 6 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 125 +++ + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 287 +++++++ + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 35 + + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 32 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 79 +- + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 64 ++ + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 65 ++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 228 ++++++ + arch/arm/boot/dts/sun8i-h3.dtsi | 64 +- + arch/arm/boot/dts/sun8i-q8-common.dtsi | 83 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 6 + + arch/arm/boot/dts/sun9i-a80-optimus.dts | 28 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 11 +- + arch/arm/boot/dts/sunxi-itead-core-common.dtsi | 136 ++++ + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm/configs/sunxi_defconfig | 13 + + arch/arm/mach-sunxi/sunxi.c | 1 + + arch/arm64/Kconfig.platforms | 5 + + arch/arm64/configs/defconfig | 7 + + drivers/bus/sunxi-rsb.c | 4 +- + drivers/clk/sunxi/clk-a10-hosc.c | 3 +- + drivers/clk/sunxi/clk-a20-gmac.c | 2 - + drivers/clk/sunxi/clk-factors.c | 123 ++- + drivers/clk/sunxi/clk-factors.h | 26 +- + drivers/clk/sunxi/clk-mod0.c | 23 +- + drivers/clk/sunxi/clk-simple-gates.c | 4 + + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 2 - + drivers/clk/sunxi/clk-sun6i-ar100.c | 235 ++---- + drivers/clk/sunxi/clk-sun8i-apb0.c | 2 +- + drivers/clk/sunxi/clk-sun8i-bus-gates.c | 3 +- + drivers/clk/sunxi/clk-sun8i-mbus.c | 127 +-- + drivers/clk/sunxi/clk-sun9i-core.c | 86 +- + drivers/clk/sunxi/clk-sunxi.c | 863 +++++++++------------ + drivers/clk/sunxi/clk-usb.c | 24 +- + drivers/soc/sunxi/sunxi_sram.c | 5 +- + 49 files changed, 2057 insertions(+), 961 deletions(-) + create mode 100644 arch/arm/boot/dts/sun7i-a20-itead-ibox.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts + create mode 100644 arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts + create mode 100644 arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts + create mode 100644 arch/arm/boot/dts/sun8i-a83t.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-itead-core-common.dtsi +Merging tegra/for-next (6af0a1cda782 Merge branch for-4.6/arm64 into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra114-roth.dts | 2 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 4 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 28 ++++- + arch/arm/boot/dts/tegra124-nyan.dtsi | 4 +- + arch/arm/boot/dts/tegra124-venice2.dts | 2 +- + arch/arm/boot/dts/tegra124.dtsi | 4 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 4 +- + 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/tegra20.dtsi | 2 +- + arch/arm/boot/dts/tegra30-apalis-eval.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.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +- + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/soc/tegra/Kconfig | 2 - + drivers/soc/tegra/pmc.c | 143 +++++++++++++++---------- + include/soc/tegra/pmc.h | 35 +++--- + 26 files changed, 160 insertions(+), 102 deletions(-) +Merging arm64/for-next/core (cac4b8cdf5a2 arm64: Fix building error with 16KB pages and 36-bit VA) +$ git merge arm64/for-next/core +Auto-merging include/linux/efi.h +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/kernel/image.h +Auto-merging arch/arm64/kernel/debug-monitors.c +Auto-merging arch/arm64/Makefile +Merge made by the 'recursive' strategy. + Documentation/arm64/booting.txt | 20 +- + .../features/vm/huge-vmap/arch-support.txt | 2 +- + arch/arm/include/asm/kvm_asm.h | 2 + + arch/arm/kvm/arm.c | 8 +- + arch/arm64/Kconfig | 89 ++++ + arch/arm64/Makefile | 10 +- + arch/arm64/include/asm/acpi.h | 19 +- + arch/arm64/include/asm/alternative.h | 63 +++ + arch/arm64/include/asm/assembler.h | 26 +- + arch/arm64/include/asm/boot.h | 6 + + arch/arm64/include/asm/brk-imm.h | 25 + + arch/arm64/include/asm/bug.h | 2 +- + arch/arm64/include/asm/cpu.h | 1 + + arch/arm64/include/asm/cpufeature.h | 42 +- + arch/arm64/include/asm/cputype.h | 37 +- + arch/arm64/include/asm/debug-monitors.h | 14 +- + arch/arm64/include/asm/elf.h | 24 +- + arch/arm64/include/asm/fixmap.h | 10 + + arch/arm64/include/asm/futex.h | 12 +- + arch/arm64/include/asm/hardirq.h | 2 +- + arch/arm64/include/asm/kasan.h | 5 +- + arch/arm64/include/asm/kernel-pgtable.h | 12 + + arch/arm64/include/asm/kvm_asm.h | 2 + + arch/arm64/include/asm/kvm_host.h | 8 +- + arch/arm64/include/asm/kvm_mmu.h | 2 +- + arch/arm64/include/asm/memory.h | 63 ++- + arch/arm64/include/asm/mmu_context.h | 64 ++- + arch/arm64/include/asm/module.h | 17 + + arch/arm64/include/asm/pgalloc.h | 26 +- + arch/arm64/include/asm/pgtable.h | 112 +++-- + arch/arm64/include/asm/processor.h | 9 +- + arch/arm64/include/asm/smp.h | 46 ++ + arch/arm64/include/asm/sysreg.h | 23 +- + arch/arm64/include/asm/uaccess.h | 82 ++-- + arch/arm64/include/asm/word-at-a-time.h | 7 +- + arch/arm64/include/uapi/asm/ptrace.h | 1 + + arch/arm64/kernel/Makefile | 3 + + arch/arm64/kernel/acpi_parking_protocol.c | 153 ++++++ + arch/arm64/kernel/armv8_deprecated.c | 7 +- + arch/arm64/kernel/asm-offsets.c | 2 + + arch/arm64/kernel/cpu_errata.c | 18 +- + arch/arm64/kernel/cpu_ops.c | 27 +- + arch/arm64/kernel/cpufeature.c | 268 ++++++----- + arch/arm64/kernel/cpuinfo.c | 55 +-- + arch/arm64/kernel/debug-monitors.c | 23 +- + arch/arm64/kernel/efi-entry.S | 2 +- + arch/arm64/kernel/head.S | 167 ++++++- + arch/arm64/kernel/image.h | 45 +- + arch/arm64/kernel/kaslr.c | 177 +++++++ + arch/arm64/kernel/module-plts.c | 201 ++++++++ + arch/arm64/kernel/module.c | 25 +- + arch/arm64/kernel/module.lds | 3 + + arch/arm64/kernel/process.c | 16 + + arch/arm64/kernel/setup.c | 36 ++ + arch/arm64/kernel/smp.c | 99 +++- + arch/arm64/kernel/suspend.c | 20 +- + arch/arm64/kernel/vdso/vdso.S | 3 +- + arch/arm64/kernel/vmlinux.lds.S | 25 +- + arch/arm64/kvm/hyp.S | 6 +- + arch/arm64/kvm/hyp/debug-sr.c | 1 + + arch/arm64/kvm/sys_regs.c | 2 +- + arch/arm64/lib/clear_user.S | 12 +- + arch/arm64/lib/copy_from_user.S | 12 +- + arch/arm64/lib/copy_in_user.S | 20 +- + arch/arm64/lib/copy_page.S | 63 ++- + arch/arm64/lib/copy_to_user.S | 12 +- + arch/arm64/mm/context.c | 54 ++- + arch/arm64/mm/dump.c | 17 +- + arch/arm64/mm/extable.c | 2 +- + arch/arm64/mm/fault.c | 34 +- + arch/arm64/mm/init.c | 119 ++++- + arch/arm64/mm/kasan_init.c | 72 ++- + arch/arm64/mm/mmu.c | 519 +++++++++++++-------- + arch/arm64/mm/pageattr.c | 46 +- + arch/arm64/mm/proc.S | 28 ++ + arch/x86/include/asm/efi.h | 2 + + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/firmware/efi/libstub/arm-stub.c | 40 +- + drivers/firmware/efi/libstub/arm64-stub.c | 78 +++- + drivers/firmware/efi/libstub/efi-stub-helper.c | 7 +- + drivers/firmware/efi/libstub/efistub.h | 7 + + drivers/firmware/efi/libstub/fdt.c | 14 + + drivers/firmware/efi/libstub/random.c | 135 ++++++ + drivers/of/fdt.c | 19 +- + include/asm-generic/fixmap.h | 12 +- + include/linux/efi.h | 6 +- + lib/extable.c | 50 +- + scripts/sortextable.c | 10 +- + 88 files changed, 2885 insertions(+), 784 deletions(-) + create mode 100644 arch/arm64/include/asm/brk-imm.h + create mode 100644 arch/arm64/kernel/acpi_parking_protocol.c + create mode 100644 arch/arm64/kernel/kaslr.c + create mode 100644 arch/arm64/kernel/module-plts.c + create mode 100644 arch/arm64/kernel/module.lds + create mode 100644 drivers/firmware/efi/libstub/random.c +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +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 (11943fdd17d2 h8300: dts: Rename the serial port clock to fck) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/boot/dts/edosk2674.dts | 6 +++--- + arch/h8300/boot/dts/h8300h_sim.dts | 4 ++-- + arch/h8300/boot/dts/h8s_sim.dts | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev()) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + drivers/zorro/zorro-sysfs.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging m68knommu/for-next (0cdfea013ee8 m68knommu: fix FEC platform device registration when driver is modular) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/device.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init) +$ git merge metag/for-next +Auto-merging arch/metag/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/metag/kernel/ftrace.c | 1 - + 1 file changed, 1 deletion(-) +Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/uapi/asm/unistd.h | 3 +++ + arch/microblaze/kernel/syscall_table.S | 3 +++ + 3 files changed, 7 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (606aab63d453 Merge branch '4.5-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mips/cavium/ciu3.txt | 27 + + arch/mips/Kconfig | 3 +- + arch/mips/ath79/Kconfig | 12 - + arch/mips/ath79/setup.c | 13 +- + arch/mips/boot/compressed/Makefile | 12 +- + arch/mips/boot/dts/qca/Makefile | 3 - + arch/mips/cavium-octeon/csrc-octeon.c | 13 +- + arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 72 +-- + arch/mips/cavium-octeon/executive/octeon-model.c | 82 ++- + arch/mips/cavium-octeon/octeon-irq.c | 679 ++++++++++++++++++++- + arch/mips/cavium-octeon/octeon-platform.c | 94 ++- + arch/mips/cavium-octeon/setup.c | 86 ++- + arch/mips/cavium-octeon/smp.c | 151 ++++- + arch/mips/include/asm/cpu.h | 2 + + arch/mips/include/asm/highmem.h | 4 +- + arch/mips/include/asm/irq_regs.h | 10 + + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 16 +- + arch/mips/include/asm/octeon/cvmx-ciu3-defs.h | 353 +++++++++++ + arch/mips/include/asm/octeon/cvmx-coremask.h | 89 +++ + arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1 + + arch/mips/include/asm/octeon/cvmx-mio-defs.h | 410 ++++++++++++- + arch/mips/include/asm/octeon/cvmx-sysinfo.h | 37 +- + arch/mips/include/asm/octeon/cvmx.h | 27 +- + arch/mips/include/asm/octeon/octeon-feature.h | 19 +- + arch/mips/include/asm/octeon/octeon-model.h | 5 + + arch/mips/include/asm/octeon/octeon.h | 25 + + arch/mips/jz4740/gpio.c | 2 +- + arch/mips/kernel/cpu-probe.c | 2 + + arch/mips/kernel/r2300_fpu.S | 2 +- + arch/mips/kernel/r4k_fpu.S | 2 +- + arch/mips/loongson64/loongson-3/smp.c | 1 - + arch/mips/mm/tlb-r4k.c | 5 + + arch/mips/pmcs-msp71xx/msp_setup.c | 2 +- + arch/mips/vr41xx/common/pmu.c | 2 +- + 34 files changed, 2018 insertions(+), 245 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu3.txt + create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu3-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-coremask.h +Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (c3ab300ea555 powerpc: Add POWER9 cputable entry) +$ git merge powerpc/next +Auto-merging arch/powerpc/platforms/powernv/pci.h +Auto-merging arch/powerpc/platforms/powernv/pci.c +Removing arch/powerpc/platforms/powernv/pci-p5ioc2.c +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Auto-merging arch/powerpc/platforms/powernv/eeh-powernv.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 16 +- + arch/powerpc/include/asm/atomic.h | 159 +++++++----- + arch/powerpc/include/asm/cmpxchg.h | 218 ++++++++++++++--- + arch/powerpc/include/asm/cputable.h | 20 +- + arch/powerpc/include/asm/mmu-hash64.h | 1 + + arch/powerpc/include/asm/mmu.h | 1 + + arch/powerpc/include/asm/opal.h | 3 + + arch/powerpc/include/asm/pci-bridge.h | 7 +- + arch/powerpc/kernel/cpu_setup_power.S | 49 +++- + arch/powerpc/kernel/cputable.c | 27 +++ + arch/powerpc/kernel/eeh.c | 2 +- + arch/powerpc/kernel/kgdb.c | 4 + + arch/powerpc/kernel/mce_power.c | 17 +- + arch/powerpc/perf/hv-gpci.c | 43 ++-- + arch/powerpc/platforms/powernv/Makefile | 2 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 60 ++--- + arch/powerpc/platforms/powernv/opal-msglog.c | 34 ++- + arch/powerpc/platforms/powernv/opal.c | 7 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 347 +++++++++++++++------------ + arch/powerpc/platforms/powernv/pci-p5ioc2.c | 271 --------------------- + arch/powerpc/platforms/powernv/pci.c | 17 +- + arch/powerpc/platforms/powernv/pci.h | 152 ++++++------ + arch/powerpc/platforms/powernv/subcore.c | 2 +- + arch/powerpc/xmon/xmon.c | 120 ++++++++- + include/linux/atomic.h | 10 + + 25 files changed, 864 insertions(+), 725 deletions(-) + delete mode 100644 arch/powerpc/platforms/powernv/pci-p5ioc2.c +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address) +$ 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 (993e0681084c s390/oprofile: add z13/z13s model numbers) +$ git merge s390/features +Removing arch/s390/oprofile/backtrace.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 8 +- + arch/s390/include/asm/fpu/internal.h | 2 + + arch/s390/include/asm/pci.h | 3 +- + arch/s390/include/asm/pgtable.h | 35 +++--- + arch/s390/include/asm/processor.h | 12 ++ + arch/s390/include/asm/xor.h | 21 +++- + arch/s390/kernel/compat_signal.c | 2 +- + arch/s390/kernel/dumpstack.c | 93 +++++++------- + arch/s390/kernel/irq.c | 3 +- + arch/s390/kernel/perf_event.c | 56 +-------- + arch/s390/kernel/setup.c | 1 + + arch/s390/kernel/stacktrace.c | 93 ++++---------- + arch/s390/lib/Makefile | 2 +- + arch/s390/lib/xor.c | 134 ++++++++++++++++++++ + arch/s390/mm/pageattr.c | 8 +- + arch/s390/oprofile/Makefile | 2 +- + arch/s390/oprofile/backtrace.c | 78 ------------ + arch/s390/oprofile/init.c | 21 +++- + arch/s390/pci/pci.c | 6 +- + arch/s390/pci/pci_debug.c | 5 +- + arch/s390/pci/pci_dma.c | 21 ++-- + arch/s390/pci/pci_event.c | 13 +- + drivers/pci/hotplug/s390_pci_hpc.c | 8 +- + drivers/s390/block/dasd_alias.c | 235 ++++++++++++++++++++++------------- + 24 files changed, 481 insertions(+), 381 deletions(-) + create mode 100644 arch/s390/lib/xor.c + delete mode 100644 arch/s390/oprofile/backtrace.c +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (f1c3418ed4e6 tile kgdb: fix bug in copy to gdb regs, and optimize memset) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/kernel/kgdb.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging uml/linux-next (288b31a382d2 um: use %lx format specifiers for unsigned longs) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/x86/um/os-Linux/task_size.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa) +$ git merge xtensa/for_next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 16 +++++++++ + arch/xtensa/include/asm/io.h | 16 +++++++-- + arch/xtensa/include/asm/processor.h | 12 +++---- + arch/xtensa/include/asm/timex.h | 9 ++--- + arch/xtensa/kernel/traps.c | 27 +++++++++++++++ + arch/xtensa/mm/Makefile | 2 +- + arch/xtensa/mm/ioremap.c | 68 +++++++++++++++++++++++++++++++++++++ + 7 files changed, 133 insertions(+), 17 deletions(-) + create mode 100644 arch/xtensa/mm/ioremap.c +Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (b7364eb223db Merge branch 'for-next-4.6-20160225' into for-next-20160225) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/btrfs.txt | 19 ++- + fs/btrfs/backref.c | 12 +- + fs/btrfs/ctree.c | 36 ++-- + fs/btrfs/ctree.h | 69 ++++++-- + fs/btrfs/delayed-inode.c | 3 +- + fs/btrfs/delayed-ref.c | 12 +- + fs/btrfs/dev-replace.c | 132 ++++++++------- + fs/btrfs/dev-replace.h | 7 +- + fs/btrfs/disk-io.c | 68 ++++---- + fs/btrfs/extent-tree.c | 38 +++-- + fs/btrfs/extent_io.c | 40 ++--- + fs/btrfs/extent_io.h | 5 +- + fs/btrfs/extent_map.c | 3 +- + fs/btrfs/file-item.c | 92 ++++++---- + fs/btrfs/file.c | 146 +++++++++------- + fs/btrfs/inode.c | 301 ++++++++++++++++++++++----------- + fs/btrfs/ioctl.c | 28 ++- + fs/btrfs/ordered-data.c | 3 +- + fs/btrfs/print-tree.c | 23 ++- + fs/btrfs/reada.c | 268 ++++++++++++++--------------- + fs/btrfs/root-tree.c | 2 +- + fs/btrfs/scrub.c | 30 ++-- + fs/btrfs/send.c | 36 ++-- + fs/btrfs/super.c | 48 +++++- + fs/btrfs/tests/btrfs-tests.c | 6 - + fs/btrfs/tests/free-space-tree-tests.c | 1 + + fs/btrfs/transaction.c | 13 +- + fs/btrfs/volumes.c | 47 ++--- + fs/btrfs/xattr.c | 2 +- + 29 files changed, 881 insertions(+), 609 deletions(-) +Merging ceph/master (cd8140c673d9 libceph: don't spam dmesg with stray reply warnings) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + net/ceph/messenger.c | 15 +++++++++++---- + net/ceph/osd_client.c | 4 ++-- + 2 files changed, 13 insertions(+), 6 deletions(-) +Merging cifs/for-next (6dc390ad61ac Merge tag 'arc-4.5-rc6-fixes-upd' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (6332b9b5e797 ext4: Make Q_GETNEXTQUOTA work for quota in hidden inodes) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext4/super.c | 4 +- + fs/ocfs2/ocfs2_trace.h | 2 + + fs/ocfs2/quota_global.c | 25 ++ + fs/quota/dquot.c | 51 ++++ + fs/quota/quota.c | 70 ++++- + fs/quota/quota_tree.c | 67 ++++- + fs/quota/quota_v2.c | 6 + + fs/reiserfs/super.c | 1 + + fs/udf/dir.c | 13 +- + fs/udf/namei.c | 29 +- + fs/udf/super.c | 38 +-- + fs/udf/udfdecl.h | 21 +- + fs/udf/unicode.c | 630 ++++++++++++++++------------------------- + fs/xfs/libxfs/xfs_quota_defs.h | 3 +- + fs/xfs/xfs_dquot.c | 129 ++++++++- + fs/xfs/xfs_file.c | 82 ++++-- + fs/xfs/xfs_inode.h | 2 + + fs/xfs/xfs_qm.c | 55 +++- + fs/xfs/xfs_qm.h | 48 +++- + fs/xfs/xfs_qm_syscalls.c | 27 +- + fs/xfs/xfs_quotaops.c | 36 ++- + fs/xfs/xfs_trans_dquot.c | 15 +- + include/linux/dqblk_qtree.h | 2 + + include/linux/quota.h | 5 + + include/linux/quotaops.h | 3 + + include/uapi/linux/dqblk_xfs.h | 1 + + include/uapi/linux/quota.h | 14 + + 27 files changed, 861 insertions(+), 518 deletions(-) +Merging ext4/dev (d89b5f6318c2 jbd2: save some atomic ops in __JI_COMMIT_RUNNING handling) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Merge made by the 'recursive' strategy. + fs/ext2/ext2.h | 3 + + fs/ext2/super.c | 25 +- + fs/ext2/xattr.c | 139 +++--- + fs/ext2/xattr.h | 21 +- + fs/ext4/extents.c | 4 +- + fs/ext4/ialloc.c | 10 + + fs/ext4/mballoc.c | 32 +- + fs/ext4/move_extent.c | 1 + + fs/ext4/super.c | 19 +- + fs/ext4/xattr.c | 166 ++++--- + fs/ext4/xattr.h | 3 +- + fs/jbd2/commit.c | 49 +-- + fs/jbd2/journal.c | 26 +- + fs/jbd2/recovery.c | 31 +- + fs/jbd2/revoke.c | 60 +-- + fs/mbcache.c | 1093 +++++++++++++++-------------------------------- + include/linux/jbd2.h | 16 +- + include/linux/mbcache.h | 93 ++-- + 18 files changed, 670 insertions(+), 1121 deletions(-) +Merging f2fs/dev (362977b0dbc6 f2fs crypto: sync ext4_lookup and ext4_file_open) +$ git merge f2fs/dev +Removing fs/f2fs/f2fs_crypto.h +Removing fs/f2fs/crypto_policy.c +Removing fs/f2fs/crypto_key.c +Removing fs/f2fs/crypto.c +Auto-merging fs/crypto/fname.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 14 + + fs/Kconfig | 2 + + fs/Makefile | 1 + + fs/crypto/Kconfig | 17 + + fs/crypto/Makefile | 2 + + fs/crypto/crypto.c | 554 +++++++++++++++++++++++++++++ + fs/{f2fs/crypto_fname.c => crypto/fname.c} | 255 +++++++------ + fs/crypto/keyinfo.c | 278 +++++++++++++++ + fs/crypto/policy.c | 229 ++++++++++++ + fs/f2fs/Kconfig | 10 +- + fs/f2fs/Makefile | 2 - + fs/f2fs/checkpoint.c | 71 ++-- + fs/f2fs/crypto.c | 491 ------------------------- + fs/f2fs/crypto_key.c | 254 ------------- + fs/f2fs/crypto_policy.c | 209 ----------- + fs/f2fs/data.c | 428 +++++++++++----------- + fs/f2fs/dir.c | 72 ++-- + fs/f2fs/extent_cache.c | 176 ++++----- + fs/f2fs/f2fs.h | 242 ++++--------- + fs/f2fs/f2fs_crypto.h | 151 -------- + fs/f2fs/file.c | 114 +++--- + fs/f2fs/gc.c | 238 +++++++------ + fs/f2fs/inline.c | 43 +-- + fs/f2fs/inode.c | 15 +- + fs/f2fs/namei.c | 159 +++++---- + fs/f2fs/node.c | 210 ++++++++--- + fs/f2fs/node.h | 26 +- + fs/f2fs/recovery.c | 14 +- + fs/f2fs/segment.c | 386 ++++++++++++-------- + fs/f2fs/segment.h | 5 +- + fs/f2fs/super.c | 191 ++++++---- + fs/f2fs/trace.c | 6 +- + fs/f2fs/xattr.c | 6 +- + include/linux/dcache.h | 2 + + include/linux/f2fs_fs.h | 34 +- + include/linux/fs.h | 8 + + include/linux/fscrypto.h | 383 ++++++++++++++++++++ + include/trace/events/f2fs.h | 12 +- + include/uapi/linux/fs.h | 18 + + 39 files changed, 3006 insertions(+), 2322 deletions(-) + create mode 100644 fs/crypto/Kconfig + create mode 100644 fs/crypto/Makefile + create mode 100644 fs/crypto/crypto.c + rename fs/{f2fs/crypto_fname.c => crypto/fname.c} (60%) + create mode 100644 fs/crypto/keyinfo.c + create mode 100644 fs/crypto/policy.c + delete mode 100644 fs/f2fs/crypto.c + delete mode 100644 fs/f2fs/crypto_key.c + delete mode 100644 fs/f2fs/crypto_policy.c + delete mode 100644 fs/f2fs/f2fs_crypto.h + create mode 100644 include/linux/fscrypto.h +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 (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (a63be4e6d0e9 GFS2: Eliminate parameter non_block on gfs2_inode_lookup) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/inode.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 2 +- + fs/gfs2/dir.c | 6 ++--- + fs/gfs2/export.c | 2 +- + fs/gfs2/glock.c | 10 +++++++- + fs/gfs2/incore.h | 1 + + fs/gfs2/inode.c | 71 +++++++++------------------------------------------- + fs/gfs2/inode.h | 5 ++-- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/super.c | 26 +++++++++++-------- + 9 files changed, 46 insertions(+), 79 deletions(-) +Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (9fd4b9fc7695 NFSv4.x/pnfs: Fix a race between layoutget and bulk recalls) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (b7052cd7bcf3 sunrpc/cache: fix off-by-one in qword_get()) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + net/sunrpc/cache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging orangefs/for-next (c1223ca48baa orangefs: get rid of op refcounts) +$ git merge orangefs/for-next +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ + Documentation/filesystems/orangefs.txt | 353 ++++++ + MAINTAINERS | 8 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 +++ + fs/orangefs/dcache.c | 145 +++ + fs/orangefs/devorangefs-req.c | 907 ++++++++++++++ + fs/orangefs/dir.c | 445 +++++++ + fs/orangefs/downcall.h | 133 +++ + fs/orangefs/file.c | 695 +++++++++++ + fs/orangefs/inode.c | 487 ++++++++ + fs/orangefs/namei.c | 461 ++++++++ + fs/orangefs/orangefs-bufmap.c | 569 +++++++++ + fs/orangefs/orangefs-bufmap.h | 47 + + fs/orangefs/orangefs-cache.c | 161 +++ + fs/orangefs/orangefs-debug.h | 92 ++ + fs/orangefs/orangefs-debugfs.c | 457 +++++++ + fs/orangefs/orangefs-debugfs.h | 3 + + fs/orangefs/orangefs-dev-proto.h | 63 + + fs/orangefs/orangefs-kernel.h | 689 +++++++++++ + fs/orangefs/orangefs-mod.c | 275 +++++ + fs/orangefs/orangefs-sysfs.c | 1773 ++++++++++++++++++++++++++++ + fs/orangefs/orangefs-sysfs.h | 2 + + fs/orangefs/orangefs-utils.c | 1210 +++++++++++++++++++ + fs/orangefs/protocol.h | 453 +++++++ + fs/orangefs/super.c | 544 +++++++++ + fs/orangefs/symlink.c | 32 + + fs/orangefs/upcall.h | 246 ++++ + fs/orangefs/waitqueue.c | 313 +++++ + fs/orangefs/xattr.c | 540 +++++++++ + 33 files changed, 11383 insertions(+) + create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs + create mode 100644 Documentation/filesystems/orangefs.txt + create mode 100644 fs/orangefs/Kconfig + create mode 100644 fs/orangefs/Makefile + create mode 100644 fs/orangefs/acl.c + create mode 100644 fs/orangefs/dcache.c + create mode 100644 fs/orangefs/devorangefs-req.c + create mode 100644 fs/orangefs/dir.c + create mode 100644 fs/orangefs/downcall.h + create mode 100644 fs/orangefs/file.c + create mode 100644 fs/orangefs/inode.c + create mode 100644 fs/orangefs/namei.c + create mode 100644 fs/orangefs/orangefs-bufmap.c + create mode 100644 fs/orangefs/orangefs-bufmap.h + create mode 100644 fs/orangefs/orangefs-cache.c + create mode 100644 fs/orangefs/orangefs-debug.h + create mode 100644 fs/orangefs/orangefs-debugfs.c + create mode 100644 fs/orangefs/orangefs-debugfs.h + create mode 100644 fs/orangefs/orangefs-dev-proto.h + create mode 100644 fs/orangefs/orangefs-kernel.h + create mode 100644 fs/orangefs/orangefs-mod.c + create mode 100644 fs/orangefs/orangefs-sysfs.c + create mode 100644 fs/orangefs/orangefs-sysfs.h + create mode 100644 fs/orangefs/orangefs-utils.c + create mode 100644 fs/orangefs/protocol.h + create mode 100644 fs/orangefs/super.c + create mode 100644 fs/orangefs/symlink.c + create mode 100644 fs/orangefs/upcall.h + create mode 100644 fs/orangefs/waitqueue.c + create mode 100644 fs/orangefs/xattr.c +$ git am -3 ../patches/0001-orangfs-update-for-follow_link-to-get_link-change.patch +Applying: orangfs: update for follow_link to get_link change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/orangefs/symlink.c +$ git add -A . +$ git commit -v -a --amend +[master cce52b6c7b79] Merge remote-tracking branch 'orangefs/for-next' + Date: Fri Feb 26 10:22:41 2016 +1100 +Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts()) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +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 (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (e15c65b38461 Merge branch 'xfs-writepage-rework-4.6' into for-next) +$ git merge xfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/direct-io.c +Auto-merging fs/dax.c +Merge made by the 'recursive' strategy. + fs/dax.c | 9 +- + fs/direct-io.c | 9 +- + fs/ext4/inode.c | 9 +- + fs/ocfs2/aops.c | 7 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 2 - + fs/xfs/libxfs/xfs_attr_sf.h | 16 - + fs/xfs/libxfs/xfs_bmap.c | 6 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 1 - + fs/xfs/libxfs/xfs_btree.c | 32 +- + fs/xfs/libxfs/xfs_da_format.h | 16 + + fs/xfs/libxfs/xfs_dir2.c | 12 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 12 +- + fs/xfs/libxfs/xfs_inode_buf.c | 170 ++++--- + fs/xfs/libxfs/xfs_inode_buf.h | 38 +- + fs/xfs/libxfs/xfs_inode_fork.c | 3 +- + fs/xfs/libxfs/xfs_log_format.h | 19 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 32 +- + fs/xfs/libxfs/xfs_sb.h | 1 - + fs/xfs/libxfs/xfs_shared.h | 1 + + fs/xfs/xfs_aops.c | 1006 ++++++++++++++------------------------ + fs/xfs/xfs_aops.h | 4 +- + fs/xfs/xfs_bmap_util.c | 8 +- + fs/xfs/xfs_buf.c | 2 +- + fs/xfs/xfs_buf.h | 26 +- + fs/xfs/xfs_buf_item.c | 10 +- + fs/xfs/xfs_dir2_readdir.c | 2 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_file.c | 6 +- + fs/xfs/xfs_filestream.c | 4 +- + fs/xfs/xfs_fsops.h | 1 - + fs/xfs/xfs_icache.c | 43 +- + fs/xfs/xfs_inode.c | 174 +++---- + fs/xfs/xfs_inode.h | 8 +- + fs/xfs/xfs_inode_item.c | 82 +++- + fs/xfs/xfs_ioctl.c | 16 +- + fs/xfs/xfs_iops.c | 53 +- + fs/xfs/xfs_itable.c | 22 +- + fs/xfs/xfs_log.c | 20 +- + fs/xfs/xfs_log_recover.c | 75 +-- + fs/xfs/xfs_mount.c | 4 +- + fs/xfs/xfs_mount.h | 1 - + fs/xfs/xfs_rtalloc.c | 2 +- + fs/xfs/xfs_trace.h | 9 +- + fs/xfs/xfs_trans_ail.c | 5 +- + fs/xfs/xfs_trans_buf.c | 10 +- + fs/xfs/xfs_trans_inode.c | 14 +- + include/linux/fs.h | 2 +- + 47 files changed, 945 insertions(+), 1061 deletions(-) +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. +Merging pci/next (a314966fad61 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next) +$ git merge pci/next +Resolved 'drivers/pci/probe.c' using previous resolution. +Auto-merging include/linux/pci.h +Removing include/asm-generic/pci-bridge.h +Auto-merging drivers/pci/probe.c +CONFLICT (content): Merge conflict in drivers/pci/probe.c +Auto-merging arch/x86/pci/common.c +Auto-merging arch/powerpc/include/asm/pci-bridge.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 867b36aa4f8d] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/pci.h | 1 - + arch/arm/include/asm/pci.h | 3 - + arch/arm64/include/asm/Kbuild | 3 - + arch/arm64/include/asm/pci.h | 1 - + arch/arm64/kernel/pci.c | 2 - + arch/mips/include/asm/pci.h | 1 - + arch/powerpc/include/asm/pci-bridge.h | 1 - + arch/unicore32/include/asm/pci.h | 2 - + arch/x86/pci/common.c | 1 - + drivers/ata/pata_macio.c | 2 +- + drivers/char/agp/uninorth-agp.c | 1 - + drivers/gpu/drm/radeon/radeon_combios.c | 1 - + drivers/ide/pdc202xx_new.c | 1 - + drivers/ide/pmac.c | 1 - + drivers/macintosh/macio_asic.c | 1 - + drivers/misc/cxl/pci.c | 1 - + drivers/net/ethernet/sun/sungem.c | 1 - + drivers/net/ethernet/toshiba/spider_net.c | 1 - + drivers/of/of_pci.c | 1 - + drivers/pci/bus.c | 7 +- + drivers/pci/host/pci-imx6.c | 137 ++++++++++++----------------- + drivers/pci/host/pci-layerscape.c | 1 + + drivers/pci/host/pcie-designware.c | 15 ++-- + drivers/pci/host/pcie-rcar.c | 14 ++- + drivers/pci/pci.c | 1 - + drivers/pci/pcie/aer/aer_inject.c | 61 +++++++++---- + drivers/pci/pcie/pme.c | 11 +-- + drivers/pci/probe.c | 8 +- + drivers/pci/quirks.c | 15 ++++ + drivers/pci/setup-bus.c | 1 - + drivers/scsi/mac53c94.c | 2 +- + drivers/scsi/mesh.c | 2 +- + drivers/usb/core/hcd-pci.c | 1 - + drivers/video/fbdev/aty/aty128fb.c | 1 - + drivers/video/fbdev/aty/radeon_base.c | 1 - + drivers/video/fbdev/imsttfb.c | 1 - + drivers/video/fbdev/matrox/matroxfb_base.h | 1 - + drivers/video/fbdev/offb.c | 4 - + include/asm-generic/pci-bridge.h | 74 ---------------- + include/linux/pci.h | 22 +++++ + sound/ppc/pmac.c | 1 - + 41 files changed, 170 insertions(+), 237 deletions(-) + delete mode 100644 include/asm-generic/pci-bridge.h +Merging hid/for-next (c2781579ce25 Merge branch 'for-4.5/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-core.c | 102 ++++-- + drivers/hid/hid-corsair.c | 3 + + drivers/hid/hid-dr.c | 4 +- + drivers/hid/hid-ids.h | 9 +- + drivers/hid/hid-lg.c | 10 +- + drivers/hid/hid-logitech-hidpp.c | 701 +++++++++++++++++++++++++++++++++------ + drivers/hid/hid-multitouch.c | 3 + + drivers/hid/hid-rmi.c | 11 + + drivers/hid/hid-sony.c | 182 +++++----- + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/hid/wacom_sys.c | 363 ++++++++++---------- + drivers/hid/wacom_wac.c | 249 +++++++------- + 12 files changed, 1113 insertions(+), 526 deletions(-) +Merging i2c/i2c/for-next (33f5ccc343b7 i2c: piix4: Pre-shift the port number) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-i2c-demux-pinctrl | 23 + + .../devicetree/bindings/i2c/i2c-demux-pinctrl.txt | 135 +++ + drivers/i2c/busses/Kconfig | 10 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 177 ++-- + drivers/i2c/busses/i2c-designware-baytrail.c | 5 - + drivers/i2c/busses/i2c-designware-core.c | 22 +- + drivers/i2c/busses/i2c-designware-core.h | 2 - + drivers/i2c/busses/i2c-mt65xx.c | 42 + + drivers/i2c/busses/i2c-piix4.c | 48 +- + drivers/i2c/busses/i2c-qup.c | 945 +++++++++++++++++++-- + drivers/i2c/busses/i2c-tegra.c | 4 +- + drivers/i2c/i2c-boardinfo.c | 6 +- + drivers/i2c/i2c-core.c | 30 +- + drivers/i2c/i2c-dev.c | 14 +- + drivers/i2c/i2c-mux.c | 8 +- + drivers/i2c/i2c-smbus.c | 8 +- + drivers/i2c/i2c-stub.c | 8 +- + drivers/i2c/muxes/Kconfig | 9 + + drivers/i2c/muxes/Makefile | 2 + + drivers/i2c/muxes/i2c-demux-pinctrl.c | 272 ++++++ + 20 files changed, 1599 insertions(+), 171 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt + create mode 100644 drivers/i2c/muxes/i2c-demux-pinctrl.c +Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + Documentation/hwmon/max34440 | 6 +++--- + drivers/hwmon/emc2103.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (e1370715b20e ARM: dts: vfxxx: Add iio_hwmon node for ADC temperature channel) +$ git merge hwmon-staging/hwmon-next +Auto-merging arch/arm/boot/dts/vfxxx.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iio/iio-bindings.txt | 2 +- + Documentation/hwmon/ltc2990 | 43 ++++++ + arch/arm/boot/dts/imx23.dtsi | 2 +- + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/arm/boot/dts/vfxxx.dtsi | 5 + + drivers/hwmon/Kconfig | 14 ++ + drivers/hwmon/Makefile | 3 +- + drivers/hwmon/iio_hwmon.c | 11 +- + drivers/hwmon/ltc2990.c | 161 +++++++++++++++++++++ + drivers/hwmon/{vexpress.c => vexpress-hwmon.c} | 0 + 10 files changed, 238 insertions(+), 5 deletions(-) + create mode 100644 Documentation/hwmon/ltc2990 + create mode 100644 drivers/hwmon/ltc2990.c + rename drivers/hwmon/{vexpress.c => vexpress-hwmon.c} (100%) +Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Removing Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml +Merge made by the 'recursive' strategy. + Documentation/DocBook/device-drivers.tmpl | 1 + + .../DocBook/media/v4l/media-ioc-g-topology.xml | 3 - + Documentation/DocBook/media/v4l/media-types.xml | 29 +- + Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml | 26 +- + Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml | 154 -- + Documentation/DocBook/media/v4l/pixfmt.xml | 1 - + .../DocBook/media/v4l/vidioc-query-dv-timings.xml | 14 +- + .../DocBook/media/v4l/vidioc-querystd.xml | 10 + + .../devicetree/bindings/media/i2c/mt9v032.txt | 2 + + .../devicetree/bindings/media/i2c/tvp5150.txt | 45 + + .../devicetree/bindings/media/rcar_vin.txt | 1 + + .../devicetree/bindings/media/renesas,jpu.txt | 13 +- + Documentation/devicetree/bindings/media/ti-cal.txt | 72 + + Documentation/dvb/README.dvb-usb | 2 +- + MAINTAINERS | 8 + + drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 +- + drivers/media/common/b2c2/flexcop.c | 4 +- + drivers/media/common/cypress_firmware.c | 2 +- + drivers/media/common/cypress_firmware.h | 2 +- + drivers/media/dvb-core/dvb-usb-ids.h | 8 +- + drivers/media/dvb-core/dvb_frontend.c | 28 +- + drivers/media/dvb-core/dvbdev.c | 13 +- + drivers/media/dvb-frontends/af9013.c | 4 + + drivers/media/dvb-frontends/af9033.c | 3 + + drivers/media/dvb-frontends/bcm3510.c | 4 +- + drivers/media/dvb-frontends/bcm3510.h | 2 +- + drivers/media/dvb-frontends/bcm3510_priv.h | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 11 +- + drivers/media/dvb-frontends/dib0070.c | 2 +- + drivers/media/dvb-frontends/dib0090.c | 4 +- + drivers/media/dvb-frontends/dib3000.h | 6 +- + drivers/media/dvb-frontends/dib3000mb.c | 8 +- + drivers/media/dvb-frontends/dib3000mb_priv.h | 2 +- + drivers/media/dvb-frontends/dib3000mc.c | 4 +- + drivers/media/dvb-frontends/dib3000mc.h | 2 +- + drivers/media/dvb-frontends/dib7000m.c | 2 +- + drivers/media/dvb-frontends/dib7000p.c | 4 +- + drivers/media/dvb-frontends/dib8000.c | 2 +- + drivers/media/dvb-frontends/dib9000.c | 4 +- + drivers/media/dvb-frontends/dibx000_common.c | 2 +- + drivers/media/dvb-frontends/rtl2830.c | 3 + + drivers/media/dvb-frontends/si2165.c | 28 +- + drivers/media/dvb-frontends/stv0299.c | 4 +- + drivers/media/dvb-frontends/stv6110x.c | 4 +- + drivers/media/dvb-frontends/stv6110x.h | 4 +- + drivers/media/dvb-frontends/stv6110x_priv.h | 2 +- + drivers/media/dvb-frontends/ts2020.c | 4 + + drivers/media/i2c/adv7604.c | 28 +- + drivers/media/i2c/msp3400-driver.c | 14 + + drivers/media/i2c/msp3400-driver.h | 5 + + drivers/media/i2c/mt9v011.c | 15 + + drivers/media/i2c/mt9v032.c | 28 + + drivers/media/i2c/ov2659.c | 8 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 +- + drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 - + drivers/media/i2c/s5k5baf.c | 5 +- + drivers/media/i2c/saa7115.c | 19 + + drivers/media/i2c/soc_camera/mt9m001.c | 2 +- + drivers/media/i2c/soc_camera/mt9t031.c | 2 +- + drivers/media/i2c/soc_camera/mt9v022.c | 2 +- + drivers/media/i2c/tc358743.c | 25 +- + drivers/media/i2c/tvp514x.c | 6 +- + drivers/media/i2c/tvp5150.c | 274 ++- + drivers/media/i2c/tvp7002.c | 6 +- + drivers/media/i2c/vpx3220.c | 2 +- + drivers/media/media-device.c | 7 +- + drivers/media/media-devnode.c | 1 + + drivers/media/media-entity.c | 18 +- + drivers/media/pci/b2c2/flexcop-pci.c | 2 +- + drivers/media/pci/bt8xx/bttv-driver.c | 27 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 4 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 3 +- + drivers/media/pci/ngene/ngene-cards.c | 2 +- + drivers/media/pci/saa7134/saa7134-empress.c | 3 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 2 +- + drivers/media/pci/saa7134/saa7134-video.c | 3 +- + drivers/media/pci/ttpci/av7110.c | 2 +- + drivers/media/pci/ttpci/budget.c | 4 +- + drivers/media/platform/Kconfig | 12 + + drivers/media/platform/Makefile | 2 + + drivers/media/platform/coda/coda-bit.c | 2 +- + drivers/media/platform/davinci/dm644x_ccdc.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 20 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 10 +- + drivers/media/platform/omap3isp/isp.c | 13 +- + drivers/media/platform/omap3isp/ispccdc.c | 2 +- + drivers/media/platform/omap3isp/isppreview.c | 14 +- + drivers/media/platform/omap3isp/ispvideo.c | 103 +- + drivers/media/platform/omap3isp/omap3isp.h | 8 +- + drivers/media/platform/rcar_jpu.c | 1 + + drivers/media/platform/soc_camera/rcar_vin.c | 2 + + .../platform/soc_camera/sh_mobile_ceu_camera.c | 14 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 2 +- + drivers/media/platform/ti-vpe/Makefile | 4 + + drivers/media/platform/ti-vpe/cal.c | 1970 ++++++++++++++++++++ + drivers/media/platform/ti-vpe/cal_regs.h | 479 +++++ + drivers/media/platform/vim2m.c | 2 +- + drivers/media/platform/vivid/vivid-tpg.h | 2 + + drivers/media/radio/radio-si476x.c | 4 +- + drivers/media/radio/wl128x/fmdrv_common.c | 2 +- + drivers/media/rc/nuvoton-cir.c | 252 +-- + drivers/media/rc/nuvoton-cir.h | 12 +- + drivers/media/rc/rc-core-priv.h | 6 +- + drivers/media/rc/rc-ir-raw.c | 23 +- + drivers/media/tuners/m88rs6000t.c | 11 +- + drivers/media/tuners/r820t.c | 2 +- + drivers/media/tuners/si2157.c | 7 +- + drivers/media/tuners/tuner-xc2028.c | 3 +- + drivers/media/usb/as102/as102_drv.h | 2 +- + drivers/media/usb/as102/as102_usb_drv.c | 2 +- + drivers/media/usb/au0828/au0828-core.c | 2 +- + drivers/media/usb/au0828/au0828-dvb.c | 12 +- + drivers/media/usb/b2c2/flexcop-usb.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 2 + + drivers/media/usb/cx231xx/cx231xx-audio.c | 5 + + drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 4 +- + drivers/media/usb/dvb-usb-v2/af9035.h | 3 +- + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_common.h | 2 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 4 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 2 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 7 + + drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c | 6 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 8 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 4 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 8 + + drivers/media/usb/dvb-usb-v2/usb_urb.c | 2 +- + drivers/media/usb/dvb-usb/a800.c | 4 +- + drivers/media/usb/dvb-usb/cxusb.c | 4 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 2 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 77 +- + drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- + drivers/media/usb/dvb-usb/dibusb-mb.c | 6 +- + drivers/media/usb/dvb-usb/dibusb-mc.c | 6 +- + drivers/media/usb/dvb-usb/dibusb.h | 2 +- + drivers/media/usb/dvb-usb/digitv.c | 4 +- + drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +- + drivers/media/usb/dvb-usb/dtt200u.c | 4 +- + drivers/media/usb/dvb-usb/dtt200u.h | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-common.h | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-i2c.c | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-init.c | 4 +- + drivers/media/usb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 12 +- + drivers/media/usb/dvb-usb/nova-t-usb2.c | 4 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +- + drivers/media/usb/dvb-usb/ttusb2.c | 2 +- + drivers/media/usb/dvb-usb/umt-010.c | 4 +- + drivers/media/usb/dvb-usb/usb-urb.c | 2 +- + drivers/media/usb/dvb-usb/vp702x-fe.c | 2 +- + drivers/media/usb/dvb-usb/vp702x.c | 4 +- + drivers/media/usb/dvb-usb/vp7045-fe.c | 2 +- + drivers/media/usb/dvb-usb/vp7045.c | 4 +- + drivers/media/usb/dvb-usb/vp7045.h | 2 +- + drivers/media/usb/em28xx/em28xx-camera.c | 4 + + drivers/media/usb/em28xx/em28xx-cards.c | 201 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 10 + + drivers/media/usb/em28xx/em28xx-video.c | 339 +++- + drivers/media/usb/em28xx/em28xx.h | 21 +- + drivers/media/usb/go7007/go7007-priv.h | 2 +- + drivers/media/usb/go7007/go7007-usb.c | 4 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 2 + + drivers/media/usb/hdpvr/hdpvr-video.c | 6 +- + drivers/media/usb/msi2500/msi2500.c | 2 - + drivers/media/usb/pwc/pwc-if.c | 6 + + drivers/media/usb/stk1160/stk1160-video.c | 1 - + drivers/media/usb/usbtv/usbtv-video.c | 37 +- + drivers/media/usb/usbtv/usbtv.h | 1 + + drivers/media/usb/usbvision/usbvision-video.c | 29 +- + drivers/media/v4l2-core/Kconfig | 1 - + drivers/media/v4l2-core/tuner-core.c | 26 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 21 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 3 +- + drivers/media/v4l2-core/v4l2-of.c | 2 +- + drivers/media/v4l2-core/videobuf2-core.c | 1 + + .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 2 +- + drivers/staging/media/lirc/lirc_parallel.c | 24 +- + include/media/tuner.h | 9 +- + include/media/v4l2-mc.h | 91 + + include/uapi/linux/media.h | 23 +- + include/uapi/linux/v4l2-common.h | 46 +- + 188 files changed, 4374 insertions(+), 867 deletions(-) + delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml + create mode 100644 Documentation/devicetree/bindings/media/i2c/tvp5150.txt + create mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt + create mode 100644 drivers/media/platform/ti-vpe/cal.c + create mode 100644 drivers/media/platform/ti-vpe/cal_regs.h + create mode 100644 include/media/v4l2-mc.h +Merging kbuild/for-next (c2fd1465f329 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + include/linux/compiler-clang.h | 5 + + scripts/Makefile.dtbinst | 2 - + scripts/basic/fixdep.c | 6 +- + scripts/coccinelle/api/pm_runtime.cocci | 2 +- + scripts/coccinelle/api/setup_timer.cocci | 199 ++++++++++++++++++++++ + scripts/coccinelle/iterators/use_after_iter.cocci | 2 +- + scripts/coccinelle/misc/array_size.cocci | 2 +- + scripts/coccinelle/misc/badty.cocci | 2 +- + scripts/coccinelle/misc/bugon.cocci | 2 +- + scripts/kconfig/Makefile | 4 +- + scripts/kconfig/confdata.c | 12 +- + scripts/link-vmlinux.sh | 7 +- + scripts/tags.sh | 2 + + 13 files changed, 230 insertions(+), 17 deletions(-) + create mode 100644 scripts/coccinelle/api/setup_timer.cocci +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (8490bda29ad1 Merge branch 'for-4.5-fixes' into for-next) +$ git merge libata/for-next +Auto-merging include/linux/blkdev.h +Auto-merging block/blk-core.c +Auto-merging arch/mips/include/asm/octeon/cvmx.h +Auto-merging Documentation/devicetree/bindings/ata/ahci-platform.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-platform.txt | 1 + + .../devicetree/bindings/mips/cavium/sata-uctl.txt | 42 +++++++ + arch/mips/include/asm/octeon/cvmx.h | 9 ++ + block/blk-core.c | 24 ++++ + drivers/ata/Kconfig | 9 ++ + drivers/ata/Makefile | 1 + + drivers/ata/ahci.c | 110 ++++++++++++----- + drivers/ata/ahci.h | 6 +- + drivers/ata/ahci_mvebu.c | 14 ++- + drivers/ata/ahci_octeon.c | 105 ++++++++++++++++ + drivers/ata/ahci_platform.c | 1 + + drivers/ata/ahci_xgene.c | 85 ++++++++++++- + drivers/ata/libahci.c | 115 ++++++++++-------- + drivers/ata/libata-scsi.c | 15 ++- + drivers/ata/pata_rb532_cf.c | 11 +- + drivers/ata/sata_via.c | 133 +++++++++++++++++++-- + drivers/scsi/hosts.c | 7 ++ + drivers/scsi/scsi_pm.c | 10 ++ + include/linux/ata.h | 4 +- + include/linux/blkdev.h | 2 + + include/linux/libata.h | 2 +- + 21 files changed, 599 insertions(+), 107 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/cavium/sata-uctl.txt + create mode 100644 drivers/ata/ahci_octeon.c +Merging pm/linux-next (154b7d22e480 Merge branch 'acpica' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/cpu-freq/intel-pstate.txt | 2 +- + Documentation/kernel-parameters.txt | 6 + + arch/arm/mach-imx/gpc.c | 9 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_amba.c | 122 ++++ + drivers/acpi/acpi_platform.c | 19 +- + drivers/acpi/acpi_processor.c | 17 + + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/aclocal.h | 6 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/dbcmds.c | 2 +- + drivers/acpi/acpica/dbconvert.c | 5 +- + drivers/acpi/acpica/dsmethod.c | 3 +- + drivers/acpi/acpica/dsobject.c | 3 +- + drivers/acpi/acpica/evgpeblk.c | 3 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/exconfig.c | 4 +- + drivers/acpi/acpica/exoparg3.c | 4 +- + drivers/acpi/acpica/nseval.c | 3 +- + drivers/acpi/acpica/nsinit.c | 135 ++-- + drivers/acpi/acpica/psargs.c | 9 +- + drivers/acpi/acpica/tbinstal.c | 5 +- + drivers/acpi/acpica/tbprint.c | 7 +- + drivers/acpi/acpica/tbutils.c | 4 +- + drivers/acpi/acpica/tbxfload.c | 28 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utnonansi.c | 246 +++++-- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utxferror.c | 3 +- + drivers/acpi/acpica/utxfinit.c | 42 +- + drivers/acpi/apei/ghes.c | 23 +- + drivers/acpi/bgrt.c | 10 +- + drivers/acpi/bus.c | 26 +- + drivers/acpi/internal.h | 6 + + drivers/acpi/pmic/intel_pmic_crc.c | 7 +- + drivers/acpi/processor_driver.c | 2 - + drivers/acpi/processor_idle.c | 62 +- + drivers/acpi/scan.c | 1 + + drivers/acpi/sleep.c | 35 + + drivers/acpi/tables.c | 10 + + drivers/base/power/domain.c | 33 +- + drivers/base/power/domain_governor.c | 64 +- + drivers/base/power/opp/core.c | 1079 ++++++++++++++++++++++--------- + drivers/base/power/opp/cpu.c | 22 +- + drivers/base/power/opp/debugfs.c | 85 ++- + drivers/base/power/opp/opp.h | 74 ++- + drivers/base/power/trace.c | 4 +- + drivers/cpufreq/Kconfig | 1 + + drivers/cpufreq/amd_freq_sensitivity.c | 8 +- + drivers/cpufreq/cpufreq-dt.c | 300 +++------ + drivers/cpufreq/cpufreq.c | 313 ++++----- + drivers/cpufreq/cpufreq_conservative.c | 282 ++++---- + drivers/cpufreq/cpufreq_governor.c | 765 +++++++++++----------- + drivers/cpufreq/cpufreq_governor.h | 261 +++----- + drivers/cpufreq/cpufreq_ondemand.c | 445 +++++-------- + drivers/cpufreq/cpufreq_ondemand.h | 30 + + drivers/cpufreq/cpufreq_performance.c | 18 +- + drivers/cpufreq/cpufreq_powersave.c | 10 +- + drivers/cpufreq/cpufreq_userspace.c | 10 +- + drivers/cpufreq/intel_pstate.c | 124 ++-- + drivers/cpufreq/powernv-cpufreq.c | 116 ++-- + drivers/cpuidle/governors/menu.c | 47 +- + drivers/devfreq/tegra-devfreq.c | 2 + + include/acpi/acoutput.h | 2 +- + include/acpi/acpixf.h | 6 +- + include/acpi/processor.h | 9 +- + include/linux/cpufreq.h | 64 +- + include/linux/pm_domain.h | 13 +- + include/linux/pm_opp.h | 27 + + include/trace/events/power.h | 22 + + kernel/power/process.c | 12 +- + kernel/power/suspend.c | 6 +- + kernel/sched/deadline.c | 4 + + kernel/sched/fair.c | 26 +- + kernel/sched/rt.c | 4 + + kernel/sched/sched.h | 1 + + kernel/trace/power-traces.c | 1 + + 79 files changed, 2894 insertions(+), 2280 deletions(-) + create mode 100644 drivers/acpi/acpi_amba.c + create mode 100644 drivers/cpufreq/cpufreq_ondemand.h +Merging idle/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (98d94507e10c Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (eb4fc33eb268 thermal: small style cleanup in mtk_thermal) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + .../bindings/thermal/mediatek-thermal.txt | 43 ++ + drivers/thermal/Kconfig | 8 + + drivers/thermal/Makefile | 1 + + drivers/thermal/mtk_thermal.c | 625 +++++++++++++++++++++ + 4 files changed, 677 insertions(+) + create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt + create mode 100644 drivers/thermal/mtk_thermal.c +Merging ieee1394/for-next (575913946989 firewire: ABI documentation: jujuutils were renamed to linux-firewire-utils) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/firewire-cdev | 2 +- + drivers/firewire/nosy.c | 10 ++++++---- + drivers/firewire/ohci.c | 5 +++-- + 3 files changed, 10 insertions(+), 7 deletions(-) +Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/lowcomms.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 62 insertions(+), 12 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 (7a02d9b6888e Merge branch 'topic/omap' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/Kconfig | 5 +- + drivers/dma/acpi-dma.c | 2 +- + drivers/dma/dw/regs.h | 2 +- + drivers/dma/edma.c | 63 ++++++++------ + drivers/dma/ep93xx_dma.c | 28 +++--- + drivers/dma/idma64.c | 3 + + drivers/dma/idma64.h | 2 +- + drivers/dma/ioat/dma.c | 218 +++++++++++++---------------------------------- + drivers/dma/ioat/dma.h | 18 ++-- + drivers/dma/ioat/hw.h | 2 + + drivers/dma/ioat/init.c | 49 +++++------ + drivers/dma/ioat/prep.c | 2 +- + drivers/dma/omap-dma.c | 8 ++ + drivers/dma/sh/Kconfig | 6 +- + 14 files changed, 161 insertions(+), 247 deletions(-) +Merging net-next/master (619b17452a38 tipc: fix null deref crash in compat config path) +$ git merge net-next/master +Recorded preimage for 'include/uapi/linux/bpf.h' +Auto-merging net/ipv6/ip6_tunnel.c +Auto-merging net/ipv6/ip6_gre.c +Auto-merging net/ipv4/tcp_metrics.c +Auto-merging net/ipv4/ip_tunnel.c +Auto-merging net/ipv4/ip_output.c +Removing net/ipv4/inet_lro.c +Auto-merging net/core/filter.c +Auto-merging include/uapi/linux/bpf.h +CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h +Removing include/linux/inet_lro.h +Removing drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h +Removing drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c +Removing drivers/net/ethernet/rocker/rocker.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging arch/arm/boot/dts/ls1021a.dtsi +Auto-merging MAINTAINERS +Removing Documentation/networking/netlink_mmap.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/uapi/linux/bpf.h'. +[master 58b5da4cd7f2] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/can/ifi_canfd.txt | 15 + + .../devicetree/bindings/net/can/sja1000.txt | 3 +- + Documentation/devicetree/bindings/net/fsl-fec.txt | 3 + + Documentation/devicetree/bindings/net/macb.txt | 2 + + .../devicetree/bindings/net/micrel-ks8995.txt | 20 + + .../bindings/net/wireless/ti,wlcore,spi.txt | 36 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/networking/00-INDEX | 2 + + Documentation/networking/batman-adv.txt | 2 +- + Documentation/networking/checksum-offloads.txt | 119 + + Documentation/networking/dsa/dsa.txt | 18 +- + Documentation/networking/ip-sysctl.txt | 26 + + Documentation/networking/netlink_mmap.txt | 332 -- + MAINTAINERS | 3 +- + arch/arm/boot/dts/ls1021a.dtsi | 12 + + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 8 +- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 8 +- + arch/x86/include/asm/stacktrace.h | 2 +- + arch/x86/kernel/cpu/perf_event.c | 4 +- + arch/x86/kernel/dumpstack.c | 6 +- + arch/x86/kernel/stacktrace.c | 18 +- + arch/x86/oprofile/backtrace.c | 3 +- + drivers/bcma/bcma_private.h | 1 - + drivers/bcma/driver_chipcommon.c | 16 +- + drivers/bcma/driver_chipcommon_pmu.c | 94 +- + drivers/bcma/driver_chipcommon_sflash.c | 1 + + drivers/bcma/driver_gpio.c | 1 + + drivers/bcma/driver_mips.c | 3 - + drivers/bcma/host_pci.c | 2 +- + drivers/bcma/scan.c | 5 + + drivers/infiniband/hw/cxgb4/cm.c | 54 +- + drivers/infiniband/hw/cxgb4/qp.c | 81 +- + drivers/infiniband/hw/mlx5/main.c | 1 + + drivers/infiniband/hw/nes/Kconfig | 1 - + drivers/infiniband/hw/nes/nes_hw.c | 44 +- + drivers/infiniband/hw/nes/nes_hw.h | 7 - + drivers/infiniband/hw/nes/nes_nic.c | 7 - + drivers/isdn/hardware/eicon/debug.c | 4 - + drivers/isdn/hardware/eicon/divamnt.c | 30 +- + drivers/net/bonding/bond_3ad.c | 44 +- + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_main.c | 24 +- + drivers/net/bonding/bond_options.c | 7 +- + drivers/net/can/Kconfig | 64 +- + drivers/net/can/Makefile | 17 +- + drivers/net/can/ifi_canfd/Kconfig | 8 + + drivers/net/can/ifi_canfd/Makefile | 5 + + drivers/net/can/ifi_canfd/ifi_canfd.c | 917 ++++ + drivers/net/can/sja1000/sja1000_platform.c | 87 +- + drivers/net/dsa/bcm_sf2.c | 12 +- + drivers/net/dsa/bcm_sf2.h | 2 + + drivers/net/dsa/mv88e6171.c | 3 +- + drivers/net/dsa/mv88e6352.c | 3 +- + drivers/net/dsa/mv88e6xxx.c | 191 +- + drivers/net/dsa/mv88e6xxx.h | 19 +- + drivers/net/ethernet/3com/3c59x.c | 10 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 10 +- + drivers/net/ethernet/amd/xgbe/xgbe-dcb.c | 39 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 388 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 42 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 16 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 6 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 53 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 11 +- + drivers/net/ethernet/apm/xgene/Makefile | 3 +- + drivers/net/ethernet/apm/xgene/xgene_enet_cle.c | 734 +++ + drivers/net/ethernet/apm/xgene/xgene_enet_cle.h | 295 ++ + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 12 + + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 6 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 482 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 35 +- + drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 12 + + drivers/net/ethernet/broadcom/Kconfig | 10 + + drivers/net/ethernet/broadcom/bgmac.c | 36 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 19 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 9 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 13 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 57 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 5 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 9 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 181 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +- + drivers/net/ethernet/cadence/macb.c | 67 +- + drivers/net/ethernet/cadence/macb.h | 4 + + drivers/net/ethernet/cavium/thunder/nic.h | 4 + + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 + + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 40 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 5 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 38 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 27 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 138 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 92 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 1 + + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 8 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 116 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 20 + + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 88 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 14 +- + drivers/net/ethernet/emulex/benet/be.h | 35 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 133 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 48 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 23 +- + drivers/net/ethernet/emulex/benet/be_main.c | 196 +- + drivers/net/ethernet/freescale/fec.h | 38 +- + drivers/net/ethernet/freescale/fec_main.c | 404 +- + drivers/net/ethernet/freescale/gianfar.c | 104 +- + drivers/net/ethernet/freescale/gianfar_ptp.c | 33 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 10 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 11 +- + drivers/net/ethernet/intel/i40e/i40e.h | 45 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 20 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 87 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 776 ++- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 27 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 328 +- + drivers/net/ethernet/intel/i40e/i40e_devids.h | 6 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 296 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 30 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 422 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 39 +- + drivers/net/ethernet/intel/i40e/i40e_register.h | 48 + + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 873 ++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 85 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 20 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 36 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 5 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 87 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 125 + + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 15 + + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 821 +-- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 76 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 7 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 124 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 121 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 6 + + drivers/net/ethernet/intel/igb/e1000_82575.c | 39 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 3 +- + drivers/net/ethernet/intel/igb/e1000_hw.h | 2 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 213 +- + drivers/net/ethernet/intel/igb/e1000_mac.h | 5 +- + drivers/net/ethernet/intel/igb/e1000_mbx.c | 18 +- + drivers/net/ethernet/intel/igb/igb.h | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 774 +-- + drivers/net/ethernet/intel/igbvf/mbx.c | 20 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 7 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 278 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_model.h | 112 + + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 12 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 44 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 302 ++ + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 125 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 207 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 40 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 221 + + drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 170 + + drivers/net/ethernet/mellanox/mlx5/core/vxlan.h | 54 + + drivers/net/ethernet/nvidia/forcedeth.c | 8 +- + drivers/net/ethernet/pasemi/Kconfig | 5 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 50 +- + drivers/net/ethernet/pasemi/pasemi_mac.h | 4 - + drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c | 1 - + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed.h | 45 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 94 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 2690 +++++----- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 2 +- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 22 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 155 +- + drivers/net/ethernet/qlogic/qed/qed_int.c | 26 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 184 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 21 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 43 +- + drivers/net/ethernet/qlogic/qed/qed_sp.h | 13 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 81 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 15 +- + drivers/net/ethernet/qlogic/qede/qede.h | 20 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 6 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 603 ++- + drivers/net/ethernet/renesas/ravb.h | 4 +- + drivers/net/ethernet/renesas/ravb_main.c | 70 +- + drivers/net/ethernet/renesas/ravb_ptp.c | 25 +- + drivers/net/ethernet/renesas/sh_eth.c | 65 +- + drivers/net/ethernet/rocker/Makefile | 1 + + drivers/net/ethernet/rocker/rocker.c | 5495 -------------------- + drivers/net/ethernet/rocker/rocker.h | 583 +-- + drivers/net/ethernet/rocker/rocker_hw.h | 467 ++ + drivers/net/ethernet/rocker/rocker_main.c | 2909 +++++++++++ + drivers/net/ethernet/rocker/rocker_ofdpa.c | 2952 +++++++++++ + drivers/net/ethernet/rocker/rocker_tlv.c | 53 + + drivers/net/ethernet/rocker/rocker_tlv.h | 201 + + drivers/net/ethernet/samsung/sxgbe/Makefile | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c | 91 - + drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h | 38 - + drivers/net/ethernet/sfc/efx.h | 3 +- + drivers/net/ethernet/sfc/ethtool.c | 184 + + drivers/net/ethernet/sfc/tx.c | 10 +- + drivers/net/ethernet/sun/sunvnet.c | 24 +- + drivers/net/ethernet/ti/netcp_core.c | 14 +- + drivers/net/geneve.c | 153 +- + drivers/net/hamradio/baycom_ser_fdx.c | 12 +- + drivers/net/hamradio/dmascc.c | 13 +- + drivers/net/hyperv/netvsc_drv.c | 14 +- + drivers/net/ipvlan/ipvlan.h | 10 +- + drivers/net/ipvlan/ipvlan_core.c | 46 +- + drivers/net/ipvlan/ipvlan_main.c | 12 +- + drivers/net/macvlan.c | 2 +- + drivers/net/phy/bcm7xxx.c | 60 +- + drivers/net/phy/dp83848.c | 88 +- + drivers/net/phy/marvell.c | 52 +- + drivers/net/phy/micrel.c | 9 +- + drivers/net/phy/spi_ks8995.c | 304 +- + drivers/net/ppp/ppp_generic.c | 12 +- + drivers/net/team/team.c | 10 +- + drivers/net/virtio_net.c | 62 + + drivers/net/vrf.c | 22 +- + drivers/net/vxlan.c | 649 ++- + drivers/net/wireless/broadcom/b43/main.c | 8 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 23 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 45 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.h | 3 + + .../broadcom/brcm80211/brcmfmac/firmware.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 13 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 12 + + drivers/net/wireless/intel/iwlwifi/dvm/led.c | 5 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 77 + + .../net/wireless/intel/iwlwifi/iwl-fw-error-dump.h | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 21 + + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 73 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 75 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 58 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 42 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 69 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 31 + + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 29 + + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 43 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 36 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 28 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 131 +- + drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 16 + + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 50 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 33 + + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 6 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 134 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 42 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 536 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 155 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 87 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 15 +- + drivers/net/wireless/marvell/libertas/cfg.c | 38 + + drivers/net/wireless/marvell/libertas/cmd.c | 40 +- + drivers/net/wireless/marvell/libertas/cmdresp.c | 9 +- + drivers/net/wireless/marvell/libertas/dev.h | 1 + + drivers/net/wireless/marvell/libertas/if_sdio.c | 2 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 1 + + drivers/net/wireless/marvell/libertas/main.c | 7 +- + drivers/net/wireless/marvell/mwifiex/README | 10 + + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 248 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 13 + + drivers/net/wireless/marvell/mwifiex/debugfs.c | 51 +- + drivers/net/wireless/marvell/mwifiex/decl.h | 24 + + drivers/net/wireless/marvell/mwifiex/fw.h | 90 +- + drivers/net/wireless/marvell/mwifiex/init.c | 16 +- + drivers/net/wireless/marvell/mwifiex/ioctl.h | 5 + + drivers/net/wireless/marvell/mwifiex/join.c | 15 + + drivers/net/wireless/marvell/mwifiex/main.c | 14 + + drivers/net/wireless/marvell/mwifiex/main.h | 44 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 321 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 50 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 310 ++ + drivers/net/wireless/marvell/mwifiex/sdio.c | 35 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 23 + + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 6 + + drivers/net/wireless/marvell/mwifiex/sta_event.c | 20 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 33 +- + drivers/net/wireless/marvell/mwifiex/wmm.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 18 +- + drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.h | 20 +- + drivers/net/wireless/ti/wlcore/Kconfig | 2 +- + drivers/net/wireless/ti/wlcore/event.c | 2 +- + drivers/net/wireless/ti/wlcore/spi.c | 86 +- + drivers/net/xen-netback/common.h | 1 + + drivers/net/xen-netback/xenbus.c | 89 +- + include/linux/bcma/bcma.h | 3 + + include/linux/bcma/bcma_driver_chipcommon.h | 31 +- + include/linux/bitmap.h | 10 + + include/linux/bpf.h | 26 + + include/linux/ethtool.h | 15 +- + include/linux/if_team.h | 1 + + include/linux/igmp.h | 5 - + include/linux/inet_lro.h | 142 - + include/linux/ipv6.h | 2 + + include/linux/mlx5/device.h | 17 + + include/linux/mlx5/driver.h | 33 +- + include/linux/mlx5/mlx5_ifc.h | 109 +- + include/linux/mlx5/port.h | 87 + + include/linux/netdev_features.h | 3 + + include/linux/netdevice.h | 38 +- + include/linux/netfilter/nfnetlink.h | 2 - + include/linux/netlink.h | 10 - + include/linux/perf_event.h | 13 +- + include/linux/qed/common_hsi.h | 36 +- + include/linux/qed/eth_common.h | 171 +- + include/linux/qed/qed_chain.h | 4 + + include/linux/qed/qed_eth_if.h | 2 + + include/linux/qed/qed_if.h | 8 +- + include/linux/skbuff.h | 65 +- + include/linux/tcp.h | 8 +- + include/net/act_api.h | 63 +- + include/net/addrconf.h | 2 + + include/net/bond_3ad.h | 1 + + include/net/dsa.h | 11 +- + include/net/dst_cache.h | 97 + + include/net/dst_metadata.h | 1 + + include/net/genetlink.h | 4 - + include/net/inet6_hashtables.h | 13 +- + include/net/inet_frag.h | 1 + + include/net/inet_hashtables.h | 25 +- + include/net/ip.h | 6 - + include/net/ip6_tunnel.h | 14 +- + include/net/ip_tunnels.h | 18 +- + include/net/ipv6.h | 8 +- + include/net/lwtunnel.h | 4 +- + include/net/netns/ipv4.h | 19 + + include/net/phonet/phonet.h | 2 +- + include/net/ping.h | 2 +- + include/net/pkt_cls.h | 34 + + include/net/raw.h | 2 +- + include/net/route.h | 5 +- + include/net/sctp/structs.h | 1 - + include/net/sock.h | 6 +- + include/net/tc_act/tc_gact.h | 16 + + include/net/tcp.h | 19 +- + include/net/udp.h | 3 +- + include/net/udp_tunnel.h | 2 +- + include/net/vxlan.h | 186 +- + include/trace/events/sunvnet.h | 139 + + include/uapi/linux/bpf.h | 35 + + include/uapi/linux/ethtool.h | 110 +- + include/uapi/linux/genetlink.h | 1 + + include/uapi/linux/if_bridge.h | 15 +- + include/uapi/linux/if_link.h | 12 + + include/uapi/linux/ip.h | 2 + + include/uapi/linux/ipv6.h | 2 + + include/uapi/linux/netlink.h | 4 + + include/uapi/linux/netlink_diag.h | 2 + + include/uapi/linux/tcp.h | 3 + + kernel/bpf/Makefile | 3 + + kernel/bpf/arraymap.c | 166 +- + kernel/bpf/hashtab.c | 346 +- + kernel/bpf/stackmap.c | 237 + + kernel/bpf/syscall.c | 57 +- + kernel/bpf/verifier.c | 48 +- + kernel/events/callchain.c | 32 +- + kernel/events/internal.h | 2 - + kernel/trace/bpf_trace.c | 2 + + lib/Kconfig.debug | 8 + + lib/Makefile | 1 + + lib/bitmap.c | 89 + + lib/test_bitmap.c | 358 ++ + net/8021q/vlan.c | 1 - + net/8021q/vlan_dev.c | 1 + + net/8021q/vlanproc.c | 3 +- + net/8021q/vlanproc.h | 4 +- + net/Kconfig | 4 + + net/batman-adv/Kconfig | 2 +- + net/batman-adv/Makefile | 2 +- + net/batman-adv/bat_algo.h | 2 +- + net/batman-adv/bat_iv_ogm.c | 113 +- + net/batman-adv/bitarray.c | 14 +- + net/batman-adv/bitarray.h | 14 +- + net/batman-adv/bridge_loop_avoidance.c | 329 +- + net/batman-adv/bridge_loop_avoidance.h | 2 +- + net/batman-adv/debugfs.c | 8 +- + net/batman-adv/debugfs.h | 2 +- + net/batman-adv/distributed-arp-table.c | 96 +- + net/batman-adv/distributed-arp-table.h | 2 +- + net/batman-adv/fragmentation.c | 26 +- + net/batman-adv/fragmentation.h | 4 +- + net/batman-adv/gateway_client.c | 127 +- + net/batman-adv/gateway_client.h | 2 +- + net/batman-adv/gateway_common.c | 4 +- + net/batman-adv/gateway_common.h | 2 +- + net/batman-adv/hard-interface.c | 54 +- + net/batman-adv/hard-interface.h | 18 +- + net/batman-adv/hash.c | 2 +- + net/batman-adv/hash.h | 24 +- + net/batman-adv/icmp_socket.c | 8 +- + net/batman-adv/icmp_socket.h | 2 +- + net/batman-adv/main.c | 105 +- + net/batman-adv/main.h | 27 +- + net/batman-adv/multicast.c | 44 +- + net/batman-adv/multicast.h | 4 +- + net/batman-adv/network-coding.c | 142 +- + net/batman-adv/network-coding.h | 2 +- + net/batman-adv/originator.c | 246 +- + net/batman-adv/originator.h | 18 +- + net/batman-adv/packet.h | 19 +- + net/batman-adv/routing.c | 112 +- + net/batman-adv/routing.h | 5 +- + net/batman-adv/send.c | 43 +- + net/batman-adv/send.h | 6 +- + net/batman-adv/soft-interface.c | 73 +- + net/batman-adv/soft-interface.h | 4 +- + net/batman-adv/sysfs.c | 32 +- + net/batman-adv/sysfs.h | 2 +- + net/batman-adv/translation-table.c | 331 +- + net/batman-adv/translation-table.h | 2 +- + net/batman-adv/types.h | 67 +- + net/bridge/br_mdb.c | 108 +- + net/bridge/br_multicast.c | 18 +- + net/bridge/br_netlink.c | 1 - + net/bridge/br_private.h | 12 +- + net/bridge/br_stp.c | 14 +- + net/bridge/br_stp_if.c | 2 - + net/bridge/br_stp_timer.c | 1 - + net/bridge/br_vlan.c | 11 + + net/bridge/netfilter/nft_reject_bridge.c | 8 +- + net/core/Makefile | 1 + + net/core/dev.c | 34 +- + net/core/dst.c | 10 +- + net/core/dst_cache.c | 168 + + net/core/ethtool.c | 192 +- + net/core/filter.c | 105 +- + net/core/flow_dissector.c | 45 +- + net/core/lwtunnel.c | 37 + + net/core/net-sysfs.c | 3 +- + net/core/netclassid_cgroup.c | 1 - + net/core/netprio_cgroup.c | 1 - + net/core/rtnetlink.c | 70 +- + net/core/skbuff.c | 125 +- + net/core/sock.c | 1 + + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 4 +- + net/dsa/slave.c | 117 +- + net/ethernet/eth.c | 3 +- + net/ieee802154/socket.c | 17 +- + net/ipv4/Kconfig | 9 +- + net/ipv4/Makefile | 1 - + net/ipv4/af_inet.c | 19 +- + net/ipv4/arp.c | 8 + + net/ipv4/devinet.c | 4 + + net/ipv4/fou.c | 14 +- + net/ipv4/gre_offload.c | 85 +- + net/ipv4/igmp.c | 78 +- + net/ipv4/inet_connection_sock.c | 254 +- + net/ipv4/inet_diag.c | 6 +- + net/ipv4/inet_hashtables.c | 237 +- + net/ipv4/inet_lro.c | 374 -- + net/ipv4/ip_fragment.c | 29 +- + net/ipv4/ip_gre.c | 32 +- + net/ipv4/ip_input.c | 30 +- + net/ipv4/ip_output.c | 3 - + net/ipv4/ip_sockglue.c | 10 +- + net/ipv4/ip_tunnel.c | 78 +- + net/ipv4/ip_tunnel_core.c | 30 +- + net/ipv4/ipip.c | 4 +- + net/ipv4/netfilter/ipt_SYNPROXY.c | 3 +- + net/ipv4/ping.c | 4 +- + net/ipv4/proc.c | 2 +- + net/ipv4/raw.c | 4 +- + net/ipv4/syncookies.c | 4 +- + net/ipv4/sysctl_net_ipv4.c | 236 +- + net/ipv4/tcp.c | 26 +- + net/ipv4/tcp_fastopen.c | 70 +- + net/ipv4/tcp_input.c | 176 +- + net/ipv4/tcp_ipv4.c | 21 +- + net/ipv4/tcp_metrics.c | 3 +- + net/ipv4/tcp_minisocks.c | 3 - + net/ipv4/tcp_offload.c | 8 +- + net/ipv4/tcp_output.c | 6 +- + net/ipv4/tcp_timer.c | 23 +- + net/ipv4/udp.c | 32 +- + net/ipv4/udp_offload.c | 93 +- + net/ipv6/Kconfig | 1 + + net/ipv6/addrconf.c | 16 + + net/ipv6/af_inet6.c | 6 +- + net/ipv6/ila/ila_common.c | 1 + + net/ipv6/inet6_connection_sock.c | 2 + + net/ipv6/inet6_hashtables.c | 78 +- + net/ipv6/ip6_checksum.c | 23 +- + net/ipv6/ip6_gre.c | 12 +- + net/ipv6/ip6_input.c | 12 +- + net/ipv6/ip6_tunnel.c | 103 +- + net/ipv6/ip6_vti.c | 2 +- + net/ipv6/ndisc.c | 9 + + net/ipv6/reassembly.c | 6 +- + net/ipv6/sit.c | 23 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/tcp_ipv6.c | 10 +- + net/ipv6/udp.c | 64 +- + net/l2tp/l2tp_ip6.c | 3 +- + net/llc/af_llc.c | 4 +- + net/mpls/mpls_iptunnel.c | 1 + + net/netfilter/ipvs/ip_vs_xmit.c | 6 +- + net/netfilter/nfnetlink.c | 7 - + net/netfilter/nfnetlink_log.c | 5 +- + net/netfilter/nfnetlink_queue.c | 6 +- + net/netfilter/xt_TPROXY.c | 31 +- + net/netfilter/xt_socket.c | 28 +- + net/netlink/Kconfig | 9 - + net/netlink/af_netlink.c | 774 +-- + net/netlink/af_netlink.h | 15 - + net/netlink/diag.c | 39 - + net/netlink/genetlink.c | 25 +- + net/openvswitch/Kconfig | 1 + + net/openvswitch/actions.c | 8 +- + net/openvswitch/datapath.c | 40 +- + net/openvswitch/flow_netlink.c | 6 + + net/openvswitch/vport-netdev.c | 2 +- + net/openvswitch/vport.h | 7 - + net/packet/af_packet.c | 440 +- + net/phonet/socket.c | 6 +- + net/rds/tcp.c | 1 - + net/sched/act_api.c | 137 +- + net/sched/act_bpf.c | 52 +- + net/sched/act_connmark.c | 54 +- + net/sched/act_csum.c | 67 +- + net/sched/act_gact.c | 55 +- + net/sched/act_ipt.c | 127 +- + net/sched/act_mirred.c | 54 +- + net/sched/act_nat.c | 72 +- + net/sched/act_pedit.c | 54 +- + net/sched/act_police.c | 52 +- + net/sched/act_simple.c | 55 +- + net/sched/act_skbedit.c | 54 +- + net/sched/act_vlan.c | 54 +- + net/sched/cls_u32.c | 99 +- + net/sched/sch_api.c | 2 +- + net/sched/sch_mqprio.c | 8 +- + net/sctp/chunk.c | 13 - + net/sctp/input.c | 4 +- + net/sctp/proc.c | 2 - + net/sctp/socket.c | 3 +- + net/tipc/link.c | 45 +- + net/tipc/link.h | 6 +- + net/tipc/name_table.c | 14 +- + net/tipc/netlink_compat.c | 2 +- + net/tipc/node.c | 105 +- + net/tipc/server.c | 4 +- + net/tipc/subscr.c | 130 +- + net/tipc/subscr.h | 11 +- + net/unix/af_unix.c | 5 +- + samples/bpf/Makefile | 4 + + samples/bpf/bpf_helpers.h | 2 + + samples/bpf/offwaketime_kern.c | 131 + + samples/bpf/offwaketime_user.c | 185 + + samples/bpf/test_maps.c | 188 + + samples/bpf/tracex2_kern.c | 2 +- + samples/bpf/tracex2_user.c | 7 +- + samples/bpf/tracex3_kern.c | 8 +- + samples/bpf/tracex3_user.c | 21 +- + tools/net/bpf_dbg.c | 10 +- + tools/net/bpf_exp.l | 84 +- + tools/net/bpf_exp.y | 146 +- + tools/testing/selftests/lib/Makefile | 2 +- + tools/testing/selftests/lib/bitmap.sh | 10 + + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/reuseport_bpf.c | 117 +- + tools/testing/selftests/net/reuseport_bpf_cpu.c | 258 + + 588 files changed, 31159 insertions(+), 17886 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/can/ifi_canfd.txt + create mode 100644 Documentation/devicetree/bindings/net/micrel-ks8995.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt + create mode 100644 Documentation/networking/checksum-offloads.txt + delete mode 100644 Documentation/networking/netlink_mmap.txt + create mode 100644 drivers/net/can/ifi_canfd/Kconfig + create mode 100644 drivers/net/can/ifi_canfd/Makefile + create mode 100644 drivers/net/can/ifi_canfd/ifi_canfd.c + create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_cle.c + create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_cle.h + create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_model.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/vxlan.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/vxlan.h + delete mode 100644 drivers/net/ethernet/rocker/rocker.c + create mode 100644 drivers/net/ethernet/rocker/rocker_hw.h + create mode 100644 drivers/net/ethernet/rocker/rocker_main.c + create mode 100644 drivers/net/ethernet/rocker/rocker_ofdpa.c + create mode 100644 drivers/net/ethernet/rocker/rocker_tlv.c + create mode 100644 drivers/net/ethernet/rocker/rocker_tlv.h + delete mode 100644 drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c + delete mode 100644 drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h + delete mode 100644 include/linux/inet_lro.h + create mode 100644 include/linux/mlx5/port.h + create mode 100644 include/net/dst_cache.h + create mode 100644 include/trace/events/sunvnet.h + create mode 100644 kernel/bpf/stackmap.c + create mode 100644 lib/test_bitmap.c + create mode 100644 net/core/dst_cache.c + delete mode 100644 net/ipv4/inet_lro.c + create mode 100644 samples/bpf/offwaketime_kern.c + create mode 100644 samples/bpf/offwaketime_user.c + create mode 100755 tools/testing/selftests/lib/bitmap.sh + create mode 100644 tools/testing/selftests/net/reuseport_bpf_cpu.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 (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_app.c | 8 ++------ + net/netfilter/ipvs/ip_vs_ctl.c | 17 ++++++----------- + 2 files changed, 8 insertions(+), 17 deletions(-) +Merging wireless-drivers-next/master (0a44b22009d5 rtlwifi: rtl8821ae: Convert driver to use common 5G channel table) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/broadcom/b43/main.c | 6 +- + .../broadcom/brcm80211/brcmfmac/flowring.c | 38 +++-- + .../broadcom/brcm80211/brcmfmac/flowring.h | 20 +-- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 11 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 2 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 183 ++++++++++++++------- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 55 ++++++- + drivers/net/wireless/realtek/rtlwifi/core.c | 16 ++ + drivers/net/wireless/realtek/rtlwifi/pci.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 23 +-- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 12 -- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 18 -- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 27 +-- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 11 +- + 17 files changed, 244 insertions(+), 185 deletions(-) +Merging bluetooth/master (395174bb07c1 Bluetooth: hci_uart: Add Intel/AG6xx support) +$ git merge bluetooth/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 +- + drivers/bluetooth/Kconfig | 11 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/ath3k.c | 5 + + drivers/bluetooth/btbcm.c | 3 +- + drivers/bluetooth/btusb.c | 2 + + drivers/bluetooth/hci_ag6xx.c | 326 +++++++++++++++++++++++++++++ + drivers/bluetooth/hci_bcm.c | 2 + + drivers/bluetooth/hci_intel.c | 4 +- + drivers/bluetooth/hci_ldisc.c | 6 + + drivers/bluetooth/hci_uart.h | 8 +- + drivers/net/ieee802154/at86rf230.c | 25 ++- + drivers/net/ieee802154/mrf24j40.c | 1 + + include/net/6lowpan.h | 32 +++ + include/net/bluetooth/hci_core.h | 3 + + include/net/mac802154.h | 5 +- + net/6lowpan/core.c | 39 +++- + net/6lowpan/debugfs.c | 247 ++++++++++++++++++++++ + net/6lowpan/iphc.c | 413 ++++++++++++++++++++++++++++++++----- + net/bluetooth/Kconfig | 9 + + net/bluetooth/Makefile | 1 + + net/bluetooth/hci_core.c | 7 + + net/bluetooth/leds.c | 74 +++++++ + net/bluetooth/leds.h | 16 ++ + net/ieee802154/6lowpan/core.c | 7 +- + net/mac802154/main.c | 2 +- + 26 files changed, 1178 insertions(+), 80 deletions(-) + create mode 100644 drivers/bluetooth/hci_ag6xx.c + create mode 100644 net/bluetooth/leds.c + create mode 100644 net/bluetooth/leds.h +Merging mac80211-next/master (b573213927c5 rfkill: Notify userspace of airplane-mode state changes) +$ git merge mac80211-next/master +Resolved 'net/mac80211/debugfs.c' using previous resolution. +Auto-merging net/wireless/sme.c +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/rfkill/core.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/sta_info.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/mesh.h +Auto-merging net/mac80211/mesh.c +Auto-merging net/mac80211/ibss.c +Auto-merging net/mac80211/debugfs.c +CONFLICT (content): Merge conflict in net/mac80211/debugfs.c +Auto-merging net/mac80211/agg-rx.c +Removing include/linux/rfkill-gpio.h +Auto-merging drivers/staging/vt6656/rxtx.c +Auto-merging drivers/net/wireless/realtek/rtlwifi/core.c +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/d3.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c +Removing Documentation/ABI/obsolete/sysfs-class-rfkill +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2802b2fc0dee] Merge remote-tracking branch 'mac80211-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/obsolete/sysfs-class-rfkill | 29 -- + Documentation/ABI/removed/sysfs-class-rfkill | 13 + + Documentation/ABI/stable/sysfs-class-rfkill | 27 +- + Documentation/networking/mac80211-injection.txt | 17 ++ + Documentation/rfkill.txt | 17 ++ + arch/arm/mach-tegra/board-paz00.c | 17 +- + drivers/net/wireless/ath/ath10k/mac.c | 7 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 7 +- + drivers/net/wireless/ath/ath9k/main.c | 8 +- + drivers/net/wireless/ath/carl9170/main.c | 8 +- + drivers/net/wireless/ath/wcn36xx/main.c | 8 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 10 + + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 8 +- + drivers/net/wireless/intel/iwlegacy/4965.h | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 20 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 + + drivers/net/wireless/mac80211_hwsim.c | 12 +- + drivers/net/wireless/marvell/mwl8k.c | 10 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 8 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 4 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 19 +- + drivers/net/wireless/st/cw1200/sta.c | 4 +- + drivers/net/wireless/st/cw1200/sta.h | 4 +- + drivers/net/wireless/ti/wlcore/main.c | 8 +- + drivers/staging/vt6655/rxtx.c | 12 +- + drivers/staging/vt6656/rxtx.c | 12 +- + include/linux/ieee80211.h | 26 ++ + include/linux/rfkill-gpio.h | 37 --- + include/linux/rfkill.h | 18 +- + include/net/cfg80211.h | 8 + + include/net/mac80211.h | 198 ++++++++++---- + include/uapi/linux/nl80211.h | 14 + + include/uapi/linux/rfkill.h | 8 + + net/mac80211/agg-rx.c | 50 +++- + net/mac80211/agg-tx.c | 53 ++-- + net/mac80211/cfg.c | 34 ++- + net/mac80211/chan.c | 2 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/debugfs_key.c | 5 +- + net/mac80211/driver-ops.c | 10 +- + net/mac80211/driver-ops.h | 4 +- + net/mac80211/ht.c | 5 + + net/mac80211/ibss.c | 32 ++- + net/mac80211/ieee80211_i.h | 37 +-- + net/mac80211/iface.c | 14 + + net/mac80211/key.c | 86 ------ + net/mac80211/key.h | 10 +- + net/mac80211/mesh.c | 9 +- + net/mac80211/mesh.h | 3 - + net/mac80211/mesh_pathtbl.c | 111 ++++++-- + net/mac80211/mesh_plink.c | 10 +- + net/mac80211/mlme.c | 79 +++--- + net/mac80211/rx.c | 139 ++++++++-- + net/mac80211/sta_info.c | 35 ++- + net/mac80211/sta_info.h | 24 +- + net/mac80211/tkip.c | 36 +-- + net/mac80211/tkip.h | 2 - + net/mac80211/trace.h | 43 +-- + net/mac80211/tx.c | 92 ++++++- + net/mac80211/util.c | 116 ++++++-- + net/mac80211/vht.c | 57 ++++ + net/mac80211/wpa.c | 11 +- + net/rfkill/Kconfig | 3 +- + net/rfkill/core.c | 298 ++++++++++++++------- + net/rfkill/rfkill-gpio.c | 24 +- + net/wireless/Kconfig | 25 +- + net/wireless/core.c | 10 + + net/wireless/mlme.c | 3 +- + net/wireless/nl80211.c | 29 +- + net/wireless/radiotap.c | 1 + + net/wireless/reg.c | 122 +++------ + net/wireless/sme.c | 9 +- + net/wireless/util.c | 275 ++++++++++++------- + 80 files changed, 1653 insertions(+), 924 deletions(-) + delete mode 100644 Documentation/ABI/obsolete/sysfs-class-rfkill + create mode 100644 Documentation/ABI/removed/sysfs-class-rfkill + delete mode 100644 include/linux/rfkill-gpio.h +Merging rdma/for-next (18558cae0272 Linux 4.5-rc4) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (44248affb5d8 MAINTAINERS: add maintainer entry for FREESCALE GPMI NAND driver) +$ git merge mtd/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +++++- + fs/jffs2/README.Locking | 5 +--- + fs/jffs2/build.c | 75 +++++++++++++++++++++++++++++++++++++------------ + fs/jffs2/file.c | 39 ++++++++++++------------- + fs/jffs2/gc.c | 17 ++++++----- + fs/jffs2/nodelist.h | 6 +++- + 6 files changed, 98 insertions(+), 52 deletions(-) +Merging l2-mtd/master (46f0ba976663 mtd: brcmnand: Fix v7.1 register offsets) +$ git merge l2-mtd/master +Auto-merging fs/jffs2/gc.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/atmel-nand.txt | 31 ++- + arch/arm/plat-samsung/devs.c | 9 - + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 - + drivers/memory/fsl_ifc.c | 2 +- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/bcm47xxpart.c | 42 +-- + drivers/mtd/bcm63xxpart.c | 182 ++++++++++--- + drivers/mtd/nand/Kconfig | 3 + + drivers/mtd/nand/atmel_nand.c | 89 +++++-- + drivers/mtd/nand/atmel_nand_ecc.h | 9 +- + drivers/mtd/nand/atmel_nand_nfc.h | 3 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 34 ++- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 73 +++++- + drivers/mtd/nand/jz4740_nand.c | 3 - + drivers/mtd/nand/lpc32xx_mlc.c | 2 +- + drivers/mtd/nand/mpc5121_nfc.c | 7 +- + drivers/mtd/nand/nand_bbt.c | 2 - + drivers/mtd/nand/nand_ids.c | 4 +- + drivers/mtd/nand/nuc900_nand.c | 2 +- + drivers/mtd/nand/plat_nand.c | 1 - + drivers/mtd/nand/pxa3xx_nand.c | 179 ++++++++----- + drivers/mtd/nand/s3c2410.c | 3 - + drivers/mtd/nand/sunxi_nand.c | 287 +++++++++++++++++++-- + drivers/mtd/nand/vf610_nfc.c | 2 - + drivers/mtd/onenand/onenand_base.c | 3 +- + drivers/mtd/onenand/onenand_bbt.c | 5 +- + drivers/mtd/spi-nor/Kconfig | 1 + + drivers/mtd/spi-nor/mtk-quadspi.c | 4 +- + drivers/mtd/spi-nor/spi-nor.c | 47 +--- + drivers/staging/mt29f_spinand/mt29f_spinand.h | 1 - + fs/jffs2/gc.c | 64 +++-- + fs/jffs2/jffs2_fs_sb.h | 2 +- + fs/jffs2/nodemgmt.c | 4 +- + include/linux/mtd/bbm.h | 1 - + include/linux/mtd/inftl.h | 1 - + include/linux/mtd/map.h | 7 +- + include/linux/mtd/nand.h | 8 +- + include/linux/mtd/nftl.h | 1 - + include/linux/platform_data/mtd-nand-s3c2410.h | 1 - + 39 files changed, 810 insertions(+), 313 deletions(-) +Merging crypto/master (49abc0d2e19b crypto: xts - fix compile errors) +$ git merge crypto/master +Resolved 'fs/crypto/fname.c' using previous resolution. +Resolved 'net/ipv4/tcp.c' using previous resolution. +Auto-merging net/sctp/socket.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp_fastopen.c +Auto-merging net/ipv4/tcp.c +CONFLICT (content): Merge conflict in net/ipv4/tcp.c +Auto-merging net/bluetooth/smp.c +Auto-merging include/net/tcp.h +Auto-merging include/net/sctp/structs.h +Removing include/crypto/internal/compress.h +Removing include/crypto/compress.h +CONFLICT (modify/delete): fs/f2fs/f2fs_crypto.h deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/f2fs_crypto.h left in tree. +CONFLICT (modify/delete): fs/f2fs/crypto_key.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto_key.c left in tree. +CONFLICT (modify/delete): fs/f2fs/crypto.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto.c left in tree. +Auto-merging fs/ext4/crypto.c +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/crypto/fname.c +CONFLICT (content): Merge conflict in fs/crypto/fname.c +Auto-merging fs/cifs/cifsencrypt.c +Auto-merging drivers/crypto/atmel-sha.c +Auto-merging drivers/crypto/atmel-aes.c +Auto-merging drivers/char/hw_random/Kconfig +Removing crypto/zlib.c +Auto-merging crypto/shash.c +Removing crypto/pcompress.c +Auto-merging crypto/crc32_generic.c +Auto-merging crypto/Kconfig +Auto-merging arch/arm64/crypto/aes-glue.c +Auto-merging arch/arm/crypto/aes-ce-glue.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/f2fs/f2fs_crypto.h fs/f2fs/crypto_key.c fs/f2fs/crypto.c +fs/f2fs/crypto.c: needs merge +fs/f2fs/crypto_key.c: needs merge +fs/f2fs/f2fs_crypto.h: needs merge +rm 'fs/f2fs/crypto.c' +rm 'fs/f2fs/crypto_key.c' +rm 'fs/f2fs/f2fs_crypto.h' +$ git commit -v -a +[master 1e14319f109c] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/crypto-API.tmpl | 242 ++++++------- + Documentation/crypto/api-intro.txt | 23 +- + .../devicetree/bindings/rng/brcm,bcm6368.txt | 17 + + .../bindings/rng/microchip,pic32-rng.txt | 17 + + .../devicetree/bindings/sparc_sun_oracle_rng.txt | 30 ++ + .../devicetree/bindings/vendor-prefixes.txt | 2 + + arch/arm/crypto/aes-ce-glue.c | 5 + + arch/arm/crypto/aesbs-glue.c | 6 + + arch/arm64/crypto/aes-glue.c | 5 + + arch/powerpc/crypto/aes-spe-glue.c | 6 + + arch/s390/crypto/aes_s390.c | 6 + + arch/x86/crypto/aesni-intel_glue.c | 11 +- + arch/x86/crypto/camellia_glue.c | 10 +- + arch/x86/crypto/cast6_avx_glue.c | 10 +- + arch/x86/crypto/serpent_avx_glue.c | 11 +- + arch/x86/crypto/serpent_sse2_glue.c | 11 +- + arch/x86/crypto/sha-mb/sha1_mb.c | 35 ++ + arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S | 2 +- + arch/x86/crypto/twofish_glue_3way.c | 10 +- + crypto/Kconfig | 23 +- + crypto/Makefile | 5 +- + crypto/ahash.c | 24 +- + crypto/algapi.c | 15 + + crypto/{crc32.c => crc32_generic.c} | 3 +- + crypto/crypto_engine.c | 355 +++++++++++++++++++ + crypto/drbg.c | 64 ---- + crypto/internal.h | 3 + + crypto/keywrap.c | 4 +- + crypto/mcryptd.c | 1 + + crypto/pcompress.c | 115 ------ + crypto/shash.c | 147 -------- + crypto/skcipher.c | 4 +- + crypto/tcrypt.c | 239 +------------ + crypto/testmgr.c | 385 +++++++++------------ + crypto/testmgr.h | 144 -------- + crypto/xts.c | 11 +- + crypto/zlib.c | 381 -------------------- + drivers/block/cryptoloop.c | 48 +-- + drivers/block/drbd/drbd_int.h | 16 +- + drivers/block/drbd/drbd_main.c | 16 +- + drivers/block/drbd/drbd_nl.c | 59 ++-- + drivers/block/drbd/drbd_receiver.c | 56 ++- + drivers/block/drbd/drbd_worker.c | 43 ++- + drivers/char/hw_random/Kconfig | 15 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/bcm63xx-rng.c | 9 +- + drivers/char/hw_random/n2-drv.c | 10 + + drivers/char/hw_random/pic32-rng.c | 155 +++++++++ + drivers/crypto/Kconfig | 3 +- + drivers/crypto/atmel-aes.c | 6 - + drivers/crypto/atmel-sha-regs.h | 4 + + drivers/crypto/atmel-sha.c | 196 ++++++++--- + drivers/crypto/caam/ctrl.c | 2 +- + drivers/crypto/caam/jr.c | 2 +- + drivers/crypto/caam/regs.h | 3 +- + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 35 ++ + drivers/crypto/ccp/ccp-crypto-sha.c | 39 +++ + drivers/crypto/ccp/ccp-crypto.h | 22 ++ + drivers/crypto/ixp4xx_crypto.c | 26 +- + drivers/crypto/omap-aes.c | 97 +++--- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 4 +- + drivers/crypto/qat/qat_common/adf_aer.c | 1 - + drivers/crypto/qat/qat_common/adf_cfg_user.h | 6 +- + drivers/crypto/qat/qat_common/qat_algs.c | 6 +- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 70 ++-- + drivers/crypto/s5p-sss.c | 12 +- + drivers/crypto/sahara.c | 19 +- + drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 5 +- + drivers/md/dm-crypt.c | 93 ++--- + drivers/net/ppp/ppp_mppe.c | 99 +++--- + drivers/net/wireless/intersil/orinoco/mic.c | 29 +- + drivers/net/wireless/intersil/orinoco/mic.h | 4 +- + drivers/net/wireless/intersil/orinoco/orinoco.h | 4 +- + drivers/nfc/s3fwrn5/firmware.c | 36 +- + drivers/scsi/iscsi_tcp.c | 54 +-- + drivers/scsi/iscsi_tcp.h | 4 +- + drivers/scsi/libiscsi_tcp.c | 29 +- + .../lustre/lustre/libcfs/linux/linux-crypto.c | 92 ++--- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 99 +++--- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 48 +-- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 92 ++--- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 46 ++- + drivers/target/iscsi/iscsi_target.c | 86 ++--- + drivers/target/iscsi/iscsi_target_auth.c | 98 ++---- + drivers/target/iscsi/iscsi_target_login.c | 45 ++- + drivers/usb/wusbcore/crypto.c | 30 +- + fs/cifs/cifsencrypt.c | 32 +- + fs/cifs/smbencrypt.c | 26 +- + fs/ecryptfs/crypto.c | 107 +++--- + fs/ecryptfs/ecryptfs_kernel.h | 12 +- + fs/ecryptfs/inode.c | 1 - + fs/ecryptfs/keystore.c | 218 +++++++----- + fs/ecryptfs/main.c | 1 - + fs/ecryptfs/mmap.c | 1 - + fs/ecryptfs/super.c | 1 - + fs/ext4/crypto.c | 24 +- + fs/ext4/crypto_fname.c | 32 +- + fs/ext4/crypto_key.c | 42 ++- + fs/ext4/ext4_crypto.h | 2 +- + fs/nfsd/nfs4recover.c | 28 +- + include/crypto/aead.h | 6 +- + include/crypto/akcipher.h | 28 +- + include/crypto/algapi.h | 92 ++++- + include/crypto/compress.h | 145 -------- + include/crypto/drbg.h | 4 - + include/crypto/hash.h | 45 +++ + include/crypto/internal/aead.h | 6 + + include/crypto/internal/compress.h | 28 -- + include/crypto/internal/hash.h | 3 - + include/crypto/skcipher.h | 24 +- + include/crypto/xts.h | 27 ++ + include/linux/crypto.h | 252 -------------- + include/linux/sunrpc/gss_krb5.h | 32 +- + include/net/sctp/auth.h | 4 +- + include/net/sctp/structs.h | 6 +- + include/net/tcp.h | 6 +- + include/scsi/libiscsi_tcp.h | 13 +- + include/target/iscsi/iscsi_target_core.h | 4 +- + net/bluetooth/smp.c | 135 ++++---- + net/ceph/crypto.c | 101 +++--- + net/ipv4/tcp.c | 41 ++- + net/ipv4/tcp_fastopen.c | 1 + + net/ipv4/tcp_ipv4.c | 23 +- + net/ipv6/tcp_ipv6.c | 23 +- + net/mac802154/llsec.c | 41 ++- + net/mac802154/llsec.h | 3 +- + net/rxrpc/ar-internal.h | 2 +- + net/rxrpc/ar-key.c | 12 +- + net/rxrpc/rxkad.c | 172 +++++---- + net/sctp/auth.c | 36 +- + net/sctp/endpointola.c | 1 - + net/sctp/sm_make_chunk.c | 51 +-- + net/sctp/socket.c | 8 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 350 +++++++++++-------- + net/sunrpc/auth_gss/gss_krb5_keys.c | 12 +- + net/sunrpc/auth_gss/gss_krb5_mech.c | 89 ++--- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 22 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 24 +- + net/wireless/lib80211_crypt_tkip.c | 99 +++--- + net/wireless/lib80211_crypt_wep.c | 46 ++- + net/xfrm/xfrm_algo.c | 7 +- + security/keys/encrypted-keys/encrypted.c | 82 +++-- + 142 files changed, 3340 insertions(+), 3649 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm6368.txt + create mode 100644 Documentation/devicetree/bindings/rng/microchip,pic32-rng.txt + create mode 100644 Documentation/devicetree/bindings/sparc_sun_oracle_rng.txt + rename crypto/{crc32.c => crc32_generic.c} (98%) + create mode 100644 crypto/crypto_engine.c + delete mode 100644 crypto/pcompress.c + delete mode 100644 crypto/zlib.c + create mode 100644 drivers/char/hw_random/pic32-rng.c + delete mode 100644 include/crypto/compress.h + delete mode 100644 include/crypto/internal/compress.h +Merging drm/drm-next (0041ee4d3642 Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu.h' using previous resolution. +Auto-merging include/dt-bindings/media/tvp5150.h +Auto-merging include/drm/drm_crtc.h +Auto-merging drivers/gpu/drm/vc4/vc4_drv.h +Auto-merging drivers/gpu/drm/tegra/drm.h +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dsi_panel_vbt.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_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_csr.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_vidi.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_ipp.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_g2d.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dsi.c +Auto-merging drivers/gpu/drm/drm_irq.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +Auto-merging drivers/gpu/drm/amd/include/amd_shared.h +Auto-merging drivers/gpu/drm/amd/amdgpu/vi.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/cik_sdma.c +Auto-merging drivers/gpu/drm/amd/amdgpu/cik.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c +Removing drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8297bfaf00b4] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/gpu.tmpl | 59 +- + Documentation/DocBook/media/v4l/controls.xml | 58 + + Documentation/DocBook/media/v4l/media-types.xml | 4 - + Documentation/DocBook/media/v4l/pixfmt-yuv422m.xml | 166 ++ + Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml | 177 ++ + Documentation/DocBook/media/v4l/pixfmt.xml | 2 + + .../devicetree/bindings/display/renesas,du.txt | 16 +- + .../display/rockchip/inno_hdmi-rockchip.txt | 50 + + .../devicetree/bindings/media/i2c/tvp5150.txt | 43 + + .../devicetree/bindings/media/renesas,vsp1.txt | 34 +- + Documentation/dma-buf-sharing.txt | 40 +- + Documentation/video4linux/v4l2-controls.txt | 1 - + MAINTAINERS | 6 + + drivers/dma-buf/dma-buf.c | 58 +- + drivers/gpu/drm/Kconfig | 12 + + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/acp/Kconfig | 11 + + drivers/gpu/drm/amd/acp/Makefile | 8 + + drivers/gpu/drm/amd/acp/acp_hw.c | 50 + + drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 34 + + drivers/gpu/drm/amd/amdgpu/Makefile | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 236 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 502 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 42 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 385 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 173 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 135 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 159 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 355 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 174 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 108 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c | 102 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 154 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 237 --- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 96 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 139 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 607 +++--- + drivers/gpu/drm/amd/amdgpu/cik.c | 308 +-- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 67 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 6 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 1985 ++++++++------------ + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 228 +-- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 6 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 70 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 71 +- + drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 6 + + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 50 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 397 +--- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h | 1 + + .../drm/amd/include/asic_reg/dce/dce_8_0_enum.h | 1117 +++++++++++ + .../drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h | 12 + + .../drm/amd/include/ivsrcid/ivsrcid_vislands30.h | 102 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 206 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 206 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 123 ++ + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 93 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 123 ++ + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 78 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 44 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 12 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 10 +- + drivers/gpu/drm/arm/Kconfig | 27 + + drivers/gpu/drm/arm/Makefile | 2 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 327 ++++ + drivers/gpu/drm/arm/hdlcd_drv.c | 550 ++++++ + drivers/gpu/drm/arm/hdlcd_drv.h | 42 + + drivers/gpu/drm/arm/hdlcd_regs.h | 87 + + drivers/gpu/drm/armada/armada_drv.c | 3 - + drivers/gpu/drm/ast/ast_mode.c | 8 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 10 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 3 - + drivers/gpu/drm/bochs/bochs_kms.c | 8 - + drivers/gpu/drm/bridge/dw-hdmi.c | 8 - + drivers/gpu/drm/cirrus/cirrus_mode.c | 9 - + drivers/gpu/drm/drm_atomic.c | 44 +- + drivers/gpu/drm/drm_atomic_helper.c | 62 +- + drivers/gpu/drm/drm_crtc.c | 101 +- + drivers/gpu/drm/drm_crtc_helper.c | 35 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 368 ++++ + drivers/gpu/drm/drm_dp_helper.c | 16 +- + drivers/gpu/drm/drm_edid.c | 26 + + drivers/gpu/drm/drm_encoder_slave.c | 3 + + drivers/gpu/drm/drm_fb_cma_helper.c | 3 +- + drivers/gpu/drm/drm_fb_helper.c | 56 +- + drivers/gpu/drm/drm_fops.c | 305 ++- + drivers/gpu/drm/drm_irq.c | 18 +- + drivers/gpu/drm/drm_kms_helper_common.c | 60 + + drivers/gpu/drm/drm_modes.c | 3 +- + drivers/gpu/drm/drm_prime.c | 10 +- + drivers/gpu/drm/exynos/exynos_dp_core.c | 8 - + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 14 - + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 8 - + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 37 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 29 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 5 - + drivers/gpu/drm/gma500/cdv_intel_crt.c | 1 - + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 1 - + drivers/gpu/drm/gma500/framebuffer.c | 20 +- + drivers/gpu/drm/gma500/gma_display.c | 7 - + drivers/gpu/drm/gma500/gma_display.h | 3 - + drivers/gpu/drm/gma500/intel_gmbus.c | 2 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 - + drivers/gpu/drm/gma500/psb_drv.c | 9 - + drivers/gpu/drm/i2c/ch7006_drv.c | 2 + + drivers/gpu/drm/i2c/sil164_drv.c | 9 - + drivers/gpu/drm/i2c/tda998x_drv.c | 9 - + drivers/gpu/drm/i915/i915_debugfs.c | 56 +- + drivers/gpu/drm/i915/i915_dma.c | 2 - + drivers/gpu/drm/i915/i915_drv.c | 27 +- + drivers/gpu/drm/i915/i915_drv.h | 108 +- + drivers/gpu/drm/i915/i915_gem.c | 95 +- + drivers/gpu/drm/i915/i915_gem_context.c | 29 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 42 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 163 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 1 - + drivers/gpu/drm/i915/i915_gem_shrinker.c | 60 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 3 + + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 1 + + drivers/gpu/drm/i915/i915_guc_submission.c | 146 +- + drivers/gpu/drm/i915/i915_irq.c | 254 ++- + drivers/gpu/drm/i915/i915_params.c | 1 + + drivers/gpu/drm/i915/i915_params.h | 68 + + drivers/gpu/drm/i915/i915_reg.h | 5 + + drivers/gpu/drm/i915/i915_sysfs.c | 8 +- + drivers/gpu/drm/i915/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 14 +- + drivers/gpu/drm/i915/intel_bios.c | 412 ++-- + drivers/gpu/drm/i915/intel_bios.h | 60 +- + drivers/gpu/drm/i915/intel_csr.c | 14 +- + drivers/gpu/drm/i915/intel_ddi.c | 291 ++- + drivers/gpu/drm/i915/intel_display.c | 1071 ++++++----- + drivers/gpu/drm/i915/intel_dp.c | 48 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- + drivers/gpu/drm/i915/intel_drv.h | 52 +- + drivers/gpu/drm/i915/intel_dsi.c | 9 +- + drivers/gpu/drm/i915/intel_dsi.h | 3 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 153 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 93 +- + drivers/gpu/drm/i915/intel_fbdev.c | 4 +- + drivers/gpu/drm/i915/intel_guc.h | 4 + + drivers/gpu/drm/i915/intel_guc_fwif.h | 113 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 13 +- + drivers/gpu/drm/i915/intel_hdmi.c | 6 + + drivers/gpu/drm/i915/intel_lrc.c | 562 +++--- + drivers/gpu/drm/i915/intel_lrc.h | 23 +- + drivers/gpu/drm/i915/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/intel_overlay.c | 24 +- + drivers/gpu/drm/i915/intel_pm.c | 93 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 38 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 19 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 31 +- + drivers/gpu/drm/i915/intel_sdvo_regs.h | 76 +- + drivers/gpu/drm/i915/intel_sprite.c | 161 +- + drivers/gpu/drm/i915/intel_uncore.c | 139 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 8 - + drivers/gpu/drm/imx/imx-drm-core.c | 13 - + drivers/gpu/drm/imx/imx-ldb.c | 8 - + drivers/gpu/drm/imx/imx-tve.c | 8 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 4 - + drivers/gpu/drm/imx/parallel-display.c | 8 - + drivers/gpu/drm/mgag200/mgag200_mode.c | 8 - + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 + + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 7 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c | 8 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 8 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 11 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 1 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 8 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 9 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 6 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 8 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 11 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 - + drivers/gpu/drm/msm/msm_fbdev.c | 4 - + drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 11 + + drivers/gpu/drm/omapdrm/omap_crtc.c | 13 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 42 - + drivers/gpu/drm/omapdrm/omap_drv.h | 1 - + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 4 +- + drivers/gpu/drm/qxl/qxl_display.c | 9 - + drivers/gpu/drm/radeon/atombios_encoders.c | 8 - + drivers/gpu/drm/radeon/cik.c | 11 +- + drivers/gpu/drm/radeon/cik_sdma.c | 9 +- + drivers/gpu/drm/radeon/r100.c | 10 +- + drivers/gpu/drm/radeon/r600.c | 10 +- + drivers/gpu/drm/radeon/r600_dma.c | 9 +- + drivers/gpu/drm/radeon/radeon.h | 2 + + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 3 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 6 + + drivers/gpu/drm/radeon/radeon_display.c | 5 +- + drivers/gpu/drm/radeon/radeon_drv.c | 11 + + drivers/gpu/drm/radeon/radeon_fence.c | 40 +- + drivers/gpu/drm/radeon/radeon_vce.c | 11 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 10 +- + drivers/gpu/drm/rcar-du/Kconfig | 15 +- + drivers/gpu/drm/rcar-du/Makefile | 2 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 95 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 228 ++- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 12 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 74 +- + drivers/gpu/drm/rcar-du/rcar_du_group.h | 4 + + drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 11 +- + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 313 +-- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 11 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 142 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 6 + + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 465 ++++- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 21 +- + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 21 +- + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 11 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 384 ++++ + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 76 + + drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 26 +- + drivers/gpu/drm/rockchip/Kconfig | 8 + + drivers/gpu/drm/rockchip/Makefile | 1 + + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 8 - + drivers/gpu/drm/rockchip/inno_hdmi.c | 938 +++++++++ + drivers/gpu/drm/rockchip/inno_hdmi.h | 362 ++++ + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 20 - + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 2 - + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 8 - + drivers/gpu/drm/sti/sti_tvout.c | 10 - + drivers/gpu/drm/tegra/dc.c | 17 - + drivers/gpu/drm/tegra/drm.c | 4 - + drivers/gpu/drm/tegra/drm.h | 1 - + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 20 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 8 - + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 1 - + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 9 - + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 9 - + drivers/gpu/drm/udl/udl_drv.c | 14 +- + drivers/gpu/drm/udl/udl_encoder.c | 8 - + drivers/gpu/drm/udl/udl_fb.c | 2 - + drivers/gpu/drm/vc4/vc4_crtc.c | 191 +- + drivers/gpu/drm/vc4/vc4_drv.c | 10 - + drivers/gpu/drm/vc4/vc4_drv.h | 13 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 97 + + drivers/gpu/drm/vc4/vc4_kms.c | 9 + + drivers/gpu/drm/vc4/vc4_plane.c | 603 +++++- + drivers/gpu/drm/vc4/vc4_regs.h | 102 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 8 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 16 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 11 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 87 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 2 - + drivers/gpu/vga/vga_switcheroo.c | 119 +- + drivers/media/common/siano/smscoreapi.c | 4 +- + drivers/media/common/siano/smsdvb-main.c | 7 - + drivers/media/dvb-core/dvb_frontend.c | 55 +- + drivers/media/dvb-core/dvb_frontend.h | 3 +- + drivers/media/dvb-frontends/af9013.c | 4 +- + drivers/media/dvb-frontends/af9033.c | 4 +- + drivers/media/dvb-frontends/as102_fe.c | 4 +- + drivers/media/dvb-frontends/atbm8830.c | 4 +- + drivers/media/dvb-frontends/au8522_dig.c | 4 +- + drivers/media/dvb-frontends/cx22700.c | 4 +- + drivers/media/dvb-frontends/cx22702.c | 4 +- + drivers/media/dvb-frontends/cx24110.c | 4 +- + drivers/media/dvb-frontends/cx24117.c | 4 +- + drivers/media/dvb-frontends/cx24120.c | 4 +- + drivers/media/dvb-frontends/cx24123.c | 4 +- + drivers/media/dvb-frontends/cxd2820r_c.c | 4 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 9 +- + drivers/media/dvb-frontends/cxd2820r_priv.h | 9 +- + drivers/media/dvb-frontends/cxd2820r_t.c | 4 +- + drivers/media/dvb-frontends/cxd2820r_t2.c | 6 +- + drivers/media/dvb-frontends/cxd2841er.c | 4 +- + drivers/media/dvb-frontends/dib3000mb.c | 9 +- + drivers/media/dvb-frontends/dib3000mc.c | 6 +- + drivers/media/dvb-frontends/dib7000m.c | 6 +- + drivers/media/dvb-frontends/dib7000p.c | 6 +- + drivers/media/dvb-frontends/dib8000.c | 75 +- + drivers/media/dvb-frontends/dib9000.c | 23 +- + drivers/media/dvb-frontends/dvb_dummy_fe.c | 7 +- + drivers/media/dvb-frontends/hd29l2.c | 4 +- + drivers/media/dvb-frontends/l64781.c | 4 +- + drivers/media/dvb-frontends/lg2160.c | 62 +- + drivers/media/dvb-frontends/lgdt3305.c | 4 +- + drivers/media/dvb-frontends/lgdt3306a.c | 4 +- + drivers/media/dvb-frontends/lgdt330x.c | 5 +- + drivers/media/dvb-frontends/lgs8gl5.c | 5 +- + drivers/media/dvb-frontends/lgs8gxx.c | 13 +- + drivers/media/dvb-frontends/m88ds3103.c | 4 +- + drivers/media/dvb-frontends/m88rs2000.c | 5 +- + drivers/media/dvb-frontends/mb86a20s.c | 11 - + drivers/media/dvb-frontends/mt312.c | 4 +- + drivers/media/dvb-frontends/mt352.c | 4 +- + drivers/media/dvb-frontends/or51132.c | 4 +- + drivers/media/dvb-frontends/rtl2830.c | 4 +- + drivers/media/dvb-frontends/rtl2832.c | 4 +- + drivers/media/dvb-frontends/s5h1409.c | 4 +- + drivers/media/dvb-frontends/s5h1411.c | 4 +- + drivers/media/dvb-frontends/s5h1420.c | 4 +- + drivers/media/dvb-frontends/s921.c | 4 +- + drivers/media/dvb-frontends/stb0899_drv.c | 4 +- + drivers/media/dvb-frontends/stb6100.c | 2 +- + drivers/media/dvb-frontends/stv0297.c | 4 +- + drivers/media/dvb-frontends/stv0299.c | 4 +- + drivers/media/dvb-frontends/stv0367.c | 8 +- + drivers/media/dvb-frontends/stv0900_core.c | 4 +- + drivers/media/dvb-frontends/tc90522.c | 10 +- + drivers/media/dvb-frontends/tda10021.c | 4 +- + drivers/media/dvb-frontends/tda10023.c | 4 +- + drivers/media/dvb-frontends/tda10048.c | 4 +- + drivers/media/dvb-frontends/tda1004x.c | 4 +- + drivers/media/dvb-frontends/tda10071.c | 4 +- + drivers/media/dvb-frontends/tda10086.c | 4 +- + drivers/media/dvb-frontends/tda8083.c | 4 +- + drivers/media/dvb-frontends/ves1820.c | 4 +- + drivers/media/dvb-frontends/ves1x93.c | 4 +- + drivers/media/dvb-frontends/zl10353.c | 4 +- + drivers/media/i2c/adp1653.c | 2 +- + drivers/media/i2c/adv7511.c | 43 +- + drivers/media/i2c/adv7604.c | 199 +- + drivers/media/i2c/adv7842.c | 20 + + drivers/media/i2c/ov9650.c | 4 +- + drivers/media/i2c/tvp5150.c | 200 +- + drivers/media/media-device.c | 6 +- + drivers/media/pci/bt8xx/dst.c | 4 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 3 +- + drivers/media/pci/cx88/cx88-dvb.c | 3 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 4 +- + drivers/media/pci/saa7134/saa7134-cards.c | 1813 ++++++++---------- + drivers/media/pci/saa7134/saa7134-core.c | 193 +- + drivers/media/pci/saa7134/saa7134-dvb.c | 9 +- + drivers/media/pci/saa7134/saa7134-tvaudio.c | 13 +- + drivers/media/pci/saa7134/saa7134-video.c | 105 +- + drivers/media/pci/saa7134/saa7134.h | 45 +- + drivers/media/platform/Kconfig | 10 +- + drivers/media/platform/Makefile | 1 - + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 12 + + drivers/media/platform/ti-vpe/cal.c | 17 +- + drivers/media/platform/vivid/vivid-osd.c | 2 +- + drivers/media/platform/vsp1/Makefile | 3 +- + drivers/media/platform/vsp1/vsp1.h | 29 +- + drivers/media/platform/vsp1/vsp1_bru.c | 33 +- + drivers/media/platform/vsp1/vsp1_bru.h | 3 +- + drivers/media/platform/vsp1/vsp1_dl.c | 305 +++ + drivers/media/platform/vsp1/vsp1_dl.h | 42 + + drivers/media/platform/vsp1/vsp1_drm.c | 597 ++++++ + drivers/media/platform/vsp1/vsp1_drm.h | 49 + + drivers/media/platform/vsp1/vsp1_drv.c | 382 ++-- + drivers/media/platform/vsp1/vsp1_entity.c | 31 +- + drivers/media/platform/vsp1/vsp1_entity.h | 14 +- + drivers/media/platform/vsp1/vsp1_hsit.c | 2 +- + drivers/media/platform/vsp1/vsp1_lif.c | 11 +- + drivers/media/platform/vsp1/vsp1_lut.c | 7 +- + drivers/media/platform/vsp1/vsp1_pipe.c | 426 +++++ + drivers/media/platform/vsp1/vsp1_pipe.h | 134 ++ + drivers/media/platform/vsp1/vsp1_regs.h | 32 +- + drivers/media/platform/vsp1/vsp1_rpf.c | 88 +- + drivers/media/platform/vsp1/vsp1_rwpf.h | 29 +- + drivers/media/platform/vsp1/vsp1_sru.c | 9 +- + drivers/media/platform/vsp1/vsp1_uds.c | 8 +- + drivers/media/platform/vsp1/vsp1_video.c | 518 +---- + drivers/media/platform/vsp1/vsp1_video.h | 111 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 98 +- + drivers/media/radio/tea575x.c | 21 +- + drivers/media/rc/rc-main.c | 45 +- + drivers/media/tuners/si2157.c | 32 +- + drivers/media/tuners/si2157.h | 5 + + drivers/media/tuners/si2157_priv.h | 8 + + drivers/media/tuners/tuner-xc2028.c | 7 +- + drivers/media/usb/au0828/au0828-core.c | 172 +- + drivers/media/usb/au0828/au0828-video.c | 166 +- + drivers/media/usb/au0828/au0828.h | 21 +- + drivers/media/usb/cpia2/cpia2_core.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 70 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 10 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 47 +- + drivers/media/usb/cx231xx/cx231xx.h | 4 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 13 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 4 +- + drivers/media/usb/dvb-usb/af9005-fe.c | 4 +- + drivers/media/usb/dvb-usb/dtt200u-fe.c | 5 +- + drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 15 +- + drivers/media/usb/dvb-usb/friio-fe.c | 27 +- + drivers/media/usb/em28xx/em28xx-cards.c | 25 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 13 +- + drivers/media/usb/em28xx/em28xx-video.c | 134 +- + drivers/media/usb/pvrusb2/pvrusb2-context.c | 2 +- + drivers/media/usb/siano/smsusb.c | 32 +- + drivers/media/v4l2-core/Makefile | 1 + + drivers/media/v4l2-core/v4l2-async.c | 7 + + drivers/media/v4l2-core/v4l2-ctrls.c | 34 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 4 + + drivers/media/v4l2-core/v4l2-mc.c | 258 +++ + drivers/media/v4l2-core/videobuf2-dvb.c | 13 +- + drivers/platform/x86/apple-gmux.c | 111 +- + drivers/staging/android/ion/ion.c | 6 +- + drivers/staging/android/ion/ion_test.c | 4 +- + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/davinci_vpfe/vpfe_video.c | 2 +- + drivers/staging/media/timb/Kconfig | 11 + + drivers/staging/media/timb/Makefile | 1 + + .../platform => staging/media/timb}/timblogiw.c | 0 + include/drm/drmP.h | 30 +- + include/drm/drm_crtc.h | 18 + + include/drm/drm_dp_aux_dev.h | 62 + + include/drm/drm_fb_helper.h | 6 + + include/drm/drm_modeset_helper_vtables.h | 2 +- + include/{media/i2c => dt-bindings/media}/tvp5150.h | 8 +- + include/linux/apple-gmux.h | 50 + + include/linux/dma-buf.h | 12 +- + include/linux/vga_switcheroo.h | 36 +- + include/media/media-device.h | 5 + + include/media/rc-core.h | 2 + + include/media/v4l2-ctrls.h | 12 - + include/media/v4l2-mc.h | 81 + + include/media/v4l2-subdev.h | 3 + + include/media/videobuf2-dvb.h | 5 + + include/media/vsp1.h | 33 + + include/uapi/drm/drm.h | 1 + + include/uapi/drm/i915_drm.h | 33 +- + include/uapi/drm/msm_drm.h | 1 + + include/uapi/linux/dma-buf.h | 40 + + include/uapi/linux/media.h | 28 +- + include/uapi/linux/v4l2-controls.h | 11 + + include/uapi/linux/videodev2.h | 4 + + mm/swapfile.c | 6 + + 465 files changed, 19781 insertions(+), 10840 deletions(-) + create mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv422m.xml + create mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml + create mode 100644 Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt + create mode 100644 drivers/gpu/drm/amd/acp/Kconfig + create mode 100644 drivers/gpu/drm/amd/acp/Makefile + create mode 100644 drivers/gpu/drm/amd/acp/acp_hw.c + create mode 100644 drivers/gpu/drm/amd/acp/include/acp_gfx_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/ivsrcid_vislands30.h + create mode 100644 drivers/gpu/drm/arm/Kconfig + create mode 100644 drivers/gpu/drm/arm/Makefile + create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c + create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c + create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h + create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h + create mode 100644 drivers/gpu/drm/drm_dp_aux_dev.c + create mode 100644 drivers/gpu/drm/drm_kms_helper_common.c + create mode 100644 drivers/gpu/drm/i915/i915_params.h + mode change 100644 => 100755 drivers/gpu/drm/i915/intel_hdmi.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.h + create mode 100644 drivers/gpu/drm/rockchip/inno_hdmi.c + create mode 100644 drivers/gpu/drm/rockchip/inno_hdmi.h + create mode 100644 drivers/media/platform/vsp1/vsp1_dl.c + create mode 100644 drivers/media/platform/vsp1/vsp1_dl.h + create mode 100644 drivers/media/platform/vsp1/vsp1_drm.c + create mode 100644 drivers/media/platform/vsp1/vsp1_drm.h + create mode 100644 drivers/media/platform/vsp1/vsp1_pipe.c + create mode 100644 drivers/media/platform/vsp1/vsp1_pipe.h + create mode 100644 drivers/media/v4l2-core/v4l2-mc.c + create mode 100644 drivers/staging/media/timb/Kconfig + create mode 100644 drivers/staging/media/timb/Makefile + rename drivers/{media/platform => staging/media/timb}/timblogiw.c (100%) + create mode 100644 include/drm/drm_dp_aux_dev.h + rename include/{media/i2c => dt-bindings/media}/tvp5150.h (87%) + create mode 100644 include/linux/apple-gmux.h + create mode 100644 include/media/vsp1.h + create mode 100644 include/uapi/linux/dma-buf.h +$ git am -3 ../patches/0001-drm-fix-bad-merge-of-drivers-gpu-drm-amd-amdgpu-amdg.patch +Applying: drm: fix bad merge of drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +$ git add -A . +$ git commit -v -a --amend +[master 699e2db917ae] Merge remote-tracking branch 'drm/drm-next' + Date: Fri Feb 26 11:36:59 2016 +1100 +Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. +Merging drm-intel/for-linux-next (032b612e055e drm/i915: Remove update_sprite_watermarks.) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/intel_csr.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dsi_panel_vbt.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_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_csr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/i915_suspend.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 932902c64118] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/char/agp/intel-gtt.c | 32 +- + drivers/gpu/drm/i915/Kconfig | 13 +- + drivers/gpu/drm/i915/i915_debugfs.c | 31 +- + drivers/gpu/drm/i915/i915_dma.c | 258 ++++---- + drivers/gpu/drm/i915/i915_drv.c | 8 - + drivers/gpu/drm/i915/i915_drv.h | 79 ++- + drivers/gpu/drm/i915/i915_gem.c | 23 +- + drivers/gpu/drm/i915/i915_gem_context.c | 40 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 50 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 6 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 16 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 5 + + drivers/gpu/drm/i915/i915_gem_userptr.c | 181 ++---- + drivers/gpu/drm/i915/i915_gpu_error.c | 4 + + drivers/gpu/drm/i915/i915_guc_submission.c | 65 +- + drivers/gpu/drm/i915/i915_irq.c | 37 +- + drivers/gpu/drm/i915/i915_params.c | 18 +- + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_reg.h | 47 +- + drivers/gpu/drm/i915/i915_suspend.c | 2 +- + drivers/gpu/drm/i915/intel_atomic.c | 1 + + drivers/gpu/drm/i915/intel_crt.c | 14 +- + drivers/gpu/drm/i915/intel_csr.c | 11 +- + drivers/gpu/drm/i915/intel_ddi.c | 8 +- + drivers/gpu/drm/i915/intel_display.c | 700 ++++++++++----------- + drivers/gpu/drm/i915/intel_dp.c | 31 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 5 + + drivers/gpu/drm/i915/intel_drv.h | 46 +- + drivers/gpu/drm/i915/intel_dsi.c | 18 +- + drivers/gpu/drm/i915/intel_dsi.h | 2 + + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 10 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 2 +- + drivers/gpu/drm/i915/intel_fbc.c | 952 +++++++++++++++++------------ + drivers/gpu/drm/i915/intel_fbdev.c | 17 +- + drivers/gpu/drm/i915/intel_guc.h | 6 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 17 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 6 +- + drivers/gpu/drm/i915/intel_hdmi.c | 8 + + drivers/gpu/drm/i915/intel_lrc.c | 78 ++- + drivers/gpu/drm/i915/intel_lrc.h | 3 +- + drivers/gpu/drm/i915/intel_pm.c | 196 +++--- + drivers/gpu/drm/i915/intel_psr.c | 63 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 68 ++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 43 +- + drivers/gpu/drm/i915/intel_sdvo.c | 4 + + drivers/gpu/drm/i915/intel_sideband.c | 23 +- + drivers/gpu/drm/i915/intel_sprite.c | 40 +- + drivers/gpu/drm/i915/intel_tv.c | 16 +- + drivers/gpu/drm/i915/intel_uncore.c | 2 + + include/drm/i915_pciids.h | 6 +- + include/uapi/drm/i915_drm.h | 10 +- + 53 files changed, 1901 insertions(+), 1425 deletions(-) + mode change 100755 => 100644 drivers/gpu/drm/i915/intel_hdmi.c +Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs()) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/host1x/bus.c | 4 +++- + drivers/gpu/host1x/job.c | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging drm-misc/topic/drm-misc (a6ddd2f1b99f drm/udl: Use module_usb_driver) +$ git merge drm-misc/topic/drm-misc +Already up-to-date. +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 (3932f008e3eb drm/msm: rename hdmi symbols) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/dsi.txt | 26 +- + .../devicetree/bindings/display/msm/hdmi.txt | 39 +- + drivers/gpu/drm/msm/Makefile | 3 + + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 11 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 493 +++++++- + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 1267 +++++++++++++++++++- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 108 +- + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 30 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 8 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 41 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 6 + + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 48 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 5 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 148 ++- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 5 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 5 +- + drivers/gpu/drm/msm/edp/edp.xml.h | 5 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 174 +-- + drivers/gpu/drm/msm/hdmi/hdmi.h | 110 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 647 ++++++++-- + drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 10 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 56 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 172 +-- + drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 166 +-- + drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 20 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 228 ++++ + drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 503 +------- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 766 ++++++++++++ + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 196 ++- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 94 +- + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 461 +++++++ + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 5 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 5 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 9 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 19 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 1 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 5 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 9 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 5 +- + drivers/gpu/drm/msm/msm_drv.c | 11 +- + drivers/gpu/drm/msm/msm_drv.h | 7 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 20 +- + drivers/gpu/drm/msm/msm_iommu.c | 4 +- + drivers/gpu/drm/msm/msm_mmu.h | 4 +- + include/uapi/drm/msm_drm.h | 1 + + 48 files changed, 4638 insertions(+), 1326 deletions(-) + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c +Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.) +$ git merge hdlcd/for-upstream/hdlcd +Merge made by the 'recursive' strategy. +Merging drm-vc4/drm-vc4-next (fc04023fafec drm/vc4: Add support for YUV planes.) +$ git merge drm-vc4/drm-vc4-next +Already up-to-date. +Merging sound/for-next (956dea9e9112 ALSA: oxfw: discontinue MIDI substream for scs1x at transaction failure) +$ git merge sound/for-next +Auto-merging sound/usb/midi.c +Removing sound/mips/au1x00.c +Merge made by the 'recursive' strategy. + Documentation/sound/alsa/ALSA-Configuration.txt | 9 + + Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt | 74 +++ + include/sound/jack.h | 23 +- + sound/core/Kconfig | 9 +- + sound/core/jack.c | 23 +- + sound/core/timer.c | 268 ++++---- + sound/drivers/mts64.c | 95 ++- + sound/drivers/portman2x4.c | 93 ++- + sound/firewire/bebob/bebob.c | 21 +- + sound/firewire/bebob/bebob.h | 5 +- + sound/firewire/bebob/bebob_midi.c | 16 +- + sound/firewire/bebob/bebob_pcm.c | 28 +- + sound/firewire/bebob/bebob_stream.c | 58 +- + sound/firewire/dice/dice-midi.c | 23 +- + sound/firewire/dice/dice-pcm.c | 199 ++---- + sound/firewire/dice/dice-stream.c | 78 ++- + sound/firewire/dice/dice-transaction.c | 56 +- + sound/firewire/dice/dice.c | 67 +- + sound/firewire/dice/dice.h | 8 - + sound/firewire/fireworks/fireworks.c | 3 + + sound/firewire/fireworks/fireworks_stream.c | 6 +- + sound/firewire/oxfw/oxfw-scs1x.c | 35 +- + sound/mips/Kconfig | 12 - + sound/mips/Makefile | 2 - + sound/mips/au1x00.c | 734 --------------------- + sound/pci/Kconfig | 2 +- + sound/pci/hda/Kconfig | 2 +- + sound/pci/hda/patch_hdmi.c | 636 +++++++++++++++--- + sound/pci/hda/thinkpad_helper.c | 17 +- + sound/soc/Kconfig | 2 +- + sound/usb/card.c | 56 +- + sound/usb/midi.c | 15 +- + sound/usb/midi.h | 14 +- + sound/usb/quirks.c | 36 +- + sound/usb/quirks.h | 3 +- + 35 files changed, 1191 insertions(+), 1537 deletions(-) + create mode 100644 Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt + delete mode 100644 sound/mips/au1x00.c +Merging sound-asoc/for-next (7135909be57e Merge remote-tracking branch 'asoc/topic/wm8974' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regmap/regmap.txt | 11 +- + .../devicetree/bindings/sound/adi,adau17x1.txt | 24 + + .../devicetree/bindings/sound/fsl-asoc-card.txt | 9 + + .../devicetree/bindings/sound/max9867.txt | 17 + + .../devicetree/bindings/sound/max98926.txt | 32 + + .../devicetree/bindings/sound/mt8173-rt5650.txt | 15 + + .../devicetree/bindings/sound/pcm179x.txt | 11 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 1 + + Documentation/devicetree/bindings/sound/rt5514.txt | 25 + + Documentation/devicetree/bindings/sound/rt5616.txt | 6 + + Documentation/devicetree/bindings/sound/rt5640.txt | 3 + + .../bindings/sound/sunxi,sun4i-spdif.txt | 39 + + arch/mips/boot/dts/brcm/bcm6328.dtsi | 2 +- + arch/mips/boot/dts/brcm/bcm6368.dtsi | 2 +- + arch/mips/boot/dts/brcm/bcm7125.dtsi | 2 +- + arch/mips/boot/dts/brcm/bcm7346.dtsi | 2 +- + arch/mips/boot/dts/brcm/bcm7358.dtsi | 2 +- + arch/mips/boot/dts/brcm/bcm7360.dtsi | 2 +- + arch/mips/boot/dts/brcm/bcm7362.dtsi | 2 +- + arch/mips/boot/dts/brcm/bcm7420.dtsi | 2 +- + arch/mips/boot/dts/brcm/bcm7425.dtsi | 2 +- + arch/mips/boot/dts/brcm/bcm7435.dtsi | 2 +- + drivers/base/regmap/regcache.c | 41 +- + drivers/base/regmap/regmap-mmio.c | 259 +++-- + drivers/base/regmap/regmap.c | 5 + + include/drm/drm_edid.h | 12 + + include/linux/platform_data/adau17x1.h | 2 +- + include/sound/pcm.h | 2 + + include/sound/soc-topology.h | 21 +- + include/sound/soc.h | 2 +- + sound/core/pcm_misc.c | 30 + + sound/soc/bcm/bcm2835-i2s.c | 284 +---- + sound/soc/codecs/Kconfig | 36 +- + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/ab8500-codec.c | 1 - + sound/soc/codecs/adau1761-i2c.c | 14 +- + sound/soc/codecs/adau1761-spi.c | 14 +- + sound/soc/codecs/adau1761.c | 10 +- + sound/soc/codecs/adau1781-i2c.c | 10 + + sound/soc/codecs/adau1781-spi.c | 10 + + sound/soc/codecs/adau1781.c | 2 +- + sound/soc/codecs/adau17x1.h | 6 +- + sound/soc/codecs/arizona.c | 71 +- + sound/soc/codecs/arizona.h | 4 +- + sound/soc/codecs/cs42xx8.c | 10 +- + sound/soc/codecs/cs47l24.c | 123 +- + sound/soc/codecs/hdac_hdmi.c | 1219 ++++++++++++++++++-- + sound/soc/codecs/hdac_hdmi.h | 6 + + sound/soc/codecs/max9867.c | 544 +++++++++ + sound/soc/codecs/max9867.h | 83 ++ + sound/soc/codecs/max98926.c | 606 ++++++++++ + sound/soc/codecs/max98926.h | 848 ++++++++++++++ + sound/soc/codecs/pcm179x-i2c.c | 73 ++ + sound/soc/codecs/pcm179x-spi.c | 72 ++ + sound/soc/codecs/pcm179x.c | 56 +- + sound/soc/codecs/pcm179x.h | 9 +- + sound/soc/codecs/pcm3168a.c | 5 + + sound/soc/codecs/rt298.c | 7 +- + sound/soc/codecs/rt298.h | 8 + + sound/soc/codecs/rt5514.c | 982 ++++++++++++++++ + sound/soc/codecs/rt5514.h | 252 ++++ + sound/soc/codecs/rt5616.c | 412 ++++--- + sound/soc/codecs/rt5640.c | 31 + + sound/soc/codecs/rt5640.h | 2 + + sound/soc/codecs/rt5659.c | 2 +- + sound/soc/codecs/ssm4567.c | 5 + + sound/soc/codecs/wm5102.c | 93 +- + sound/soc/codecs/wm5110.c | 75 +- + sound/soc/codecs/wm8974.c | 93 ++ + sound/soc/codecs/wm8997.c | 2 +- + sound/soc/codecs/wm8998.c | 2 +- + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm_adsp.c | 129 ++- + sound/soc/codecs/wm_adsp.h | 8 +- + sound/soc/davinci/davinci-mcasp.c | 2 + + sound/soc/fsl/Kconfig | 4 +- + sound/soc/fsl/fsl-asoc-card.c | 26 +- + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 3 +- + sound/soc/intel/Kconfig | 4 + + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 17 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 28 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 122 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 145 ++- + sound/soc/intel/boards/skl_rt286.c | 113 +- + sound/soc/intel/common/sst-match-acpi.c | 16 +- + sound/soc/intel/skylake/skl-messages.c | 62 +- + sound/soc/intel/skylake/skl-nhlt.c | 34 + + sound/soc/intel/skylake/skl-pcm.c | 106 +- + sound/soc/intel/skylake/skl-topology.c | 209 +++- + sound/soc/intel/skylake/skl-topology.h | 27 + + sound/soc/intel/skylake/skl-tplg-interface.h | 3 +- + sound/soc/intel/skylake/skl.c | 81 ++ + sound/soc/intel/skylake/skl.h | 3 + + sound/soc/mediatek/Kconfig | 10 + + sound/soc/mediatek/Makefile | 1 + + sound/soc/mediatek/mt8173-rt5650.c | 236 ++++ + sound/soc/mediatek/mtk-afe-common.h | 1 + + sound/soc/mediatek/mtk-afe-pcm.c | 22 +- + sound/soc/mxs/mxs-saif.c | 2 +- + sound/soc/qcom/apq8016_sbc.c | 10 +- + sound/soc/qcom/lpass-apq8016.c | 31 +- + sound/soc/qcom/lpass-cpu.c | 147 ++- + sound/soc/qcom/lpass-ipq806x.c | 11 +- + sound/soc/qcom/lpass-lpaif-reg.h | 116 +- + sound/soc/qcom/lpass-platform.c | 244 ++-- + sound/soc/qcom/lpass.h | 10 +- + sound/soc/rockchip/rockchip_i2s.c | 13 + + sound/soc/samsung/i2s.c | 21 +- + sound/soc/samsung/s3c-i2s-v2.c | 2 +- + sound/soc/samsung/s3c-i2s-v2.h | 2 +- + sound/soc/sh/rcar/adg.c | 9 +- + sound/soc/sh/rcar/cmd.c | 18 +- + sound/soc/sh/rcar/core.c | 88 +- + sound/soc/sh/rcar/ctu.c | 72 +- + sound/soc/sh/rcar/dma.c | 56 +- + sound/soc/sh/rcar/dvc.c | 8 +- + sound/soc/sh/rcar/gen.c | 35 + + sound/soc/sh/rcar/mix.c | 2 +- + sound/soc/sh/rcar/rsnd.h | 86 +- + sound/soc/sh/rcar/src.c | 74 +- + sound/soc/sh/rcar/ssi.c | 324 +++--- + sound/soc/sh/rcar/ssiu.c | 9 +- + sound/soc/soc-core.c | 8 +- + sound/soc/soc-pcm.c | 24 +- + sound/soc/soc-topology.c | 240 ++-- + sound/soc/sunxi/Kconfig | 8 + + sound/soc/sunxi/Makefile | 1 + + sound/soc/sunxi/sun4i-spdif.c | 550 +++++++++ + 129 files changed, 8727 insertions(+), 1590 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.txt + create mode 100644 Documentation/devicetree/bindings/sound/max9867.txt + create mode 100644 Documentation/devicetree/bindings/sound/max98926.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt8173-rt5650.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5514.txt + create mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt + create mode 100644 sound/soc/codecs/hdac_hdmi.h + create mode 100755 sound/soc/codecs/max9867.c + create mode 100755 sound/soc/codecs/max9867.h + create mode 100644 sound/soc/codecs/max98926.c + create mode 100644 sound/soc/codecs/max98926.h + create mode 100644 sound/soc/codecs/pcm179x-i2c.c + create mode 100644 sound/soc/codecs/pcm179x-spi.c + create mode 100644 sound/soc/codecs/rt5514.c + create mode 100644 sound/soc/codecs/rt5514.h + create mode 100644 sound/soc/mediatek/mt8173-rt5650.c + create mode 100644 sound/soc/sunxi/sun4i-spdif.c +Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew)) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (6ccb1d8f78bd Input: add MELFAS MIP4 Touchscreen driver) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/cyttsp.txt | 95 ++ + drivers/input/mouse/Kconfig | 10 + + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/byd.c | 337 +++++ + drivers/input/mouse/byd.h | 18 + + drivers/input/mouse/psmouse-base.c | 14 + + drivers/input/mouse/psmouse.h | 1 + + drivers/input/touchscreen/Kconfig | 16 +- + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/cyttsp_core.c | 194 ++- + drivers/input/touchscreen/cyttsp_core.h | 10 +- + drivers/input/touchscreen/cyttsp_i2c.c | 10 - + drivers/input/touchscreen/cyttsp_spi.c | 10 - + drivers/input/touchscreen/melfas_mip4.c | 1499 ++++++++++++++++++++ + include/linux/input/cyttsp.h | 15 - + 15 files changed, 2125 insertions(+), 106 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/cyttsp.txt + create mode 100644 drivers/input/mouse/byd.c + create mode 100644 drivers/input/mouse/byd.h + create mode 100644 drivers/input/touchscreen/melfas_mip4.c +Merging block/for-next (ab3d8b3ecf77 Merge branch 'for-4.6/core' into for-next) +$ git merge block/for-next +Resolved 'drivers/nvme/host/pci.c' using previous resolution. +Auto-merging drivers/nvme/host/pci.c +CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/nvme.h +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/nvme/host/Kconfig +Auto-merging block/blk-mq.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f2678091cb02] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + block/blk-mq-sysfs.c | 9 ++- + block/blk-mq.c | 177 +++++++++++++++++++++++++++------------------ + block/blk-mq.h | 1 + + block/cfq-iosched.c | 43 ++++++++--- + drivers/nvme/host/Kconfig | 6 +- + drivers/nvme/host/Makefile | 10 ++- + drivers/nvme/host/core.c | 84 ++++++++++++++++----- + drivers/nvme/host/nvme.h | 3 +- + drivers/nvme/host/pci.c | 78 +++++++++----------- + include/linux/blk-mq.h | 2 + + 10 files changed, 258 insertions(+), 155 deletions(-) +Merging device-mapper/for-next (01dd954e0fd8 dm: drop unnecessary assignment of md->queue) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-crypt.c +Auto-merging block/blk-core.c +Merge made by the 'recursive' strategy. + block/blk-core.c | 2 +- + drivers/md/dm-cache-target.c | 2 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-delay.c | 2 +- + drivers/md/dm-flakey.c | 2 +- + drivers/md/dm-ioctl.c | 5 +- + drivers/md/dm-log-writes.c | 2 +- + drivers/md/dm-mpath.c | 784 ++++++++++++++++++++++++++---------------- + drivers/md/dm-path-selector.h | 5 - + drivers/md/dm-queue-length.c | 37 +- + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-round-robin.c | 85 ++++- + drivers/md/dm-service-time.c | 35 +- + drivers/md/dm-snap.c | 2 +- + drivers/md/dm-table.c | 30 +- + drivers/md/dm-target.c | 3 +- + drivers/md/dm-thin-metadata.c | 2 +- + drivers/md/dm-thin.c | 2 +- + drivers/md/dm-verity-fec.c | 2 +- + drivers/md/dm-verity-target.c | 12 +- + drivers/md/dm.c | 571 ++++++++++++++++-------------- + drivers/md/dm.h | 4 +- + include/linux/device-mapper.h | 13 +- + 23 files changed, 983 insertions(+), 623 deletions(-) +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (af3d6866825f mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host) +$ git merge mmc-uh/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 5 +- + .../bindings/mmc/microchip,sdhci-pic32.txt | 29 ++ + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + MAINTAINERS | 8 +- + drivers/mmc/card/block.c | 10 +- + drivers/mmc/card/mmc_test.c | 1 + + drivers/mmc/core/core.c | 29 +- + drivers/mmc/core/debugfs.c | 2 +- + drivers/mmc/core/host.c | 1 + + drivers/mmc/core/mmc.c | 4 +- + drivers/mmc/core/mmc_ops.c | 19 +- + drivers/mmc/core/pwrseq_simple.c | 1 - + drivers/mmc/core/sd_ops.c | 7 +- + drivers/mmc/core/sdio_ops.c | 3 +- + drivers/mmc/host/Kconfig | 21 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 9 +- + drivers/mmc/host/bfin_sdh.c | 3 - + drivers/mmc/host/davinci_mmc.c | 15 +- + drivers/mmc/host/dw_mmc-exynos.c | 31 +- + drivers/mmc/host/dw_mmc-pltfm.c | 19 +- + drivers/mmc/host/dw_mmc-rockchip.c | 7 - + drivers/mmc/host/dw_mmc.c | 101 ++--- + drivers/mmc/host/dw_mmc.h | 6 +- + drivers/mmc/host/jz4740_mmc.c | 2 - + drivers/mmc/host/mtk-sd.c | 2 + + drivers/mmc/host/mxcmmc.c | 3 - + drivers/mmc/host/omap_hsmmc.c | 9 +- + drivers/mmc/host/pxamci.c | 6 - + drivers/mmc/host/s3cmci.c | 3 +- + drivers/mmc/host/sdhci-acpi.c | 2 + + drivers/mmc/host/sdhci-bcm2835.c | 14 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 38 +- + drivers/mmc/host/sdhci-iproc.c | 40 +- + drivers/mmc/host/sdhci-msm.c | 25 +- + drivers/mmc/host/sdhci-of-arasan.c | 38 +- + drivers/mmc/host/sdhci-of-at91.c | 33 +- + drivers/mmc/host/sdhci-of-esdhc.c | 19 +- + drivers/mmc/host/sdhci-pic32.c | 257 ++++++++++++ + drivers/mmc/host/sdhci-pltfm.h | 1 - + drivers/mmc/host/sdhci-pxav2.c | 1 - + drivers/mmc/host/sdhci-pxav3.c | 26 +- + drivers/mmc/host/sdhci-st.c | 40 +- + drivers/mmc/host/sdhci-tegra.c | 21 +- + drivers/mmc/host/sdhci.c | 446 +++++++++------------ + drivers/mmc/host/sdhci.h | 4 +- + drivers/mmc/host/sdricoh_cs.c | 26 +- + drivers/mmc/host/sh_mmcif.c | 2 +- + drivers/mmc/host/sh_mobile_sdhi.c | 54 ++- + drivers/mmc/host/sunxi-mmc.c | 95 ++++- + drivers/mmc/host/tmio_mmc_dma.c | 11 - + drivers/mmc/host/tmio_mmc_pio.c | 27 +- + drivers/mmc/host/usdhi6rol0.c | 2 +- + include/linux/mfd/tmio.h | 4 + + include/linux/mmc/core.h | 1 - + include/linux/mmc/dw_mmc.h | 12 +- + include/linux/mmc/tmio.h | 5 + + 57 files changed, 925 insertions(+), 677 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/microchip,sdhci-pic32.txt + create mode 100644 drivers/mmc/host/sdhci-pic32.c +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (93ac96deff4c md: Drop sending a change uevent when stopping) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 1 - + drivers/md/raid5.c | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging mfd/for-mfd-next (103d8a7bb8a2 mfd: tps65090: Set regmap config reg counts properly) +$ git merge mfd/for-mfd-next +Removing drivers/mfd/tps65912-irq.c +Auto-merging drivers/mfd/db8500-prcmu.c +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/iio/adc/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 58 ++ + .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 35 ++ + Documentation/devicetree/bindings/mfd/act8945a.txt | 76 +++ + Documentation/devicetree/bindings/mfd/axp20x.txt | 7 +- + .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 47 ++ + Documentation/devicetree/bindings/mfd/mt6397.txt | 10 +- + Documentation/devicetree/bindings/mfd/tps65086.txt | 55 ++ + Documentation/devicetree/bindings/mfd/tps65912.txt | 50 ++ + drivers/gpio/Kconfig | 8 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-tps65086.c | 139 +++++ + drivers/gpio/gpio-tps65912.c | 171 +++--- + drivers/iio/adc/Kconfig | 7 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/fsl-imx25-gcq.c | 417 ++++++++++++++ + drivers/input/touchscreen/Kconfig | 9 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/fsl-imx25-tcq.c | 596 ++++++++++++++++++++ + drivers/mfd/Kconfig | 96 +++- + drivers/mfd/Makefile | 9 +- + drivers/mfd/ab8500-core.c | 106 ++-- + drivers/mfd/act8945a.c | 102 ++++ + drivers/mfd/as3711.c | 4 +- + drivers/mfd/axp20x-i2c.c | 104 ++++ + drivers/mfd/axp20x-rsb.c | 80 +++ + drivers/mfd/axp20x.c | 105 +--- + drivers/mfd/cs47l24-tables.c | 10 +- + drivers/mfd/da9062-core.c | 23 +- + drivers/mfd/da9063-i2c.c | 36 +- + drivers/mfd/db8500-prcmu.c | 7 +- + drivers/mfd/fsl-imx25-tsadc.c | 203 +++++++ + drivers/mfd/intel-lpss-pci.c | 19 +- + drivers/mfd/intel-lpss.c | 1 + + drivers/mfd/intel_quark_i2c_gpio.c | 26 +- + drivers/mfd/mt6397-core.c | 105 +++- + drivers/mfd/rc5t583.c | 4 +- + drivers/mfd/syscon.c | 19 +- + drivers/mfd/tps65010.c | 21 +- + drivers/mfd/tps65086.c | 149 +++++ + drivers/mfd/tps65090.c | 5 +- + drivers/mfd/tps65912-core.c | 240 +++----- + drivers/mfd/tps65912-i2c.c | 162 ++---- + drivers/mfd/tps65912-irq.c | 217 -------- + drivers/mfd/tps65912-spi.c | 160 ++---- + drivers/mfd/wm5102-tables.c | 16 +- + drivers/mfd/wm5110-tables.c | 82 ++- + drivers/mfd/wm8998-tables.c | 12 +- + drivers/regulator/Kconfig | 2 +- + drivers/regulator/axp20x-regulator.c | 3 + + drivers/regulator/tps65912-regulator.c | 613 ++++----------------- + include/dt-bindings/iio/adc/fsl-imx25-gcq.h | 18 + + include/linux/mfd/as3711.h | 3 +- + include/linux/mfd/axp20x.h | 34 +- + include/linux/mfd/core.h | 26 + + include/linux/mfd/cros_ec.h | 2 +- + include/linux/mfd/imx25-tsadc.h | 140 +++++ + include/linux/mfd/mt6323/core.h | 36 ++ + include/linux/mfd/mt6323/registers.h | 408 ++++++++++++++ + include/linux/mfd/mt6397/core.h | 2 + + include/linux/mfd/rc5t583.h | 5 +- + include/linux/mfd/syscon.h | 8 +- + include/linux/mfd/tps65086.h | 117 ++++ + include/linux/mfd/tps65090.h | 5 + + include/linux/mfd/tps65912.h | 209 +++---- + 64 files changed, 3817 insertions(+), 1625 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt + create mode 100644 Documentation/devicetree/bindings/mfd/act8945a.txt + create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt + create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt + create mode 100644 Documentation/devicetree/bindings/mfd/tps65912.txt + create mode 100644 drivers/gpio/gpio-tps65086.c + create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c + create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c + create mode 100644 drivers/mfd/act8945a.c + create mode 100644 drivers/mfd/axp20x-i2c.c + create mode 100644 drivers/mfd/axp20x-rsb.c + create mode 100644 drivers/mfd/fsl-imx25-tsadc.c + create mode 100644 drivers/mfd/tps65086.c + delete mode 100644 drivers/mfd/tps65912-irq.c + create mode 100644 include/dt-bindings/iio/adc/fsl-imx25-gcq.h + create mode 100644 include/linux/mfd/imx25-tsadc.h + create mode 100644 include/linux/mfd/mt6323/core.h + create mode 100644 include/linux/mfd/mt6323/registers.h + create mode 100644 include/linux/mfd/tps65086.h +Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (5c0e09e03fb5 power: act8945a: add charger driver for ACT8945A) +$ git merge battery/master +Auto-merging arch/arm/boot/dts/omap3-n900.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/act8945a-charger.txt | 35 ++ + .../bindings/power_supply/ti,bq24735.txt | 3 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/omap3-n900.dts | 6 +- + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/act8945a_charger.c | 359 +++++++++++++++++++++ + drivers/power/bq2415x_charger.c | 22 ++ + drivers/power/bq24735-charger.c | 146 +++++++-- + drivers/power/bq27xxx_battery.c | 12 + + drivers/power/bq27xxx_battery_i2c.c | 24 ++ + drivers/power/collie_battery.c | 3 +- + drivers/power/isp1704_charger.c | 19 +- + drivers/power/power_supply_sysfs.c | 3 +- + drivers/power/reset/Kconfig | 2 + + drivers/power/reset/arm-versatile-reboot.c | 39 ++- + include/linux/power/bq24735-charger.h | 2 + + include/linux/power_supply.h | 3 + + 18 files changed, 651 insertions(+), 45 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/act8945a-charger.txt + create mode 100644 drivers/power/act8945a_charger.c +Merging omap_dss2/for-next (f059c4b220b8 fbdev: exynos: fix IS_ERR_VALUE usage) +$ git merge omap_dss2/for-next +Merge made by the 'recursive' strategy. + drivers/video/fbdev/exynos/exynos_mipi_dsi.c | 6 +++--- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/metronomefb.c | 6 ++++-- + 3 files changed, 8 insertions(+), 6 deletions(-) +Merging regulator/for-next (3c030f0deff7 Merge remote-tracking branch 'regulator/topic/vexpress' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/axp20x-regulator.c +Auto-merging drivers/regulator/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/regulator/act8945a-regulator.txt | 80 ++ + .../regulator/hisilicon,hi655x-regulator.txt | 29 + + .../devicetree/bindings/regulator/lp872x.txt | 1 + + .../devicetree/bindings/regulator/max77802.txt | 2 +- + .../bindings/regulator/regulator-max77620.txt | 200 +++++ + MAINTAINERS | 4 +- + drivers/regulator/Kconfig | 26 + + drivers/regulator/Makefile | 9 +- + drivers/regulator/act8945a-regulator.c | 165 +++++ + drivers/regulator/ad5398.c | 6 +- + drivers/regulator/axp20x-regulator.c | 56 +- + drivers/regulator/core.c | 53 +- + drivers/regulator/da9210-regulator.c | 5 + + drivers/regulator/fan53555.c | 18 + + drivers/regulator/gpio-regulator.c | 6 +- + drivers/regulator/hi655x-regulator.c | 227 ++++++ + drivers/regulator/lp872x.c | 38 +- + drivers/regulator/ltc3589.c | 15 +- + drivers/regulator/max77620-regulator.c | 825 +++++++++++++++++++++ + .../regulator/{max77686.c => max77686-regulator.c} | 0 + .../regulator/{max77802.c => max77802-regulator.c} | 0 + drivers/regulator/mt6397-regulator.c | 15 +- + drivers/regulator/s2mps11.c | 43 +- + drivers/regulator/s5m8767.c | 13 +- + .../regulator/{vexpress.c => vexpress-regulator.c} | 0 + include/linux/regulator/lp872x.h | 5 + + 26 files changed, 1738 insertions(+), 103 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/act8945a-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/hisilicon,hi655x-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/regulator-max77620.txt + create mode 100644 drivers/regulator/act8945a-regulator.c + create mode 100644 drivers/regulator/hi655x-regulator.c + create mode 100644 drivers/regulator/max77620-regulator.c + rename drivers/regulator/{max77686.c => max77686-regulator.c} (100%) + rename drivers/regulator/{max77802.c => max77802-regulator.c} (100%) + rename drivers/regulator/{vexpress.c => vexpress-regulator.c} (100%) +Merging security/next (602094428090 Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next) +$ git merge security/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-chip.c | 19 ++- + drivers/char/tpm/tpm.h | 7 -- + drivers/char/tpm/tpm2-cmd.c | 22 ++-- + drivers/char/tpm/tpm_crb.c | 196 ++++++++++++++++++------------ + drivers/char/tpm/tpm_eventlog.c | 14 ++- + drivers/char/tpm/tpm_tis.c | 255 +++++++++++++++++++++++----------------- + include/keys/trusted-type.h | 2 +- + security/keys/trusted.c | 11 +- + security/smack/smack_lsm.c | 46 +++----- + 9 files changed, 317 insertions(+), 255 deletions(-) +Merging integrity/next (95ee08fa373b ima: require signed IMA policy) +$ git merge integrity/next +Auto-merging kernel/module.c +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 1 + + drivers/base/firmware_class.c | 74 ++++++------------ + fs/exec.c | 92 +++++++++++++++++++++++ + include/linux/fs.h | 15 ++++ + include/linux/ima.h | 10 ++- + include/linux/lsm_hooks.h | 35 ++++----- + include/linux/security.h | 16 ++-- + kernel/kexec_file.c | 73 +++--------------- + kernel/module.c | 68 ++--------------- + security/integrity/iint.c | 4 +- + security/integrity/ima/ima.h | 49 ++++++++---- + security/integrity/ima/ima_api.c | 25 +++---- + security/integrity/ima/ima_appraise.c | 69 ++++++++--------- + security/integrity/ima/ima_crypto.c | 120 +++++++++++++++++++++++++++++- + security/integrity/ima/ima_fs.c | 53 ++++++++++++- + security/integrity/ima/ima_init.c | 2 +- + security/integrity/ima/ima_main.c | 92 ++++++++++++++++------- + security/integrity/ima/ima_policy.c | 115 +++++++++++++++++++--------- + security/integrity/ima/ima_template.c | 2 - + security/integrity/ima/ima_template_lib.c | 1 - + security/integrity/integrity.h | 15 ++-- + security/security.c | 34 +++++---- + 22 files changed, 601 insertions(+), 364 deletions(-) +Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (1926e54f1157 MAINTAINERS: Update mailing list for Renesas ARM64 SoC Development) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/rockchip-iommu.c | 214 ++++++++++++++++++++++++++--------------- + 1 file changed, 135 insertions(+), 79 deletions(-) +Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (a13b64591747 vfio/pci: Expose shadow ROM as PCI option ROM) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/pci/Kconfig | 4 + + drivers/vfio/pci/Makefile | 1 + + drivers/vfio/pci/vfio_pci.c | 176 ++++++++++++++++++++++- + drivers/vfio/pci/vfio_pci_config.c | 45 +++++- + drivers/vfio/pci/vfio_pci_igd.c | 280 ++++++++++++++++++++++++++++++++++++ + drivers/vfio/pci/vfio_pci_intrs.c | 17 +-- + drivers/vfio/pci/vfio_pci_private.h | 39 +++++ + drivers/vfio/pci/vfio_pci_rdwr.c | 9 +- + drivers/vfio/vfio.c | 70 +++++++-- + include/linux/vfio.h | 11 ++ + include/uapi/linux/vfio.h | 92 +++++++++++- + 11 files changed, 707 insertions(+), 37 deletions(-) + create mode 100644 drivers/vfio/pci/vfio_pci_igd.c +Merging jc_docs/docs-next (510e64fb0423 Doc: ARM: Fix a typo in clksrc-change-registers.awk) +$ git merge jc_docs/docs-next +Auto-merging Documentation/DocBook/device-drivers.tmpl +Merge made by the 'recursive' strategy. + Documentation/CodingStyle | 2 +- + Documentation/DocBook/device-drivers.tmpl | 2 +- + Documentation/HOWTO | 7 +- + Documentation/SubmittingPatches | 2 +- + .../arm/Samsung/clksrc-change-registers.awk | 2 +- + Documentation/features/list-arch.sh | 2 +- + Documentation/i2c/dev-interface | 2 +- + Documentation/i2c/slave-eeprom-backend | 4 +- + Documentation/ja_JP/HOWTO | 2 +- + Documentation/ko_KR/HOWTO | 4 +- + Documentation/ko_KR/stable_api_nonsense.txt | 4 +- + Documentation/mic/mpssd/mpssd.c | 4 +- + .../prctl/disable-tsc-ctxt-sw-stress-test.c | 2 +- + .../prctl/disable-tsc-on-off-stress-test.c | 2 +- + Documentation/prctl/disable-tsc-test.c | 2 +- + Documentation/ptp/testptp.c | 3 +- + Documentation/timers/hpet_example.c | 2 +- + Documentation/zh_CN/arm64/booting.txt | 93 ++++++++++++++-------- + Documentation/zh_CN/arm64/silicon-errata.txt | 74 +++++++++++++++++ + README | 14 ++-- + 20 files changed, 161 insertions(+), 68 deletions(-) + create mode 100644 Documentation/zh_CN/arm64/silicon-errata.txt +Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix) +$ git merge trivial/for-next +Auto-merging net/openvswitch/vport-geneve.c +Auto-merging mm/balloon_compaction.c +Auto-merging lib/842/842_decompress.c +Auto-merging kernel/time/timekeeping.c +Auto-merging drivers/usb/gadget/legacy/Kconfig +Auto-merging drivers/rtc/rtc-rx8025.c +Auto-merging drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c +Auto-merging drivers/gpu/drm/i915/i915_gem_fence.c +Merge made by the 'recursive' strategy. + REPORTING-BUGS | 2 +- + drivers/atm/firestream.c | 2 +- + drivers/crypto/nx/nx-842.c | 2 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 10 +++++----- + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 2 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 2 +- + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/usb/gadget/legacy/Kconfig | 3 +-- + kernel/time/timekeeping.c | 2 +- + lib/842/842_decompress.c | 2 +- + lib/flex_proportions.c | 2 +- + lib/percpu-refcount.c | 2 +- + mm/balloon_compaction.c | 4 ++-- + net/openvswitch/vport-geneve.c | 2 +- + tools/testing/selftests/timers/alarmtimer-suspend.c | 2 +- + 17 files changed, 22 insertions(+), 23 deletions(-) +Merging audit/next (fd97646b0595 audit: Fix typo in comment) +$ git merge audit/next +Auto-merging kernel/audit_watch.c +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + include/uapi/linux/audit.h | 1 + + kernel/audit.c | 20 +++++++++++++++++++- + kernel/audit_watch.c | 2 +- + kernel/auditfilter.c | 6 +++--- + 4 files changed, 24 insertions(+), 5 deletions(-) +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (6338b8a12d0a Merge branches 'dt/linus' and 'dt/next' into for-next) +$ git merge dt-rh/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/property-units.txt | 39 +++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/compressed/string.c | 9 + + drivers/of/resolver.c | 7 +- + scripts/dtc/checks.c | 2 +- + scripts/dtc/dtc-lexer.l | 39 ++- + scripts/dtc/dtc-lexer.lex.c_shipped | 101 +++--- + scripts/dtc/dtc-parser.tab.c_shipped | 84 ++--- + scripts/dtc/dtc-parser.y | 20 +- + scripts/dtc/dtc.c | 62 +++- + scripts/dtc/dtx_diff | 349 +++++++++++++++++++++ + scripts/dtc/libfdt/fdt.c | 13 +- + scripts/dtc/libfdt/fdt_ro.c | 100 ++++++ + scripts/dtc/libfdt/fdt_rw.c | 2 + + scripts/dtc/libfdt/libfdt.h | 73 ++++- + scripts/dtc/util.c | 3 +- + scripts/dtc/version_gen.h | 2 +- + 17 files changed, 793 insertions(+), 113 deletions(-) + create mode 100644 Documentation/devicetree/bindings/property-units.txt + create mode 100755 scripts/dtc/dtx_diff +Merging mailbox/mailbox-for-next (be9c09bcca03 arm64: dts: mailbox device tree node for APM X-Gene platform.) +$ git merge mailbox/mailbox-for-next +Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi +Merge made by the 'recursive' strategy. + .../bindings/mailbox/xgene-slimpro-mailbox.txt | 35 +++ + arch/arm64/boot/dts/apm/apm-storm.dtsi | 14 + + drivers/mailbox/Kconfig | 9 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/mailbox-xgene-slimpro.c | 284 +++++++++++++++++++++ + 5 files changed, 344 insertions(+) + create mode 100644 Documentation/devicetree/bindings/mailbox/xgene-slimpro-mailbox.txt + create mode 100644 drivers/mailbox/mailbox-xgene-slimpro.c +Merging spi/for-next (4483631212ee Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/sh' and 'spi/topic/ti-qspi' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/adi,axi-spi-engine.txt | 31 ++ + .../bindings/spi/icpdas-lp8841-spi-rtc.txt | 54 ++ + .../devicetree/bindings/spi/spi-rockchip.txt | 1 + + drivers/spi/Kconfig | 96 ++-- + drivers/spi/Makefile | 5 +- + drivers/spi/spi-axi-spi-engine.c | 591 +++++++++++++++++++++ + drivers/spi/spi-bcm2835.c | 5 - + drivers/spi/spi-bcm2835aux.c | 72 ++- + drivers/spi/spi-dw-mid.c | 4 +- + drivers/spi/spi-dw-mmio.c | 5 - + drivers/spi/spi-imx.c | 85 ++- + drivers/spi/spi-lp8841-rtc.c | 255 +++++++++ + drivers/spi/spi-pl022.c | 7 - + drivers/spi/spi-pxa2xx-pci.c | 13 + + drivers/spi/spi-pxa2xx.c | 145 +++-- + drivers/spi/spi-pxa2xx.h | 37 -- + drivers/spi/spi-rockchip.c | 6 +- + drivers/spi/spi-ti-qspi.c | 139 ++++- + drivers/spi/spi.c | 402 +++++++++++++- + include/linux/pxa2xx_ssp.h | 1 + + include/linux/spi/spi.h | 145 +++++ + 21 files changed, 1859 insertions(+), 240 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/adi,axi-spi-engine.txt + create mode 100644 Documentation/devicetree/bindings/spi/icpdas-lp8841-spi-rtc.txt + create mode 100644 drivers/spi/spi-axi-spi-engine.c + create mode 100644 drivers/spi/spi-lp8841-rtc.c +Merging tip/auto-latest (9d102a2e2002 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Recorded preimage for 'drivers/firmware/efi/libstub/arm64-stub.c' +Recorded preimage for 'drivers/firmware/efi/libstub/efistub.h' +Auto-merging scripts/sortextable.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/deadline.c +Auto-merging kernel/kexec_file.c +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/efi.h +Auto-merging fs/exec.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/firmware/efi/libstub/efistub.h +CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/efistub.h +Auto-merging drivers/firmware/efi/libstub/arm64-stub.c +CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/arm64-stub.c +Auto-merging drivers/firmware/efi/libstub/arm-stub.c +Auto-merging drivers/cpufreq/intel_pstate.c +Auto-merging drivers/acpi/acpi_platform.c +Auto-merging arch/x86/include/asm/efi.h +Auto-merging arch/x86/events/perf_event.h +Auto-merging arch/x86/events/intel/uncore_snbep.c +Auto-merging arch/x86/events/intel/uncore_snb.c +Auto-merging arch/x86/events/intel/uncore_nhmex.c +Auto-merging arch/x86/events/intel/uncore.h +Auto-merging arch/x86/events/intel/uncore.c +Auto-merging arch/x86/events/intel/rapl.c +Auto-merging arch/x86/events/intel/pt.c +Auto-merging arch/x86/events/intel/p6.c +Auto-merging arch/x86/events/intel/p4.c +Auto-merging arch/x86/events/intel/lbr.c +Auto-merging arch/x86/events/intel/knc.c +Auto-merging arch/x86/events/intel/ds.c +Auto-merging arch/x86/events/intel/cstate.c +Auto-merging arch/x86/events/intel/cqm.c +Auto-merging arch/x86/events/intel/core.c +Auto-merging arch/x86/events/intel/bts.c +Auto-merging arch/x86/events/core.c +Auto-merging arch/x86/events/amd/uncore.c +Auto-merging arch/x86/events/amd/iommu.c +Auto-merging arch/x86/events/amd/ibs.c +Auto-merging arch/x86/events/amd/core.c +Auto-merging arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/kernel/vmlinux.lds.S +Auto-merging arch/arm64/kernel/setup.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/firmware/efi/libstub/arm64-stub.c'. +Recorded resolution for 'drivers/firmware/efi/libstub/efistub.h'. +[master 45ab060e92e6] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../marvell,odmi-controller.txt | 41 ++ + .../interrupt-controller/sigma,smp8642-intc.txt | 49 ++ + Documentation/efi-stub.txt | 4 +- + Documentation/kernel-parameters.txt | 25 +- + Documentation/sysctl/kernel.txt | 21 + + Documentation/x86/early-microcode.txt | 25 + + Documentation/x86/exception-tables.txt | 35 + + Documentation/x86/x86_64/boot-options.txt | 2 + + Documentation/x86/x86_64/mm.txt | 12 +- + MAINTAINERS | 1 + + arch/arm/include/asm/arch_gicv3.h | 1 + + arch/arm/include/asm/cacheflush.h | 1 - + arch/arm/kernel/setup.c | 6 +- + arch/arm/plat-samsung/pm-check.c | 4 +- + arch/arm/vdso/vdso.S | 3 +- + arch/arm64/include/asm/cacheflush.h | 4 - + arch/arm64/kernel/setup.c | 6 +- + arch/arm64/kernel/vmlinux.lds.S | 1 + + arch/avr32/kernel/setup.c | 6 +- + arch/c6x/kernel/setup.c | 2 - + arch/cris/arch-v32/drivers/cryptocop.c | 8 +- + arch/ia64/include/uapi/asm/siginfo.h | 13 +- + arch/ia64/kernel/efi.c | 13 +- + arch/ia64/kernel/err_inject.c | 3 +- + arch/ia64/kernel/setup.c | 6 +- + arch/m32r/kernel/setup.c | 4 +- + arch/microblaze/kernel/setup.c | 2 - + arch/mips/Kconfig | 1 + + arch/mips/ath79/irq.c | 244 +------ + arch/mips/bmips/irq.c | 10 +- + arch/mips/include/asm/mach-ath79/ath79.h | 4 + + arch/mips/include/uapi/asm/siginfo.h | 13 +- + arch/mips/kernel/setup.c | 10 +- + arch/mips/mm/gup.c | 3 +- + arch/parisc/include/asm/cache.h | 3 + + arch/parisc/include/asm/cacheflush.h | 4 - + arch/parisc/mm/init.c | 6 +- + arch/powerpc/include/asm/mman.h | 5 +- + arch/powerpc/include/asm/mmu_context.h | 12 + + arch/powerpc/kernel/setup_32.c | 2 - + arch/powerpc/kernel/setup_64.c | 3 - + arch/powerpc/mm/mem.c | 2 +- + arch/s390/include/asm/mmu_context.h | 12 + + arch/s390/kernel/early.c | 1 - + arch/s390/kernel/setup.c | 8 +- + arch/s390/mm/gup.c | 4 +- + arch/score/kernel/setup.c | 2 +- + arch/sh/kernel/setup.c | 8 +- + arch/sh/mm/gup.c | 2 +- + arch/sparc/kernel/head_64.S | 8 - + arch/sparc/mm/gup.c | 2 +- + arch/sparc/mm/init_64.c | 8 +- + arch/tile/kernel/setup.c | 11 +- + arch/um/include/asm/mmu_context.h | 14 + + arch/unicore32/include/asm/mmu_context.h | 12 + + arch/unicore32/kernel/setup.c | 6 +- + arch/x86/Kbuild | 3 +- + arch/x86/Kconfig | 42 +- + arch/x86/Kconfig.debug | 28 +- + arch/x86/boot/cpuflags.h | 2 +- + arch/x86/boot/mkcpustr.c | 2 +- + arch/x86/boot/tools/build.c | 1 - + arch/x86/crypto/aesni-intel_asm.S | 75 ++- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 15 + + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 15 + + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 9 + + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 13 + + arch/x86/crypto/crc32-pclmul_glue.c | 2 +- + arch/x86/crypto/crc32c-intel_glue.c | 2 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 8 +- + arch/x86/crypto/crct10dif-pclmul_glue.c | 2 +- + arch/x86/crypto/ghash-clmulni-intel_asm.S | 5 + + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 13 + + arch/x86/crypto/serpent-avx2-asm_64.S | 13 + + arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S | 35 +- + arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S | 36 +- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 13 + + arch/x86/entry/calling.h | 31 - + arch/x86/entry/common.c | 48 +- + arch/x86/entry/entry_32.S | 3 +- + arch/x86/entry/entry_64.S | 276 +++----- + arch/x86/entry/entry_64_compat.S | 1 + + arch/x86/entry/syscall_32.c | 10 +- + arch/x86/entry/syscall_64.c | 13 +- + arch/x86/entry/syscalls/syscall_64.tbl | 20 +- + arch/x86/entry/syscalls/syscalltbl.sh | 58 +- + arch/x86/entry/thunk_64.S | 4 + + arch/x86/entry/vdso/vclock_gettime.c | 2 +- + arch/x86/entry/vdso/vdso2c.h | 9 +- + arch/x86/entry/vdso/vdso32-setup.c | 1 - + arch/x86/entry/vdso/vdso32/system_call.S | 2 +- + arch/x86/entry/vdso/vma.c | 127 ++-- + arch/x86/entry/vsyscall/vsyscall_gtod.c | 9 +- + arch/x86/events/Makefile | 13 + + .../cpu/perf_event_amd.c => events/amd/core.c} | 2 +- + .../cpu/perf_event_amd_ibs.c => events/amd/ibs.c} | 12 +- + .../perf_event_amd_iommu.c => events/amd/iommu.c} | 4 +- + .../perf_event_amd_iommu.h => events/amd/iommu.h} | 0 + .../amd/uncore.c} | 4 +- + .../x86/{kernel/cpu/perf_event.c => events/core.c} | 9 +- + .../perf_event_intel_bts.c => events/intel/bts.c} | 2 +- + .../cpu/perf_event_intel.c => events/intel/core.c} | 2 +- + .../perf_event_intel_cqm.c => events/intel/cqm.c} | 2 +- + .../intel/cstate.c} | 2 +- + .../perf_event_intel_ds.c => events/intel/ds.c} | 8 +- + .../cpu/perf_event_knc.c => events/intel/knc.c} | 2 +- + .../perf_event_intel_lbr.c => events/intel/lbr.c} | 4 +- + .../cpu/perf_event_p4.c => events/intel/p4.c} | 2 +- + .../cpu/perf_event_p6.c => events/intel/p6.c} | 2 +- + .../perf_event_intel_pt.c => events/intel/pt.c} | 4 +- + .../{kernel/cpu/intel_pt.h => events/intel/pt.h} | 0 + .../intel/rapl.c} | 2 +- + .../intel/uncore.c} | 2 +- + .../intel/uncore.h} | 2 +- + .../intel/uncore_nhmex.c} | 2 +- + .../intel/uncore_snb.c} | 2 +- + .../intel/uncore_snbep.c} | 3 +- + .../{kernel/cpu/perf_event_msr.c => events/msr.c} | 0 + arch/x86/{kernel/cpu => events}/perf_event.h | 2 +- + arch/x86/include/asm/alternative.h | 6 - + arch/x86/include/asm/apic.h | 1 - + arch/x86/include/asm/arch_hweight.h | 2 + + arch/x86/include/asm/asm.h | 40 +- + arch/x86/include/asm/barrier.h | 15 +- + arch/x86/include/asm/bitops.h | 36 +- + arch/x86/include/asm/cacheflush.h | 6 - + arch/x86/include/asm/clocksource.h | 9 +- + arch/x86/include/asm/cmpxchg.h | 1 + + arch/x86/include/asm/cpufeature.h | 507 ++------------ + arch/x86/include/asm/cpufeatures.h | 289 ++++++++ + arch/x86/include/asm/desc_defs.h | 23 + + arch/x86/include/asm/disabled-features.h | 15 + + arch/x86/include/asm/dmi.h | 2 +- + arch/x86/include/asm/efi.h | 28 +- + arch/x86/include/asm/elf.h | 2 +- + arch/x86/include/asm/fixmap.h | 2 +- + arch/x86/include/asm/fpu/internal.h | 20 +- + arch/x86/include/asm/fpu/types.h | 12 + + arch/x86/include/asm/fpu/xstate.h | 3 +- + arch/x86/include/asm/frame.h | 59 +- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/include/asm/imr.h | 2 +- + arch/x86/include/asm/irq_work.h | 2 +- + arch/x86/include/asm/kvm_para.h | 7 - + arch/x86/include/asm/mce.h | 1 + + arch/x86/include/asm/microcode.h | 26 + + arch/x86/include/asm/mmu.h | 3 +- + arch/x86/include/asm/mmu_context.h | 85 ++- + arch/x86/include/asm/msr-index.h | 11 +- + arch/x86/include/asm/mwait.h | 2 + + arch/x86/include/asm/paravirt.h | 9 +- + arch/x86/include/asm/paravirt_types.h | 18 +- + arch/x86/include/asm/pgtable.h | 38 ++ + arch/x86/include/asm/pgtable_types.h | 39 +- + arch/x86/include/asm/pkeys.h | 34 + + arch/x86/include/asm/preempt.h | 13 +- + arch/x86/include/asm/processor.h | 3 +- + arch/x86/include/asm/qspinlock_paravirt.h | 4 + + arch/x86/include/asm/required-features.h | 7 + + arch/x86/include/asm/rwsem.h | 2 +- + arch/x86/include/asm/sections.h | 2 +- + arch/x86/include/asm/sighandling.h | 1 - + arch/x86/include/asm/smap.h | 2 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/include/asm/special_insns.h | 22 + + arch/x86/include/asm/thread_info.h | 2 +- + arch/x86/include/asm/tlbflush.h | 58 ++ + arch/x86/include/asm/uaccess.h | 21 +- + arch/x86/include/asm/uaccess_64.h | 2 +- + arch/x86/include/asm/vdso.h | 3 - + arch/x86/include/asm/vgtod.h | 6 + + arch/x86/include/asm/xen/hypercall.h | 5 +- + arch/x86/include/uapi/asm/mman.h | 22 + + arch/x86/include/uapi/asm/processor-flags.h | 2 + + arch/x86/include/uapi/asm/sigcontext.h | 32 +- + arch/x86/include/uapi/asm/ucontext.h | 53 +- + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/acpi/wakeup_64.S | 3 + + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/apic_numachip.c | 4 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/asm-offsets_32.c | 2 +- + arch/x86/kernel/asm-offsets_64.c | 10 +- + arch/x86/kernel/cpu/Makefile | 26 +- + arch/x86/kernel/cpu/amd.c | 30 +- + arch/x86/kernel/cpu/bugs_64.c | 2 +- + arch/x86/kernel/cpu/centaur.c | 12 +- + arch/x86/kernel/cpu/common.c | 120 ++-- + arch/x86/kernel/cpu/cyrix.c | 11 +- + arch/x86/kernel/cpu/hypervisor.c | 2 +- + arch/x86/kernel/cpu/intel.c | 12 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- + arch/x86/kernel/cpu/match.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 15 +- + arch/x86/kernel/cpu/mcheck/mce-severity.c | 22 +- + arch/x86/kernel/cpu/mcheck/mce.c | 85 ++- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 111 +++- + arch/x86/kernel/cpu/mcheck/p5.c | 18 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 15 +- + arch/x86/kernel/cpu/mcheck/threshold.c | 4 +- + arch/x86/kernel/cpu/mcheck/winchip.c | 5 +- + arch/x86/kernel/cpu/microcode/amd.c | 17 +- + arch/x86/kernel/cpu/microcode/core.c | 19 +- + arch/x86/kernel/cpu/microcode/intel.c | 285 ++++---- + arch/x86/kernel/cpu/mkcapflags.sh | 6 +- + arch/x86/kernel/cpu/mshyperv.c | 8 +- + arch/x86/kernel/cpu/mtrr/centaur.c | 2 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 44 +- + arch/x86/kernel/cpu/mtrr/generic.c | 25 +- + arch/x86/kernel/cpu/mtrr/main.c | 22 +- + arch/x86/kernel/cpu/rdrand.c | 2 +- + arch/x86/kernel/cpu/topology.c | 4 +- + arch/x86/kernel/cpu/transmeta.c | 10 +- + arch/x86/kernel/cpu/vmware.c | 5 +- + arch/x86/kernel/crash.c | 41 +- + arch/x86/kernel/e820.c | 39 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/fpu/core.c | 115 +++- + arch/x86/kernel/fpu/init.c | 13 +- + arch/x86/kernel/fpu/regset.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 185 +++++- + arch/x86/kernel/ftrace.c | 17 +- + arch/x86/kernel/head64.c | 14 +- + arch/x86/kernel/head_32.S | 8 +- + arch/x86/kernel/head_64.S | 5 +- + arch/x86/kernel/hpet.c | 1 + + arch/x86/kernel/kexec-bzimage64.c | 2 +- + arch/x86/kernel/kgdb.c | 12 +- + arch/x86/kernel/kprobes/core.c | 59 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/ldt.c | 4 +- + arch/x86/kernel/mcount_64.S | 14 +- + arch/x86/kernel/mpparse.c | 2 +- + arch/x86/kernel/msr.c | 2 +- + arch/x86/kernel/pmem.c | 4 +- + arch/x86/kernel/process.c | 4 +- + arch/x86/kernel/process_64.c | 2 + + arch/x86/kernel/setup.c | 15 +- + arch/x86/kernel/signal.c | 127 +++- + arch/x86/kernel/test_nx.c | 2 - + arch/x86/kernel/test_rodata.c | 2 +- + arch/x86/kernel/traps.c | 56 +- + arch/x86/kernel/tsc.c | 10 +- + arch/x86/kernel/verify_cpu.S | 2 +- + arch/x86/kernel/vm86_32.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 37 +- + arch/x86/kvm/emulate.c | 31 +- + arch/x86/kvm/mmu.c | 4 +- + arch/x86/kvm/vmx.c | 8 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/lguest/boot.c | 8 +- + arch/x86/lib/clear_page_64.S | 2 +- + arch/x86/lib/cmdline.c | 60 +- + arch/x86/lib/copy_page_64.S | 2 +- + arch/x86/lib/copy_user_64.S | 2 +- + arch/x86/lib/memcpy_64.S | 2 +- + arch/x86/lib/memmove_64.S | 2 +- + arch/x86/lib/memset_64.S | 4 +- + arch/x86/lib/rwsem.S | 11 +- + arch/x86/mm/Makefile | 2 + + arch/x86/mm/dump_pagetables.c | 11 +- + arch/x86/mm/extable.c | 100 ++- + arch/x86/mm/fault.c | 170 ++++- + arch/x86/mm/gup.c | 45 +- + arch/x86/mm/init_32.c | 6 - + arch/x86/mm/init_64.c | 27 +- + arch/x86/mm/kasan_init_64.c | 17 +- + arch/x86/mm/mpx.c | 8 +- + arch/x86/mm/numa.c | 67 +- + arch/x86/mm/pageattr.c | 34 +- + arch/x86/mm/pat.c | 6 +- + arch/x86/mm/pkeys.c | 101 +++ + arch/x86/mm/setup_nx.c | 6 +- + arch/x86/net/bpf_jit.S | 48 +- + arch/x86/oprofile/op_model_amd.c | 1 - + arch/x86/platform/efi/efi-bgrt.c | 52 +- + arch/x86/platform/efi/efi.c | 67 +- + arch/x86/platform/efi/efi_32.c | 7 +- + arch/x86/platform/efi/efi_64.c | 206 ++++-- + arch/x86/platform/efi/efi_stub_64.S | 46 +- + arch/x86/platform/efi/quirks.c | 37 +- + arch/x86/platform/geode/alix.c | 14 +- + arch/x86/platform/geode/geos.c | 8 +- + arch/x86/platform/geode/net5501.c | 8 +- + .../intel-mid/device_libs/platform_bma023.c | 2 +- + .../intel-mid/device_libs/platform_emc1403.c | 2 +- + .../intel-mid/device_libs/platform_gpio_keys.c | 2 +- + .../intel-mid/device_libs/platform_lis331.c | 2 +- + .../intel-mid/device_libs/platform_max7315.c | 2 +- + .../intel-mid/device_libs/platform_mpu3050.c | 2 +- + .../platform/intel-mid/device_libs/platform_msic.c | 2 +- + .../intel-mid/device_libs/platform_msic_audio.c | 2 +- + .../intel-mid/device_libs/platform_msic_battery.c | 2 +- + .../intel-mid/device_libs/platform_msic_gpio.c | 2 +- + .../intel-mid/device_libs/platform_msic_ocd.c | 2 +- + .../device_libs/platform_msic_power_btn.c | 2 +- + .../intel-mid/device_libs/platform_msic_thermal.c | 2 +- + .../intel-mid/device_libs/platform_pmic_gpio.c | 2 +- + .../intel-mid/device_libs/platform_tc35876x.c | 2 +- + .../intel-mid/device_libs/platform_tca6416.c | 2 +- + arch/x86/platform/intel-mid/mfld.c | 5 +- + arch/x86/platform/intel-mid/mrfl.c | 5 +- + arch/x86/platform/intel-quark/imr.c | 61 +- + arch/x86/platform/intel-quark/imr_selftest.c | 30 +- + arch/x86/power/hibernate_asm_64.S | 7 + + arch/x86/purgatory/stack.S | 2 +- + arch/x86/um/asm/barrier.h | 2 +- + arch/x86/um/sys_call_table_32.c | 4 +- + arch/x86/um/sys_call_table_64.c | 7 +- + arch/x86/um/user-offsets.c | 6 +- + arch/x86/xen/enlighten.c | 2 +- + arch/x86/xen/mmu.c | 8 +- + arch/x86/xen/pmu.c | 2 +- + arch/x86/xen/xen-asm.S | 10 +- + arch/x86/xen/xen-asm_64.S | 1 + + arch/x86/xen/xen-head.S | 2 +- + drivers/acpi/acpi_platform.c | 2 +- + drivers/acpi/apei/einj.c | 15 +- + drivers/char/agp/frontend.c | 2 +- + drivers/cpufreq/intel_pstate.c | 2 +- + drivers/firmware/efi/arm-init.c | 14 +- + drivers/firmware/efi/efi.c | 41 +- + drivers/firmware/efi/efivars.c | 2 +- + drivers/firmware/efi/esrt.c | 5 +- + drivers/firmware/efi/libstub/arm-stub.c | 4 + + drivers/firmware/efi/libstub/arm32-stub.c | 17 + + drivers/firmware/efi/libstub/arm64-stub.c | 34 +- + drivers/firmware/efi/libstub/efistub.h | 12 + + drivers/firmware/efi/runtime-wrappers.c | 113 ++-- + drivers/firmware/efi/vars.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 10 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 3 +- + drivers/gpu/drm/via/via_dmablit.c | 3 +- + drivers/infiniband/core/umem.c | 2 +- + drivers/infiniband/core/umem_odp.c | 8 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 3 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 3 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- + drivers/iommu/amd_iommu_v2.c | 1 + + drivers/irqchip/Kconfig | 15 + + drivers/irqchip/Makefile | 5 + + drivers/irqchip/irq-ath79-cpu.c | 97 +++ + drivers/irqchip/irq-ath79-misc.c | 189 ++++++ + drivers/irqchip/irq-atmel-aic-common.c | 14 +- + drivers/irqchip/irq-atmel-aic-common.h | 7 +- + drivers/irqchip/irq-atmel-aic.c | 9 +- + drivers/irqchip/irq-atmel-aic5.c | 9 +- + drivers/irqchip/irq-bcm2836.c | 1 - + drivers/irqchip/irq-bcm6345-l1.c | 364 +++++++++++ + drivers/irqchip/irq-gic-v2m.c | 14 +- + drivers/irqchip/irq-gic-v3-its.c | 18 +- + drivers/irqchip/irq-gic.c | 2 +- + drivers/irqchip/irq-mvebu-odmi.c | 236 +++++++ + drivers/irqchip/irq-tango.c | 232 +++++++ + drivers/irqchip/irq-ts4800.c | 2 +- + drivers/media/pci/ivtv/ivtv-udma.c | 4 +- + drivers/media/pci/ivtv/ivtv-yuv.c | 10 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +- + drivers/misc/lkdtm.c | 29 +- + drivers/misc/mic/scif/scif_rma.c | 2 - + drivers/misc/sgi-gru/grufault.c | 3 +- + drivers/nvdimm/e820.c | 2 +- + drivers/parisc/eisa_enumerator.c | 4 +- + drivers/rapidio/rio.c | 8 +- + drivers/scsi/st.c | 2 - + drivers/sh/superhyway/superhyway.c | 2 +- + drivers/staging/android/ashmem.c | 4 +- + drivers/video/fbdev/pvr2fb.c | 4 +- + drivers/virt/fsl_hypervisor.c | 5 +- + drivers/watchdog/hpwdt.c | 9 +- + drivers/xen/balloon.c | 2 +- + fs/btrfs/disk-io.c | 2 +- + fs/exec.c | 8 +- + fs/proc/task_mmu.c | 14 + + include/asm-generic/mm_hooks.h | 12 + + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/cache.h | 14 + + include/linux/clockchips.h | 4 +- + include/linux/compiler.h | 5 +- + include/linux/efi.h | 85 ++- + include/linux/hrtimer.h | 1 + + include/linux/init.h | 4 + + include/linux/ioport.h | 33 +- + include/linux/latencytop.h | 3 + + include/linux/lockdep.h | 2 - + include/linux/mm.h | 104 ++- + include/linux/mm_types.h | 22 +- + include/linux/mman.h | 6 +- + include/linux/perf_event.h | 7 +- + include/linux/pkeys.h | 33 + + include/linux/sched.h | 4 + + include/linux/sched/sysctl.h | 4 + + include/linux/wait.h | 2 +- + include/uapi/asm-generic/siginfo.h | 17 +- + init/main.c | 32 +- + kernel/debug/kdb/kdb_bp.c | 4 +- + kernel/events/core.c | 389 +++++++---- + kernel/events/uprobes.c | 10 +- + kernel/futex.c | 131 +++- + kernel/irq/handle.c | 6 +- + kernel/irq/internals.h | 3 + + kernel/irq/irqdesc.c | 21 +- + kernel/irq/manage.c | 8 +- + kernel/irq/proc.c | 2 +- + kernel/irq/spurious.c | 4 +- + kernel/kexec_core.c | 8 +- + kernel/kexec_file.c | 8 +- + kernel/latencytop.c | 14 +- + kernel/locking/lockdep.c | 59 -- + kernel/memremap.c | 13 +- + kernel/profile.c | 1 + + kernel/resource.c | 93 +-- + kernel/sched/core.c | 80 ++- + kernel/sched/deadline.c | 2 +- + kernel/sched/debug.c | 102 +-- + kernel/sched/fair.c | 200 +++--- + kernel/sched/sched.h | 1 + + kernel/sched/stats.h | 8 +- + kernel/signal.c | 4 + + kernel/sysctl.c | 13 +- + kernel/time/clocksource.c | 52 +- + kernel/time/hrtimer.c | 18 +- + kernel/trace/trace_kprobe.c | 19 +- + lib/atomic64_test.c | 2 +- + lib/test_static_keys.c | 62 +- + mm/Kconfig | 5 + + mm/frame_vector.c | 2 +- + mm/gup.c | 127 +++- + mm/ksm.c | 12 +- + mm/memory.c | 33 +- + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 6 +- + mm/mmap.c | 23 +- + mm/mprotect.c | 8 +- + mm/nommu.c | 66 +- + mm/process_vm_access.c | 11 +- + mm/util.c | 4 +- + net/ceph/pagevec.c | 2 +- + scripts/sortextable.c | 32 + + security/tomoyo/domain.c | 9 +- + tools/build/Makefile.feature | 31 +- + tools/build/feature/Makefile | 4 + + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-compile.c | 2 + + tools/build/feature/test-libcrypto.c | 17 + + tools/lib/api/Build | 1 + + tools/lib/api/Makefile | 1 + + tools/lib/api/debug-internal.h | 20 + + tools/lib/api/debug.c | 28 + + tools/lib/api/debug.h | 10 + + tools/lib/api/fs/fs.c | 64 ++ + tools/lib/api/fs/fs.h | 3 + + tools/lib/bpf/libbpf.c | 34 +- + tools/lib/lockdep/common.c | 5 - + tools/lib/lockdep/include/liblockdep/common.h | 1 - + tools/lib/lockdep/preload.c | 2 - + tools/lib/traceevent/event-parse.c | 4 + + tools/perf/Documentation/perf-config.txt | 357 +++++++++- + tools/perf/Documentation/perf-inject.txt | 7 + + tools/perf/Documentation/perf-record.txt | 6 + + tools/perf/Documentation/perf-report.txt | 40 +- + tools/perf/Documentation/perf-top.txt | 3 + + tools/perf/Documentation/perfconfig.example | 2 +- + tools/perf/Documentation/tips.txt | 1 + + tools/perf/Makefile | 25 +- + tools/perf/Makefile.perf | 16 +- + tools/perf/arch/powerpc/Makefile | 2 + + tools/perf/arch/powerpc/util/Build | 1 + + tools/perf/arch/powerpc/util/book3s_hcalls.h | 123 ++++ + tools/perf/arch/powerpc/util/book3s_hv_exits.h | 33 + + tools/perf/arch/powerpc/util/kvm-stat.c | 170 +++++ + tools/perf/arch/s390/util/kvm-stat.c | 10 +- + tools/perf/arch/x86/util/intel-bts.c | 4 +- + tools/perf/arch/x86/util/intel-pt.c | 6 +- + tools/perf/arch/x86/util/kvm-stat.c | 16 +- + tools/perf/builtin-annotate.c | 2 +- + tools/perf/builtin-buildid-cache.c | 14 +- + tools/perf/builtin-config.c | 27 +- + tools/perf/builtin-help.c | 3 +- + tools/perf/builtin-inject.c | 107 ++- + tools/perf/builtin-kvm.c | 38 +- + tools/perf/builtin-mem.c | 84 ++- + tools/perf/builtin-record.c | 29 +- + tools/perf/builtin-report.c | 56 +- + tools/perf/builtin-script.c | 134 +++- + tools/perf/builtin-stat.c | 203 +++--- + tools/perf/builtin-top.c | 39 +- + tools/perf/config/Makefile | 112 ++-- + tools/perf/jvmti/Makefile | 80 +++ + tools/perf/jvmti/jvmti_agent.c | 465 +++++++++++++ + tools/perf/jvmti/jvmti_agent.h | 36 + + tools/perf/jvmti/libjvmti.c | 304 +++++++++ + tools/perf/perf.c | 2 + + tools/perf/perf.h | 2 + + .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 5 +- + tools/perf/tests/.gitignore | 1 + + tools/perf/tests/Build | 9 +- + tools/perf/tests/bp_signal.c | 140 +++- + tools/perf/tests/bpf-script-test-relocation.c | 50 ++ + tools/perf/tests/bpf.c | 65 +- + tools/perf/tests/code-reading.c | 10 +- + tools/perf/tests/hists_cumulate.c | 2 +- + tools/perf/tests/hists_filter.c | 2 +- + tools/perf/tests/hists_output.c | 10 +- + tools/perf/tests/llvm.c | 17 +- + tools/perf/tests/llvm.h | 5 +- + tools/perf/tests/make | 50 +- + tools/perf/tests/parse-events.c | 54 +- + tools/perf/tests/vmlinux-kallsyms.c | 24 +- + tools/perf/ui/browser.c | 4 +- + tools/perf/ui/browser.h | 2 +- + tools/perf/ui/browsers/annotate.c | 2 +- + tools/perf/ui/browsers/hists.c | 725 ++++++++++++++++++--- + tools/perf/ui/gtk/hists.c | 169 ++++- + tools/perf/ui/hist.c | 172 ++--- + tools/perf/ui/stdio/hist.c | 268 ++++++-- + tools/perf/util/Build | 7 + + tools/perf/util/auxtrace.c | 7 +- + tools/perf/util/auxtrace.h | 6 +- + tools/perf/util/bpf-loader.c | 724 +++++++++++++++++++- + tools/perf/util/bpf-loader.h | 59 ++ + tools/perf/util/build-id.c | 50 +- + tools/perf/util/build-id.h | 1 + + tools/perf/util/cache.h | 3 + + tools/perf/util/callchain.c | 102 ++- + tools/perf/util/config.c | 4 +- + tools/perf/util/cpumap.c | 30 + + tools/perf/util/cpumap.h | 32 +- + tools/perf/util/ctype.c | 9 + + tools/perf/util/data-convert-bt.c | 18 + + tools/perf/util/debug.c | 111 ++-- + tools/perf/util/debug.h | 1 + + tools/perf/util/demangle-java.c | 199 ++++++ + tools/perf/util/demangle-java.h | 10 + + tools/perf/util/dso.c | 5 + + tools/perf/util/env.c | 13 + + tools/perf/util/env.h | 15 + + tools/perf/util/event.c | 2 +- + tools/perf/util/evlist.c | 40 +- + tools/perf/util/evlist.h | 3 + + tools/perf/util/evsel.c | 30 +- + tools/perf/util/evsel.h | 8 + + tools/perf/util/genelf.c | 449 +++++++++++++ + tools/perf/util/genelf.h | 67 ++ + tools/perf/util/genelf_debug.c | 610 +++++++++++++++++ + tools/perf/util/header.c | 270 ++++++++ + tools/perf/util/header.h | 1 + + tools/perf/util/hist.c | 655 ++++++++++++++++--- + tools/perf/util/hist.h | 100 ++- + tools/perf/util/jit.h | 15 + + tools/perf/util/jitdump.c | 672 +++++++++++++++++++ + tools/perf/util/jitdump.h | 124 ++++ + tools/perf/util/kvm-stat.h | 8 +- + tools/perf/util/machine.h | 10 + + tools/perf/util/mem-events.c | 255 ++++++++ + tools/perf/util/mem-events.h | 35 + + tools/perf/util/parse-events.c | 314 +++++++-- + tools/perf/util/parse-events.h | 28 +- + tools/perf/util/parse-events.l | 19 +- + tools/perf/util/parse-events.y | 178 +++-- + tools/perf/util/pmu.c | 19 +- + tools/perf/util/sort.c | 615 +++++++++-------- + tools/perf/util/sort.h | 27 +- + tools/perf/util/stat-shadow.c | 211 +++--- + tools/perf/util/stat.c | 14 +- + tools/perf/util/stat.h | 23 +- + tools/perf/util/strbuf.c | 24 - + tools/perf/util/strbuf.h | 2 - + tools/perf/util/symbol-elf.c | 3 + + tools/perf/util/symbol.c | 10 +- + tools/perf/util/symbol.h | 3 +- + tools/perf/util/trace-event.c | 1 + + tools/perf/util/util.c | 112 ++-- + tools/perf/util/util.h | 25 +- + tools/testing/selftests/x86/Makefile | 17 +- + .../selftests/x86/check_initial_reg_state.c | 109 ++++ + tools/testing/selftests/x86/ptrace_syscall.c | 132 +++- + tools/testing/selftests/x86/sigreturn.c | 230 ++++++- + virt/kvm/arm/arch_timer.c | 4 +- + virt/kvm/async_pf.c | 8 +- + virt/kvm/kvm_main.c | 10 +- + 584 files changed, 16895 insertions(+), 4877 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/sigma,smp8642-intc.txt + create mode 100644 arch/x86/events/Makefile + rename arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_amd_ibs.c => events/amd/ibs.c} (98%) + rename arch/x86/{kernel/cpu/perf_event_amd_iommu.c => events/amd/iommu.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_amd_iommu.h => events/amd/iommu.h} (100%) + rename arch/x86/{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c} (99%) + rename arch/x86/{kernel/cpu/perf_event.c => events/core.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_bts.c => events/intel/bts.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel.c => events/intel/core.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_cqm.c => events/intel/cqm.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_cstate.c => events/intel/cstate.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_ds.c => events/intel/ds.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_knc.c => events/intel/knc.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_lbr.c => events/intel/lbr.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_p4.c => events/intel/p4.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_p6.c => events/intel/p6.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_pt.c => events/intel/pt.c} (99%) + rename arch/x86/{kernel/cpu/intel_pt.h => events/intel/pt.h} (100%) + rename arch/x86/{kernel/cpu/perf_event_intel_rapl.c => events/intel/rapl.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_uncore.c => events/intel/uncore.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_uncore.h => events/intel/uncore.h} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_uncore_nhmex.c => events/intel/uncore_nhmex.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_uncore_snb.c => events/intel/uncore_snb.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_intel_uncore_snbep.c => events/intel/uncore_snbep.c} (99%) + rename arch/x86/{kernel/cpu/perf_event_msr.c => events/msr.c} (100%) + rename arch/x86/{kernel/cpu => events}/perf_event.h (99%) + create mode 100644 arch/x86/include/asm/cpufeatures.h + create mode 100644 arch/x86/include/asm/pkeys.h + create mode 100644 arch/x86/mm/pkeys.c + create mode 100644 drivers/irqchip/irq-ath79-cpu.c + create mode 100644 drivers/irqchip/irq-ath79-misc.c + create mode 100644 drivers/irqchip/irq-bcm6345-l1.c + create mode 100644 drivers/irqchip/irq-mvebu-odmi.c + create mode 100644 drivers/irqchip/irq-tango.c + create mode 100644 include/linux/pkeys.h + create mode 100644 tools/build/feature/test-libcrypto.c + create mode 100644 tools/lib/api/debug-internal.h + create mode 100644 tools/lib/api/debug.c + create mode 100644 tools/lib/api/debug.h + create mode 100644 tools/perf/arch/powerpc/util/book3s_hcalls.h + create mode 100644 tools/perf/arch/powerpc/util/book3s_hv_exits.h + create mode 100644 tools/perf/arch/powerpc/util/kvm-stat.c + create mode 100644 tools/perf/jvmti/Makefile + create mode 100644 tools/perf/jvmti/jvmti_agent.c + create mode 100644 tools/perf/jvmti/jvmti_agent.h + create mode 100644 tools/perf/jvmti/libjvmti.c + create mode 100644 tools/perf/tests/bpf-script-test-relocation.c + create mode 100644 tools/perf/util/demangle-java.c + create mode 100644 tools/perf/util/demangle-java.h + create mode 100644 tools/perf/util/genelf.c + create mode 100644 tools/perf/util/genelf.h + create mode 100644 tools/perf/util/genelf_debug.c + create mode 100644 tools/perf/util/jit.h + create mode 100644 tools/perf/util/jitdump.c + create mode 100644 tools/perf/util/jitdump.h + create mode 100644 tools/perf/util/mem-events.c + create mode 100644 tools/perf/util/mem-events.h + create mode 100644 tools/testing/selftests/x86/check_initial_reg_state.c +Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e56d31d31b6b] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. + drivers/clocksource/Kconfig | 1 + + drivers/clocksource/arm_arch_timer.c | 36 ++++++++++++++----- + drivers/clocksource/arm_global_timer.c | 17 +++++++++ + drivers/clocksource/rockchip_timer.c | 21 +++++++---- + drivers/clocksource/time-lpc32xx.c | 66 +++++++++++++++++++++++++++------- + 5 files changed, 114 insertions(+), 27 deletions(-) +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 (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup) +$ git merge edac-amd/for-next +Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi +Merge made by the 'recursive' strategy. + .../bindings/arm/altera/socfpga-eccmgr.txt | 49 ++ + .../devicetree/bindings/edac/apm-xgene-edac.txt | 10 + + arch/arm/boot/dts/socfpga.dtsi | 20 + + arch/arm/mach-socfpga/Makefile | 2 + + arch/arm/mach-socfpga/core.h | 2 + + arch/arm/mach-socfpga/l2_cache.c | 41 ++ + arch/arm/mach-socfpga/ocram.c | 49 ++ + arch/arm/mach-socfpga/socfpga.c | 5 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 6 + + drivers/edac/Kconfig | 26 +- + drivers/edac/Makefile | 2 +- + drivers/edac/altera_edac.c | 492 ++++++++++++++++++++- + drivers/edac/amd64_edac.c | 2 +- + drivers/edac/debugfs.c | 2 +- + drivers/edac/edac_mc.c | 64 +-- + drivers/edac/edac_pci.c | 67 +-- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/xgene_edac.c | 70 ++- + 18 files changed, 800 insertions(+), 111 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-eccmgr.txt + create mode 100644 arch/arm/mach-socfpga/l2_cache.c + create mode 100644 arch/arm/mach-socfpga/ocram.c +Merging irqchip/irqchip/for-next (95d4f352d268 Merge branch 'irqchip/mvebu' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (2863b4e3dd92 Merge branches 'doc.2015.02.23a', 'fixes.2015.02.23a' and 'torture.2015.02.23a' into HEAD) +$ git merge rcu/rcu/next +Auto-merging kernel/irq/internals.h +Auto-merging include/linux/compiler.h +Merge made by the 'recursive' strategy. + .../Design/Data-Structures/BigTreeClassicRCU.svg | 474 +++++++ + .../Design/Data-Structures/BigTreeClassicRCUBH.svg | 499 +++++++ + .../Data-Structures/BigTreeClassicRCUBHdyntick.svg | 695 ++++++++++ + .../Data-Structures/BigTreePreemptRCUBHdyntick.svg | 741 +++++++++++ + .../BigTreePreemptRCUBHdyntickCB.svg | 858 ++++++++++++ + .../Design/Data-Structures/Data-Structures.html | 1395 ++++++++++++++++++++ + .../Design/Data-Structures/Data-Structures.htmlx | 1295 ++++++++++++++++++ + .../Design/Data-Structures/HugeTreeClassicRCU.svg | 939 +++++++++++++ + .../RCU/Design/Data-Structures/TreeLevel.svg | 828 ++++++++++++ + .../RCU/Design/Data-Structures/TreeMapping.svg | 305 +++++ + .../Design/Data-Structures/TreeMappingLevel.svg | 380 ++++++ + .../RCU/Design/Data-Structures/blkd_task.svg | 843 ++++++++++++ + .../RCU/Design/Data-Structures/nxtlist.svg | 396 ++++++ + .../RCU/Design/Requirements/Requirements.html | 225 +++- + .../RCU/Design/Requirements/Requirements.htmlx | 121 +- + Documentation/memory-barriers.txt | 141 +- + include/linux/compiler.h | 12 +- + include/linux/irq.h | 6 +- + include/linux/rcupdate.h | 2 - + include/linux/srcu.h | 19 +- + kernel/irq/internals.h | 4 + + kernel/rcu/rcutorture.c | 14 +- + kernel/rcu/tiny_plugin.h | 15 +- + kernel/rcu/tree.c | 143 +- + kernel/rcu/tree.h | 42 +- + kernel/rcu/tree_plugin.h | 27 +- + kernel/rcu/update.c | 1 + + scripts/checkpatch.pl | 3 +- + .../selftests/rcutorture/bin/parse-console.sh | 6 +- + 29 files changed, 10233 insertions(+), 196 deletions(-) + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCU.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntickCB.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html + create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.htmlx + create mode 100644 Documentation/RCU/Design/Data-Structures/HugeTreeClassicRCU.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/TreeLevel.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMapping.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMappingLevel.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/blkd_task.svg + create mode 100644 Documentation/RCU/Design/Data-Structures/nxtlist.svg +Merging kvm/linux-next (433da86023f8 KVM: async_pf: use list_first_entry) +$ git merge kvm/linux-next +Auto-merging virt/kvm/kvm_main.c +Auto-merging virt/kvm/async_pf.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/mmu.c +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 6 + + Documentation/virtual/kvm/devices/s390_flic.txt | 2 + + Documentation/virtual/kvm/devices/vm.txt | 52 +++++++++ + arch/s390/include/asm/kvm_host.h | 8 +- + arch/s390/include/uapi/asm/kvm.h | 8 +- + arch/s390/kvm/gaccess.c | 57 +++++----- + arch/s390/kvm/gaccess.h | 38 ++++++- + arch/s390/kvm/intercept.c | 78 +++++++------ + arch/s390/kvm/interrupt.c | 40 +++---- + arch/s390/kvm/kvm-s390.c | 55 ++++++--- + arch/s390/kvm/kvm-s390.h | 17 ++- + arch/s390/kvm/priv.c | 13 ++- + arch/x86/include/asm/kvm_host.h | 2 + + arch/x86/include/uapi/asm/hyperv.h | 4 +- + arch/x86/kvm/assigned-dev.c | 14 +-- + arch/x86/kvm/hyperv.c | 50 +++++++-- + arch/x86/kvm/irq.c | 9 +- + arch/x86/kvm/irq.h | 8 -- + arch/x86/kvm/irq_comm.c | 25 ++++- + arch/x86/kvm/lapic.c | 142 +++++++++++++++++------- + arch/x86/kvm/lapic.h | 10 +- + arch/x86/kvm/mmu.c | 58 ++++------ + arch/x86/kvm/paging_tmpl.h | 19 +--- + arch/x86/kvm/pmu.c | 2 +- + arch/x86/kvm/svm.c | 3 +- + arch/x86/kvm/trace.h | 12 +- + arch/x86/kvm/vmx.c | 58 +++++++--- + arch/x86/kvm/x86.c | 78 +++++++------ + arch/x86/kvm/x86.h | 16 +++ + drivers/hv/hyperv_vmbus.h | 6 - + include/trace/events/kvm.h | 9 +- + include/uapi/linux/kvm.h | 14 ++- + virt/kvm/async_pf.c | 8 +- + virt/kvm/kvm_main.c | 27 +++-- + 34 files changed, 614 insertions(+), 334 deletions(-) +Merging kvm-arm/next (67aaab4cff18 arm64: KVM: Move __cpu_init_stage2 after kvm_call_hyp) +$ git merge kvm-arm/next +Resolved 'arch/arm/kvm/arm.c' using previous resolution. +Resolved 'arch/arm64/include/asm/cpufeature.h' using previous resolution. +Resolved 'arch/arm64/include/asm/kvm_host.h' using previous resolution. +Resolved 'arch/arm64/kernel/cpufeature.c' using previous resolution. +Resolved 'arch/arm64/kvm/hyp.S' using previous resolution. +Auto-merging virt/kvm/arm/hyp/vgic-v2-sr.c +Auto-merging virt/kvm/arm/hyp/timer-sr.c +Auto-merging drivers/clocksource/arm_arch_timer.c +Removing arch/arm64/kvm/hyp/hyp.h +Auto-merging arch/arm64/kvm/hyp/debug-sr.c +Auto-merging arch/arm64/kvm/hyp.S +CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp.S +Auto-merging arch/arm64/kernel/perf_event.c +Auto-merging arch/arm64/kernel/head.S +Auto-merging arch/arm64/kernel/cpufeature.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kernel/asm-offsets.c +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/include/asm/kvm_host.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/kvm_asm.h +Auto-merging arch/arm64/include/asm/cpufeature.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/Kconfig +Removing arch/arm/kvm/interrupts_head.S +Auto-merging arch/arm/kvm/arm.c +CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c +Auto-merging arch/arm/kernel/vmlinux.lds.S +Auto-merging arch/arm/include/asm/kvm_asm.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a5b179514872] Merge remote-tracking branch 'kvm-arm/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/kvm_asm.h | 41 +- + arch/arm/include/asm/kvm_emulate.h | 20 +- + arch/arm/include/asm/kvm_host.h | 65 ++- + arch/arm/include/asm/kvm_hyp.h | 139 +++++ + arch/arm/include/asm/kvm_mmu.h | 2 +- + arch/arm/include/asm/virt.h | 9 + + arch/arm/kernel/asm-offsets.c | 40 +- + arch/arm/kernel/vmlinux.lds.S | 6 + + arch/arm/kvm/Makefile | 1 + + arch/arm/kvm/arm.c | 178 ++++-- + arch/arm/kvm/coproc.c | 52 +- + arch/arm/kvm/coproc.h | 16 +- + arch/arm/kvm/emulate.c | 34 +- + arch/arm/kvm/guest.c | 5 +- + arch/arm/kvm/handle_exit.c | 7 - + arch/arm/kvm/hyp/Makefile | 17 + + arch/arm/kvm/hyp/banked-sr.c | 77 +++ + arch/arm/kvm/hyp/cp15-sr.c | 84 +++ + arch/arm/kvm/hyp/entry.S | 101 ++++ + arch/arm/kvm/hyp/hyp-entry.S | 169 ++++++ + arch/arm/kvm/hyp/s2-setup.c | 33 ++ + arch/arm/kvm/hyp/switch.c | 232 ++++++++ + arch/arm/kvm/hyp/tlb.c | 70 +++ + arch/arm/kvm/hyp/vfp.S | 68 +++ + arch/arm/kvm/init.S | 8 - + arch/arm/kvm/interrupts.S | 480 +--------------- + arch/arm/kvm/interrupts_head.S | 648 ---------------------- + arch/arm/kvm/mmu.c | 23 + + arch/arm/kvm/reset.c | 2 +- + arch/arm64/Kconfig | 13 + + arch/arm64/include/asm/cpufeature.h | 3 +- + arch/arm64/include/asm/hw_breakpoint.h | 18 +- + arch/arm64/include/asm/kvm_arm.h | 6 +- + arch/arm64/include/asm/kvm_asm.h | 5 +- + arch/arm64/include/asm/kvm_emulate.h | 8 + + arch/arm64/include/asm/kvm_host.h | 6 + + arch/arm64/include/asm/kvm_hyp.h | 180 ++++++ + arch/arm64/include/asm/kvm_mmu.h | 12 +- + arch/arm64/include/asm/virt.h | 10 + + arch/arm64/kernel/asm-offsets.c | 3 - + arch/arm64/kernel/cpufeature.c | 11 + + arch/arm64/kernel/head.S | 28 +- + arch/arm64/kernel/perf_event.c | 6 +- + arch/arm64/kvm/hyp-init.S | 15 +- + arch/arm64/kvm/hyp.S | 7 + + arch/arm64/kvm/hyp/Makefile | 8 +- + arch/arm64/kvm/hyp/debug-sr.c | 4 +- + arch/arm64/kvm/hyp/entry.S | 6 + + arch/arm64/kvm/hyp/hyp-entry.S | 109 ++-- + arch/arm64/kvm/hyp/hyp.h | 90 --- + arch/arm64/kvm/hyp/s2-setup.c | 43 ++ + arch/arm64/kvm/hyp/switch.c | 203 ++++++- + arch/arm64/kvm/hyp/sysreg-sr.c | 149 +++-- + arch/arm64/kvm/hyp/tlb.c | 2 +- + arch/arm64/kvm/hyp/vgic-v3-sr.c | 4 +- + drivers/clocksource/arm_arch_timer.c | 96 ++-- + {arch/arm64/kvm => virt/kvm/arm}/hyp/timer-sr.c | 14 +- + {arch/arm64/kvm => virt/kvm/arm}/hyp/vgic-v2-sr.c | 4 +- + 58 files changed, 2019 insertions(+), 1671 deletions(-) + create mode 100644 arch/arm/include/asm/kvm_hyp.h + create mode 100644 arch/arm/kvm/hyp/Makefile + create mode 100644 arch/arm/kvm/hyp/banked-sr.c + create mode 100644 arch/arm/kvm/hyp/cp15-sr.c + create mode 100644 arch/arm/kvm/hyp/entry.S + create mode 100644 arch/arm/kvm/hyp/hyp-entry.S + create mode 100644 arch/arm/kvm/hyp/s2-setup.c + create mode 100644 arch/arm/kvm/hyp/switch.c + create mode 100644 arch/arm/kvm/hyp/tlb.c + create mode 100644 arch/arm/kvm/hyp/vfp.S + delete mode 100644 arch/arm/kvm/interrupts_head.S + create mode 100644 arch/arm64/include/asm/kvm_hyp.h + delete mode 100644 arch/arm64/kvm/hyp/hyp.h + create mode 100644 arch/arm64/kvm/hyp/s2-setup.c + rename {arch/arm64/kvm => virt/kvm/arm}/hyp/timer-sr.c (86%) + rename {arch/arm64/kvm => virt/kvm/arm}/hyp/vgic-v2-sr.c (98%) +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 (d3695aa4f452 KVM: PPC: Add support for multiple-TCE hcalls) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Auto-merging Documentation/virtual/kvm/api.txt +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 25 +++ + arch/powerpc/include/asm/kvm_book3s_64.h | 2 - + arch/powerpc/include/asm/kvm_host.h | 1 + + arch/powerpc/include/asm/kvm_ppc.h | 16 ++ + arch/powerpc/include/asm/pgtable.h | 3 + + arch/powerpc/kvm/Makefile | 2 +- + arch/powerpc/kvm/book3s.c | 2 +- + arch/powerpc/kvm/book3s_64_vio.c | 146 ++++++++++++-- + arch/powerpc/kvm/book3s_64_vio_hv.c | 328 +++++++++++++++++++++++++++---- + arch/powerpc/kvm/book3s_hv.c | 26 ++- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +- + arch/powerpc/kvm/book3s_pr_papr.c | 35 ++++ + arch/powerpc/kvm/powerpc.c | 3 + + arch/powerpc/mm/pgtable.c | 8 + + arch/powerpc/perf/hv-24x7.c | 8 - + 15 files changed, 535 insertions(+), 74 deletions(-) +Merging kvms390/next (1763f8d09d52 KVM: s390: bail out early on fatal signal in dirty logging) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (23217b443b4b workqueue: Replace usage of init_name with dev_set_name()) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drivers-x86/for-next (2d905b3e74ad intel-hid: allocate correct amount of memory for private struct) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/intel-hid.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-toshiba_acpi | 16 + + drivers/leds/Kconfig | 1 + + drivers/leds/dell-led.c | 126 +------- + drivers/platform/x86/Kconfig | 14 +- + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/alienware-wmi.c | 286 ++++++++++++++--- + drivers/platform/x86/asus-nb-wmi.c | 9 + + drivers/platform/x86/dell-laptop.c | 340 ++++++--------------- + drivers/platform/x86/dell-rbtn.c | 15 + + drivers/platform/x86/dell-smbios.c | 177 +++++++++++ + drivers/platform/x86/dell-smbios.h | 44 +++ + drivers/platform/x86/dell-wmi.c | 154 +++++++--- + drivers/platform/x86/ideapad-laptop.c | 14 + + drivers/platform/x86/intel-hid.c | 3 +- + drivers/platform/x86/intel_pmc_ipc.c | 8 +- + drivers/platform/x86/intel_scu_ipc.c | 35 +-- + drivers/platform/x86/intel_telemetry_pltdrv.c | 13 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 115 +++++++ + 19 files changed, 905 insertions(+), 470 deletions(-) + create mode 100644 drivers/platform/x86/dell-smbios.c + create mode 100644 drivers/platform/x86/dell-smbios.h +Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging regmap/for-next (10c43341ac84 Merge remote-tracking branches 'regmap/topic/doc', 'regmap/topic/irq', 'regmap/topic/stride' and 'regmap/topic/update-bits' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 16 +++ + drivers/base/regmap/regcache-flat.c | 20 +++- + drivers/base/regmap/regcache.c | 4 +- + drivers/base/regmap/regmap-irq.c | 103 +++++++++++++++++ + drivers/base/regmap/regmap.c | 219 ++++++++++-------------------------- + include/linux/regmap.h | 85 +++++++------- + 6 files changed, 244 insertions(+), 203 deletions(-) +Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/hsi/nokia-modem.txt | 12 +++++++----- + drivers/hsi/clients/nokia-modem.c | 2 ++ + drivers/hsi/clients/ssi_protocol.c | 16 +++++----------- + 3 files changed, 14 insertions(+), 16 deletions(-) +Merging leds/for-next (94b0580b6768 leds: gpio: Use GPIOF_OUT_INIT_LOW instead of hardcoded zero) +$ git merge leds/for-next +Auto-merging drivers/leds/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-sn3218.txt | 41 +++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/leds/Kconfig | 12 + + drivers/leds/Makefile | 1 + + drivers/leds/led-class.c | 2 + + drivers/leds/led-core.c | 45 ++- + drivers/leds/leds-gpio.c | 6 +- + drivers/leds/leds-lp3944.c | 7 +- + drivers/leds/leds-sn3218.c | 306 +++++++++++++++++++++ + include/linux/leds.h | 8 +- + 10 files changed, 407 insertions(+), 22 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-sn3218.txt + create mode 100644 drivers/leds/leds-sn3218.c +Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_si_intf.c | 11 +++++++---- + drivers/char/ipmi/ipmi_ssif.c | 13 ++++--------- + 2 files changed, 11 insertions(+), 13 deletions(-) +Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles") +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-firmware-qemu_fw_cfg | 100 +++ + Documentation/devicetree/bindings/arm/fw-cfg.txt | 38 +- + Documentation/driver-model/platform.txt | 2 +- + drivers/base/bus.c | 15 +- + drivers/base/component.c | 2 +- + drivers/base/dma-coherent.c | 28 +- + drivers/firmware/Kconfig | 20 + + drivers/firmware/Makefile | 1 + + drivers/firmware/qemu_fw_cfg.c | 751 +++++++++++++++++++++ + fs/kernfs/dir.c | 19 +- + include/linux/debugfs.h | 8 + + lib/kobject.c | 1 + + 12 files changed, 915 insertions(+), 70 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg + create mode 100644 drivers/firmware/qemu_fw_cfg.c +Merging tty/tty-next (a3f0b77f36ca sc16is7xx: implemented get_mctrl) +$ git merge tty/tty-next +Auto-merging kernel/audit.c +Auto-merging include/linux/sched.h +Auto-merging include/asm-generic/vmlinux.lds.h +Removing drivers/tty/serial/m32r_sio.h +Removing drivers/tty/serial/68328serial.c +Auto-merging drivers/of/fdt.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/serial/brcm,bcm2835-aux-uart.txt | 18 + + .../bindings/serial/renesas,sci-serial.txt | 2 + + Documentation/serial/tty.txt | 3 - + MAINTAINERS | 2 +- + arch/alpha/include/asm/serial.h | 8 +- + arch/arm/mach-omap2/serial.c | 2 +- + arch/frv/include/asm/serial.h | 2 +- + arch/ia64/kernel/unaligned.c | 7 +- + arch/m68k/include/asm/serial.h | 8 +- + arch/mips/pmcs-msp71xx/msp_serial.c | 2 +- + arch/mn10300/include/asm/serial.h | 10 +- + arch/xtensa/platforms/iss/console.c | 4 - + arch/xtensa/platforms/xt2000/setup.c | 2 +- + drivers/char/pcmcia/synclink_cs.c | 21 +- + drivers/char/ttyprintk.c | 2 +- + drivers/isdn/i4l/isdn_tty.c | 12 +- + drivers/mmc/card/sdio_uart.c | 14 +- + drivers/net/irda/irtty-sir.c | 10 - + drivers/of/fdt.c | 32 +- + drivers/of/fdt_address.c | 11 +- + drivers/s390/char/con3215.c | 3 +- + drivers/staging/dgap/dgap.c | 36 +- + drivers/staging/dgnc/dgnc_tty.c | 20 +- + drivers/tty/Kconfig | 2 +- + drivers/tty/amiserial.c | 28 +- + drivers/tty/cyclades.c | 22 +- + drivers/tty/ehv_bytechan.c | 40 +- + drivers/tty/goldfish.c | 2 +- + drivers/tty/hvc/hvc_vio.c | 29 +- + drivers/tty/hvc/hvc_xen.c | 6 +- + drivers/tty/isicom.c | 3 +- + drivers/tty/mxser.c | 21 +- + drivers/tty/n_gsm.c | 22 +- + drivers/tty/n_hdlc.c | 19 +- + drivers/tty/n_tty.c | 117 +- + drivers/tty/nozomi.c | 2 +- + drivers/tty/pty.c | 30 +- + drivers/tty/rocket.c | 18 +- + drivers/tty/rocket_int.h | 1 - + drivers/tty/serial/68328serial.c | 1322 -------------------- + drivers/tty/serial/8250/8250.h | 14 + + drivers/tty/serial/8250/8250_accent.c | 13 +- + drivers/tty/serial/8250/8250_acorn.c | 2 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 146 +++ + drivers/tty/serial/8250/8250_boca.c | 41 +- + drivers/tty/serial/8250/8250_core.c | 21 +- + drivers/tty/serial/8250/8250_dw.c | 126 +- + drivers/tty/serial/8250/8250_early.c | 38 +- + drivers/tty/serial/8250/8250_exar_st16c554.c | 17 +- + drivers/tty/serial/8250/8250_fourport.c | 28 +- + drivers/tty/serial/8250/8250_gsc.c | 7 +- + drivers/tty/serial/8250/8250_hp300.c | 27 +- + drivers/tty/serial/8250/8250_hub6.c | 2 +- + drivers/tty/serial/8250/8250_ingenic.c | 40 +- + drivers/tty/serial/8250/8250_mtk.c | 10 +- + drivers/tty/serial/8250/8250_of.c | 1 + + drivers/tty/serial/8250/8250_omap.c | 31 + + drivers/tty/serial/8250/8250_pci.c | 96 +- + drivers/tty/serial/8250/8250_pnp.c | 48 +- + drivers/tty/serial/8250/8250_port.c | 453 +++++-- + drivers/tty/serial/8250/Kconfig | 24 + + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/8250/serial_cs.c | 90 +- + drivers/tty/serial/Kconfig | 18 +- + drivers/tty/serial/Makefile | 1 - + drivers/tty/serial/amba-pl011.c | 20 +- + drivers/tty/serial/arc_uart.c | 1 - + drivers/tty/serial/atmel_serial.c | 134 +- + drivers/tty/serial/clps711x.c | 10 +- + drivers/tty/serial/crisv10.c | 33 +- + drivers/tty/serial/digicolor-usart.c | 9 +- + drivers/tty/serial/earlycon.c | 118 +- + drivers/tty/serial/imx.c | 5 +- + drivers/tty/serial/jsm/jsm_tty.c | 13 +- + drivers/tty/serial/m32r_sio.c | 134 +- + drivers/tty/serial/m32r_sio.h | 49 - + drivers/tty/serial/meson_uart.c | 8 +- + drivers/tty/serial/mpc52xx_uart.c | 8 +- + drivers/tty/serial/mpsc.c | 178 ++- + drivers/tty/serial/msm_serial.c | 2 - + drivers/tty/serial/omap-serial.c | 2 +- + drivers/tty/serial/samsung.c | 6 - + drivers/tty/serial/sc16is7xx.c | 38 +- + drivers/tty/serial/serial_core.c | 125 +- + drivers/tty/serial/serial_ks8695.c | 2 +- + drivers/tty/serial/sh-sci.c | 183 ++- + drivers/tty/serial/sh-sci.h | 15 + + drivers/tty/serial/sprd_serial.c | 2 - + drivers/tty/serial/uartlite.c | 45 + + drivers/tty/serial/xilinx_uartps.c | 539 ++++---- + drivers/tty/serial/zs.c | 4 + + drivers/tty/synclink.c | 23 +- + drivers/tty/synclink_gt.c | 19 +- + drivers/tty/synclinkmp.c | 63 +- + drivers/tty/tty_audit.c | 231 +--- + drivers/tty/tty_buffer.c | 39 +- + drivers/tty/tty_io.c | 267 ++-- + drivers/tty/tty_ioctl.c | 12 +- + drivers/tty/tty_ldisc.c | 198 +-- + drivers/tty/tty_mutex.c | 8 +- + drivers/tty/tty_port.c | 11 +- + drivers/tty/vt/keyboard.c | 14 +- + drivers/tty/vt/selection.c | 2 + + drivers/tty/vt/vt.c | 2 +- + drivers/usb/serial/console.c | 6 +- + drivers/usb/serial/cypress_m8.c | 3 +- + drivers/usb/serial/digi_acceleport.c | 8 +- + drivers/usb/serial/io_edgeport.c | 4 +- + drivers/usb/serial/mct_u232.c | 2 +- + drivers/usb/serial/mos7720.c | 4 +- + drivers/usb/serial/mos7840.c | 4 +- + include/asm-generic/vmlinux.lds.h | 6 +- + include/linux/audit.h | 4 + + include/linux/isdn.h | 1 + + include/linux/of_fdt.h | 2 +- + include/linux/platform_data/serial-omap.h | 2 +- + include/linux/sched.h | 1 - + include/linux/serial_8250.h | 8 + + include/linux/serial_core.h | 25 +- + include/linux/tty.h | 58 +- + include/linux/tty_ldisc.h | 13 - + kernel/audit.c | 27 +- + net/irda/ircomm/ircomm_tty.c | 15 +- + net/irda/ircomm/ircomm_tty_ioctl.c | 13 +- + net/nfc/nci/uart.c | 9 +- + security/selinux/hooks.c | 4 +- + 126 files changed, 2383 insertions(+), 3618 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm2835-aux-uart.txt + delete mode 100644 drivers/tty/serial/68328serial.c + create mode 100644 drivers/tty/serial/8250/8250_bcm2835aux.c + delete mode 100644 drivers/tty/serial/m32r_sio.h +Merging usb/usb-next (a057c3259ab6 usb: dwc2: USB_DWC2 should depend on HAS_DMA) +$ git merge usb/usb-next +Auto-merging include/linux/device.h +Auto-merging drivers/usb/dwc2/Kconfig +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/core/hcd-pci.c +Auto-merging drivers/usb/chipidea/debug.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/usb/atm/cxacru.c | 2 + + drivers/usb/chipidea/debug.c | 5 +- + drivers/usb/class/cdc-acm.c | 67 ++ + drivers/usb/class/cdc-acm.h | 1 + + drivers/usb/class/usbtmc.c | 331 ++++++++ + drivers/usb/common/common.c | 1 + + drivers/usb/core/buffer.c | 18 +- + drivers/usb/core/config.c | 37 +- + drivers/usb/core/devices.c | 26 +- + drivers/usb/core/devio.c | 240 +++++- + drivers/usb/core/file.c | 9 +- + drivers/usb/core/hcd-pci.c | 2 +- + drivers/usb/core/hcd.c | 114 ++- + drivers/usb/core/hub.c | 114 ++- + drivers/usb/core/hub.h | 7 + + drivers/usb/core/sysfs.c | 68 +- + drivers/usb/core/urb.c | 3 +- + drivers/usb/core/usb.c | 5 +- + drivers/usb/core/usb.h | 2 +- + drivers/usb/dwc2/Kconfig | 1 + + drivers/usb/gadget/function/rndis.c | 20 +- + drivers/usb/gadget/udc/Kconfig | 4 + + drivers/usb/host/Kconfig | 13 +- + drivers/usb/host/bcma-hcd.c | 83 +- + drivers/usb/host/ehci-dbg.c | 477 ++++++----- + drivers/usb/host/ehci-fsl.c | 24 +- + drivers/usb/host/ehci-hcd.c | 22 +- + drivers/usb/host/ehci-hub.c | 6 +- + drivers/usb/host/ehci-msm.c | 66 +- + drivers/usb/host/ehci-pci.c | 8 +- + drivers/usb/host/ehci-platform.c | 6 +- + drivers/usb/host/ehci-q.c | 104 ++- + drivers/usb/host/ehci-sched.c | 524 ++++++------ + drivers/usb/host/ehci-st.c | 6 +- + drivers/usb/host/ehci-timer.c | 5 +- + drivers/usb/host/ehci.h | 97 +-- + drivers/usb/host/fotg210-hcd.c | 15 +- + drivers/usb/host/fsl-mph-dr-of.c | 7 +- + drivers/usb/host/max3421-hcd.c | 16 +- + drivers/usb/host/ohci-nxp.c | 7 - + drivers/usb/host/ohci-platform.c | 6 +- + drivers/usb/host/ohci-pxa27x.c | 2 +- + drivers/usb/host/ohci-st.c | 6 +- + drivers/usb/host/oxu210hp-hcd.c | 15 +- + drivers/usb/host/pci-quirks.c | 3 +- + drivers/usb/host/r8a66597-hcd.c | 11 +- + drivers/usb/host/u132-hcd.c | 18 +- + drivers/usb/host/xhci-hub.c | 27 +- + drivers/usb/host/xhci-mem.c | 180 ++-- + drivers/usb/host/xhci-ring.c | 134 ++- + drivers/usb/host/xhci.c | 8 +- + drivers/usb/host/xhci.h | 15 +- + drivers/usb/misc/chaoskey.c | 122 ++- + drivers/usb/misc/sisusbvga/sisusb.c | 1543 +++++++++++++++++------------------ + drivers/usb/mon/mon_main.c | 9 +- + drivers/usb/musb/Kconfig | 2 + + drivers/usb/renesas_usbhs/Kconfig | 2 +- + drivers/usb/renesas_usbhs/fifo.c | 20 +- + drivers/usb/renesas_usbhs/fifo.h | 20 +- + drivers/usb/renesas_usbhs/pipe.h | 2 +- + drivers/usb/storage/debug.c | 12 +- + drivers/usb/storage/debug.h | 3 - + drivers/usb/storage/ene_ub6250.c | 4 +- + drivers/usb/storage/sddr09.c | 18 +- + drivers/usb/storage/uas.c | 36 +- + drivers/usb/usbip/usbip_event.c | 5 +- + drivers/usb/usbip/vhci_hcd.c | 88 +- + drivers/usb/usbip/vhci_rx.c | 30 +- + drivers/usb/usbip/vhci_sysfs.c | 19 +- + drivers/usb/usbip/vhci_tx.c | 14 +- + drivers/usb/wusbcore/wusbhc.h | 2 +- + include/linux/device.h | 5 + + include/linux/usb.h | 11 +- + include/linux/usb/hcd.h | 5 +- + include/linux/usb/msm_hsusb_hw.h | 1 + + include/linux/usb/storage.h | 12 +- + include/uapi/linux/usb/ch11.h | 21 + + include/uapi/linux/usb/ch9.h | 29 + + include/uapi/linux/usb/tmc.h | 29 +- + include/uapi/linux/usbdevice_fs.h | 1 + + 81 files changed, 3028 insertions(+), 2027 deletions(-) +Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (18558cae0272 Linux 4.5-rc4) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 23 ++++++++++++++++++++++ + drivers/usb/chipidea/ci_hdrc_imx.c | 13 ++++++++---- + drivers/usb/chipidea/core.c | 3 +++ + drivers/usb/chipidea/udc.c | 1 - + 4 files changed, 35 insertions(+), 5 deletions(-) +Merging staging/staging-next (c4e315884ed8 staging: lustre: Remove LASSERTS from router checker) +$ git merge staging/staging-next +Resolved 'drivers/base/firmware_class.c' using previous resolution. +Resolved 'drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c' using previous resolution. +Resolved 'drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h' using previous resolution. +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Removing drivers/staging/wilc1000/linux_wlan_common.h +Removing drivers/staging/staging.c +Removing drivers/staging/sm750fb/sm750_help.h +Auto-merging drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c +Removing drivers/staging/panel/TODO +Removing drivers/staging/panel/Makefile +Removing drivers/staging/panel/Kconfig +Removing drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c +Removing drivers/staging/olpc_dcon/olpc_dcon_xo_1.c +Removing drivers/staging/olpc_dcon/olpc_dcon.h +Removing drivers/staging/olpc_dcon/olpc_dcon.c +Removing drivers/staging/olpc_dcon/TODO +Removing drivers/staging/olpc_dcon/Makefile +Removing drivers/staging/olpc_dcon/Kconfig +Auto-merging drivers/staging/media/davinci_vpfe/vpfe_video.c +Auto-merging drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h +CONFLICT (content): Merge conflict in drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h +Auto-merging drivers/staging/lustre/lustre/obdclass/kernelcomm.c +Auto-merging drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c +Auto-merging drivers/staging/lustre/lustre/include/uapi_kernelcomm.h +Removing drivers/staging/dgap/dgap.h +CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree. +Removing drivers/staging/dgap/Makefile +Removing drivers/staging/dgap/Kconfig +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/staging/android/ashmem.c +Auto-merging drivers/misc/panel.c +Auto-merging drivers/misc/mic/vop/vop_main.h +Auto-merging drivers/misc/mic/scif/scif_rma.c +Removing drivers/misc/mic/host/mic_virtio.c +Removing drivers/misc/mic/host/mic_fops.h +Removing drivers/misc/mic/host/mic_fops.c +Removing drivers/misc/mic/card/mic_virtio.h +Removing drivers/misc/mic/card/mic_virtio.c +Removing drivers/misc/mei/wd.c +Auto-merging drivers/misc/lkdtm.c +Auto-merging drivers/iio/adc/mxs-lradc.c +Auto-merging drivers/iio/adc/Makefile +Auto-merging drivers/iio/adc/Kconfig +Auto-merging drivers/hv/hyperv_vmbus.h +Auto-merging drivers/base/firmware_class.c +CONFLICT (content): Merge conflict in drivers/base/firmware_class.c +Auto-merging drivers/android/binder.c +Auto-merging MAINTAINERS +Auto-merging Documentation/mic/mpssd/mpssd.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/dgap/dgap.c +drivers/staging/dgap/dgap.c: needs merge +rm 'drivers/staging/dgap/dgap.c' +$ git commit -v -a +[master fdc64c374a8f] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 1 + + Documentation/ABI/stable/sysfs-bus-vmbus | 14 + + Documentation/ABI/testing/sysfs-bus-iio | 10 + + .../ABI/testing/sysfs-bus-iio-health-afe440x | 54 + + .../devicetree/bindings/goldfish/pipe.txt | 17 + + .../devicetree/bindings/iio/accel/mma8452.txt | 4 +- + .../bindings/iio/adc/at91-sama5d2_adc.txt | 28 + + .../devicetree/bindings/iio/adc/mcp3422.txt | 1 + + .../devicetree/bindings/iio/adc/ti-adc0832.txt | 19 + + .../bindings/iio/chemical/atlas,ph-sm.txt | 22 + + .../devicetree/bindings/iio/health/afe4403.txt | 34 + + .../devicetree/bindings/iio/health/afe4404.txt | 30 + + .../devicetree/bindings/iio/health/max30100.txt | 8 + + .../devicetree/bindings/iio/light/opt3001.txt | 26 + + .../devicetree/bindings/misc/eeprom-93xx46.txt | 25 + + .../devicetree/bindings/nvmem/lpc1857-eeprom.txt | 28 + + .../devicetree/bindings/nvmem/mtk-efuse.txt | 36 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/mic/mic_overview.txt | 54 +- + Documentation/mic/mpssd/mpss | 2 +- + Documentation/mic/mpssd/mpssd.c | 2 +- + .../misc-devices}/lcd-panel-cgram.txt | 0 + Documentation/misc-devices/mei/mei.txt | 12 +- + MAINTAINERS | 40 +- + drivers/android/binder.c | 31 +- + drivers/base/firmware_class.c | 9 +- + drivers/char/nvram.c | 12 +- + drivers/char/nwbutton.c | 5 +- + drivers/char/ppdev.c | 397 +- + drivers/char/raw.c | 4 +- + drivers/hv/channel.c | 36 +- + drivers/hv/channel_mgmt.c | 268 +- + drivers/hv/connection.c | 8 +- + drivers/hv/hv.c | 26 +- + drivers/hv/hyperv_vmbus.h | 6 +- + drivers/hv/ring_buffer.c | 31 +- + drivers/hv/vmbus_drv.c | 25 + + drivers/hwtracing/coresight/Kconfig | 1 + + drivers/hwtracing/coresight/Makefile | 4 +- + drivers/hwtracing/coresight/coresight-etb10.c | 293 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 393 ++ + drivers/hwtracing/coresight/coresight-etm-perf.h | 32 + + drivers/hwtracing/coresight/coresight-etm.h | 142 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 1272 ++++ + drivers/hwtracing/coresight/coresight-etm3x.c | 1737 +---- + drivers/hwtracing/coresight/coresight-etm4x.c | 37 +- + drivers/hwtracing/coresight/coresight-funnel.c | 21 +- + drivers/hwtracing/coresight/coresight-priv.h | 15 + + .../coresight/coresight-replicator-qcom.c | 19 +- + drivers/hwtracing/coresight/coresight-replicator.c | 25 +- + drivers/hwtracing/coresight/coresight-tmc.c | 35 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 23 +- + drivers/hwtracing/coresight/coresight.c | 388 +- + drivers/hwtracing/coresight/of_coresight.c | 3 +- + drivers/hwtracing/intel_th/Kconfig | 1 + + drivers/hwtracing/intel_th/core.c | 30 +- + drivers/hwtracing/intel_th/gth.c | 32 +- + drivers/hwtracing/intel_th/gth.h | 3 - + drivers/hwtracing/intel_th/intel_th.h | 41 + + drivers/hwtracing/intel_th/msu.c | 9 +- + drivers/hwtracing/intel_th/pci.c | 12 +- + drivers/hwtracing/intel_th/sth.c | 11 +- + drivers/hwtracing/stm/Kconfig | 16 + + drivers/hwtracing/stm/Makefile | 2 + + drivers/hwtracing/stm/core.c | 175 +- + drivers/hwtracing/stm/dummy_stm.c | 71 +- + drivers/hwtracing/stm/heartbeat.c | 130 + + drivers/hwtracing/stm/policy.c | 25 +- + drivers/hwtracing/stm/stm.h | 2 + + drivers/iio/accel/Kconfig | 2 +- + drivers/iio/accel/mma8452.c | 206 +- + drivers/iio/accel/st_accel_core.c | 16 + + drivers/iio/adc/Kconfig | 53 +- + drivers/iio/adc/Makefile | 4 + + drivers/iio/adc/at91-sama5d2_adc.c | 508 ++ + drivers/iio/adc/axp288_adc.c | 2 +- + drivers/iio/adc/mcp320x.c | 31 +- + drivers/iio/adc/mcp3422.c | 7 +- + drivers/{staging => }/iio/adc/mxs-lradc.c | 13 +- + drivers/iio/adc/ti-adc0832.c | 288 + + drivers/iio/adc/ti-ads1015.c | 612 ++ + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 7 +- + drivers/iio/chemical/Kconfig | 14 + + drivers/iio/chemical/Makefile | 1 + + drivers/iio/chemical/atlas-ph-sensor.c | 511 ++ + drivers/iio/common/st_sensors/st_sensors_core.c | 6 +- + drivers/iio/common/st_sensors/st_sensors_core.h | 8 + + drivers/iio/common/st_sensors/st_sensors_trigger.c | 52 +- + drivers/iio/dac/Kconfig | 29 +- + drivers/iio/dac/Makefile | 2 + + drivers/iio/dac/ad5064.c | 391 +- + drivers/iio/dac/ad5761.c | 430 ++ + drivers/iio/dac/mcp4725.c | 87 +- + drivers/iio/dac/stx104.c | 152 + + drivers/iio/gyro/st_gyro_core.c | 15 + + drivers/iio/health/Kconfig | 31 +- + drivers/iio/health/Makefile | 2 + + drivers/iio/health/afe4403.c | 708 ++ + drivers/iio/health/afe4404.c | 679 ++ + drivers/iio/health/afe440x.h | 191 + + drivers/iio/health/max30100.c | 81 +- + drivers/iio/humidity/Kconfig | 6 +- + drivers/iio/humidity/dht11.c | 77 +- + drivers/iio/humidity/si7005.c | 1 + + drivers/iio/humidity/si7020.c | 1 + + drivers/iio/imu/inv_mpu6050/Kconfig | 24 +- + drivers/iio/imu/inv_mpu6050/Makefile | 8 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 18 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 263 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 206 + + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 19 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 35 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 97 + + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 10 +- + drivers/iio/industrialio-buffer.c | 59 +- + drivers/iio/industrialio-core.c | 1 + + drivers/iio/light/opt3001.c | 156 +- + drivers/iio/magnetometer/ak8975.c | 4 +- + drivers/iio/magnetometer/st_magn_core.c | 4 + + drivers/iio/pressure/Kconfig | 42 +- + drivers/iio/pressure/Makefile | 2 + + drivers/iio/pressure/mpl115.c | 66 +- + drivers/iio/pressure/mpl115.h | 24 + + drivers/iio/pressure/mpl115_i2c.c | 67 + + drivers/iio/pressure/mpl115_spi.c | 106 + + drivers/iio/pressure/ms5611.h | 1 + + drivers/iio/pressure/ms5611_core.c | 92 +- + drivers/iio/pressure/ms5611_i2c.c | 7 + + drivers/iio/pressure/ms5611_spi.c | 8 + + drivers/iio/pressure/st_pressure_core.c | 8 + + drivers/misc/Kconfig | 282 +- + drivers/misc/Makefile | 1 + + drivers/misc/apds990x.c | 8 +- + drivers/misc/arm-charlcd.c | 24 +- + drivers/misc/bh1770glc.c | 8 +- + drivers/misc/c2port/core.c | 8 +- + drivers/misc/cxl/sysfs.c | 5 +- + drivers/misc/eeprom/at24.c | 4 +- + drivers/misc/eeprom/at25.c | 4 +- + drivers/misc/eeprom/eeprom.c | 2 +- + drivers/misc/eeprom/eeprom_93xx46.c | 216 +- + drivers/misc/genwqe/card_sysfs.c | 2 +- + drivers/misc/ibmasm/ibmasm.h | 9 +- + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 8 +- + drivers/misc/lkdtm.c | 2 +- + drivers/misc/mei/Kconfig | 6 +- + drivers/misc/mei/Makefile | 1 - + drivers/misc/mei/amthif.c | 130 +- + drivers/misc/mei/bus-fixup.c | 41 +- + drivers/misc/mei/bus.c | 57 +- + drivers/misc/mei/client.c | 189 +- + drivers/misc/mei/client.h | 27 +- + drivers/misc/mei/debugfs.c | 65 +- + drivers/misc/mei/hbm.c | 24 +- + drivers/misc/mei/hw-me.c | 10 +- + drivers/misc/mei/hw-txe.c | 10 +- + drivers/misc/mei/hw.h | 32 +- + drivers/misc/mei/init.c | 20 +- + drivers/misc/mei/interrupt.c | 94 +- + drivers/misc/mei/main.c | 106 +- + drivers/misc/mei/mei-trace.c | 2 + + drivers/misc/mei/mei-trace.h | 40 +- + drivers/misc/mei/mei_dev.h | 118 +- + drivers/misc/mei/pci-me.c | 4 +- + drivers/misc/mei/pci-txe.c | 4 +- + drivers/misc/mei/wd.c | 391 -- + drivers/misc/mic/Kconfig | 44 +- + drivers/misc/mic/Makefile | 1 + + drivers/misc/mic/bus/Makefile | 1 + + drivers/misc/mic/bus/cosm_bus.h | 2 + + drivers/misc/mic/bus/vop_bus.c | 203 + + drivers/misc/mic/bus/vop_bus.h | 140 + + drivers/misc/mic/card/Makefile | 1 - + drivers/misc/mic/card/mic_device.c | 89 +- + drivers/misc/mic/card/mic_device.h | 3 + + drivers/misc/mic/card/mic_virtio.c | 634 -- + drivers/misc/mic/card/mic_virtio.h | 76 - + drivers/misc/mic/card/mic_x100.c | 1 + + drivers/misc/mic/cosm/cosm_main.c | 13 +- + drivers/misc/mic/host/Makefile | 2 - + drivers/misc/mic/host/mic_boot.c | 125 +- + drivers/misc/mic/host/mic_debugfs.c | 190 - + drivers/misc/mic/host/mic_device.h | 9 +- + drivers/misc/mic/host/mic_fops.c | 222 - + drivers/misc/mic/host/mic_fops.h | 32 - + drivers/misc/mic/host/mic_main.c | 49 +- + drivers/misc/mic/host/mic_virtio.c | 811 --- + drivers/misc/mic/host/mic_x100.c | 19 +- + drivers/misc/mic/scif/scif_dma.c | 41 +- + drivers/misc/mic/scif/scif_rma.c | 7 +- + drivers/misc/mic/vop/Makefile | 9 + + drivers/misc/mic/vop/vop_debugfs.c | 232 + + drivers/misc/mic/vop/vop_main.c | 755 +++ + .../misc/mic/{host/mic_virtio.h => vop/vop_main.h} | 129 +- + drivers/misc/mic/vop/vop_vringh.c | 1165 ++++ + drivers/{staging/panel => misc}/panel.c | 136 +- + drivers/misc/pch_phub.c | 6 +- + drivers/misc/ti-st/st_core.c | 1 - + drivers/misc/vmw_vmci/vmci_driver.c | 2 +- + drivers/nvmem/Kconfig | 20 + + drivers/nvmem/Makefile | 4 + + drivers/nvmem/core.c | 4 +- + drivers/nvmem/lpc18xx_eeprom.c | 330 + + drivers/nvmem/mtk-efuse.c | 89 + + drivers/nvmem/rockchip-efuse.c | 90 +- + drivers/nvmem/sunxi_sid.c | 9 +- + drivers/platform/Kconfig | 3 +- + drivers/platform/goldfish/Kconfig | 18 + + drivers/platform/goldfish/Makefile | 2 +- + drivers/platform/goldfish/goldfish_pipe.c | 183 +- + drivers/staging/Kconfig | 6 - + drivers/staging/Makefile | 6 - + drivers/staging/android/Kconfig | 9 - + drivers/staging/android/ashmem.c | 4 +- + drivers/staging/android/ion/ion.c | 74 +- + drivers/staging/android/ion/ion.h | 20 +- + drivers/staging/android/ion/ion_carveout_heap.c | 2 +- + drivers/staging/android/ion/ion_page_pool.c | 4 +- + drivers/staging/android/ion/ion_system_heap.c | 2 +- + drivers/staging/android/lowmemorykiller.c | 24 +- + drivers/staging/android/sw_sync.c | 191 +- + drivers/staging/android/sw_sync.h | 8 +- + drivers/staging/android/sync.c | 469 +- + drivers/staging/android/sync.h | 241 +- + drivers/staging/android/sync_debug.c | 221 +- + drivers/staging/android/trace/sync.h | 44 - + drivers/staging/android/uapi/ashmem.h | 1 + + drivers/staging/android/uapi/sync.h | 37 +- + drivers/staging/board/armadillo800eva.c | 1 - + drivers/staging/board/board.c | 1 - + .../clocking-wizard/clk-xlnx-clock-wizard.c | 9 +- + drivers/staging/comedi/comedi.h | 599 +- + drivers/staging/comedi/comedi_fops.c | 84 +- + drivers/staging/comedi/comedi_pcmcia.h | 3 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 4 +- + drivers/staging/comedi/drivers/comedi_isadma.c | 3 +- + drivers/staging/comedi/drivers/dt2801.c | 18 +- + drivers/staging/comedi/drivers/dt282x.c | 2 +- + drivers/staging/comedi/drivers/dt3000.c | 2 +- + drivers/staging/comedi/drivers/mite.c | 72 +- + drivers/staging/comedi/drivers/mite.h | 3 + + drivers/staging/comedi/drivers/ni_mio_c_common.c | 0 + drivers/staging/comedi/drivers/ni_mio_common.c | 583 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 20 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 2 +- + drivers/staging/dgap/Kconfig | 6 - + drivers/staging/dgap/Makefile | 1 - + drivers/staging/dgap/dgap.c | 7057 -------------------- + drivers/staging/dgap/dgap.h | 1229 ---- + drivers/staging/dgnc/dgnc_neo.c | 6 +- + drivers/staging/emxx_udc/emxx_udc.c | 53 +- + drivers/staging/fbtft/Kconfig | 12 + + drivers/staging/fbtft/Makefile | 2 + + drivers/staging/fbtft/fb_hx8340bn.c | 144 +- + drivers/staging/fbtft/fb_hx8347d.c | 9 +- + drivers/staging/fbtft/fb_hx8353d.c | 52 +- + drivers/staging/fbtft/fb_hx8357d.c | 144 +- + drivers/staging/fbtft/fb_hx8357d.h | 60 +- + drivers/staging/fbtft/fb_ili9163.c | 189 +- + drivers/staging/fbtft/fb_ili9320.c | 13 +- + drivers/staging/fbtft/fb_ili9325.c | 81 +- + drivers/staging/fbtft/fb_ili9340.c | 34 +- + drivers/staging/fbtft/fb_ili9341.c | 69 +- + drivers/staging/fbtft/fb_ili9481.c | 33 +- + drivers/staging/fbtft/fb_ili9486.c | 35 +- + drivers/staging/fbtft/fb_s6d02a1.c | 42 +- + drivers/staging/fbtft/fb_ssd1305.c | 216 + + drivers/staging/fbtft/fb_ssd1325.c | 205 + + drivers/staging/fbtft/fb_st7735r.c | 42 +- + drivers/staging/fbtft/fb_tinylcd.c | 28 +- + drivers/staging/fbtft/fb_uc1701.c | 27 +- + drivers/staging/fbtft/fbtft-core.c | 24 +- + drivers/staging/fbtft/fbtft.h | 8 - + drivers/staging/fbtft/fbtft_device.c | 75 +- + drivers/staging/fsl-mc/bus/Kconfig | 3 +- + drivers/staging/fsl-mc/bus/Makefile | 2 + + drivers/staging/fsl-mc/bus/dprc-driver.c | 333 +- + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 127 + + drivers/staging/fsl-mc/bus/mc-allocator.c | 201 +- + drivers/staging/fsl-mc/bus/mc-bus.c | 19 +- + drivers/staging/fsl-mc/bus/mc-msi.c | 276 + + drivers/staging/fsl-mc/include/dprc.h | 2 +- + drivers/staging/fsl-mc/include/mc-private.h | 41 +- + drivers/staging/fsl-mc/include/mc.h | 26 + + drivers/staging/fwserial/dma_fifo.c | 10 +- + drivers/staging/fwserial/fwserial.c | 17 +- + drivers/staging/fwserial/fwserial.h | 1 - + drivers/staging/gdm724x/gdm_lte.c | 6 +- + drivers/staging/gdm724x/gdm_mux.c | 18 +- + drivers/staging/gdm72xx/gdm_qos.c | 14 +- + drivers/staging/gdm72xx/gdm_qos.h | 2 +- + drivers/staging/gdm72xx/gdm_sdio.c | 4 +- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/gdm72xx/gdm_usb.c | 3 +- + drivers/staging/gdm72xx/gdm_usb.h | 8 +- + drivers/staging/gdm72xx/gdm_wimax.c | 36 +- + drivers/staging/gdm72xx/hci.h | 11 +- + drivers/staging/gdm72xx/netlink_k.c | 11 +- + drivers/staging/gdm72xx/sdio_boot.c | 2 +- + drivers/staging/gdm72xx/usb_boot.c | 14 +- + drivers/staging/gdm72xx/usb_ids.h | 64 +- + drivers/staging/goldfish/goldfish_audio.c | 8 +- + drivers/staging/goldfish/goldfish_nand.c | 50 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 6 +- + .../staging/iio/Documentation/sysfs-bus-iio-light | 28 - + drivers/staging/iio/accel/lis3l02dq_core.c | 4 +- + drivers/staging/iio/accel/sca3000_core.c | 3 +- + drivers/staging/iio/accel/sca3000_ring.c | 3 +- + drivers/staging/iio/adc/Kconfig | 18 +- + drivers/staging/iio/adc/Makefile | 1 - + drivers/staging/iio/adc/ad7192.c | 78 +- + drivers/staging/iio/adc/ad7280a.c | 4 +- + drivers/staging/iio/adc/ad7606.h | 10 +- + drivers/staging/iio/adc/ad7606_core.c | 53 +- + drivers/staging/iio/adc/ad7606_par.c | 32 +- + drivers/staging/iio/adc/ad7606_spi.c | 32 +- + drivers/staging/iio/adc/ad7816.c | 4 +- + drivers/staging/iio/adc/spear_adc.c | 17 +- + drivers/staging/iio/cdc/ad7150.c | 34 +- + drivers/staging/iio/cdc/ad7746.c | 4 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 8 +- + drivers/staging/iio/light/isl29018.c | 47 +- + drivers/staging/iio/light/isl29028.c | 31 +- + drivers/staging/iio/light/tsl2583.c | 92 +- + drivers/staging/iio/light/tsl2x7x_core.c | 6 +- + drivers/staging/iio/magnetometer/hmc5843.h | 5 +- + drivers/staging/iio/magnetometer/hmc5843_core.c | 10 +- + drivers/staging/iio/magnetometer/hmc5843_i2c.c | 3 +- + drivers/staging/iio/magnetometer/hmc5843_spi.c | 3 +- + drivers/staging/iio/resolver/ad2s1200.c | 12 +- + drivers/staging/iio/resolver/ad2s1210.c | 39 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 6 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 2 +- + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 60 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 5 - + .../lustre/include/linux/libcfs/libcfs_string.h | 2 - + .../lustre/include/linux/libcfs/linux/libcfs.h | 3 - + drivers/staging/lustre/include/linux/lnet/api.h | 23 +- + .../staging/lustre/include/linux/lnet/lib-dlc.h | 122 + + .../staging/lustre/include/linux/lnet/lib-lnet.h | 96 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 96 +- + .../staging/lustre/include/linux/lnet/lnetctl.h | 4 - + drivers/staging/lustre/include/linux/lnet/lnetst.h | 104 +- + drivers/staging/lustre/include/linux/lnet/nidstr.h | 9 +- + .../staging/lustre/include/linux/lnet/socklnd.h | 9 +- + drivers/staging/lustre/include/linux/lnet/types.h | 47 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 506 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 30 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 610 +- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 8 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 601 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 29 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 788 ++- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 195 +- + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 11 +- + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 168 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 113 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 1504 +++-- + drivers/staging/lustre/lnet/lnet/config.c | 300 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 80 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 103 +- + drivers/staging/lustre/lnet/lnet/lib-me.c | 21 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 594 +- + drivers/staging/lustre/lnet/lnet/lib-msg.c | 108 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 182 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 102 +- + drivers/staging/lustre/lnet/lnet/lo.c | 14 +- + drivers/staging/lustre/lnet/lnet/module.c | 101 +- + drivers/staging/lustre/lnet/lnet/nidstrings.c | 116 +- + drivers/staging/lustre/lnet/lnet/peer.c | 235 +- + drivers/staging/lustre/lnet/lnet/router.c | 653 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 163 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 105 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 263 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 195 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 5 +- + drivers/staging/lustre/lnet/selftest/console.c | 395 +- + drivers/staging/lustre/lnet/selftest/console.h | 65 +- + drivers/staging/lustre/lnet/selftest/framework.c | 287 +- + drivers/staging/lustre/lnet/selftest/module.c | 18 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 30 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 348 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 6 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 47 +- + drivers/staging/lustre/lnet/selftest/timer.c | 6 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 14 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 16 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 10 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 2 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 32 +- + drivers/staging/lustre/lustre/fld/lproc_fld.c | 11 +- + drivers/staging/lustre/lustre/include/cl_object.h | 8 +- + drivers/staging/lustre/lustre/include/lclient.h | 4 +- + drivers/staging/lustre/lustre/include/linux/obd.h | 6 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 10 +- + drivers/staging/lustre/lustre/include/lu_object.h | 10 +- + drivers/staging/lustre/lustre/include/lu_ref.h | 4 - + .../lustre/lustre/include/lustre/lustre_idl.h | 50 +- + drivers/staging/lustre/lustre/include/lustre_cfg.h | 9 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 18 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 4 +- + .../staging/lustre/lustre/include/lustre_export.h | 18 +- + .../lustre/lustre/include/lustre_kernelcomm.h | 55 + + drivers/staging/lustre/lustre/include/lustre_lib.h | 24 +- + drivers/staging/lustre/lustre/include/lustre_log.h | 12 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 10 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 15 +- + drivers/staging/lustre/lustre/include/lustre_ver.h | 18 +- + drivers/staging/lustre/lustre/include/obd.h | 46 +- + drivers/staging/lustre/lustre/include/obd_class.h | 51 +- + .../staging/lustre/lustre/include/obd_support.h | 1 - + .../include/uapi_kernelcomm.h} | 72 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 43 +- + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 2 - + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 9 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 13 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 60 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 65 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 45 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 17 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 65 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 25 +- + drivers/staging/lustre/lustre/libcfs/Makefile | 5 +- + drivers/staging/lustre/lustre/libcfs/debug.c | 33 +- + drivers/staging/lustre/lustre/libcfs/fail.c | 3 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 141 +- + drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 19 +- + drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 12 +- + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 14 +- + .../staging/lustre/lustre/libcfs/libcfs_string.c | 54 +- + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 78 +- + .../lustre/lustre/libcfs/linux/linux-crypto.c | 23 +- + .../lustre/lustre/libcfs/linux/linux-curproc.c | 7 +- + .../lustre/lustre/libcfs/linux/linux-debug.c | 23 +- + .../staging/lustre/lustre/libcfs/linux/linux-mem.c | 2 +- + .../lustre/lustre/libcfs/linux/linux-module.c | 85 +- + .../lustre/lustre/libcfs/linux/linux-tracefile.c | 31 +- + drivers/staging/lustre/lustre/libcfs/module.c | 267 +- + drivers/staging/lustre/lustre/libcfs/prng.c | 13 +- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 167 +- + drivers/staging/lustre/lustre/libcfs/tracefile.h | 87 +- + drivers/staging/lustre/lustre/libcfs/workitem.c | 41 +- + drivers/staging/lustre/lustre/llite/dcache.c | 20 +- + drivers/staging/lustre/lustre/llite/dir.c | 109 +- + drivers/staging/lustre/lustre/llite/file.c | 193 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 14 +- + .../staging/lustre/lustre/llite/llite_internal.h | 29 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 77 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 14 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 10 +- + drivers/staging/lustre/lustre/llite/lloop.c | 21 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 14 +- + drivers/staging/lustre/lustre/llite/namei.c | 53 +- + drivers/staging/lustre/lustre/llite/rw.c | 24 +- + drivers/staging/lustre/lustre/llite/rw26.c | 16 +- + drivers/staging/lustre/lustre/llite/statahead.c | 48 +- + drivers/staging/lustre/lustre/llite/super25.c | 10 +- + drivers/staging/lustre/lustre/llite/symlink.c | 3 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 16 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 14 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 5 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 22 +- + drivers/staging/lustre/lustre/llite/xattr.c | 30 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 16 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 11 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 6 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 155 +- + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 4 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 6 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 42 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 3 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 30 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 88 +- + drivers/staging/lustre/lustre/lov/lov_merge.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 58 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 51 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 5 - + drivers/staging/lustre/lustre/lov/lov_pack.c | 15 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 25 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 30 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 5 +- + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 4 +- + drivers/staging/lustre/lustre/lov/lovsub_object.c | 4 +- + drivers/staging/lustre/lustre/lov/lproc_lov.c | 18 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 12 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 47 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 24 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 157 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 50 +- + drivers/staging/lustre/lustre/obdclass/Makefile | 10 +- + drivers/staging/lustre/lustre/obdclass/acl.c | 10 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 83 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 47 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 43 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 97 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 22 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 39 +- + .../kernel_user_comm.c => obdclass/kernelcomm.c} | 80 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 26 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 31 +- + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 2 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 7 +- + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 3 - + .../lustre/lustre/obdclass/lprocfs_counters.c | 4 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 100 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 94 +- + .../lustre/lustre/obdclass/lustre_handles.c | 12 +- + .../staging/lustre/lustre/obdclass/lustre_peer.c | 4 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 16 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 39 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 415 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 29 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 123 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 4 +- + drivers/staging/lustre/lustre/osc/osc_dev.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 19 +- + drivers/staging/lustre/lustre/osc/osc_lock.c | 61 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 125 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 16 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 140 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 78 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 17 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 26 +- + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 20 +- + drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 2 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 31 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 30 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 102 +- + drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 10 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 15 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 16 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 54 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 15 +- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 24 +- + drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 16 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 105 +- + .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 4 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 11 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 12 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 7 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 5 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 24 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 20 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 6 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 100 +- + drivers/staging/media/mn88472/mn88472.c | 6 +- + drivers/staging/media/mn88473/mn88473.c | 6 +- + drivers/staging/most/aim-cdev/cdev.c | 374 +- + drivers/staging/most/aim-network/networking.c | 11 +- + drivers/staging/most/hdm-dim2/dim2_hal.c | 4 +- + drivers/staging/most/hdm-dim2/dim2_hal.h | 7 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 68 +- + drivers/staging/most/hdm-dim2/dim2_hdm.h | 2 +- + drivers/staging/most/hdm-usb/hdm_usb.c | 17 +- + drivers/staging/most/mostcore/core.c | 193 +- + drivers/staging/most/mostcore/mostcore.h | 3 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 79 +- + drivers/staging/netlogic/platform_net.c | 14 +- + drivers/staging/netlogic/xlr_net.c | 178 +- + drivers/staging/netlogic/xlr_net.h | 978 +-- + drivers/staging/nvec/TODO | 2 - + drivers/staging/nvec/nvec.c | 95 +- + drivers/staging/nvec/nvec.h | 5 +- + drivers/staging/nvec/nvec_paz00.c | 12 +- + drivers/staging/nvec/nvec_power.c | 14 +- + drivers/staging/octeon-usb/octeon-hcd.c | 188 +- + drivers/staging/octeon-usb/octeon-hcd.h | 536 +- + drivers/staging/octeon/ethernet-mdio.c | 26 +- + drivers/staging/octeon/ethernet-rgmii.c | 291 +- + drivers/staging/octeon/ethernet-rx.c | 23 +- + drivers/staging/octeon/ethernet-tx.c | 13 +- + drivers/staging/octeon/ethernet.c | 18 +- + drivers/staging/octeon/octeon-ethernet.h | 4 +- + drivers/staging/olpc_dcon/Kconfig | 35 - + drivers/staging/olpc_dcon/Makefile | 6 - + drivers/staging/olpc_dcon/TODO | 9 - + drivers/staging/olpc_dcon/olpc_dcon.c | 813 --- + drivers/staging/olpc_dcon/olpc_dcon.h | 111 - + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 205 - + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 161 - + drivers/staging/panel/Kconfig | 278 - + drivers/staging/panel/Makefile | 1 - + drivers/staging/panel/TODO | 8 - + drivers/staging/rdma/hfi1/chip.c | 1 - + drivers/staging/rdma/hfi1/chip_registers.h | 11 + + drivers/staging/rdma/hfi1/diag.c | 2 +- + drivers/staging/rdma/hfi1/driver.c | 2 +- + drivers/staging/rdma/hfi1/efivar.c | 6 +- + drivers/staging/rdma/hfi1/hfi.h | 8 +- + drivers/staging/rdma/hfi1/mad.c | 33 +- + drivers/staging/rdma/hfi1/mr.c | 6 +- + drivers/staging/rdma/hfi1/pcie.c | 84 +- + drivers/staging/rdma/hfi1/ud.c | 2 +- + drivers/staging/rdma/hfi1/user_sdma.c | 8 +- + drivers/staging/rtl8188eu/Makefile | 2 +- + drivers/staging/rtl8188eu/TODO | 2 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_iol.c | 13 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 25 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 18 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 66 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 28 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 23 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 91 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 26 - + drivers/staging/rtl8188eu/hal/fw.c | 50 +- + drivers/staging/rtl8188eu/hal/phy.c | 26 - + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 4 +- + drivers/staging/rtl8188eu/include/drv_types.h | 2 +- + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 2 +- + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 2 - + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 3 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 8 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 3 +- + drivers/staging/rtl8192e/dot11d.h | 3 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 28 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 6 +- + drivers/staging/rtl8192e/rtllib.h | 2 +- + drivers/staging/rtl8192e/rtllib_module.c | 5 - + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 8 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- + drivers/staging/rtl8192e/rtllib_wx.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 6 - + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 3 - + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 1 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 16 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 67 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 14 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 24 +- + drivers/staging/rtl8192u/r8192U_core.c | 43 +- + drivers/staging/rtl8192u/r8192U_dm.c | 65 +- + drivers/staging/rtl8192u/r8192U_wx.c | 38 +- + drivers/staging/rtl8192u/r819xU_phy.c | 3 +- + drivers/staging/rtl8712/drv_types.h | 1 + + drivers/staging/rtl8712/ieee80211.h | 112 +- + drivers/staging/rtl8712/os_intfs.c | 3 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 2 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 8 +- + drivers/staging/rtl8712/rtl8712_io.c | 77 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 13 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 7 +- + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 45 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 15 +- + drivers/staging/rtl8712/rtl871x_recv.c | 16 +- + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 25 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 33 +- + drivers/staging/rtl8712/usb_intf.c | 12 + + drivers/staging/rtl8712/usb_ops_linux.c | 7 +- + drivers/staging/rtl8712/xmit_linux.c | 4 +- + drivers/staging/rtl8723au/TODO | 2 +- + drivers/staging/rtl8723au/core/rtw_ap.c | 92 +- + drivers/staging/rtl8723au/core/rtw_cmd.c | 3 +- + drivers/staging/rtl8723au/core/rtw_mlme.c | 38 +- + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 36 +- + drivers/staging/rtl8723au/core/rtw_recv.c | 74 +- + drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 36 +- + drivers/staging/rtl8723au/core/rtw_xmit.c | 90 +- + drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c | 6 +- + drivers/staging/rtl8723au/hal/HalHWImg8723A_MAC.c | 2 +- + drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c | 2 +- + drivers/staging/rtl8723au/hal/hal_com.c | 2 +- + drivers/staging/rtl8723au/hal/odm.c | 2 +- + .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 28 +- + drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 6 +- + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 8 +- + drivers/staging/rtl8723au/hal/usb_halinit.c | 6 +- + drivers/staging/rtl8723au/include/osdep_service.h | 6 +- + drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 2 +- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 22 +- + drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 9 +- + drivers/staging/rts5208/rtsx.c | 2 - + drivers/staging/rts5208/rtsx_transport.c | 157 +- + drivers/staging/rts5208/sd.c | 20 +- + drivers/staging/rts5208/spi.c | 2 - + drivers/staging/slicoss/slic.h | 2 + + drivers/staging/slicoss/slicoss.c | 47 +- + drivers/staging/sm750fb/ddk750_chip.c | 132 +- + drivers/staging/sm750fb/ddk750_display.c | 200 +- + drivers/staging/sm750fb/ddk750_help.h | 1 - + drivers/staging/sm750fb/ddk750_hwi2c.c | 34 +- + drivers/staging/sm750fb/ddk750_mode.c | 161 +- + drivers/staging/sm750fb/ddk750_power.c | 54 +- + drivers/staging/sm750fb/ddk750_power.h | 11 +- + drivers/staging/sm750fb/ddk750_reg.h | 3002 +++------ + drivers/staging/sm750fb/ddk750_sii164.c | 4 +- + drivers/staging/sm750fb/ddk750_sii164.h | 5 +- + drivers/staging/sm750fb/sm750.c | 187 +- + drivers/staging/sm750fb/sm750.h | 4 +- + drivers/staging/sm750fb/sm750_accel.c | 148 +- + drivers/staging/sm750fb/sm750_accel.h | 278 +- + drivers/staging/sm750fb/sm750_cursor.c | 60 +- + drivers/staging/sm750fb/sm750_help.h | 56 - + drivers/staging/sm750fb/sm750_hw.c | 211 +- + drivers/staging/speakup/buffers.c | 4 +- + drivers/staging/speakup/devsynth.c | 4 +- + drivers/staging/speakup/fakekey.c | 6 +- + drivers/staging/speakup/i18n.c | 5 +- + drivers/staging/speakup/keyhelp.c | 22 +- + drivers/staging/speakup/main.c | 4 - + drivers/staging/speakup/serialio.c | 10 +- + drivers/staging/speakup/speakup_acntpc.c | 5 - + drivers/staging/speakup/speakup_acntsa.c | 4 - + drivers/staging/speakup/speakup_apollo.c | 4 - + drivers/staging/speakup/speakup_audptr.c | 4 - + drivers/staging/speakup/speakup_bns.c | 4 - + drivers/staging/speakup/speakup_decext.c | 28 +- + drivers/staging/speakup/speakup_decpc.c | 4 - + drivers/staging/speakup/speakup_dectlk.c | 4 - + drivers/staging/speakup/speakup_dtlk.c | 4 - + drivers/staging/speakup/speakup_dummy.c | 4 - + drivers/staging/speakup/speakup_keypc.c | 4 - + drivers/staging/speakup/speakup_ltlk.c | 4 - + drivers/staging/speakup/speakup_soft.c | 3 - + drivers/staging/speakup/speakup_spkout.c | 4 - + drivers/staging/speakup/speakup_txprt.c | 4 - + drivers/staging/speakup/spk_priv.h | 4 - + drivers/staging/speakup/spk_priv_keyinfo.h | 4 - + drivers/staging/speakup/spkguide.txt | 1 - + drivers/staging/speakup/varhandlers.c | 50 +- + drivers/staging/staging.c | 19 - + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 9 +- + drivers/staging/unisys/include/guestlinuxdebug.h | 13 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 237 +- + drivers/staging/unisys/visorbus/vbusdeviceinfo.h | 7 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 6 +- + drivers/staging/unisys/visorbus/visorchannel.c | 4 +- + drivers/staging/unisys/visorbus/visorchipset.c | 65 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 8 +- + .../staging/unisys/visorinput/ultrainputreport.h | 45 +- + drivers/staging/unisys/visornic/visornic_main.c | 42 +- + drivers/staging/vt6655/card.c | 18 +- + drivers/staging/vt6655/channel.c | 67 +- + drivers/staging/vt6655/channel.h | 2 +- + drivers/staging/vt6655/device_main.c | 29 +- + drivers/staging/vt6655/key.c | 8 +- + drivers/staging/vt6655/mac.c | 109 +- + drivers/staging/vt6655/mac.h | 58 +- + drivers/staging/vt6655/power.c | 66 +- + drivers/staging/vt6655/power.h | 8 +- + drivers/staging/vt6655/rf.c | 178 +- + drivers/staging/vt6656/device.h | 4 +- + drivers/staging/vt6656/main_usb.c | 30 +- + drivers/staging/vt6656/power.c | 2 +- + drivers/staging/vt6656/usbpipe.c | 21 +- + drivers/staging/wilc1000/Makefile | 6 +- + drivers/staging/wilc1000/coreconfigurator.c | 420 +- + drivers/staging/wilc1000/coreconfigurator.h | 73 +- + drivers/staging/wilc1000/host_interface.c | 1512 ++--- + drivers/staging/wilc1000/host_interface.h | 125 +- + drivers/staging/wilc1000/linux_mon.c | 134 +- + drivers/staging/wilc1000/linux_wlan.c | 514 +- + drivers/staging/wilc1000/linux_wlan_common.h | 166 - + drivers/staging/wilc1000/wilc_debugfs.c | 53 +- + drivers/staging/wilc1000/wilc_msgqueue.c | 143 +- + drivers/staging/wilc1000/wilc_msgqueue.h | 110 +- + drivers/staging/wilc1000/wilc_sdio.c | 118 +- + drivers/staging/wilc1000/wilc_spi.c | 51 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 1103 +-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 1 - + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 17 +- + drivers/staging/wilc1000/wilc_wlan.c | 561 +- + drivers/staging/wilc1000/wilc_wlan.h | 25 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 43 +- + drivers/staging/wilc1000/wilc_wlan_cfg.h | 18 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 17 +- + drivers/staging/wlan-ng/cfg80211.c | 41 +- + drivers/staging/wlan-ng/hfa384x.h | 5 - + drivers/staging/wlan-ng/hfa384x_usb.c | 149 +- + drivers/staging/wlan-ng/p80211conv.c | 132 +- + drivers/staging/wlan-ng/p80211netdev.c | 8 +- + drivers/staging/wlan-ng/p80211wep.c | 10 +- + drivers/staging/wlan-ng/prism2mgmt.h | 1 - + drivers/staging/wlan-ng/prism2mib.c | 24 +- + drivers/staging/wlan-ng/prism2usb.c | 18 +- + drivers/staging/xgifb/XGI_main_26.c | 22 +- + drivers/staging/xgifb/vb_init.c | 3 +- + drivers/staging/xgifb/vb_setmode.c | 42 +- + drivers/staging/xgifb/vgatypes.h | 7 +- + drivers/vme/bridges/vme_ca91cx42.c | 11 +- + drivers/w1/masters/omap_hdq.c | 1 - + drivers/w1/w1.c | 1 - + drivers/watchdog/Kconfig | 15 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/mei_wdt.c | 724 ++ + fs/compat_ioctl.c | 22 - + include/linux/amba/bus.h | 9 + + include/linux/coresight-pmu.h | 39 + + include/linux/coresight.h | 34 +- + include/linux/eeprom_93xx46.h | 9 + + include/linux/fence.h | 2 + + include/linux/hyperv.h | 95 + + include/linux/iio/common/st_sensors.h | 4 + + include/linux/iio/iio.h | 2 +- + include/linux/irqdomain.h | 1 + + include/linux/msi.h | 9 + + include/linux/platform_data/ad5761.h | 44 + + include/linux/stm.h | 10 + + include/linux/vmw_vmci_defs.h | 43 +- + include/uapi/linux/iio/types.h | 1 + + lib/devres.c | 2 +- + scripts/ver_linux | 2 +- + tools/hv/Makefile | 2 + + 825 files changed, 34558 insertions(+), 35933 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-health-afe440x + create mode 100644 Documentation/devicetree/bindings/goldfish/pipe.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc0832.txt + create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt + create mode 100644 Documentation/devicetree/bindings/iio/health/afe4403.txt + create mode 100644 Documentation/devicetree/bindings/iio/health/afe4404.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/opt3001.txt + create mode 100644 Documentation/devicetree/bindings/misc/eeprom-93xx46.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/lpc1857-eeprom.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/mtk-efuse.txt + rename {drivers/staging/panel => Documentation/misc-devices}/lcd-panel-cgram.txt (100%) + create mode 100644 drivers/hwtracing/coresight/coresight-etm-perf.c + create mode 100644 drivers/hwtracing/coresight/coresight-etm-perf.h + create mode 100644 drivers/hwtracing/coresight/coresight-etm3x-sysfs.c + create mode 100644 drivers/hwtracing/stm/heartbeat.c + create mode 100644 drivers/iio/adc/at91-sama5d2_adc.c + rename drivers/{staging => }/iio/adc/mxs-lradc.c (99%) + create mode 100644 drivers/iio/adc/ti-adc0832.c + create mode 100644 drivers/iio/adc/ti-ads1015.c + create mode 100644 drivers/iio/chemical/atlas-ph-sensor.c + create mode 100644 drivers/iio/common/st_sensors/st_sensors_core.h + create mode 100644 drivers/iio/dac/ad5761.c + create mode 100644 drivers/iio/dac/stx104.c + create mode 100644 drivers/iio/health/afe4403.c + create mode 100644 drivers/iio/health/afe4404.c + create mode 100644 drivers/iio/health/afe440x.h + create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c + create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c + create mode 100644 drivers/iio/pressure/mpl115.h + create mode 100644 drivers/iio/pressure/mpl115_i2c.c + create mode 100644 drivers/iio/pressure/mpl115_spi.c + delete mode 100644 drivers/misc/mei/wd.c + create mode 100644 drivers/misc/mic/bus/vop_bus.c + create mode 100644 drivers/misc/mic/bus/vop_bus.h + delete mode 100644 drivers/misc/mic/card/mic_virtio.c + delete mode 100644 drivers/misc/mic/card/mic_virtio.h + delete mode 100644 drivers/misc/mic/host/mic_fops.c + delete mode 100644 drivers/misc/mic/host/mic_fops.h + delete mode 100644 drivers/misc/mic/host/mic_virtio.c + create mode 100644 drivers/misc/mic/vop/Makefile + create mode 100644 drivers/misc/mic/vop/vop_debugfs.c + create mode 100644 drivers/misc/mic/vop/vop_main.c + rename drivers/misc/mic/{host/mic_virtio.h => vop/vop_main.h} (58%) + create mode 100644 drivers/misc/mic/vop/vop_vringh.c + rename drivers/{staging/panel => misc}/panel.c (96%) + create mode 100644 drivers/nvmem/lpc18xx_eeprom.c + create mode 100644 drivers/nvmem/mtk-efuse.c + create mode 100644 drivers/staging/comedi/drivers/ni_mio_c_common.c + delete mode 100644 drivers/staging/dgap/Kconfig + delete mode 100644 drivers/staging/dgap/Makefile + delete mode 100644 drivers/staging/dgap/dgap.c + delete mode 100644 drivers/staging/dgap/dgap.h + create mode 100644 drivers/staging/fbtft/fb_ssd1305.c + create mode 100644 drivers/staging/fbtft/fb_ssd1325.c + create mode 100644 drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c + create mode 100644 drivers/staging/fsl-mc/bus/mc-msi.c + create mode 100644 drivers/staging/lustre/include/linux/lnet/lib-dlc.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_kernelcomm.h + rename drivers/staging/lustre/{include/linux/libcfs/libcfs_kernelcomm.h => lustre/include/uapi_kernelcomm.h} (51%) + rename drivers/staging/lustre/lustre/{libcfs/kernel_user_comm.c => obdclass/kernelcomm.c} (81%) + delete mode 100644 drivers/staging/olpc_dcon/Kconfig + delete mode 100644 drivers/staging/olpc_dcon/Makefile + delete mode 100644 drivers/staging/olpc_dcon/TODO + delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.c + delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.h + delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c + delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c + delete mode 100644 drivers/staging/panel/Kconfig + delete mode 100644 drivers/staging/panel/Makefile + delete mode 100644 drivers/staging/panel/TODO + delete mode 100644 drivers/staging/sm750fb/sm750_help.h + delete mode 100644 drivers/staging/staging.c + delete mode 100644 drivers/staging/wilc1000/linux_wlan_common.h + create mode 100644 drivers/watchdog/mei_wdt.c + create mode 100644 include/linux/coresight-pmu.h + create mode 100644 include/linux/platform_data/ad5761.h +$ git am -3 ../patches/0001-staging-mark-CONFIG_FSL_MC_BUS-as-broken-for-now.patch +Applying: staging: mark CONFIG_FSL_MC_BUS as broken for now +Using index info to reconstruct a base tree... +M drivers/staging/fsl-mc/bus/Kconfig +Falling back to patching base and 3-way merge... +Auto-merging drivers/staging/fsl-mc/bus/Kconfig +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/fsl-mc/bus/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master e80114d1521c] Merge remote-tracking branch 'staging/staging-next' + Date: Fri Feb 26 14:03:17 2016 +1100 +Merging char-misc/char-misc-next (35bf7692e765 mei: fix format string in debug prints) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt) +$ git merge extcon/extcon-next +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15.dts +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +- + drivers/extcon/extcon-arizona.c | 4 +-- + drivers/extcon/extcon-gpio.c | 2 +- + drivers/extcon/extcon-max14577.c | 3 ++ + drivers/extcon/extcon-max77693.c | 12 +++++++- + drivers/extcon/extcon-max77843.c | 5 +++- + drivers/extcon/extcon-max8997.c | 3 ++ + drivers/extcon/extcon-palmas.c | 50 +++++++++++++++++++++++++++++++++ + drivers/extcon/extcon-rt8973a.c | 8 ++++-- + drivers/extcon/extcon-sm5502.c | 8 ++++-- + include/linux/mfd/palmas.h | 3 ++ + 11 files changed, 90 insertions(+), 11 deletions(-) +Merging cgroup/for-next (468de7d80707 Merge branch 'for-4.6' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/sched/core.c +Auto-merging fs/kernfs/dir.c +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/cgroup-v2.txt +Merge made by the 'recursive' strategy. + Documentation/cgroup-v2.txt | 153 +++++++++++ + Documentation/kernel-parameters.txt | 5 + + fs/kernfs/dir.c | 191 ++++++++++--- + fs/kernfs/mount.c | 69 +++++ + fs/proc/namespaces.c | 3 + + include/linux/cgroup-defs.h | 18 +- + include/linux/cgroup.h | 49 ++++ + include/linux/kernfs.h | 11 +- + include/linux/nsproxy.h | 2 + + include/linux/proc_ns.h | 4 + + include/uapi/linux/sched.h | 3 +- + kernel/Makefile | 3 +- + kernel/cgroup.c | 516 ++++++++++++++++++++++++++---------- + kernel/cpuset.c | 10 +- + kernel/fork.c | 2 +- + kernel/nsproxy.c | 19 +- + kernel/sched/core.c | 2 +- + kernel/sched/cpuacct.c | 2 +- + 18 files changed, 869 insertions(+), 193 deletions(-) +Merging scsi/for-next (3f84575f934a Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/st.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/hosts.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/scsi/hisilicon-sas.txt | 21 +- + Documentation/scsi/st.txt | 15 +- + drivers/message/fusion/mptbase.c | 2 + + drivers/scsi/aacraid/aachba.c | 27 +- + drivers/scsi/aacraid/aacraid.h | 14 +- + drivers/scsi/aacraid/commctrl.c | 13 +- + drivers/scsi/aacraid/comminit.c | 6 +- + drivers/scsi/aacraid/commsup.c | 69 +- + drivers/scsi/aacraid/dpcsup.c | 2 - + drivers/scsi/aacraid/linit.c | 199 +- + drivers/scsi/aacraid/src.c | 30 +- + drivers/scsi/aha1542.c | 3 + + drivers/scsi/aic7xxx/aic7xxx_osm.c | 1 + + drivers/scsi/arm/acornscsi.c | 3 +- + drivers/scsi/arm/fas216.c | 2 + + drivers/scsi/be2iscsi/be.h | 20 +- + drivers/scsi/be2iscsi/be_cmds.c | 867 ++++---- + drivers/scsi/be2iscsi/be_cmds.h | 148 +- + drivers/scsi/be2iscsi/be_iscsi.c | 62 +- + drivers/scsi/be2iscsi/be_main.c | 301 +-- + drivers/scsi/be2iscsi/be_main.h | 25 +- + drivers/scsi/be2iscsi/be_mgmt.c | 573 ++--- + drivers/scsi/be2iscsi/be_mgmt.h | 2 + + drivers/scsi/bfa/bfa_core.c | 19 + + drivers/scsi/bfa/bfa_cs.h | 41 +- + drivers/scsi/bfa/bfa_ioc.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 9 + + drivers/scsi/bnx2fc/bnx2fc_io.c | 5 +- + drivers/scsi/device_handler/Kconfig | 8 +- + drivers/scsi/esas2r/esas2r_ioctl.c | 5 +- + drivers/scsi/fdomain.c | 2 +- + drivers/scsi/hisi_sas/Makefile | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 41 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 77 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 87 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2205 ++++++++++++++++++++ + drivers/scsi/hosts.c | 22 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 3 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 122 +- + drivers/scsi/ibmvscsi/viosrp.h | 26 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 4 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 5 + + drivers/scsi/lpfc/lpfc_scsi.c | 17 - + drivers/scsi/lpfc/lpfc_sli.c | 43 + + drivers/scsi/megaraid/megaraid_sas.h | 351 +++- + drivers/scsi/megaraid/megaraid_sas_base.c | 1064 ++++++---- + drivers/scsi/megaraid/megaraid_sas_fp.c | 2 + + drivers/scsi/megaraid/megaraid_sas_fusion.c | 1287 +++++++++--- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 136 +- + drivers/scsi/mpt3sas/mpi/mpi2.h | 82 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 127 +- + drivers/scsi/mpt3sas/mpi/mpi2_init.h | 22 +- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 117 +- + drivers/scsi/mpt3sas/mpi/mpi2_raid.h | 5 +- + drivers/scsi/mpt3sas/mpi/mpi2_sas.h | 10 +- + drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 5 +- + drivers/scsi/mpt3sas/mpi/mpi2_type.h | 5 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 151 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 47 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 37 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 272 ++- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 25 +- + drivers/scsi/ppa.c | 46 +- + drivers/scsi/qla2xxx/qla_attr.c | 22 +- + drivers/scsi/qla2xxx/qla_bsg.c | 201 ++ + drivers/scsi/qla2xxx/qla_bsg.h | 34 + + drivers/scsi/qla2xxx/qla_dbg.c | 146 +- + drivers/scsi/qla2xxx/qla_def.h | 56 +- + drivers/scsi/qla2xxx/qla_fw.h | 14 +- + drivers/scsi/qla2xxx/qla_gbl.h | 2 + + drivers/scsi/qla2xxx/qla_init.c | 119 +- + drivers/scsi/qla2xxx/qla_inline.h | 4 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 - + drivers/scsi/qla2xxx/qla_mbx.c | 27 +- + drivers/scsi/qla2xxx/qla_os.c | 10 + + drivers/scsi/qla2xxx/qla_sup.c | 70 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_83xx.c | 6 +- + drivers/scsi/scsi_lib.c | 1 + + drivers/scsi/scsi_scan.c | 12 +- + drivers/scsi/scsi_transport_iscsi.c | 2 + + drivers/scsi/sim710.c | 3 +- + drivers/scsi/st.c | 122 +- + drivers/scsi/ufs/ufs.h | 2 +- + drivers/scsi/ufs/ufshcd.c | 397 +++- + drivers/scsi/ufs/ufshcd.h | 6 +- + include/scsi/iscsi_if.h | 2 + + include/scsi/scsi_device.h | 1 + + 88 files changed, 7763 insertions(+), 2443 deletions(-) + create mode 100644 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +Merging target-updates/for-next (fab683eb12e7 scsi: qla2xxxx: avoid type mismatch in comparison) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (683072c71ff1 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/tegra/pinctrl-tegra.c +Auto-merging drivers/pinctrl/tegra/pinctrl-tegra-xusb.c +Merge made by the 'recursive' strategy. + .../bindings/gpio/microchip,pic32-gpio.txt | 49 + + .../bindings/pinctrl/microchip,pic32-pinctrl.txt | 60 + + .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 74 + + .../bindings/pinctrl/rockchip,pinctrl.txt | 2 +- + .../bindings/pinctrl/st,stm32-pinctrl.txt | 126 ++ + arch/arm/boot/dts/mt2701-pinfunc.h | 735 +++++++ + drivers/pinctrl/Kconfig | 52 +- + drivers/pinctrl/Makefile | 16 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 26 + + drivers/pinctrl/intel/pinctrl-intel.c | 4 - + drivers/pinctrl/mediatek/Kconfig | 16 +- + drivers/pinctrl/mediatek/Makefile | 11 +- + drivers/pinctrl/mediatek/pinctrl-mt2701.c | 586 +++++ + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 8 +- + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 8 +- + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 8 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 50 + + drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 12 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt2701.h | 2323 ++++++++++++++++++++ + drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 7 + + drivers/pinctrl/pinctrl-amd.c | 4 +- + drivers/pinctrl/pinctrl-coh901.c | 2 +- + drivers/pinctrl/pinctrl-pic32.c | 2312 +++++++++++++++++++ + drivers/pinctrl/pinctrl-pic32.h | 141 ++ + drivers/pinctrl/pinctrl-rockchip.c | 369 +++- + drivers/pinctrl/pinctrl-st.c | 1 + + drivers/pinctrl/pinctrl-zynq.c | 2 +- + drivers/pinctrl/qcom/Kconfig | 8 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 453 ++++ + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 30 +- + drivers/pinctrl/stm32/Kconfig | 16 + + drivers/pinctrl/stm32/Makefile | 5 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 829 +++++++ + drivers/pinctrl/stm32/pinctrl-stm32.h | 51 + + drivers/pinctrl/stm32/pinctrl-stm32f429.c | 1598 ++++++++++++++ + drivers/pinctrl/sunxi/Kconfig | 32 +- + drivers/pinctrl/sunxi/Makefile | 3 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c | 106 + + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 5 +- + drivers/pinctrl/tegra/Kconfig | 30 + + drivers/pinctrl/tegra/Makefile | 7 + + drivers/pinctrl/{ => tegra}/pinctrl-tegra-xusb.c | 4 +- + drivers/pinctrl/{ => tegra}/pinctrl-tegra.c | 4 +- + drivers/pinctrl/{ => tegra}/pinctrl-tegra.h | 0 + drivers/pinctrl/{ => tegra}/pinctrl-tegra114.c | 0 + drivers/pinctrl/{ => tegra}/pinctrl-tegra124.c | 0 + drivers/pinctrl/{ => tegra}/pinctrl-tegra20.c | 0 + drivers/pinctrl/{ => tegra}/pinctrl-tegra210.c | 0 + drivers/pinctrl/{ => tegra}/pinctrl-tegra30.c | 0 + drivers/pinctrl/uniphier/Kconfig | 2 +- + 51 files changed, 10059 insertions(+), 129 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/microchip,pic32-gpio.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,pic32-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt + create mode 100644 arch/arm/boot/dts/mt2701-pinfunc.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt2701.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt2701.h + create mode 100644 drivers/pinctrl/pinctrl-pic32.c + create mode 100644 drivers/pinctrl/pinctrl-pic32.h + create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq4019.c + create mode 100644 drivers/pinctrl/stm32/Kconfig + create mode 100644 drivers/pinctrl/stm32/Makefile + create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32.c + create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32.h + create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32f429.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c + create mode 100644 drivers/pinctrl/tegra/Kconfig + create mode 100644 drivers/pinctrl/tegra/Makefile + rename drivers/pinctrl/{ => tegra}/pinctrl-tegra-xusb.c (99%) + rename drivers/pinctrl/{ => tegra}/pinctrl-tegra.c (99%) + rename drivers/pinctrl/{ => tegra}/pinctrl-tegra.h (100%) + rename drivers/pinctrl/{ => tegra}/pinctrl-tegra114.c (100%) + rename drivers/pinctrl/{ => tegra}/pinctrl-tegra124.c (100%) + rename drivers/pinctrl/{ => tegra}/pinctrl-tegra20.c (100%) + rename drivers/pinctrl/{ => tegra}/pinctrl-tegra210.c (100%) + rename drivers/pinctrl/{ => tegra}/pinctrl-tegra30.c (100%) +Merging vhost/linux-next (b91608c87c59 vring: Use the DMA API on Xen) +$ git merge vhost/linux-next +Auto-merging lib/Makefile +Auto-merging arch/s390/pci/pci_dma.c +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci-noop.c | 46 +--- + arch/s390/Kconfig | 5 +- + arch/s390/include/asm/device.h | 6 +- + arch/s390/include/asm/dma-mapping.h | 6 +- + arch/s390/pci/pci.c | 1 + + arch/s390/pci/pci_dma.c | 4 +- + drivers/virtio/Kconfig | 2 +- + drivers/virtio/virtio_mmio.c | 67 ++---- + drivers/virtio/virtio_pci_common.h | 6 - + drivers/virtio/virtio_pci_legacy.c | 42 ++-- + drivers/virtio/virtio_pci_modern.c | 63 ++---- + drivers/virtio/virtio_ring.c | 439 +++++++++++++++++++++++++++++++----- + include/linux/dma-mapping.h | 2 + + include/linux/virtio.h | 23 +- + include/linux/virtio_ring.h | 35 +++ + lib/Makefile | 1 + + lib/dma-noop.c | 75 ++++++ + tools/virtio/linux/dma-mapping.h | 17 ++ + 18 files changed, 595 insertions(+), 245 deletions(-) + create mode 100644 lib/dma-noop.c + create mode 100644 tools/virtio/linux/dma-mapping.h +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Auto-merging drivers/remoteproc/remoteproc_core.c +Merge made by the 'recursive' strategy. + drivers/remoteproc/remoteproc_core.c | 4 +++- + drivers/remoteproc/wkup_m3_rproc.c | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (531dd08c87bd Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Resolved 'drivers/gpio/Kconfig' using previous resolution. +Resolved 'drivers/gpio/Makefile' using previous resolution. +Resolved 'drivers/pinctrl/sunxi/pinctrl-sunxi.c' using previous resolution. +Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c +Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c +CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c +Auto-merging drivers/gpio/Makefile +CONFLICT (content): Merge conflict in drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +CONFLICT (content): Merge conflict in drivers/gpio/Kconfig +Removing arch/xtensa/include/asm/gpio.h +Removing arch/x86/include/asm/gpio.h +Removing arch/sparc/include/asm/gpio.h +Removing arch/powerpc/include/asm/gpio.h +Removing arch/openrisc/include/asm/gpio.h +Auto-merging arch/mips/jz4740/gpio.c +Removing arch/microblaze/include/asm/gpio.h +Removing arch/metag/include/asm/gpio.h +Removing arch/ia64/include/asm/gpio.h +Auto-merging arch/arm/mach-imx/mach-mx27ads.c +Removing arch/alpha/include/asm/gpio.h +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/obsolete/sysfs-gpio +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 155333a1be41] Merge remote-tracking branch 'gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/{testing => obsolete}/sysfs-gpio | 4 +- + Documentation/ABI/testing/gpio-cdev | 26 + + .../devicetree/bindings/gpio/gpio-ts4800.txt | 20 + + .../devicetree/bindings/gpio/gpio-xgene-sb.txt | 47 +- + Documentation/gpio/board.txt | 11 +- + MAINTAINERS | 16 + + arch/alpha/include/asm/gpio.h | 4 - + arch/arm/common/scoop.c | 10 +- + arch/arm/mach-gemini/gpio.c | 4 +- + arch/arm/mach-imx/mach-mx27ads.c | 4 +- + arch/arm/mach-ixp4xx/common.c | 4 +- + arch/arm/mach-s3c24xx/mach-h1940.c | 2 +- + arch/arm/mach-sa1100/simpad.c | 4 +- + arch/arm/mach-w90x900/gpio.c | 13 +- + arch/arm/plat-orion/gpio.c | 24 +- + arch/avr32/boards/merisc/setup.c | 1 - + arch/avr32/mach-at32ap/pio.c | 2 +- + arch/blackfin/kernel/bfin_gpio.c | 6 +- + arch/blackfin/kernel/debug-mmrs.c | 2 +- + arch/blackfin/mach-bf538/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf538/ext-gpio.c | 8 +- + arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 2 +- + arch/blackfin/mach-common/ints-priority.c | 2 +- + arch/blackfin/mach-common/pm.c | 2 +- + arch/ia64/include/asm/gpio.h | 4 - + arch/m68k/coldfire/gpio.c | 2 +- + arch/metag/include/asm/gpio.h | 4 - + arch/microblaze/include/asm/gpio.h | 4 - + arch/mips/alchemy/common/gpiolib.c | 8 +- + arch/mips/ar7/gpio.c | 26 +- + arch/mips/bcm63xx/gpio.c | 4 +- + arch/mips/jz4740/gpio.c | 10 +- + arch/mips/kernel/gpio_txx9.c | 4 +- + arch/mips/rb532/gpio.c | 12 +- + arch/mips/txx9/generic/setup.c | 10 +- + arch/mips/txx9/rbtx4938/setup.c | 3 +- + arch/openrisc/include/asm/gpio.h | 4 - + arch/powerpc/include/asm/gpio.h | 4 - + arch/powerpc/sysdev/ppc4xx_gpio.c | 2 +- + arch/powerpc/sysdev/simple_gpio.c | 2 +- + arch/sh/include/mach-common/mach/magicpanelr2.h | 2 +- + arch/sparc/include/asm/gpio.h | 4 - + arch/unicore32/kernel/gpio.c | 2 +- + arch/x86/include/asm/gpio.h | 4 - + arch/xtensa/include/asm/gpio.h | 4 - + drivers/ata/pata_at91.c | 3 +- + drivers/ata/pata_bf54x.c | 2 +- + drivers/gpio/Kconfig | 72 ++- + drivers/gpio/Makefile | 8 +- + drivers/gpio/devres.c | 2 +- + drivers/gpio/gpio-104-dio-48e.c | 430 +++++++++++++ + drivers/gpio/gpio-104-idi-48.c | 30 +- + drivers/gpio/gpio-104-idio-16.c | 27 +- + drivers/gpio/gpio-amd8111.c | 7 +- + drivers/gpio/gpio-ath79.c | 264 +++++--- + drivers/gpio/gpio-brcmstb.c | 13 +- + drivers/gpio/gpio-davinci.c | 5 +- + drivers/gpio/gpio-f7188x.c | 27 +- + drivers/gpio/gpio-ich.c | 51 +- + drivers/gpio/gpio-ks8695.c | 12 - + drivers/gpio/gpio-mcp23s08.c | 2 + + drivers/gpio/gpio-mpc5200.c | 1 - + drivers/gpio/gpio-mpc8xxx.c | 259 +++----- + drivers/gpio/gpio-pisosr.c | 183 ++++++ + drivers/gpio/gpio-rcar.c | 42 ++ + drivers/gpio/gpio-sch311x.c | 8 +- + drivers/gpio/gpio-tpic2810.c | 170 +++++ + drivers/gpio/gpio-tps65218.c | 222 +++++++ + drivers/gpio/gpio-ts4800.c | 91 +++ + drivers/gpio/gpio-ws16c48.c | 427 +++++++++++++ + drivers/gpio/gpio-xgene-sb.c | 265 +++++++- + drivers/gpio/gpiolib-acpi.c | 18 +- + drivers/gpio/gpiolib-sysfs.c | 51 +- + drivers/gpio/gpiolib.c | 705 +++++++++++++++------ + drivers/gpio/gpiolib.h | 79 ++- + drivers/mfd/menelaus.c | 2 +- + drivers/mtd/onenand/omap2.c | 2 +- + drivers/pcmcia/bfin_cf_pcmcia.c | 2 +- + drivers/pcmcia/pxa2xx_vpac270.c | 1 - + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 33 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 18 - + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 +- + drivers/soc/fsl/qe/gpio.c | 2 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 2 - + drivers/usb/host/ohci-at91.c | 2 - + drivers/video/fbdev/atmel_lcdfb.c | 2 - + drivers/video/fbdev/omap/lcd_h3.c | 2 +- + drivers/video/fbdev/omap/lcd_osk.c | 3 +- + drivers/video/fbdev/omap/lcd_palmtt.c | 2 +- + include/asm-generic/gpio.h | 4 + + include/linux/gpio/driver.h | 35 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/gpio.h | 58 ++ + tools/Makefile | 8 +- + tools/gpio/Makefile | 12 + + tools/gpio/gpio-utils.c | 11 + + tools/gpio/gpio-utils.h | 27 + + tools/gpio/lsgpio.c | 195 ++++++ + 100 files changed, 3401 insertions(+), 846 deletions(-) + rename Documentation/ABI/{testing => obsolete}/sysfs-gpio (88%) + create mode 100644 Documentation/ABI/testing/gpio-cdev + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ts4800.txt + delete mode 100644 arch/alpha/include/asm/gpio.h + delete mode 100644 arch/ia64/include/asm/gpio.h + delete mode 100644 arch/metag/include/asm/gpio.h + delete mode 100644 arch/microblaze/include/asm/gpio.h + delete mode 100644 arch/openrisc/include/asm/gpio.h + delete mode 100644 arch/powerpc/include/asm/gpio.h + delete mode 100644 arch/sparc/include/asm/gpio.h + delete mode 100644 arch/x86/include/asm/gpio.h + delete mode 100644 arch/xtensa/include/asm/gpio.h + create mode 100644 drivers/gpio/gpio-104-dio-48e.c + create mode 100644 drivers/gpio/gpio-pisosr.c + create mode 100644 drivers/gpio/gpio-tpic2810.c + create mode 100644 drivers/gpio/gpio-tps65218.c + create mode 100644 drivers/gpio/gpio-ts4800.c + create mode 100644 drivers/gpio/gpio-ws16c48.c + create mode 100644 include/uapi/linux/gpio.h + create mode 100644 tools/gpio/Makefile + create mode 100644 tools/gpio/gpio-utils.c + create mode 100644 tools/gpio/gpio-utils.h + create mode 100644 tools/gpio/lsgpio.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 (ff01c944cfa9 pwm: Mark all devices as "might sleep") +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (0cbb0b92689a Merge tag 'pci-v4.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (b953c0d234bc Linux 4.1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (023bd7166be0 clk: skip unnecessary set_phase if nothing to do) +$ git merge clk/clk-next +Auto-merging include/linux/device.h +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm/mach-mvebu/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/axi-clkgen.txt | 5 +- + .../bindings/clock/brcm,iproc-clocks.txt | 6 + + .../devicetree/bindings/clock/qcom,gcc.txt | 1 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 2 +- + arch/arm/mach-mvebu/Kconfig | 3 + + arch/mips/Kconfig | 2 - + arch/mips/pic32/Kconfig | 1 - + drivers/clk/Kconfig | 21 +- + drivers/clk/Makefile | 1 - + drivers/clk/bcm/clk-bcm2835.c | 38 +- + drivers/clk/bcm/clk-cygnus.c | 59 + + drivers/clk/bcm/clk-iproc-pll.c | 41 +- + drivers/clk/bcm/clk-iproc.h | 43 +- + drivers/clk/clk-axi-clkgen.c | 170 +-- + drivers/clk/clk-divider.c | 5 +- + drivers/clk/clk-fixed-factor.c | 13 + + drivers/clk/clk-fixed-rate.c | 13 + + drivers/clk/clk-gpio.c | 165 +-- + drivers/clk/clk-palmas.c | 16 +- + drivers/clk/clk-vt8500.c | 100 +- + drivers/clk/clk.c | 202 +-- + drivers/clk/meson/clkc.c | 2 +- + drivers/clk/mvebu/Kconfig | 2 - + drivers/clk/nxp/clk-lpc32xx.c | 10 +- + drivers/clk/qcom/Kconfig | 8 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/common.c | 29 +- + drivers/clk/qcom/gcc-ipq4019.c | 1354 ++++++++++++++++++++ + drivers/clk/qcom/gcc-msm8916.c | 18 + + drivers/clk/qcom/gcc-msm8960.c | 2 +- + drivers/clk/qcom/gcc-msm8996.c | 92 ++ + drivers/clk/qcom/gdsc.c | 89 +- + drivers/clk/qcom/gdsc.h | 34 +- + drivers/clk/qcom/mmcc-msm8974.c | 15 +- + drivers/clk/qcom/mmcc-msm8996.c | 157 +++ + drivers/clk/samsung/clk-exynos5433.c | 138 +- + drivers/clk/shmobile/r8a7795-cpg-mssr.c | 235 ++++ + drivers/clk/shmobile/renesas-cpg-mssr.c | 7 +- + drivers/clk/shmobile/renesas-cpg-mssr.h | 2 + + drivers/clk/socfpga/clk-gate-a10.c | 6 +- + drivers/clk/socfpga/clk-periph-a10.c | 7 +- + drivers/clk/socfpga/clk-pll-a10.c | 2 +- + drivers/clk/st/clkgen-fsyn.c | 8 +- + drivers/clk/ti/apll.c | 20 +- + drivers/clk/ti/clkt_dpll.c | 6 +- + drivers/clk/ti/dpll.c | 25 +- + drivers/clk/ti/dpll3xxx.c | 16 +- + drivers/clk/ti/dpll44xx.c | 8 +- + drivers/clk/versatile/clk-sp810.c | 4 +- + include/dt-bindings/clock/bcm-cygnus.h | 6 + + include/dt-bindings/clock/exynos5433.h | 9 +- + include/dt-bindings/clock/lpc32xx-clock.h | 1 + + include/dt-bindings/clock/qcom,gcc-ipq4019.h | 158 +++ + include/dt-bindings/clock/qcom,gcc-msm8916.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8996.h | 11 + + include/dt-bindings/clock/qcom,mmcc-msm8996.h | 17 + + include/linux/clk-provider.h | 9 +- + include/linux/clk/ti.h | 8 +- + include/linux/device.h | 12 + + 59 files changed, 2733 insertions(+), 703 deletions(-) + create mode 100644 drivers/clk/qcom/gcc-ipq4019.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq4019.h +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging aio/master (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg()) +$ git merge aio/master +Auto-merging net/unix/af_unix.c +Auto-merging net/sctp/socket.c +Auto-merging net/core/stream.c +Auto-merging net/atm/common.c +Auto-merging mm/readahead.c +Auto-merging mm/internal.h +Auto-merging mm/filemap.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/signal.c +Auto-merging kernel/auditsc.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/fs.h +Auto-merging fs/splice.c +Auto-merging fs/read_write.c +Auto-merging fs/pipe.c +Auto-merging fs/namei.c +Auto-merging fs/internal.h +Auto-merging fs/attr.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_lock.c | 2 +- + drivers/gpu/drm/ttm/ttm_lock.c | 6 +- + fs/aio.c | 729 ++++++++++++++++++++++++++++++++++++++--- + fs/attr.c | 2 +- + fs/binfmt_flat.c | 2 +- + fs/fuse/dev.c | 2 +- + fs/internal.h | 6 + + fs/namei.c | 2 +- + fs/pipe.c | 4 +- + fs/read_write.c | 5 +- + fs/splice.c | 8 +- + include/linux/aio.h | 9 + + include/linux/fs.h | 3 + + include/linux/sched.h | 6 + + include/uapi/linux/aio_abi.h | 15 +- + init/Kconfig | 13 + + kernel/auditsc.c | 6 +- + kernel/signal.c | 20 ++ + kernel/sysctl.c | 9 + + mm/filemap.c | 6 +- + mm/internal.h | 4 +- + mm/readahead.c | 13 +- + net/atm/common.c | 4 +- + net/ax25/af_ax25.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/core/stream.c | 2 +- + net/decnet/af_decnet.c | 2 +- + net/irda/af_irda.c | 4 +- + net/netrom/af_netrom.c | 2 +- + net/rose/af_rose.c | 2 +- + net/sctp/socket.c | 2 +- + net/unix/af_unix.c | 4 +- + net/x25/af_x25.c | 2 +- + 33 files changed, 819 insertions(+), 81 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 030f7510a4f2 Merge remote-tracking branch 'clk/clk-next' +Merging next-20160111 version of aio +$ git merge -m next-20160111/aio 6a81013efc4013555c5de34c01530b805f45c92c +Auto-merging net/unix/af_unix.c +Auto-merging net/sctp/socket.c +Auto-merging net/core/stream.c +Auto-merging net/atm/common.c +Auto-merging mm/filemap.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/signal.c +Auto-merging kernel/auditsc.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/fs.h +Auto-merging fs/splice.c +Auto-merging fs/read_write.c +Auto-merging fs/pipe.c +Auto-merging fs/internal.h +Auto-merging fs/attr.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_lock.c | 2 +- + drivers/gpu/drm/ttm/ttm_lock.c | 6 +- + fs/aio.c | 382 ++++++++++++++++++++++++++++++++++++++--- + fs/attr.c | 2 +- + fs/binfmt_flat.c | 2 +- + fs/fuse/dev.c | 2 +- + fs/internal.h | 6 + + fs/pipe.c | 4 +- + fs/read_write.c | 5 +- + fs/splice.c | 8 +- + include/linux/aio.h | 8 + + include/linux/fs.h | 2 + + include/linux/sched.h | 6 + + include/uapi/linux/aio_abi.h | 2 +- + init/Kconfig | 13 ++ + kernel/auditsc.c | 6 +- + kernel/signal.c | 20 +++ + kernel/sysctl.c | 9 + + mm/filemap.c | 6 +- + net/atm/common.c | 4 +- + net/ax25/af_ax25.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/core/stream.c | 2 +- + net/decnet/af_decnet.c | 2 +- + net/irda/af_irda.c | 4 +- + net/netrom/af_netrom.c | 2 +- + net/rose/af_rose.c | 2 +- + net/sctp/socket.c | 2 +- + net/unix/af_unix.c | 4 +- + net/x25/af_x25.c | 2 +- + 30 files changed, 455 insertions(+), 64 deletions(-) +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (3d6dee7af7fe Makefile: add kselftest-merge) +$ git merge kselftest/next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 10 + + tools/testing/selftests/breakpoints/Makefile | 4 +- + .../breakpoints/step_after_suspend_test.c | 218 +++++++++++++++++++++ + tools/testing/selftests/cpu-hotplug/config | 2 + + tools/testing/selftests/firmware/config | 1 + + tools/testing/selftests/ftrace/config | 1 + + tools/testing/selftests/ipc/config | 2 + + tools/testing/selftests/media_tests/.gitignore | 1 + + tools/testing/selftests/media_tests/Makefile | 7 + + .../selftests/media_tests/media_device_test.c | 94 +++++++++ + tools/testing/selftests/memory-hotplug/config | 4 + + tools/testing/selftests/mount/config | 2 + + tools/testing/selftests/net/config | 3 + + tools/testing/selftests/pstore/config | 4 + + tools/testing/selftests/seccomp/config | 2 + + tools/testing/selftests/static_keys/config | 1 + + tools/testing/selftests/user/config | 1 + + tools/testing/selftests/vm/config | 1 + + tools/testing/selftests/zram/config | 2 + + 19 files changed, 359 insertions(+), 1 deletion(-) + create mode 100644 tools/testing/selftests/breakpoints/step_after_suspend_test.c + create mode 100644 tools/testing/selftests/cpu-hotplug/config + create mode 100644 tools/testing/selftests/firmware/config + create mode 100644 tools/testing/selftests/ftrace/config + create mode 100644 tools/testing/selftests/ipc/config + create mode 100644 tools/testing/selftests/media_tests/.gitignore + create mode 100644 tools/testing/selftests/media_tests/Makefile + create mode 100644 tools/testing/selftests/media_tests/media_device_test.c + create mode 100644 tools/testing/selftests/memory-hotplug/config + create mode 100644 tools/testing/selftests/mount/config + create mode 100644 tools/testing/selftests/net/config + create mode 100644 tools/testing/selftests/pstore/config + create mode 100644 tools/testing/selftests/seccomp/config + create mode 100644 tools/testing/selftests/static_keys/config + create mode 100644 tools/testing/selftests/user/config + create mode 100644 tools/testing/selftests/vm/config + create mode 100644 tools/testing/selftests/zram/config +Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval') +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_mr.c | 5 ++--- + fs/afs/main.c | 6 ++---- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging luto-misc/next (afd2ff9b7e1b Linux 4.4) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (4c5e6154516b Merge branch 'for-4.5/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API) +$ git merge coresight/next +Resolved 'drivers/hwtracing/coresight/coresight-etm3x.c' using previous resolution. +Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c +CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a5c70290742e] Merge remote-tracking branch 'coresight/next' +$ git diff -M --stat --summary HEAD^.. +Merging rtc/rtc-next (ef1654006c2f rtc: pic32: Add PIC32 real time clock driver) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-rx8025.c +Merge made by the 'recursive' strategy. + .../bindings/rtc/alphascale,asm9260-rtc.txt | 19 + + .../devicetree/bindings/rtc/epson,rx6110.txt | 39 ++ + .../devicetree/bindings/rtc/maxim,ds3231.txt | 37 ++ + .../bindings/rtc/microchip,pic32-rtc.txt | 21 ++ + Documentation/rtc.txt | 6 + + drivers/mfd/max77686.c | 86 +---- + drivers/rtc/Kconfig | 47 ++- + drivers/rtc/Makefile | 3 + + drivers/rtc/class.c | 13 - + drivers/rtc/interface.c | 54 +++ + drivers/rtc/rtc-asm9260.c | 355 ++++++++++++++++++ + drivers/rtc/rtc-ds1305.c | 4 +- + drivers/rtc/rtc-ds1307.c | 411 ++++++++++++++++++++- + drivers/rtc/rtc-max77686.c | 214 ++++++++--- + drivers/rtc/rtc-pcf2123.c | 271 ++++++++++---- + drivers/rtc/rtc-pcf85063.c | 132 ++++--- + drivers/rtc/rtc-pic32.c | 411 +++++++++++++++++++++ + drivers/rtc/rtc-rv8803.c | 39 +- + drivers/rtc/rtc-rx6110.c | 402 ++++++++++++++++++++ + drivers/rtc/rtc-rx8025.c | 25 +- + drivers/rtc/rtc-s5m.c | 8 +- + drivers/rtc/rtc-sysfs.c | 35 +- + include/linux/mfd/max77686-private.h | 3 - + include/linux/rtc.h | 4 + + 24 files changed, 2320 insertions(+), 319 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/epson,rx6110.txt + create mode 100644 Documentation/devicetree/bindings/rtc/maxim,ds3231.txt + create mode 100644 Documentation/devicetree/bindings/rtc/microchip,pic32-rtc.txt + create mode 100644 drivers/rtc/rtc-asm9260.c + create mode 100644 drivers/rtc/rtc-pic32.c + create mode 100644 drivers/rtc/rtc-rx6110.c +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (36f90b0a2ddd Linux 4.5-rc2) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (c27b54512f75 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'mm/mprotect.c' +Resolved 'arch/mips/Kconfig' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'fs/ocfs2/aops.c' using previous resolution. +Resolved 'fs/xfs/xfs_aops.c' using previous resolution. +Auto-merging scripts/link-vmlinux.sh +Auto-merging net/sctp/socket.c +Auto-merging mm/util.c +Auto-merging mm/nommu.c +Auto-merging mm/mprotect.c +CONFLICT (content): Merge conflict in mm/mprotect.c +Auto-merging mm/mmap.c +Auto-merging mm/mempolicy.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +Auto-merging mm/ksm.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/Kconfig +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/time/hrtimer.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/signal.c +Auto-merging kernel/profile.c +Auto-merging kernel/memremap.c +Auto-merging kernel/kexec_file.c +Auto-merging kernel/kexec_core.c +Auto-merging kernel/fork.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/Makefile +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/Kbuild +Removing include/trace/events/gfpflags.h +Auto-merging include/linux/sched/sysctl.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/hrtimer.h +Auto-merging include/linux/dma-mapping.h +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/xfs/xfs_aops.h +Auto-merging fs/xfs/xfs_aops.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c +Auto-merging fs/ocfs2/quota_global.c +Auto-merging fs/ocfs2/ocfs2_trace.h +Auto-merging fs/ocfs2/aops.c +CONFLICT (content): Merge conflict in fs/ocfs2/aops.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/dax.c +Auto-merging fs/btrfs/tests/btrfs-tests.c +Auto-merging drivers/xen/balloon.c +Auto-merging drivers/video/fbdev/atmel_lcdfb.c +Auto-merging drivers/usb/common/common.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Auto-merging drivers/rapidio/rio.c +Auto-merging drivers/net/wireless/marvell/mwifiex/debugfs.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_main.c +Auto-merging drivers/net/ethernet/freescale/gianfar.c +Auto-merging drivers/media/platform/coda/coda-bit.c +Auto-merging drivers/gpu/host1x/job.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging drivers/firmware/efi/efivars.c +Auto-merging arch/x86/mm/pageattr.c +Auto-merging arch/x86/mm/gup.c +Auto-merging arch/x86/mm/Makefile +Auto-merging arch/x86/kernel/process_64.c +Auto-merging arch/x86/kernel/dumpstack.c +Auto-merging arch/x86/kernel/cpu/Makefile +Auto-merging arch/x86/include/asm/ftrace.h +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kernel/dumpstack.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/mips/mm/gup.c +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging arch/arm/mach-lpc32xx/phy3250.c +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/cgroup-v2.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/mprotect.c'. +[master 0ee76d6fcc5f] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/blockdev/zram.txt | 10 + + Documentation/cgroup-v2.txt | 19 + + .../filesystems/ocfs2-online-filecheck.txt | 94 + + Documentation/filesystems/proc.txt | 18 + + Documentation/kcov.txt | 111 + + Documentation/kernel-parameters.txt | 17 +- + Documentation/memory-hotplug.txt | 23 +- + Documentation/printk-formats.txt | 18 + + Documentation/rapidio/mport_cdev.txt | 104 + + Documentation/rapidio/tsi721.txt | 9 + + Documentation/sysctl/vm.txt | 18 + + Documentation/vm/ksm.txt | 63 + + Documentation/vm/page_owner.txt | 9 +- + Documentation/vm/slub.txt | 4 +- + Documentation/vm/transhuge.txt | 5 + + Makefile | 11 +- + arch/Kconfig | 4 + + arch/arc/include/asm/hugepage.h | 3 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/page.h | 2 + + arch/arm/kernel/smp.c | 2 + + arch/arm/mach-lpc32xx/phy3250.c | 13 +- + arch/arm/mach-netx/fb.c | 14 +- + arch/arm/mach-nspire/clcd.c | 13 +- + arch/arm/mm/mmap.c | 2 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm64/mm/mmap.c | 4 +- + arch/avr32/Kconfig | 1 + + arch/blackfin/Kconfig | 1 + + arch/blackfin/include/asm/pgtable.h | 2 + + arch/cris/Kconfig | 1 + + arch/ia64/mm/hugetlbpage.c | 2 +- + arch/m32r/mm/init.c | 27 +- + arch/metag/mm/hugetlbpage.c | 2 +- + arch/mips/Kconfig | 1 + + arch/mips/mm/gup.c | 2 +- + arch/mips/mm/mmap.c | 4 +- + arch/parisc/mm/hugetlbpage.c | 2 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/process.c | 4 +- + arch/powerpc/kernel/rtasd.c | 9 +- + arch/powerpc/kernel/traps.c | 5 +- + arch/powerpc/mm/hash_utils_64.c | 36 +- + arch/powerpc/mm/init_32.c | 8 +- + arch/powerpc/mm/mmap.c | 4 +- + arch/powerpc/mm/mmu_context_hash64.c | 3 +- + arch/powerpc/mm/pgtable_64.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 10 +- + arch/powerpc/sysdev/fsl_rio.c | 19 +- + arch/powerpc/sysdev/fsl_rio.h | 1 + + arch/powerpc/sysdev/fsl_rmu.c | 16 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/dumpstack.c | 6 +- + arch/s390/kernel/time.c | 8 +- + arch/s390/kernel/topology.c | 7 +- + arch/s390/mm/vmem.c | 10 +- + arch/sh/Kconfig | 1 + + arch/sh/mm/hugetlbpage.c | 2 +- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/compat.h | 7 + + arch/sparc/include/asm/syscall.h | 9 +- + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/sparc/mm/hugetlbpage.c | 2 +- + arch/tile/Kconfig | 1 + + arch/tile/mm/hugetlbpage.c | 2 +- + arch/tile/mm/init.c | 11 +- + arch/um/kernel/skas/mmu.c | 2 +- + arch/unicore32/mm/pgd.c | 2 +- + arch/x86/Kconfig | 8 +- + arch/x86/boot/Makefile | 6 + + arch/x86/boot/compressed/Makefile | 2 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/x86/entry/vdso/Makefile | 2 + + arch/x86/include/asm/compat.h | 3 +- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/kernel/Makefile | 5 + + arch/x86/kernel/aperture_64.c | 12 +- + arch/x86/kernel/apic/Makefile | 4 + + arch/x86/kernel/apic/hw_nmi.c | 1 - + arch/x86/kernel/cpu/Makefile | 4 + + arch/x86/kernel/dumpstack.c | 5 +- + arch/x86/kernel/machine_kexec_64.c | 46 + + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kernel/tboot.c | 2 +- + arch/x86/lib/Makefile | 3 + + arch/x86/mm/Makefile | 3 + + arch/x86/mm/gup.c | 2 +- + arch/x86/mm/init.c | 36 +- + arch/x86/mm/mmap.c | 6 +- + arch/x86/mm/pageattr.c | 14 +- + arch/x86/realmode/rm/Makefile | 2 + + block/Kconfig | 13 + + block/genhd.c | 2 +- + block/partition-generic.c | 11 + + drivers/ata/pata_hpt366.c | 13 +- + drivers/base/memory.c | 34 +- + drivers/base/property.c | 12 +- + drivers/block/aoe/aoecmd.c | 4 +- + drivers/block/zram/zcomp.c | 24 + + drivers/block/zram/zcomp.h | 2 + + drivers/block/zram/zram_drv.c | 7 +- + drivers/char/random.c | 22 + + drivers/dma/iop-adma.c | 8 +- + drivers/dma/mv_xor.c | 4 +- + drivers/dma/qcom_bam_dma.c | 14 +- + drivers/firewire/core-cdev.c | 4 +- + drivers/firmware/efi/efivars.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- + drivers/gpu/drm/drm_edid_load.c | 17 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 13 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 13 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 8 +- + drivers/gpu/drm/sti/sti_cursor.c | 20 +- + drivers/gpu/drm/sti/sti_gdp.c | 3 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 6 +- + drivers/gpu/drm/tegra/gem.c | 11 +- + drivers/gpu/drm/vc4/vc4_bo.c | 5 +- + drivers/gpu/host1x/cdma.c | 8 +- + drivers/gpu/host1x/job.c | 10 +- + drivers/hid/uhid.c | 2 +- + drivers/ide/hpt366.c | 9 +- + drivers/input/input-compat.h | 12 +- + drivers/media/platform/coda/coda-bit.c | 10 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 7 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/rionet.c | 277 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 10 +- + drivers/pinctrl/pinmux.c | 13 +- + drivers/power/ab8500_btemp.c | 15 +- + drivers/power/ab8500_charger.c | 16 +- + drivers/power/ab8500_fg.c | 15 +- + drivers/power/abx500_chargalg.c | 14 +- + drivers/power/charger-manager.c | 27 +- + drivers/rapidio/Kconfig | 8 + + drivers/rapidio/devices/Makefile | 1 + + drivers/rapidio/devices/rio_mport_cdev.c | 2714 ++++++++++++++++++++ + drivers/rapidio/devices/tsi721.c | 1034 +++++--- + drivers/rapidio/devices/tsi721.h | 87 +- + drivers/rapidio/devices/tsi721_dma.c | 397 ++- + drivers/rapidio/rio-driver.c | 12 + + drivers/rapidio/rio-scan.c | 135 +- + drivers/rapidio/rio.c | 433 +++- + drivers/rapidio/rio.h | 5 + + .../staging/lustre/lustre/llite/llite_internal.h | 2 +- + drivers/usb/common/common.c | 22 +- + drivers/video/fbdev/acornfb.c | 4 +- + drivers/video/fbdev/amba-clcd-versatile.c | 14 +- + drivers/video/fbdev/amba-clcd.c | 4 +- + drivers/video/fbdev/atmel_lcdfb.c | 9 +- + drivers/video/fbdev/ep93xx-fb.c | 8 +- + drivers/video/fbdev/gbefb.c | 8 +- + drivers/video/fbdev/imxfb.c | 12 +- + drivers/video/fbdev/mx3fb.c | 9 +- + drivers/video/fbdev/nuc900fb.c | 8 +- + drivers/video/fbdev/omap/lcdc.c | 16 +- + drivers/video/fbdev/pxa168fb.c | 8 +- + drivers/video/fbdev/pxafb.c | 4 +- + drivers/video/fbdev/s3c-fb.c | 7 +- + drivers/video/fbdev/s3c2410fb.c | 8 +- + drivers/video/fbdev/sa1100fb.c | 8 +- + drivers/virtio/virtio_balloon.c | 6 + + drivers/xen/Kconfig | 23 +- + drivers/xen/balloon.c | 11 +- + fs/autofs4/autofs_i.h | 72 +- + fs/autofs4/dev-ioctl.c | 57 +- + fs/autofs4/expire.c | 84 +- + fs/autofs4/init.c | 10 +- + fs/autofs4/inode.c | 52 +- + fs/autofs4/root.c | 163 +- + fs/autofs4/symlink.c | 11 +- + fs/autofs4/waitq.c | 78 +- + fs/binfmt_elf.c | 2 +- + fs/block_dev.c | 19 +- + fs/btrfs/tests/btrfs-tests.c | 3 +- + fs/buffer.c | 24 +- + fs/cifs/cifs_debug.c | 56 +- + fs/cifs/cifs_debug.h | 2 +- + fs/cifs/cifsfs.c | 6 +- + fs/cifs/cifsglob.h | 4 +- + fs/dax.c | 21 +- + fs/eventpoll.c | 2 +- + fs/ext2/inode.c | 16 +- + fs/ext4/dir.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/inode.c | 6 +- + fs/ext4/ioctl.c | 5 + + fs/mpage.c | 3 +- + fs/ocfs2/Makefile | 3 +- + fs/ocfs2/alloc.c | 105 +- + fs/ocfs2/aops.c | 1146 ++++----- + fs/ocfs2/aops.h | 19 +- + fs/ocfs2/cluster/heartbeat.c | 191 +- + fs/ocfs2/dlm/dlmcommon.h | 21 +- + fs/ocfs2/dlm/dlmconvert.c | 30 +- + fs/ocfs2/dlm/dlmdomain.c | 11 +- + fs/ocfs2/dlm/dlmmaster.c | 124 +- + fs/ocfs2/dlm/dlmrecovery.c | 33 +- + fs/ocfs2/dlm/dlmthread.c | 7 + + fs/ocfs2/file.c | 165 +- + fs/ocfs2/filecheck.c | 605 +++++ + fs/ocfs2/filecheck.h | 48 + + fs/ocfs2/inode.c | 203 +- + fs/ocfs2/inode.h | 9 +- + fs/ocfs2/journal.c | 8 +- + fs/ocfs2/localalloc.c | 4 +- + fs/ocfs2/mmap.c | 4 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 18 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/resize.c | 2 +- + fs/ocfs2/stackglue.c | 3 +- + fs/ocfs2/stackglue.h | 2 + + fs/ocfs2/super.c | 49 +- + fs/ocfs2/super.h | 2 - + fs/proc/base.c | 67 + + fs/proc/meminfo.c | 31 +- + fs/proc/page.c | 8 +- + fs/select.c | 8 +- + fs/xfs/xfs_aops.c | 17 +- + fs/xfs/xfs_aops.h | 1 + + fs/xfs/xfs_bmap_util.c | 3 +- + include/asm-generic/atomic-long.h | 6 +- + include/asm-generic/bug.h | 6 + + include/asm-generic/pgtable.h | 17 + + include/linux/auto_dev-ioctl.h | 6 - + include/linux/auto_fs.h | 10 +- + include/linux/buffer_head.h | 10 +- + include/linux/compaction.h | 16 + + include/linux/compat.h | 18 + + include/linux/cpumask.h | 2 - + include/linux/crc64_ecma.h | 56 + + include/linux/dax.h | 8 +- + include/linux/dma-mapping.h | 25 +- + include/linux/fault-inject.h | 5 +- + include/linux/freezer.h | 2 +- + include/linux/gfp.h | 47 +- + include/linux/hardirq.h | 2 + + include/linux/hrtimer.h | 12 +- + include/linux/kcov.h | 29 + + include/linux/kernel.h | 2 + + include/linux/kexec.h | 4 + + include/linux/kfifo.h | 2 +- + include/linux/list_bl.h | 4 +- + include/linux/memcontrol.h | 147 +- + include/linux/memory.h | 3 + + include/linux/memory_hotplug.h | 7 +- + include/linux/migrate.h | 6 +- + include/linux/mm.h | 103 +- + include/linux/mmdebug.h | 3 +- + include/linux/mmzone.h | 26 +- + include/linux/oom.h | 2 +- + include/linux/page-flags-layout.h | 2 + + include/linux/page-flags.h | 32 +- + include/linux/page_ext.h | 1 + + include/linux/page_owner.h | 50 +- + include/linux/page_ref.h | 164 ++ + include/linux/pagemap.h | 22 +- + include/linux/percpu.h | 3 - + include/linux/poison.h | 4 + + include/linux/poll.h | 2 +- + include/linux/printk.h | 12 +- + include/linux/radix-tree.h | 27 +- + include/linux/random.h | 1 + + include/linux/rio.h | 98 +- + include/linux/rio_drv.h | 15 +- + include/linux/rio_mport_cdev.h | 271 ++ + include/linux/rio_regs.h | 3 + + include/linux/sched.h | 21 +- + include/linux/sched/sysctl.h | 21 - + include/linux/sem.h | 1 + + include/linux/slab.h | 13 +- + include/linux/slab_def.h | 3 + + include/linux/slub_def.h | 1 + + include/linux/string.h | 9 +- + include/linux/swap.h | 1 + + include/linux/syscalls.h | 3 + + include/linux/tick.h | 2 +- + include/linux/trace_events.h | 10 - + include/linux/tracepoint-defs.h | 14 +- + include/linux/unaligned/access_ok.h | 24 +- + include/linux/vm_event_item.h | 2 + + include/trace/events/btrfs.h | 2 +- + include/trace/events/compaction.h | 57 +- + include/trace/events/gfpflags.h | 43 - + include/trace/events/huge_memory.h | 40 +- + include/trace/events/kmem.h | 2 +- + include/trace/events/mmflags.h | 174 ++ + include/trace/events/page_ref.h | 133 + + include/trace/events/vmscan.h | 2 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/auto_fs.h | 21 +- + include/uapi/linux/auto_fs4.h | 17 +- + include/uapi/linux/byteorder/big_endian.h | 24 +- + include/uapi/linux/byteorder/little_endian.h | 24 +- + include/uapi/linux/kcov.h | 10 + + include/uapi/linux/swab.h | 10 +- + include/uapi/linux/virtio_balloon.h | 3 +- + init/Kconfig | 49 + + init/main.c | 5 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 +- + kernel/Makefile | 12 + + kernel/auditsc.c | 4 +- + kernel/exit.c | 4 +- + kernel/fork.c | 13 +- + kernel/hung_task.c | 21 +- + kernel/kallsyms.c | 42 +- + kernel/kcov.c | 273 ++ + kernel/kexec.c | 9 +- + kernel/kexec_core.c | 6 + + kernel/kexec_file.c | 8 +- + kernel/locking/Makefile | 3 + + kernel/memremap.c | 4 +- + kernel/panic.c | 41 +- + kernel/printk/Makefile | 1 + + kernel/printk/internal.h | 55 + + kernel/printk/nmi.c | 222 ++ + kernel/printk/printk.c | 150 +- + kernel/profile.c | 4 +- + kernel/ptrace.c | 2 +- + kernel/rcu/Makefile | 4 + + kernel/sched/Makefile | 4 + + kernel/seccomp.c | 4 +- + kernel/signal.c | 4 + + kernel/sys.c | 5 +- + kernel/sys_ni.c | 2 + + kernel/sysctl.c | 10 + + kernel/time/hrtimer.c | 18 +- + kernel/time/tick-sched.c | 10 +- + kernel/time/timer.c | 15 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 21 + + lib/Kconfig.ubsan | 5 + + lib/Makefile | 13 + + lib/bug.c | 15 +- + lib/crc64_ecma.c | 341 +++ + lib/kstrtox.c | 64 + + lib/nmi_backtrace.c | 89 +- + lib/radix-tree.c | 182 +- + lib/string.c | 45 +- + lib/test_printf.c | 53 + + lib/vsprintf.c | 75 + + mm/Kconfig | 8 +- + mm/Kconfig.debug | 65 +- + mm/Makefile | 21 +- + mm/backing-dev.c | 20 +- + mm/compaction.c | 322 ++- + mm/debug-pagealloc.c | 127 +- + mm/debug.c | 165 +- + mm/debug_page_ref.c | 53 + + mm/failslab.c | 12 +- + mm/filemap.c | 180 +- + mm/huge_memory.c | 111 +- + mm/internal.h | 34 +- + mm/kasan/Makefile | 1 + + mm/kmemcheck.c | 3 + + mm/ksm.c | 733 +++++- + mm/madvise.c | 298 ++- + mm/memblock.c | 11 +- + mm/memcontrol.c | 223 +- + mm/memory-failure.c | 2 - + mm/memory.c | 48 +- + mm/memory_hotplug.c | 49 +- + mm/mempolicy.c | 4 +- + mm/mempool.c | 20 +- + mm/migrate.c | 43 +- + mm/mmap.c | 125 - + mm/mprotect.c | 12 +- + mm/mremap.c | 4 +- + mm/nommu.c | 117 - + mm/oom_kill.c | 214 +- + mm/page-writeback.c | 62 +- + mm/page_alloc.c | 504 +++- + mm/page_owner.c | 100 +- + mm/page_poison.c | 158 ++ + mm/pgtable-generic.c | 14 - + mm/rmap.c | 16 +- + mm/shmem.c | 37 +- + mm/slab.c | 1030 ++++---- + mm/slab.h | 99 +- + mm/slab_common.c | 10 +- + mm/slub.c | 389 +-- + mm/truncate.c | 6 +- + mm/userfaultfd.c | 3 +- + mm/util.c | 154 ++ + mm/vmalloc.c | 25 +- + mm/vmscan.c | 240 +- + mm/vmstat.c | 17 +- + mm/workingset.c | 170 +- + mm/zsmalloc.c | 9 +- + net/sctp/socket.c | 2 +- + net/xfrm/xfrm_user.c | 2 +- + scripts/Makefile.lib | 6 + + scripts/Makefile.ubsan | 4 + + scripts/gdb/linux/proc.py | 41 + + scripts/gdb/vmlinux-gdb.py | 1 + + scripts/kallsyms.c | 93 +- + scripts/link-vmlinux.sh | 6 +- + scripts/namespace.pl | 2 + + sound/arm/pxa2xx-pcm-lib.c | 12 +- + sound/drivers/pcsp/pcsp.c | 9 +- + sound/soc/fsl/imx-pcm-fiq.c | 10 +- + sound/soc/nuc900/nuc900-pcm.c | 6 +- + sound/soc/omap/omap-pcm.c | 12 +- + tools/perf/builtin-kmem.c | 49 +- + tools/testing/radix-tree/.gitignore | 2 + + tools/testing/radix-tree/Makefile | 20 + + tools/testing/radix-tree/find_next_bit.c | 57 + + tools/testing/radix-tree/linux.c | 60 + + tools/testing/radix-tree/linux/bitops.h | 150 ++ + tools/testing/radix-tree/linux/bitops/__ffs.h | 43 + + tools/testing/radix-tree/linux/bitops/ffs.h | 41 + + tools/testing/radix-tree/linux/bitops/ffz.h | 12 + + tools/testing/radix-tree/linux/bitops/find.h | 13 + + tools/testing/radix-tree/linux/bitops/fls.h | 41 + + tools/testing/radix-tree/linux/bitops/fls64.h | 14 + + tools/testing/radix-tree/linux/bitops/hweight.h | 11 + + tools/testing/radix-tree/linux/bitops/le.h | 53 + + tools/testing/radix-tree/linux/bitops/non-atomic.h | 111 + + tools/testing/radix-tree/linux/bug.h | 1 + + tools/testing/radix-tree/linux/cpu.h | 35 + + tools/testing/radix-tree/linux/export.h | 2 + + tools/testing/radix-tree/linux/gfp.h | 8 + + tools/testing/radix-tree/linux/kernel.h | 35 + + tools/testing/radix-tree/linux/kmemleak.h | 1 + + tools/testing/radix-tree/linux/mempool.h | 17 + + tools/testing/radix-tree/linux/notifier.h | 8 + + tools/testing/radix-tree/linux/percpu.h | 7 + + tools/testing/radix-tree/linux/preempt.h | 5 + + tools/testing/radix-tree/linux/radix-tree.h | 1 + + tools/testing/radix-tree/linux/rcupdate.h | 9 + + tools/testing/radix-tree/linux/slab.h | 28 + + tools/testing/radix-tree/linux/types.h | 28 + + tools/testing/radix-tree/main.c | 272 ++ + tools/testing/radix-tree/rcupdate.c | 86 + + tools/testing/radix-tree/regression.h | 8 + + tools/testing/radix-tree/regression1.c | 221 ++ + tools/testing/radix-tree/regression2.c | 126 + + tools/testing/radix-tree/regression3.c | 86 + + tools/testing/radix-tree/tag_check.c | 332 +++ + tools/testing/radix-tree/test.c | 219 ++ + tools/testing/radix-tree/test.h | 40 + + tools/vm/page-types.c | 125 +- + tools/vm/slabinfo.c | 2 +- + 454 files changed, 17824 insertions(+), 5280 deletions(-) + create mode 100644 Documentation/filesystems/ocfs2-online-filecheck.txt + create mode 100644 Documentation/kcov.txt + create mode 100644 Documentation/rapidio/mport_cdev.txt + create mode 100644 drivers/rapidio/devices/rio_mport_cdev.c + create mode 100644 fs/ocfs2/filecheck.c + create mode 100644 fs/ocfs2/filecheck.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/kcov.h + create mode 100644 include/linux/page_ref.h + create mode 100644 include/linux/rio_mport_cdev.h + delete mode 100644 include/trace/events/gfpflags.h + create mode 100644 include/trace/events/mmflags.h + create mode 100644 include/trace/events/page_ref.h + create mode 100644 include/uapi/linux/kcov.h + create mode 100644 kernel/kcov.c + create mode 100644 kernel/printk/internal.h + create mode 100644 kernel/printk/nmi.c + create mode 100644 lib/crc64_ecma.c + create mode 100644 mm/debug_page_ref.c + create mode 100644 mm/page_poison.c + create mode 100644 scripts/gdb/linux/proc.py + create mode 100644 tools/testing/radix-tree/.gitignore + create mode 100644 tools/testing/radix-tree/Makefile + create mode 100644 tools/testing/radix-tree/find_next_bit.c + create mode 100644 tools/testing/radix-tree/linux.c + create mode 100644 tools/testing/radix-tree/linux/bitops.h + create mode 100644 tools/testing/radix-tree/linux/bitops/__ffs.h + create mode 100644 tools/testing/radix-tree/linux/bitops/ffs.h + create mode 100644 tools/testing/radix-tree/linux/bitops/ffz.h + create mode 100644 tools/testing/radix-tree/linux/bitops/find.h + create mode 100644 tools/testing/radix-tree/linux/bitops/fls.h + create mode 100644 tools/testing/radix-tree/linux/bitops/fls64.h + create mode 100644 tools/testing/radix-tree/linux/bitops/hweight.h + create mode 100644 tools/testing/radix-tree/linux/bitops/le.h + create mode 100644 tools/testing/radix-tree/linux/bitops/non-atomic.h + create mode 100644 tools/testing/radix-tree/linux/bug.h + create mode 100644 tools/testing/radix-tree/linux/cpu.h + create mode 100644 tools/testing/radix-tree/linux/export.h + create mode 100644 tools/testing/radix-tree/linux/gfp.h + create mode 100644 tools/testing/radix-tree/linux/kernel.h + create mode 100644 tools/testing/radix-tree/linux/kmemleak.h + create mode 100644 tools/testing/radix-tree/linux/mempool.h + create mode 100644 tools/testing/radix-tree/linux/notifier.h + create mode 100644 tools/testing/radix-tree/linux/percpu.h + create mode 100644 tools/testing/radix-tree/linux/preempt.h + create mode 100644 tools/testing/radix-tree/linux/radix-tree.h + create mode 100644 tools/testing/radix-tree/linux/rcupdate.h + create mode 100644 tools/testing/radix-tree/linux/slab.h + create mode 100644 tools/testing/radix-tree/linux/types.h + create mode 100644 tools/testing/radix-tree/main.c + create mode 100644 tools/testing/radix-tree/rcupdate.c + create mode 100644 tools/testing/radix-tree/regression.h + create mode 100644 tools/testing/radix-tree/regression1.c + create mode 100644 tools/testing/radix-tree/regression2.c + create mode 100644 tools/testing/radix-tree/regression3.c + create mode 100644 tools/testing/radix-tree/tag_check.c + create mode 100644 tools/testing/radix-tree/test.c + create mode 100644 tools/testing/radix-tree/test.h +$ git am -3 ../patches/0001-mm-cleanup-pte_alloc-interfaces-fix.patch +Applying: mm: cleanup *pte_alloc* interfaces fix +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/mm/mmu.c +$ git add -A . +$ git commit -v -a --amend +[master d6a737040958] Merge branch 'akpm-current/current' + Date: Fri Feb 26 16:05:25 2016 +1100 +$ git am -3 ../patches/0001-mm-cleanup-pte_alloc-interfaces-fix-2.patch +Applying: mm: cleanup *pte_alloc* interfaces fix 2 +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/mm/hugetlbpage.c +$ git add -A . +$ git commit -v -a --amend +[master 4488c8a31ce8] Merge branch 'akpm-current/current' + Date: Fri Feb 26 16:05:25 2016 +1100 +$ git am -3 ../patches/0001-signals-pkeys-make-si_pkey-32-bits-for-now.patch +Applying: signals, pkeys: make si_pkey 32 bits for now +$ 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: net/sched/sch_mqprio.c: fix build with older gcc +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 6e62ee2f472b...8404c72206cb akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (8404c72206cb net/sched/sch_mqprio.c: fix build with older gcc) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + net/sched/sch_mqprio.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..195163909790 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.5-rc2 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..9810ab21953a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160226 |